aboutsummaryrefslogtreecommitdiff
path: root/target/x86
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-07-08 20:51:19 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-07-08 20:51:19 +0000
commit9dd07e229c674d6fb6a220cbc70859fa2e7d3736 (patch)
treecc8517a76b16da13a8f170d2167a906bfeb7b286 /target/x86
parent649046bd2e1723ec886a78092199865c6dc6580c (diff)
downloadbuildroot-9dd07e229c674d6fb6a220cbc70859fa2e7d3736.tar.gz
buildroot-9dd07e229c674d6fb6a220cbc70859fa2e7d3736.tar.bz2
- add pxelinux
Diffstat (limited to 'target/x86')
-rw-r--r--target/x86/syslinux/Config.in7
-rw-r--r--target/x86/syslinux/syslinux.mk17
2 files changed, 18 insertions, 6 deletions
diff --git a/target/x86/syslinux/Config.in b/target/x86/syslinux/Config.in
index 1e19b8c4a2..6e46ecfe36 100644
--- a/target/x86/syslinux/Config.in
+++ b/target/x86/syslinux/Config.in
@@ -4,3 +4,10 @@ config BR2_TARGET_SYSLINUX
depends on BR2_i386
help
The syslinux bootloader for x86 systems.
+
+config BR2_TARGET_PXELINUX
+ bool "pxelinux"
+ default n
+ depends on BR2_i386 || BR2_x86_64
+ help
+ The pxelinux loader for x86 systems.
diff --git a/target/x86/syslinux/syslinux.mk b/target/x86/syslinux/syslinux.mk
index a1f5d7f8e2..8eb4c115a3 100644
--- a/target/x86/syslinux/syslinux.mk
+++ b/target/x86/syslinux/syslinux.mk
@@ -22,7 +22,7 @@ ifeq ($(SYSLINUX_SUPPORTED_ARCH),y)
#
#############################################################
-SYSLINUX_VERSION:=3.31
+SYSLINUX_VERSION:=3.51
SYSLINUX_DIR=$(BUILD_DIR)/syslinux-$(SYSLINUX_VERSION)
SYSLINUX_DIR2=$(TOOL_BUILD_DIR)/syslinux-$(SYSLINUX_VERSION)
SYSLINUX_SOURCE=syslinux-$(SYSLINUX_VERSION).tar.bz2
@@ -37,20 +37,22 @@ $(DL_DIR)/$(SYSLINUX_SOURCE):
syslinux-source: $(DL_DIR)/$(SYSLINUX_SOURCE)
$(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH)
- $(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+ $(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(SYSLINUX_DIR) target/x86/syslinux/ \*.patch
touch -c $@
-$(SYSLINUX_DIR)/isolinux.bin: $(SYSLINUX_DIR)/Makefile
- $(MAKE) -C $(SYSLINUX_DIR)
+$(SYSLINUX_DIR)/isolinux.bin $(SYSLINUX_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/Makefile
+ $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(SYSLINUX_DIR)
touch -c $@
syslinux: $(SYSLINUX_DIR)/isolinux.bin
+pxelinux: $(SYSLINUX_DIR)/pxelinux.bin
-syslinux-clean:
+pxelinux-clean syslinux-clean:
+ rm -f $(SYSLINUX_DIR)/isolinux.bin $(SYSLINUX_DIR)/pxelinux.bin
-$(MAKE) -C $(SYSLINUX_DIR) clean
-syslinux-dirclean:
+pxelinux-dirclean syslinux-dirclean:
rm -rf $(SYSLINUX_DIR)
endif
@@ -63,3 +65,6 @@ endif
ifeq ($(strip $(BR2_TARGET_SYSLINUX)),y)
TARGETS+=syslinux
endif
+ifeq ($(strip $(BR2_TARGET_PXELINUX)),y)
+TARGETS+=pxelinux
+endif