summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2013-12-06 21:11:36 +0100
committerMichael Brown2013-12-06 21:11:36 +0100
commit153748cce9b637e082f869d17197bc3ff5b24756 (patch)
tree76eb37b364062b8d077d2dec992d85f31398b769
parent[fbcon] Update the console width and height after changing mode (diff)
downloadipxe-153748cce9b637e082f869d17197bc3ff5b24756.tar.gz
ipxe-153748cce9b637e082f869d17197bc3ff5b24756.tar.xz
ipxe-153748cce9b637e082f869d17197bc3ff5b24756.zip
[lkrnprefix] Include iPXE version string in image header
Originally-implemented-by: Christian Hesse <list@eworm.de> Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/arch/i386/Makefile4
-rw-r--r--src/arch/i386/prefix/lkrnprefix.S5
2 files changed, 8 insertions, 1 deletions
diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 3ee40014e..d1b885c87 100644
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -69,6 +69,10 @@ CFLAGS += -fshort-wchar
#
CFLAGS += -Ui386
+# Define version string for lkrnprefix.S
+#
+CFLAGS_lkrnprefix += -DVERSION="\"$(VERSION)\""
+
# Locations of utilities
#
ISOLINUX_BIN_LIST := \
diff --git a/src/arch/i386/prefix/lkrnprefix.S b/src/arch/i386/prefix/lkrnprefix.S
index 690031f0d..624f9b0ad 100644
--- a/src/arch/i386/prefix/lkrnprefix.S
+++ b/src/arch/i386/prefix/lkrnprefix.S
@@ -127,7 +127,7 @@ realmode_swtch:
start_sys:
.word 0
kernel_version:
- .word 0
+ .word version_string - 0x200
type_of_loader:
.byte 0
loadflags:
@@ -166,6 +166,9 @@ hardware_subarch:
hardware_subarch_data:
.byte 0, 0, 0, 0, 0, 0, 0, 0
+version_string:
+ .asciz VERSION
+
/*
We don't need to do too much setup.