dde_ipxe: use recent iPXE upstream version

This commit is contained in:
Christian Helmuth 2013-05-17 12:11:19 +02:00 committed by Norman Feske
parent 33c5469b92
commit df1209aa89
3 changed files with 4 additions and 4 deletions

View File

@ -8,7 +8,7 @@
VERBOSE ?= @ VERBOSE ?= @
ECHO = @echo ECHO = @echo
GIT_URL = http://git.ipxe.org/ipxe.git GIT_URL = http://git.ipxe.org/ipxe.git
GIT_REV = 34a81da0c8dd47628a7408cd3f8d8a926d1ecbee GIT_REV = c4bce43c3c4d3c5ebb2d926b58ad16dc9642c19d
CONTRIB_DIR = contrib CONTRIB_DIR = contrib
PATCH_FILE = patches/dde_ipxe.patch PATCH_FILE = patches/dde_ipxe.patch

View File

@ -5,7 +5,7 @@ LIBS = dde_kit dde_ipxe_support
SRC_C = nic.c dde.c dummies.c SRC_C = nic.c dde.c dummies.c
SRC_C += $(addprefix core/, iobuf.c string.c bitops.c) SRC_C += $(addprefix core/, iobuf.c string.c bitops.c list.c random.c)
SRC_C += $(addprefix arch/x86/core/, x86_string.c) SRC_C += $(addprefix arch/x86/core/, x86_string.c)
SRC_C += $(addprefix arch/i386/core/, rdtsc_timer.c) SRC_C += $(addprefix arch/i386/core/, rdtsc_timer.c)
SRC_C += $(addprefix net/, ethernet.c netdevice.c nullnet.c eth_slow.c iobpad.c) SRC_C += $(addprefix net/, ethernet.c netdevice.c nullnet.c eth_slow.c iobpad.c)

View File

@ -28,10 +28,10 @@ index 655cbdc..a8016c8 100644
/** /**
* Assert a condition at run-time. * Assert a condition at run-time.
diff --git a/src/include/compiler.h b/src/include/compiler.h diff --git a/src/include/compiler.h b/src/include/compiler.h
index ed9af23..e8c62d7 100644 index e555924..b430e37 100644
--- a/src/include/compiler.h --- a/src/include/compiler.h
+++ b/src/include/compiler.h +++ b/src/include/compiler.h
@@ -262,7 +262,7 @@ REQUEST_EXPANDED ( CONFIG_SYMBOL ); @@ -263,7 +263,7 @@ REQUEST_EXPANDED ( CONFIG_SYMBOL );
/** printf() for debugging */ /** printf() for debugging */
extern void __attribute__ (( format ( printf, 1, 2 ) )) extern void __attribute__ (( format ( printf, 1, 2 ) ))