Pull request for branch bootloaders-cleanup

index 435d4bd..f5eb859 100644
@@ -293,4 +293,6 @@ source "package/Config.in"
 
 source "fs/Config.in"
 
+source "boot/Config.in"
+
 source "target/Config.in"

index 68732fa..67e41ae 100644
@@ -320,8 +320,9 @@ ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
 TARGETS+=target-purgelocales
 endif
 
-# target stuff is last so it can override anything else
+include boot/common.mk
 include target/Makefile.in
+include fs/common.mk
 
 TARGETS+=erase-fakeroots
 

new file mode 100644
index 0000000..6f2796f
@@ -0,0 +1,12 @@
+menu "Bootloaders"
+
+source "boot/grub/Config.in"
+source "boot/grub2/Config.in"
+source "boot/syslinux/Config.in"
+source "boot/yaboot/Config.in"
+source "boot/u-boot/Config.in"
+source "boot/at91bootstrap/Config.in"
+source "boot/at91dataflashboot/Config.in"
+
+endmenu
+

similarity index 92%
rename from target/device/Atmel/at91bootstrap/Config.in
rename to boot/at91bootstrap/Config.in
index 91e0b08..44db8f5 100644
@@ -1,7 +1,6 @@
 menuconfig BR2_TARGET_AT91BOOTSTRAP
-	depends on BR2_TARGET_AT91SAM9260EK || BR2_TARGET_AT91SAM9260DFC || BR2_TARGET_AT91SAM9260PF || \
-	BR2_TARGET_AT91SAM9261EK || BR2_TARGET_AT91SAM9263EK || BR2_TARGET_AT91SAM9XEEK || BR2_TARGET_AT91SAM9G20DFC
-	bool "Build AT91 Bootstrap for selected chip"
+	depends on BR2_arm
+	bool "AT91 Bootstrap"
 
 if	BR2_TARGET_AT91BOOTSTRAP
 

similarity index 96%
rename from target/device/Atmel/at91bootstrap/at91bootstrap.mk
rename to boot/at91bootstrap/at91bootstrap.mk
index f681fa9..2072c6b 100644
@@ -39,7 +39,7 @@ $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE):
 $(AT91BOOTSTRAP_DIR)/.unpacked: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
 	mkdir -p $(BUILD_DIR)
 	$(AT91BOOTSTRAP_ZCAT) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) target/device/Atmel/at91bootstrap/ at91bootstrap-$(AT91BOOTSTRAP_VERSION)\*.patch
+	toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) boot/at91bootstrap/ at91bootstrap-$(AT91BOOTSTRAP_VERSION)\*.patch
 	touch $(AT91BOOTSTRAP_DIR)/.unpacked
 
 $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config

similarity index 76%
rename from target/device/Atmel/DataFlashBoot/Config.in
rename to boot/at91dataflashboot/Config.in
index 1da5e62..c6711c4 100644
@@ -1,6 +1,6 @@
-config BR2_TARGET_DATAFLASHBOOT
-       depends on BR2_TARGET_AT91RM9200 || BR2_TARGET_AT91SAM9261 || BR2_TARGET_AT91SAM9261S
-	bool "Build Dataflashboot for selected chip"
+menuconfig BR2_TARGET_DATAFLASHBOOT
+       depends on BR2_arm
+       bool "AT91 DataFlashBoot"
 
 choice
 	prompt "Target Architecture"

similarity index 100%
rename from target/device/Atmel/DataFlashBoot/DataflashBoot.mk
rename to boot/at91dataflashboot/at91dataflashboot.mk

new file mode 100644
index 0000000..dc0bfb4
@@ -0,0 +1 @@
+include boot/*/*.mk
\ No newline at end of file

similarity index 100%
rename from target/x86/grub/Config.in
rename to boot/grub/Config.in

similarity index 100%
rename from target/x86/grub/grub.100-autoreconf.patch
rename to boot/grub/grub.100-autoreconf.patch

similarity index 100%
rename from target/x86/grub/grub.200-fix_mbr_handling.patch
rename to boot/grub/grub.200-fix_mbr_handling.patch

similarity index 100%
rename from target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch
rename to boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch

similarity index 98%
rename from target/x86/grub/grub.mk
rename to boot/grub/grub.mk
index af46244..80f9b6d 100644
@@ -75,7 +75,7 @@ $(GRUB_DIR)/.unpacked: $(DL_DIR)/$(GRUB_SOURCE) $(DL_DIR)/$(GRUB_PATCH)
 	for i in `grep -v "^#" $(GRUB_DIR)/debian/patches/00list`; do \
 		cat $(GRUB_DIR)/debian/patches/$$i | patch -p1 -d $(GRUB_DIR); \
 	done
-	toolchain/patch-kernel.sh $(GRUB_DIR) target/x86/grub grub.\*.patch{,.bz2}
+	toolchain/patch-kernel.sh $(GRUB_DIR) boot/grub grub.\*.patch{,.bz2}
 	touch $@
 
 $(GRUB_DIR)/.configured: $(GRUB_DIR)/.unpacked

similarity index 100%
rename from target/x86/grub/menu.lst
rename to boot/grub/menu.lst

similarity index 100%
rename from target/x86/grub2/Config.in
rename to boot/grub2/Config.in

similarity index 100%
rename from target/x86/grub2/grub-1.95-001-fix-grub-install.patch
rename to boot/grub2/grub-1.95-001-fix-grub-install.patch

similarity index 98%
rename from target/x86/grub2/grub2.mk
rename to boot/grub2/grub2.mk
index 46c6471..119397b 100644
@@ -75,7 +75,7 @@ $(GRUB2_DIR)/.unpacked: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH)
 	for i in `grep -v "^#" $(GRUB2_DIR)/debian/patches/00list`; do \
 		cat $(GRUB2_DIR)/debian/patches/$$i | patch -p1 -d $(GRUB2_DIR); \
 	done
-	toolchain/patch-kernel.sh $(GRUB2_DIR) target/x86/grub2 grub-\*.patch
+	toolchain/patch-kernel.sh $(GRUB2_DIR) boot/grub2 grub-\*.patch
 	touch $@
 
 $(GRUB2_DIR)/.configured: $(GRUB2_DIR)/.unpacked

similarity index 100%
rename from target/x86/syslinux/Config.in
rename to boot/syslinux/Config.in

similarity index 100%
rename from target/x86/syslinux/syslinux-3.82-makefile.patch
rename to boot/syslinux/syslinux-3.82-makefile.patch

similarity index 96%
rename from target/x86/syslinux/syslinux.mk
rename to boot/syslinux/syslinux.mk
index 75d4ad4..df27b6d 100644
@@ -38,7 +38,7 @@ 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) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(SYSLINUX_DIR) target/x86/syslinux/ \*.patch
+	toolchain/patch-kernel.sh $(SYSLINUX_DIR) boot/syslinux/ \*.patch
 	touch -c $@
 
 $(SYSLINUX_DIR)/isolinux.bin $(SYSLINUX_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/Makefile

similarity index 100%
rename from target/u-boot/Config.in
rename to boot/u-boot/Config.in

similarity index 99%
rename from target/u-boot/Makefile.in
rename to boot/u-boot/Makefile.in
index d1bb5e5..a875f2b 100644
@@ -70,7 +70,7 @@ $(U_BOOT_DIR)/.unpacked: $(DL_DIR)/$(U_BOOT_SOURCE)
 	touch $@
 
 $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
-	toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot \
+	toolchain/patch-kernel.sh $(U_BOOT_DIR) boot/u-boot \
 		u-boot-$(U_BOOT_VERSION)-\*.patch \
 		u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)
 ifneq ($(strip $(U_BOOT_ARCH_PATCH_DIR)),)

similarity index 100%
rename from target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32
rename to boot/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32

similarity index 100%
rename from target/powerpc/yaboot/Config.in
rename to boot/yaboot/Config.in

similarity index 100%
rename from target/powerpc/yaboot/yaboot.mk
rename to boot/yaboot/yaboot.mk

index 5d53635..2d96793 100644
@@ -1,12 +1,3 @@
-menu "Bootloaders"
-
-source "target/x86/grub/Config.in"
-#source "target/x86/grub2/Config.in"
-source "target/x86/syslinux/Config.in"
-source "target/powerpc/yaboot/Config.in"
-source "target/u-boot/Config.in"
-endmenu
-
 menu "Kernel"
 choice
 	prompt "Kernel type"

index ffcdbb6..8feb564 100644
@@ -54,16 +54,8 @@ include target/generic/Makefile.in
 
 # this eventually adds the kernel target to TARGETS:
 include target/device/Makefile.in
-include target/x86/Makefile.in
-include target/powerpc/Makefile.in
 include target/xtensa/Makefile.in
 
-ifeq ($(BR2_TARGET_UBOOT),y)
-include target/u-boot/Makefile.in
-endif
-
-include fs/common.mk
-
 # kernel rules
 # We already did add the kernel target to TARGETS and now just pull in the rules
 # to actually build this target.

index 4e36b90..870c537 100644
@@ -66,8 +66,4 @@ config BR2_BOARD_PATH
 
 endmenu
 
-source "target/device/Atmel/DataFlashBoot/Config.in"
-
-source "target/device/Atmel/at91bootstrap/Config.in"
-
 endif

index c5dfffd..6de54d7 100644
@@ -66,18 +66,6 @@ include target/device/Atmel/*/Makefile.in
 UBOOT_CONFIG:=$(UBOOT_BOARD_NAME)_config
 UBOOT_CONFIG_FILE:=$(BOARD_PATH)/u-boot/$(UBOOT_BOARD_NAME).h
 
-#ifeq ($(BR2_TARGET_UBOOT_AT91),y)
-#include $(ATMEL_PATH)/u-boot/u-boot.mk
-#endif
-
-ifeq ($(BR2_TARGET_DATAFLASHBOOT),y)
-include $(ATMEL_PATH)/DataFlashBoot/DataflashBoot.mk
-endif
-
-ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
-include $(ATMEL_PATH)/at91bootstrap/at91bootstrap.mk
-endif
-
 atmel_status:
 	@echo BUILD_DIR=$(BUILD_DIR)
 	@echo BOARD_NAME=$(BOARD_NAME)

deleted file mode 100644
index 0d4698d..0000000
@@ -1 +0,0 @@
-include target/powerpc/*/*.mk

deleted file mode 100644
index 115035c..0000000
@@ -1,3 +0,0 @@
-ifeq ($(BR2_i386),y)
-include target/x86/*/*.mk
-endif

index 6f2796f..78ff82c 100644
@@ -3,7 +3,6 @@ menu "Bootloaders"
 source "boot/grub/Config.in"
 source "boot/grub2/Config.in"
 source "boot/syslinux/Config.in"
-source "boot/yaboot/Config.in"
 source "boot/u-boot/Config.in"
 source "boot/at91bootstrap/Config.in"
 source "boot/at91dataflashboot/Config.in"

deleted file mode 100644
index 75da815..0000000
@@ -1,5 +0,0 @@
-config BR2_TARGET_YABOOT
-	bool "yaboot"
-	depends on BR2_powerpc
-	help
-	  The yaboot bootloader for new world powerpc systems.

44 lines not on this page · raw message

index 2072c6b..dc475e4 100644
@@ -63,22 +63,16 @@ $(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET)
 	mkdir -p $(BINARIES_DIR)
 ifeq	($(AT91BOOTSTRAP_VERSION),2.3)
 	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
-	$(call COPY_FILE, $(AT91BOOTSTRAP_TARGET), $(BR2_TARGET_ATMEL_COPYTO), $(AT91BOOTSTRAP_BINARY))
 else
 	make MEMORY=$(AT91BOOTSTRAP_MEMORY) \
 		CROSS_COMPILE=$(TARGET_CROSS) \
 		-C $(AT91BOOTSTRAP_DIR) boot
 	make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install || \
 		echo "Could not copy bootstrap to BINARIES_DIR"
-ifneq ($(BR2_TARGET_ATMEL_COPYTO),)
-	make DESTDIR=$(BR2_TARGET_ATMEL_COPYTO) -C $(AT91BOOTSTRAP_DIR) install || \
-		echo "Could not copy bootstrap to BR2_ATMEL_COPYTO"
-endif
 endif
 	touch $@
 
 #	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
-#	cp $(AT91BOOTSTRAP_TARGET) $(BR2_TARGET_ATMEL_COPYTO)/$(AT91BOOTSTRAP_BINARY)
 
 .PHONY: at91bootstrap at91bootstrap-source
 

index 8939c28..519328c 100644
@@ -31,8 +31,7 @@ DataflashBoot-dirclean:
 	rm -rf $(DATAFLASHBOOT_DIR)
 
 dataflash:	 $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY)
-	$(call COPY_FILE, $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY), $(TARGET_ATMEL_COPYTO),	$(BOARD_NAME)-$(DATAFLASHBOOT_BINARY))
-
+	cp $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY) $(BINARIES_DIR)
 
 #############################################################
 #

index ca47e18..b07e67c 100644
@@ -6,7 +6,6 @@ menuconfig BR2_TARGET_UBOOT
 if BR2_TARGET_UBOOT
 config BR2_TARGET_UBOOT_BOARDNAME
 	string "board name"
-	default "$(BOARD_NAME)"
 	help
 	  One of U-Boot supported boards to be built.
 	  This will be suffixed with _config to meet U-Boot standard naming.

index b07e67c..49d66c4 100644
@@ -25,26 +25,6 @@ config BR2_TARGET_UBOOT_2009_11
 config BR2_TARGET_UBOOT_2009_08
 	bool "u-boot-2009.08"
 
-config BR2_TARGET_UBOOT_2009_06
-	bool "u-boot-2009.06"
-	depends on BR2_DEPRECATED
-
-config BR2_TARGET_UBOOT_2009_03
-	bool "u-boot-2009.03"
-	depends on BR2_DEPRECATED
-
-config BR2_TARGET_UBOOT_2009_01
-	bool "u-boot-2009.01"
-	depends on BR2_DEPRECATED
-
-config BR2_TARGET_UBOOT_2008_10
-	bool "u-boot-2008.10"
-	depends on BR2_DEPRECATED
-
-config BR2_TARGET_UBOOT_1_2_0_ATMEL
-	bool "u-boot-1.2.0-atmel"
-	depends on BR2_TARGET_AT91
-
 endchoice
 
 config BR2_UBOOT_VERSION

@@ -52,15 +32,9 @@ config BR2_UBOOT_VERSION
 	default "2010.03"	if BR2_TARGET_UBOOT_2010_03
 	default "2009.11"	if BR2_TARGET_UBOOT_2009_11
 	default "2009.08"	if BR2_TARGET_UBOOT_2009_08
-	default "2009.06"	if BR2_TARGET_UBOOT_2009_06
-	default "2009.03"	if BR2_TARGET_UBOOT_2009_03
-	default "2009.01"	if BR2_TARGET_UBOOT_2009_01
-	default "2008.10"	if BR2_TARGET_UBOOT_2008_10
-	default "1.2.0-atmel"	if BR2_TARGET_UBOOT_1_2_0_ATMEL
 
 config BR2_U_BOOT_SITE
 	string
-	default "$(BR2_ATMEL_MIRROR)"		if BR2_TARGET_UBOOT_1_2_0_ATMEL
 	default "ftp://ftp.denx.de/pub/u-boot"
 
 source "target/device/Config.in.u-boot"

similarity index 100%
rename from boot/u-boot/Makefile.in
rename to boot/u-boot/u-boot.mk

index 49d66c4..3f4110a 100644
@@ -33,10 +33,6 @@ config BR2_UBOOT_VERSION
 	default "2009.11"	if BR2_TARGET_UBOOT_2009_11
 	default "2009.08"	if BR2_TARGET_UBOOT_2009_08
 
-config BR2_U_BOOT_SITE
-	string
-	default "ftp://ftp.denx.de/pub/u-boot"
-
 source "target/device/Config.in.u-boot"
 
 config BR2_TARGET_UBOOT_CUSTOM_PATCH

index a875f2b..7e98ca8 100644
@@ -7,7 +7,7 @@ U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION))
 
 U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2
 
-U_BOOT_SITE:=$(call qstrip,$(BR2_U_BOOT_SITE))
+U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot
 U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)
 U_BOOT_PATCH_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches
 U_BOOT_CAT:=$(BZCAT)

index 3f4110a..4c76d57 100644
@@ -33,8 +33,6 @@ config BR2_UBOOT_VERSION
 	default "2009.11"	if BR2_TARGET_UBOOT_2009_11
 	default "2009.08"	if BR2_TARGET_UBOOT_2009_08
 
-source "target/device/Config.in.u-boot"
-
 config BR2_TARGET_UBOOT_CUSTOM_PATCH
 	string "custom patch"
 	help

deleted file mode 100644
index e4ca543..0000000
@@ -1,2 +0,0 @@
-include target/device/Atmel/arch-arm/u-boot/Makefile.in
-

723 lines not on this page · raw message

309 lines not on this page · raw message

324 lines not on this page · raw message

536 lines not on this page · raw message

801 lines not on this page · raw message

deleted file mode 100644
index 81ab7c6..0000000
@@ -1,28 +0,0 @@
-diff -urN u-boot-2008.10-0rig/drivers/net/macb.c u-boot-2008.10/drivers/net/macb.c
---- u-boot-2008.10-0rig/drivers/net/macb.c	2008-10-18 21:30:31.000000000 +0200
-+++ u-boot-2008.10/drivers/net/macb.c	2008-12-28 23:44:11.000000000 +0100
-@@ -415,18 +415,16 @@
- 
- 	/* choose RMII or MII mode. This depends on the board */
- #ifdef CONFIG_RMII
--#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
--    defined(CONFIG_AT91SAM9263)
--	macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
--#else
-+#if defined(CONFIG_AVR32)
- 	macb_writel(macb, USRIO, 0);
--#endif
- #else
--#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
--    defined(CONFIG_AT91SAM9263)
--	macb_writel(macb, USRIO, MACB_BIT(CLKEN));
-+	macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
-+#endif
- #else
-+#if defined(CONFIG_AVR32)
- 	macb_writel(macb, USRIO, MACB_BIT(MII));
-+#else
-+	macb_writel(macb, USRIO, MACB_BIT(CLKEN));
- #endif
- #endif /* CONFIG_RMII */
- 

269 lines not on this page · raw message

64 lines not on this page · raw message

323 lines not on this page · raw message

196 lines not on this page · raw message

93 lines not on this page · raw message

77 lines not on this page · raw message

130 lines not on this page · raw message

deleted file mode 100644
index 6d32e78..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index b5981e1..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index d67aacf..0000000

Lines of this file are not shown. View the raw message.

index 7e98ca8..466d4a0 100644
@@ -276,18 +276,3 @@ $(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)
 endif
 
 endif
-
-u-boot-status:
-	@echo
-	@echo U_BOOT_INC_CONF_FILE = $(U_BOOT_INC_CONF_FILE)
-	@echo BR2_UBOOT_VERSION = $(BR2_UBOOT_VERSION)
-	@echo BR2_TARGET_UBOOT_SERVERIP = $(BR2_TARGET_UBOOT_SERVERIP)
-	@echo BR2_TARGET_UBOOT_IPADDR = $(BR2_TARGET_UBOOT_IPADDR)
-	@echo BR2_TARGET_UBOOT_GATEWAY = $(BR2_TARGET_UBOOT_GATEWAY)
-	@echo BR2_TARGET_UBOOT_NETMASK = $(BR2_TARGET_UBOOT_NETMASK)
-	@echo BR2_TARGET_UBOOT_ETH0ADDR = $(BR2_TARGET_UBOOT_ETHADDR)
-	@echo BR2_TARGET_UBOOT_ETH1ADDR = $(BR2_TARGET_UBOOT_ETH1ADDR)
-	@echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT)
-	@echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME)
-	@exit 0
-

index 466d4a0..4edef12 100644
@@ -46,11 +46,7 @@ ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
 U_BOOT_TARGETS+=$(TARGET_DIR)/usr/sbin/fw_printenv
 endif
 
-U_BOOT_CONFIGURE_OPTS :=
-
-ifneq ($(BR2_TARGET_UBOOT_1_2_0_ATMEL),)
 U_BOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1
-endif
 
 # Define a helper function
 define insert_define

index 4c76d57..78a195d 100644
@@ -33,10 +33,13 @@ config BR2_UBOOT_VERSION
 	default "2009.11"	if BR2_TARGET_UBOOT_2009_11
 	default "2009.08"	if BR2_TARGET_UBOOT_2009_08
 
-config BR2_TARGET_UBOOT_CUSTOM_PATCH
-	string "custom patch"
+config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
+	string "custom patch dir"
 	help
-	  If your board requires a custom patch, add the path to the file here.
+	  If your board requires custom patches, add the path to the
+	  directory containing the patches here. The patches must be
+	  named u-boot-<version>-<something>.patch.
+
 	  Most users may leave this empty
 
 choice

index 4edef12..efde3ea 100644
@@ -9,7 +9,6 @@ U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2
 
 U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot
 U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)
-U_BOOT_PATCH_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches
 U_BOOT_CAT:=$(BZCAT)
 U_BOOT_BIN:=u-boot.bin
 U_BOOT_TARGET_BIN:=u-boot-$(U_BOOT_VERSION)-$(DATE).bin

@@ -69,13 +68,8 @@ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
 	toolchain/patch-kernel.sh $(U_BOOT_DIR) boot/u-boot \
 		u-boot-$(U_BOOT_VERSION)-\*.patch \
 		u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)
-ifneq ($(strip $(U_BOOT_ARCH_PATCH_DIR)),)
-	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_ARCH_PATCH_DIR) \*.patch
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_CUSTOM_PATCH)),"")
-	@mkdir -p $(U_BOOT_PATCH_DIR)
-	cp -dpr $(BR2_TARGET_UBOOT_CUSTOM_PATCH) $(U_BOOT_PATCH_DIR)
-	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_PATCH_DIR) \*.patch
+ifneq ($(qstrip $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
+	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_CUSTOM_PATCH_DIR) u-boot-$(U_BOOT_VERSION)-\*.patch
 endif
 	touch $@
 

deleted file mode 100644
index 07cddb0..0000000
@@ -1,13 +0,0 @@
-diff -urN u-boot-2009.01-rc3/include/asm-avr32/io.h u-boot-avr32//include/asm-avr32/io.h
---- u-boot-2009.01-rc3/include/asm-avr32/io.h	2009-01-18 21:37:48.000000000 +0100
-+++ u-boot-avr32//include/asm-avr32/io.h	2009-01-22 07:14:38.000000000 +0100
-@@ -125,9 +125,4 @@
- 
- }
- 
--static inline phys_addr_t virt_to_phys(void * vaddr)
--{
--	return (phys_addr_t)(vaddr);
--}
--
- #endif /* __ASM_AVR32_IO_H */

index efde3ea..ac16c8b 100644
@@ -11,7 +11,6 @@ U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot
 U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)
 U_BOOT_CAT:=$(BZCAT)
 U_BOOT_BIN:=u-boot.bin
-U_BOOT_TARGET_BIN:=u-boot-$(U_BOOT_VERSION)-$(DATE).bin
 
 U_BOOT_TOOLS:=$(HOST_DIR)/usr/bin/mkimage
 MKIMAGE:=$(U_BOOT_TOOLS)

@@ -153,9 +152,7 @@ $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified
 
 $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
 	rm -f $(BINARIES_DIR)/$(U_BOOT_BIN)
-	rm -f $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
-	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
-	(cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET_BIN) $(U_BOOT_BIN))
+	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/
 
 $(U_BOOT_TOOLS): $(U_BOOT_DIR)/$(U_BOOT_BIN)
 	mkdir -p $(@D)

index ac16c8b..00724ba 100644
@@ -4,6 +4,15 @@
 #
 #############################################################
 U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION))
+U_BOOT_BOARD_NAME:=$(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
+
+# U-Boot may not be selected in the configuration, but mkimage might
+# be needed to build/prepare a kernel image. In this case, we just
+# pick some random stable U-Boot version that will be used just to
+# build mkimage.
+ifeq ($(U_BOOT_VERSION),)
+U_BOOT_VERSION=2010.03
+endif
 
 U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2
 

@@ -30,9 +39,6 @@ TARGET_UBOOT_ETHADDR:=$(call qstrip,$(BR2_TARGET_UBOOT_ETHADDR))
 
 # u-boot still uses arch=ppc for powerpc
 U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
-ifeq ($(UBOOT_BOARD_NAME),)
-UBOOT_BOARD_NAME:=$(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
-endif
 
 U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/config.h
 

@@ -73,6 +79,9 @@ endif
 	touch $@
 
 $(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.patched
+ifeq ($(U_BOOT_BOARD_NAME),)
+	$(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)
+endif
 	$(TARGET_CONFIGURE_OPTS)		\
 		CFLAGS="$(TARGET_CFLAGS)"	\
 		LDFLAGS="$(TARGET_LDFLAGS)"	\

@@ -154,11 +163,16 @@ $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
 	rm -f $(BINARIES_DIR)/$(U_BOOT_BIN)
 	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/
 
-$(U_BOOT_TOOLS): $(U_BOOT_DIR)/$(U_BOOT_BIN)
+# Build just mkimage for the host. It might have already been built by
+# the U-Boot build procedure, but mkimage may also be needed even if
+# U-Boot isn't selected in the configuration, to generate a kernel
+# uImage.
+$(MKIMAGE): $(U_BOOT_DIR)/.patched
 	mkdir -p $(@D)
-	cp -dpf $(U_BOOT_DIR)/tools/mkimage $@
+	$(MAKE) -C $(U_BOOT_DIR) tools
+	cp -dpf $(U_BOOT_DIR)/tools/mkimage $(@D)
 
-$(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/$(U_BOOT_BIN)
+$(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured
 	mkdir -p $(@D)
 	$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(U_BOOT_DIR)/tools \
 		-DUSE_HOSTCC -o $@ \

@@ -171,7 +185,7 @@ $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/$(U_BOOT_BIN)
 
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 
-$(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/$(U_BOOT_BIN)
+$(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/.configured
 	mkdir -p $(@D)
 	$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(LINUX_HEADERS_DIR)/include \
 		-DUSE_HOSTCC -o $@ \

index 78a195d..a4f5fd9 100644
@@ -42,53 +42,6 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 
 	  Most users may leave this empty
 
-choice
-	prompt "Bootsource"
-	depends on BR2_BOOTSOURCE
-	default BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD
-
-	config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD
-	bool "Boot from dataflashcard"
-	depends on BR2_BOOTSOURCE_DATAFLASHCARD
-
-	config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	bool "Boot from dataflash"
-	depends on BR2_BOOTSOURCE_DATAFLASH
-
-	config BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH
-	bool "Boot from a NAND flash"
-	depends on BR2_BOOTSOURCE_NANDFLASH
-
-	config BR2_TARGET_UBOOT_BOOTSOURCE_FLASH
-	bool "Boot from a parallell flash"
-	depends on BR2_BOOTSOURCE_FLASH
-
-	config BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD
-	bool "Boot from an SD-Card"
-	depends on BR2_BOOTSOURCE_SDCARD
-
-	config BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM
-	bool "Boot from a serial EEPROM (Not yet supported)"
-	depends on BR2_BOOTSOURCE_EEPROM
-
-endchoice
-
-config BR2_TARGET_UBOOT_BOOTSOURCE
-	string
-	depends on BR2_BOOTSOURCE
-	default "dataflash"	if BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD
-	default "dataflash"	if BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default "nandflash"	if BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH
-	default "flash"		if BR2_TARGET_UBOOT_BOOTSOURCE_FLASH
-	default "sdcard"	if BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD
-	default "eeprom"	if BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM
-
-config BR2_TARGET_UBOOT_SILENT
-	bool "silent console"
-	help
-	  If the option has been enabled, the output can be
-	  silenced by setting the environment variable "silent".
-
 config BR2_TARGET_UBOOT_TOOL_MKIMAGE
 	bool "mkimage tool in target"
 	help

@@ -99,165 +52,6 @@ config BR2_TARGET_UBOOT_TOOL_ENV
 	help
 	  Install fw_printenv / fw_setenv tools in target.
 
-menuconfig BR2_TARGET_UBOOT_DEFAULT_ENV
-	bool "Generate a default environment"
-	help
-	  Will generate variables for factory default command
-	  and autoscript.
-
-if BR2_TARGET_UBOOT_DEFAULT_ENV
-choice
-	prompt "SDRAM Memory size"
-	default BR2_TARGET_UBOOT_SDRAM_SIZE_64M
-	help
-	  Size of the onboard SDRAM
-
-config BR2_TARGET_UBOOT_SDRAM_SIZE_256MB
-	bool "256 MB"
-
-config BR2_TARGET_UBOOT_SDRAM_SIZE_128MB
-	bool "128 MB"
-
-config BR2_TARGET_UBOOT_SDRAM_SIZE_64MB
-	bool "64 MB"
-
-config BR2_TARGET_UBOOT_SDRAM_SIZE_32MB
-	bool "32 MB"
-
-config BR2_TARGET_UBOOT_SDRAM_SIZE_16MB
-	bool "16 MB"
-
-config BR2_TARGET_UBOOT_SDRAM_SIZE_8MB
-	bool "8 MB"
-
-endchoice
-
-config BR2_TARGET_UBOOT_MEMORY_SIZE
-	string
-	default "256M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_256MB
-	default "128M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_128MB
-	default "64M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_64MB
-	default "32M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_32MB
-	default "16M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_16MB
-	default "8M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_8MB
-
-choice
-	prompt "Kernel Size"
-	default BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
-
-config BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
-	bool "Kernel size is less than 1.25 MB"
-
-config BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
-	bool "Kernel size is less than 1.50 MB"
-
-config BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
-	bool "Kernel size is less than 1.75 MB"
-
-config BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
-	bool "Kernel size is less than 2.00 MB"
-
-config BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB
-	bool "Kernel size is less than 2.25 MB"
-
-config BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB
-	bool "Kernel size is less than 2.50 MB"
-
-endchoice
-
-choice
-	prompt "Dataflash Size"
-	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default BR2_TARGET_UBOOT_DATAFLASH_SIZE_2_00MB
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB
-	bool "Dataflash size is 8 MB"
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB
-	bool "Dataflash size is 4 MB"
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB
-	bool "Dataflash size is 2 MB"
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE_1MB
-	bool "Dataflash size is 1 MB"
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB
-	bool "Dataflash size is 0.5 MB"
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB
-	bool "Dataflash size is 0.25 MB"
-
-endchoice
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE
-	string
-	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default "8M"	if BR2_TARGET_DATAFLASH_SIZE_8MB
-	default "4M"	if BR2_TARGET_DATAFLASH_SIZE_4MB
-	default "2M"	if BR2_TARGET_DATAFLASH_SIZE_2MB
-	default "1M"	if BR2_TARGET_DATAFLASH_SIZE_1MB
-	default "0.5M"	if BR2_TARGET_DATAFLASH_SIZE_0_50MB
-	default "0.25M"	if BR2_TARGET_DATAFLASH_SIZE_0_25MB
-
-config BR2_TARGET_UBOOT_END_OF_FLASH
-	string
-	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default "C083FFFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB
-	default "C041FFFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB
-	default "C020FFFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB
-	default "C0107FFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_1MB
-	default "C0083FFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB
-	default "C0041FFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB
-	help
-
-config BR2_TARGET_UBOOT_KERNEL_START
-	string "Kernel SDRAM address"
-	default "21000000"
-	help
-	  Kernel is loaded to this address in SDRAM
-
-config BR2_TARGET_UBOOT_KERNEL_LOCATION
-	string "Kernel flash address"
-	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || \
-			BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default "C0042000" if BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default ""
-	help
-	  Kernel location in dataflash
-
-config BR2_TARGET_UBOOT_FILESYSTEM_START
-	string
-	default "2114A000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
-	default "2118C000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
-  	default "211CE000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
-  	default "21210000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
-  	default "21252000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB
-  	default "21294000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB
-	help
-	  Kernel is loaded to this SDRAM address
-	  Assumes SDRAM starts at 20000000
-	  Will need to be updated if the SDRAM is located elsewhere
-
-config BR2_TARGET_UBOOT_FILESYSTEM_LOCATION
-	string
-	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || \
-			BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default "C018C000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
-  	default "C01CE000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
-  	default "C0210000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
-  	default "C0252000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
-  	default "C0294000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB
-  	default "C02D6000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB
-	help
-	  Determine location for File System in Dataflash
-	  This needs to be updated for other memory technologies
-
-config BR2_TARGET_UBOOT_FILESYSTEM_SIZE
-	string "File System Size"
-	default "6000000"
-	help
-
 menuconfig BR2_TARGET_UBOOT_NETWORK
 	bool "Network Settings"
 	default y

@@ -304,45 +98,4 @@ config BR2_TARGET_UBOOT_ETH1ADDR
 
 endif # BR2_TARGET_UBOOT_NETWORK
 
-endif # BR2_TARGET_UBOOT_DEFAULT_ENV
-
 endif # BR2_TARGET_UBOOT
-
-config BR2_BOOTSOURCE_DATAFLASHCARD
-	bool
-	help
-	  Allow use of a dataflashcard as a boot source
-
-config BR2_BOOTSOURCE_DATAFLASH
-	bool
-	help
-	  Allow use of a dataflash as a boot source
-
-config BR2_BOOTSOURCE_NANDFLASH
-	bool
-	help
-	  Allow use of a NAND flash as a boot source
-
-config BR2_BOOTSOURCE_FLASH
-	bool
-	help
-	  Allow use of a flash RAM as a boot source
-
-config BR2_BOOTSOURCE_SDCARD
-	bool
-	help
-	  Allow use of an SD-card as a boot source
-
-config BR2_BOOTSOURCE_EEPROM
-	bool
-	help
-	  Allow use of a serial eeprom as a boot source
-
-config	BR2_BOOTSOURCE
-	bool
-	default y if BR2_BOOTSOURCE_DATAFLASHCARD
-	default y if BR2_BOOTSOURCE_DATAFLASH
-	default y if BR2_BOOTSOURCE_NANDFLASH
-	default y if BR2_BOOTSOURCE_FLASH
-	default y if BR2_BOOTSOURCE_SDCARD
-	default y if BR2_BOOTSOURCE_EEPROM

174 lines not on this page · raw message

index a562da2..220eeb2 100644
@@ -30,7 +30,6 @@ U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
 
 U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/config.h
 
-U_BOOT_TARGET_TOOLS:=
 ifeq ($(BR2_TARGET_UBOOT_TOOL_MKIMAGE),y)
 U_BOOT_TARGETS+=$(TARGET_DIR)/usr/bin/mkimage
 endif

@@ -155,7 +154,7 @@ u-boot: $(U_BOOT_TARGETS)
 
 u-boot-clean:
 	-$(MAKE) -C $(U_BOOT_DIR) clean
-	rm -f $(MKIMAGE) $(U_BOOT_TARGET_TOOLS)
+	rm -f $(MKIMAGE)
 
 u-boot-dirclean:
 	rm -rf $(U_BOOT_DIR)

index 220eeb2..90a45b8 100644
@@ -108,6 +108,7 @@ endif
 endif # BR2_TARGET_UBOOT_NETWORK
 	touch $@
 
+# Build U-Boot itself
 $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified
 	$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \

@@ -116,6 +117,7 @@ $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified
 		$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \
 		 -C $(U_BOOT_DIR)
 
+# Copy the result to the images/ directory
 $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
 	rm -f $(BINARIES_DIR)/$(U_BOOT_BIN)
 	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/

@@ -129,6 +131,7 @@ $(MKIMAGE): $(U_BOOT_DIR)/.patched
 	$(MAKE) -C $(U_BOOT_DIR) tools
 	cp -dpf $(U_BOOT_DIR)/tools/mkimage $(@D)
 
+# Build manually mkimage for the target
 $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured
 	mkdir -p $(@D)
 	$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(U_BOOT_DIR)/tools \

@@ -142,6 +145,7 @@ $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured
 
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 
+# Build manually fw_printenv for the target
 $(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/.configured
 	mkdir -p $(@D)
 	$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(LINUX_HEADERS_DIR)/include \

index a4f5fd9..79c5c3d 100644
@@ -25,13 +25,24 @@ config BR2_TARGET_UBOOT_2009_11
 config BR2_TARGET_UBOOT_2009_08
 	bool "u-boot-2009.08"
 
+config BR2_TARGET_UBOOT_CUSTOM_TARBALL
+	bool "Custom tarball"
+
 endchoice
 
+if BR2_TARGET_UBOOT_CUSTOM_TARBALL
+
+config BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION
+	string "URL of custom U-Boot tarball"
+
+endif
+
 config BR2_UBOOT_VERSION
 	string
 	default "2010.03"	if BR2_TARGET_UBOOT_2010_03
 	default "2009.11"	if BR2_TARGET_UBOOT_2009_11
 	default "2009.08"	if BR2_TARGET_UBOOT_2009_08
+	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
 
 config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 	string "custom patch dir"

index 90a45b8..ee56611 100644
@@ -14,9 +14,17 @@ ifeq ($(U_BOOT_VERSION),)
 U_BOOT_VERSION=2010.03
 endif
 
+ifeq ($(U_BOOT_VERSION),custom)
+# Handle custom U-Boot tarballs as specified by the configuration
+U_BOOT_TARBALL=$(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
+U_BOOT_SITE:=$(dir $(U_BOOT_TARBALL))
+U_BOOT_SOURCE:=$(notdir $(U_BOOT_TARBALL))
+else
+# Handle stable official U-Boot versions
+U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot
 U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2
+endif
 
-U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot
 U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)
 U_BOOT_CAT:=$(BZCAT)
 U_BOOT_BIN:=u-boot.bin

@@ -51,9 +59,9 @@ $(DL_DIR)/$(U_BOOT_SOURCE):
 	 $(call DOWNLOAD,$(U_BOOT_SITE),$(U_BOOT_SOURCE))
 
 $(U_BOOT_DIR)/.unpacked: $(DL_DIR)/$(U_BOOT_SOURCE)
-	$(U_BOOT_CAT) $(DL_DIR)/$(U_BOOT_SOURCE) \
-		| tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	mkdir -p $(U_BOOT_DIR)
+	mkdir -p $(@D)
+	$(INFLATE$(suffix $(U_BOOT_SOURCE))) $(DL_DIR)/$(U_BOOT_SOURCE) \
+		| tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
 	touch $@
 
 $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked

index 79c5c3d..00fd03a 100644
@@ -1,11 +1,11 @@
 menuconfig BR2_TARGET_UBOOT
-	bool "Das U-Boot Boot Monitor"
+	bool "U-Boot"
 	help
 	  Build "Das U-Boot" Boot Monitor
 
 if BR2_TARGET_UBOOT
 config BR2_TARGET_UBOOT_BOARDNAME
-	string "board name"
+	string "U-Boot board name"
 	help
 	  One of U-Boot supported boards to be built.
 	  This will be suffixed with _config to meet U-Boot standard naming.

@@ -17,13 +17,13 @@ choice
 	  Select the specific U-Boot version you want to use
 
 config BR2_TARGET_UBOOT_2010_03
-	bool "u-boot-2010.03"
+	bool "2010.03"
 
 config BR2_TARGET_UBOOT_2009_11
-	bool "u-boot-2009.11"
+	bool "2009.11"
 
 config BR2_TARGET_UBOOT_2009_08
-	bool "u-boot-2009.08"
+	bool "2009.08"
 
 config BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	bool "Custom tarball"

index 00fd03a..aa680cf 100644
@@ -37,7 +37,7 @@ config BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION
 
 endif
 
-config BR2_UBOOT_VERSION
+config BR2_TARGET_UBOOT_VERSION
 	string
 	default "2010.03"	if BR2_TARGET_UBOOT_2010_03
 	default "2009.11"	if BR2_TARGET_UBOOT_2009_11

index ee56611..ad67343 100644
@@ -3,7 +3,7 @@
 # U-Boot
 #
 #############################################################
-U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION))
+U_BOOT_VERSION:=$(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
 U_BOOT_BOARD_NAME:=$(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
 
 # U-Boot may not be selected in the configuration, but mkimage might

index 7d2bcfd..afa0aaf 100644
@@ -883,14 +883,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set

@@ -898,23 +894,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set

@@ -922,11 +903,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"

index 79e55fc..d549eac 100644
@@ -809,14 +809,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set

@@ -824,23 +820,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set

@@ -848,11 +829,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"

index 087067f..3865f6a 100644
@@ -897,14 +897,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set

@@ -912,23 +908,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set

@@ -936,11 +917,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"

index e52cd2d..46218a0 100644
@@ -817,14 +817,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set

@@ -832,23 +828,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set

@@ -856,11 +837,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"

index cd7483b..2f0bd52 100644
@@ -949,14 +949,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD is not set
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set

@@ -964,23 +960,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set

@@ -988,11 +969,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"

index 5ab47ad..afb5fbe 100644
@@ -906,14 +906,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD is not set
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set

@@ -921,23 +917,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set

@@ -945,11 +926,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"

index bc95b6b..22c4c0c 100644
@@ -946,14 +946,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set

@@ -961,23 +957,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set

@@ -985,11 +966,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"

index 9771c83..f93b10a 100644
@@ -868,14 +868,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set

@@ -883,23 +879,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set

@@ -907,11 +888,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"

index 30cc4e1..3b53329 100644
@@ -813,14 +813,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="at91sam9g20ek"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set

@@ -828,23 +824,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-BR2_TARGET_UBOOT_SDRAM_SIZE_256MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_64MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="256M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set

@@ -852,11 +833,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"

index e18754e..053a9aa 100644
@@ -817,14 +817,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set

@@ -832,23 +828,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set

@@ -856,11 +837,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"

index d3092df..4b5b633 100644
@@ -739,16 +739,10 @@ BR2_TARGET_UBOOT_BOARDNAME="atngw100"
 # BR2_TARGET_UBOOT_2009_03 is not set
 # BR2_TARGET_UBOOT_2009_01 is not set
 BR2_TARGET_UBOOT_2008_10=y
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2008.10"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-# BR2_TARGET_UBOOT_SILENT is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
 
 #
 # Kernel

index d7c9c15..0c22b90 100644
@@ -740,35 +740,10 @@ BR2_TARGET_UBOOT_BOARDNAME="atngw100"
 # BR2_TARGET_UBOOT_2010_03 is not set
 # BR2_TARGET_UBOOT_2009_11 is not set
 BR2_TARGET_UBOOT_2009_08=y
-# BR2_TARGET_UBOOT_2009_06 is not set
-# BR2_TARGET_UBOOT_2009_03 is not set
-# BR2_TARGET_UBOOT_2009_01 is not set
-# BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.08"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-# BR2_TARGET_UBOOT_SILENT is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-BR2_TARGET_UBOOT_SDRAM_SIZE_256MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_64MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="256M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"

index a1fe0b7..213157b 100644
@@ -771,16 +771,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="atngw100"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-# BR2_TARGET_UBOOT_SILENT is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
 
 #
 # Kernel

index 0fbbf14..bbdf26f 100644
@@ -868,16 +868,10 @@ BR2_TARGET_UBOOT_BOARDNAME="atstk1002"
 # BR2_TARGET_UBOOT_2009_03 is not set
 # BR2_TARGET_UBOOT_2009_01 is not set
 BR2_TARGET_UBOOT_2008_10=y
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2008.10"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-# BR2_TARGET_UBOOT_SILENT is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
 
 #
 # Kernel

index 3879272..2c11692 100644
@@ -706,16 +706,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="cp926ejs"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-# BR2_TARGET_UBOOT_SILENT is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
 
 #
 # Kernel

index 86443db..4aacbcb 100644
@@ -682,16 +682,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="cp926ejs"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-# BR2_TARGET_UBOOT_SILENT is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
 
 #
 # Kernel

index 0ad7ab0..1ee7a9e 100644
@@ -706,13 +706,12 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS=""
 #
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="atngw100"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_SERVERIP="192.168.1.254"
 BR2_TARGET_UBOOT_IPADDR="192.168.1.60"
 BR2_TARGET_UBOOT_GATEWAY="192.168.1.254"
 BR2_TARGET_UBOOT_NETMASK="255.255.255.0"
 BR2_TARGET_UBOOT_ETHADDR="04:25:fe:ed:00:18"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
 

index 80f9b6d..96b082d 100644
@@ -1,20 +1,3 @@
-GRUB_SUPPORTED_ARCH=n
-ifeq ($(ARCH),i386)
-GRUB_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i486)
-GRUB_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i586)
-GRUB_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i686)
-GRUB_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),x86_64)
-GRUB_SUPPORTED_ARCH=y
-endif
-ifeq ($(GRUB_SUPPORTED_ARCH),y)
 #############################################################
 #
 # grub

@@ -125,8 +108,6 @@ grub-clean:
 grub-dirclean:
 	rm -rf $(GRUB_DIR)
 
-endif
-
 #############################################################
 #
 # Toplevel Makefile options

index 119397b..a298ae6 100644
@@ -1,20 +1,3 @@
-GRUB2_SUPPORTED_ARCH=n
-ifeq ($(ARCH),i386)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i486)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i586)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i686)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),x86_64)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(GRUB2_SUPPORTED_ARCH),y)
 #############################################################
 #
 # grub2

@@ -122,8 +105,6 @@ grub2-clean:
 grub2-dirclean:
 	rm -rf $(GRUB2_DIR)
 
-endif
-
 #############################################################
 #
 # Toplevel Makefile options

index 96b082d..74ea77f 100644
@@ -96,7 +96,7 @@ ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
 endif
 	touch $@
 
-grub: uclibc $(GRUB_DIR)/.installed
+grub: $(GRUB_DIR)/.installed
 
 grub-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB_DIR) uninstall

index a298ae6..06e1524 100644
@@ -93,7 +93,7 @@ ifeq ($(BR2_TARGET_GRUB2_SPLASH),y)
 endif
 	touch $@
 
-grub2: uclibc $(GRUB2_DIR)/.installed
+grub2: $(GRUB2_DIR)/.installed
 
 grub2-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB2_DIR) uninstall

index 74ea77f..3805afe 100644
@@ -11,7 +11,7 @@ GRUB_CAT:=$(ZCAT)
 GRUB_DIR:=$(BUILD_DIR)/grub-0.97
 GRUB_BINARY:=grub/grub
 GRUB_TARGET_BINARY:=sbin/grub
-GRUB_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz
+GRUB_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz
 
 
 GRUB_CFLAGS=-DSUPPORT_LOOPDEV

index 06e1524..24f1e1a 100644
@@ -11,7 +11,7 @@ GRUB2_CAT:=$(ZCAT)
 GRUB2_DIR:=$(BUILD_DIR)/grub-1.95
 GRUB2_BINARY:=grub2/grub2
 GRUB2_TARGET_BINARY:=sbin/grub2
-GRUB2_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz
+GRUB2_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz
 
 
 GRUB2_CFLAGS=-DSUPPORT_LOOPDEV

index 24f1e1a..4af6c02 100644
@@ -3,12 +3,12 @@
 # grub2
 #
 #############################################################
-GRUB2_SOURCE:=grub2_1.95.orig.tar.gz
-GRUB2_PATCH:=grub2_1.95-5.diff.gz
+GRUB2_SOURCE:=grub2_1.98.orig.tar.gz
+GRUB2_PATCH:=grub2_1.98-1.diff.gz
 GRUB2_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2
-GRUB2_PATCH_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2
+GRUB2_PATCH_SITE:=$(GRUB2_SITE)
 GRUB2_CAT:=$(ZCAT)
-GRUB2_DIR:=$(BUILD_DIR)/grub-1.95
+GRUB2_DIR:=$(BUILD_DIR)/grub-1.98
 GRUB2_BINARY:=grub2/grub2
 GRUB2_TARGET_BINARY:=sbin/grub2
 GRUB2_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz

deleted file mode 100644
index 3287b61..0000000
@@ -1,23 +0,0 @@
-? config.status.lineno
-? fix-grub-install.diff
-? genkernsyms.sh
-? gensymlist.sh
-? grub-mkimage.d
-? grub_script.tab.c
-? grub_script.tab.h
-? kernel_elf_symlist.c
-Index: util/powerpc/ieee1275/grub-install.in
-===================================================================
-RCS file: /cvsroot/grub/grub2/util/powerpc/ieee1275/grub-install.in,v
-retrieving revision 1.5
-diff -u -r1.5 grub-install.in
---- grub-1.95/util/powerpc/ieee1275/grub-install.in	28 May 2006 23:01:43 -0000	1.5
-+++ grub-1.95/util/powerpc/ieee1275/grub-install.in	4 Mar 2007 19:05:47 -0000
-@@ -23,6 +23,7 @@
- # Initialize some variables.
- prefix=@prefix@
- exec_prefix=@exec_prefix@
-+bindir=@bindir@
- sbindir=@sbindir@
- libdir=@libdir@
- PACKAGE_NAME=@PACKAGE_NAME@

95 lines not on this page · raw message

index 7526399..d27cb4c 100644
@@ -2,12 +2,3 @@ config BR2_TARGET_GRUB2
 	bool "grub2"
 	help
 	  The GRand Unified Bootloader for x86 systems, take #2.
-
-config BR2_TARGET_GRUB2_SPLASH
-	bool "Splashimage support"
-	depends on BR2_TARGET_GRUB2
-	help
-	  Add support for splashimage.
-	
-	  A splashimage is a 14-color indexed .xpm picture which
-	  is displayed as background for the grub menu.

index 95fa245..6c3bbef 100644
@@ -18,39 +18,12 @@ GRUB2_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2
 GRUB2_PATCH_SITE:=$(GRUB2_SITE)
 GRUB2_CAT:=$(ZCAT)
 GRUB2_DIR:=$(BUILD_DIR)/grub-1.98
-GRUB2_BINARY:=grub2/grub2
-GRUB2_TARGET_BINARY:=sbin/grub2
-GRUB2_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz
 
 GRUB2_CFLAGS=-DSUPPORT_LOOPDEV
 ifeq ($(BR2_LARGEFILE),)
 GRUB2_CFLAGS+=-U_FILE_OFFSET_BITS
 endif
 
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_SPLASH) += --enable-graphics
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_DISKLESS) += --enable-diskless
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_3c595) += --enable-3c595
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_3c90x) += --enable-3c90x
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_davicom) += --enable-davicom
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_e1000) += --enable-e1000
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_eepro100) += --enable-eepro100
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_epic100) += --enable-epic100
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_forcedeth) += --enable-forcedeth
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_natsemi) += --enable-natsemi
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_ns83820) += --enable-ns83820
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_ns8390) += --enable-ns8390
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_pcnet32) += --enable-pcnet32
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_pnic) += --enable-pnic
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_rtl8139) += --enable-rtl8139
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_r8169) += --enable-r8169
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_sis900) += --enable-sis900
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tg3) += --enable-tg3
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tulip) += --enable-tulip
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tlan) += --enable-tlan
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_undi) += --enable-undi
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_via_rhine) += --enable-via-rhine
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_w89c840) += --enable-w89c840
-
 $(DL_DIR)/$(GRUB2_SOURCE):
 	 $(call DOWNLOAD,$(GRUB2_SITE),$(GRUB2_SOURCE))
 

index d27cb4c..1301b5b 100644
@@ -1,4 +1,9 @@
 config BR2_TARGET_GRUB2
 	bool "grub2"
+	# Only supports PC, Mac (Power, x86 and x86-64), Pegasos
+	depends on BR2_i386 || BR2_powerpc
+	# Build process is broken (./configure doesn't work, Ruby
+	# required, etc.)
+	depends on BROKEN
 	help
 	  The GRand Unified Bootloader for x86 systems, take #2.

deleted file mode 100644
index 9e98a78..0000000
@@ -1,11 +0,0 @@
---- syslinux-3.82-org/Makefile	2009-09-17 13:11:23.000000000 +0200
-+++ syslinux-3.82/Makefile	2009-09-17 13:13:32.000000000 +0200
-@@ -42,7 +42,7 @@
- 	mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \
- 	mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \
- 	core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
--	gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
-+	gpxe/gpxelinux.0 dos/syslinux.com \
- 	$(MODULES)
- 
- # BSUBDIRs build the on-target binary components.

new file mode 100644
index 0000000..ff85b8d
@@ -0,0 +1,17 @@
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: syslinux-3.85/Makefile
+===================================================================
+--- syslinux-3.85.orig/Makefile
++++ syslinux-3.85/Makefile
+@@ -43,7 +43,7 @@
+ 	mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \
+ 	mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \
+ 	core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
+-	gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
++	gpxe/gpxelinux.0 dos/syslinux.com \
+ 	dosutil/*.com dosutil/*.sys \
+ 	$(MODULES)
+ 

index df27b6d..46b41f2 100644
@@ -22,34 +22,38 @@ ifeq ($(SYSLINUX_SUPPORTED_ARCH),y)
 #
 #############################################################
 
-SYSLINUX_VERSION:=3.82
+SYSLINUX_VERSION:=3.85
 SYSLINUX_DIR=$(BUILD_DIR)/syslinux-$(SYSLINUX_VERSION)
-SYSLINUX_DIR2=$(TOOLCHAIN_DIR)/syslinux-$(SYSLINUX_VERSION)
 SYSLINUX_SOURCE=syslinux-$(SYSLINUX_VERSION).tar.bz2
 SYSLINUX_CAT:=$(BZCAT)
-SYSLINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/
-SYSLINUX_BIN=$(SYSLINUX_DIR2)/mtools/syslinux
-
+SYSLINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/3.xx/
 
 $(DL_DIR)/$(SYSLINUX_SOURCE):
 	 $(call DOWNLOAD,$(SYSLINUX_SITE),$(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) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(SYSLINUX_DIR) boot/syslinux/ \*.patch
+$(SYSLINUX_DIR)/.unpacked: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH)
+	mkdir -p $(@D)
+	$(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(@D) boot/syslinux/ \*.patch
 	touch -c $@
 
-$(SYSLINUX_DIR)/isolinux.bin $(SYSLINUX_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/Makefile
-	$(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(SYSLINUX_DIR)
+$(SYSLINUX_DIR)/.compiled: $(SYSLINUX_DIR)/.unpacked
+	$(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(SYSLINUX_DIR)
 	touch -c $@
 
-syslinux: $(SYSLINUX_DIR)/isolinux.bin
-pxelinux: $(SYSLINUX_DIR)/pxelinux.bin
+$(BINARIES_DIR)/isolinux.bin: $(SYSLINUX_DIR)/.compiled
+	cp -a $(SYSLINUX_DIR)/core/isolinux.bin $@
+
+$(BINARIES_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/.compiled
+	cp -a $(SYSLINUX_DIR)/core/pxelinux.bin $@
+
+syslinux: $(BINARIES_DIR)/isolinux.bin
+pxelinux: $(BINARIES_DIR)/pxelinux.bin
 
 pxelinux-clean syslinux-clean:
-	rm -f $(SYSLINUX_DIR)/isolinux.bin $(SYSLINUX_DIR)/pxelinux.bin
+	rm -f $(BINARIES_DIR)/isolinux.bin $(BINARIES_DIR)/pxelinux.bin
 	-$(MAKE) -C $(SYSLINUX_DIR) clean
 
 pxelinux-dirclean syslinux-dirclean:

index 46b41f2..966d0c2 100644
@@ -1,21 +1,3 @@
-SYSLINUX_SUPPORTED_ARCH=n
-ifeq ($(ARCH),i386)
-SYSLINUX_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i486)
-SYSLINUX_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i586)
-SYSLINUX_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i686)
-SYSLINUX_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),x86_64)
-SYSLINUX_SUPPORTED_ARCH=y
-endif
-ifeq ($(SYSLINUX_SUPPORTED_ARCH),y)
-
 #############################################################
 #
 # syslinux to make target msdos/iso9660 filesystems bootable

@@ -59,8 +41,6 @@ pxelinux-clean syslinux-clean:
 pxelinux-dirclean syslinux-dirclean:
 	rm -rf $(SYSLINUX_DIR)
 
-endif
-
 #############################################################
 #
 # Toplevel Makefile options

new file mode 100644
index 0000000..08983e1
@@ -0,0 +1,19 @@
+############################################################
+#
+# nasm
+#
+# This is special case: nasm is used to build syslinux and
+# pxelinux. As these are for the target, we should cross-compile
+# nasm. However, as nasm is x86-only, there's no point in
+# cross-compiling it. So we just build it for the host. The target
+# variant is only provided because of a bug in the package
+# infrastructure that prevents having only a host variant.
+############################################################
+
+NASM_VERSION=2.08.01
+NASM_SOURCE=nasm-$(NASM_VERSION).tar.bz2
+NASM_SITE=http://www.nasm.us/pub/nasm/releasebuilds/2.08.01/
+NASM_LIBTOOL_PATCH=NO
+
+$(eval $(call AUTOTARGETS,package,nasm))
+$(eval $(call AUTOTARGETS,package,nasm,host))

index 966d0c2..192e905 100644
@@ -31,8 +31,8 @@ $(BINARIES_DIR)/isolinux.bin: $(SYSLINUX_DIR)/.compiled
 $(BINARIES_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/.compiled
 	cp -a $(SYSLINUX_DIR)/core/pxelinux.bin $@
 
-syslinux: $(BINARIES_DIR)/isolinux.bin
-pxelinux: $(BINARIES_DIR)/pxelinux.bin
+syslinux: host-nasm $(BINARIES_DIR)/isolinux.bin
+pxelinux: host-nasm $(BINARIES_DIR)/pxelinux.bin
 
 pxelinux-clean syslinux-clean:
 	rm -f $(BINARIES_DIR)/isolinux.bin $(BINARIES_DIR)/pxelinux.bin

index 44db8f5..8514ccc 100644
@@ -6,7 +6,7 @@ if	BR2_TARGET_AT91BOOTSTRAP
 
 config BR2_TARGET_AT91BOOTSTRAP_BOARD
 	string "Bootstrap board"
-	default "$(BOARD_NAME)"
+	default ""
 	help
 	  This is used to do a make <board>_config
 

index 8514ccc..8efbd13 100644
@@ -13,7 +13,6 @@ config BR2_TARGET_AT91BOOTSTRAP_BOARD
 choice
 	prompt "Boot Memory"
 	default BR2_TARGET_AT91BOOT_DATAFLASHCARD
-	depends on BR2_TARGET_AT91BOOTSTRAP
 	help
 	  Select Chip for which AT91 bootstrap should be built
 

@@ -45,7 +44,6 @@ endchoice
 
 config BR2_TARGET_AT91BOOTSTRAP_MEMORY
 	string
-	depends on BR2_TARGET_AT91BOOTSTRAP
 	default	"dataflash"	if	BR2_TARGET_AT91BOOT_DATAFLASH
 	default	"dataflashcard"	if	BR2_TARGET_AT91BOOT_DATAFLASHCARD
 	default	"nandflash"	if	BR2_TARGET_AT91BOOT_NANDFLASH

@@ -55,7 +53,6 @@ config BR2_TARGET_AT91BOOTSTRAP_MEMORY
 
 config	BR2_AT91BOOTSTRAP_IMG_SIZE
 	string	"Image Size to copy to SDRAM"
-	depends on BR2_TARGET_AT91BOOTSTRAP
 	default	"0x32000"	if	BR2_TARGET_AT91BOOT_DATAFLASH
 	default	"0x32000"	if	BR2_TARGET_AT91BOOT_DATAFLASHCARD
 	default	"0x30000"	if	BR2_TARGET_AT91BOOT_NANDFLASH

@@ -69,7 +66,6 @@ config	BR2_AT91BOOTSTRAP_IMG_SIZE
 choice
 	prompt "Start address of application"
 	default BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
-	depends on BR2_TARGET_AT91BOOTSTRAP
 	help
 	  Select Chip for which AT91 bootstrap should be built
 	  Currently supports AT91SAM9260EK, AT91SAM9261EK,

@@ -97,10 +93,6 @@ config	BR2_AT91BOOTSTRAP_JUMP_ADDR
 	default	"0x23F00000" if BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
 	default	"0x23F00000" if BR2_AT91BOOTSTRAP_JUMP_TO_HIGH_SDRAM
 	default "0x20000000" if BR2_AT91BOOTSTRAP_JUMP_TO_START_OF_SDRAM
-	depends on BR2_TARGET_AT91BOOTSTRAP
-
-comment "It will be copied to $(BR2_AT91BOOTSTRAP_JUMP_ADDR)"
-	depends on BR2_TARGET_AT91BOOTSTRAP
 
 endif
 

index 8efbd13..7c0f393 100644
@@ -18,27 +18,21 @@ choice
 
 config BR2_TARGET_AT91BOOT_DATAFLASH
 	bool "AT45 Dataflash"
-	depends on BR2_BOOTSOURCE_DATAFLASH
 
 config BR2_TARGET_AT91BOOT_DATAFLASHCARD
 	bool "AT45 Dataflash Card"
-	depends on BR2_BOOTSOURCE_DATAFLASHCARD
 
 config BR2_TARGET_AT91BOOT_NANDFLASH
 	bool "NAND Flash"
-	depends on BR2_BOOTSOURCE_NANDFLASH
 
 config BR2_TARGET_AT91BOOT_FLASH
 	bool "Internal Flash or external parallel flash"
-	depends on BR2_BOOTSOURCE_FLASH
 
 config BR2_TARGET_AT91BOOT_SDCARD
 	bool "SD-Card"
-	depends on BR2_BOOTSOURCE_SDCARD
 
 config BR2_TARGET_AT91BOOT_EEPROM
 	bool "EEPROM"
-	depends on BR2_BOOTSOURCE_EEPROM
 
 endchoice
 

index 7c0f393..1bf8d50 100644
@@ -61,10 +61,7 @@ choice
 	prompt "Start address of application"
 	default BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
 	help
-	  Select Chip for which AT91 bootstrap should be built
-	  Currently supports AT91SAM9260EK, AT91SAM9261EK,
-	  AT91SAM9XEEK, AT91SAM9263EK
-
+	  Location of the application start address
 
 config	BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
 	bool "Copy to the default U-Boot start location in the SDRAM"

index dc475e4..1d1091e 100644
@@ -50,8 +50,6 @@ $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config
 		$(AT91BOOTSTRAP_BOARD)_defconfig
 	touch $(AT91BOOTSTRAP_DIR)/.configured
 
-#		$(BOARD_NAME)_defconfig
-
 $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
 	$(MAKE) \
 		MEMORY=$(AT91BOOTSTRAP_MEMORY) \

@@ -61,19 +59,13 @@ $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
 
 $(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET)
 	mkdir -p $(BINARIES_DIR)
-ifeq	($(AT91BOOTSTRAP_VERSION),2.3)
-	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
-else
 	make MEMORY=$(AT91BOOTSTRAP_MEMORY) \
 		CROSS_COMPILE=$(TARGET_CROSS) \
 		-C $(AT91BOOTSTRAP_DIR) boot
 	make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install || \
 		echo "Could not copy bootstrap to BINARIES_DIR"
-endif
 	touch $@
 
-#	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
-
 .PHONY: at91bootstrap at91bootstrap-source
 
 at91bootstrap: $(AT91BOOTSTRAP_DIR)/.installed

@@ -97,8 +89,4 @@ at91bootstrap-dirclean:
 #############################################################
 ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
 TARGETS+=at91bootstrap
-endif
-
-at91bootstrap-status:
-	@echo AT91BOOTSTRAP_BOARD=$(AT91BOOTSTRAP_BOARD)
 

index 1d1091e..b71df89 100644
@@ -90,3 +90,8 @@ at91bootstrap-dirclean:
 ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
 TARGETS+=at91bootstrap
 
+# we NEED a board name
+ifeq ($(AT91BOOTSTRAP_BOARD),)
+$(error No AT91Bootstrap board name set. Check your BR2_TARGET_AT91BOOTSTRAP_BOARD setting)
+endif
+endif

index b71df89..d6e2c18 100644
@@ -3,9 +3,7 @@
 # at91bootstrap
 #
 #############################################################
-AT91BOOTSTRAP_VERSION:=2.10
-AT91BOOTSTRAP_PATCH_LEVEL:=
-AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION)$(AT91BOOTSTRAP_PATCH_LEVEL)
+AT91BOOTSTRAP_VERSION:=2.13
 AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION)
 ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR))
 AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR)

@@ -18,7 +16,7 @@ AT91BOOTSTRAP_BOARD:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD))
 
 AT91BOOTSTRAP_MEMORY:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY))
 
-AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_PATCHED_VERSION).bin
+AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_VERSION).bin
 
 AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY)
 

index d6e2c18..bad5cee 100644
@@ -5,8 +5,7 @@
 #############################################################
 AT91BOOTSTRAP_VERSION:=2.13
 AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION)
-ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR))
-AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR)
+AT91BOOTSTRAP_SITE:=ftp://www.at91.com/pub/buildroot/
 AT91BOOTSTRAP_SOURCE:=$(AT91BOOTSTRAP_NAME).tar.bz2
 AT91BOOTSTRAP_DIR:=$(BUILD_DIR)/$(AT91BOOTSTRAP_NAME)
 AT91BOOTSTRAP:=$(call qstrip,$(BR2_AT91BOOTSTRAP))

index bad5cee..fc7206e 100644
@@ -56,11 +56,10 @@ $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
 
 $(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET)
 	mkdir -p $(BINARIES_DIR)
-	make MEMORY=$(AT91BOOTSTRAP_MEMORY) \
-		CROSS_COMPILE=$(TARGET_CROSS) \
-		-C $(AT91BOOTSTRAP_DIR) boot
-	make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install || \
-		echo "Could not copy bootstrap to BINARIES_DIR"
+	make MEMORY=$(AT91BOOTSTRAP_MEMORY) 	\
+		CROSS_COMPILE=$(TARGET_CROSS) 	\
+		DESTDIR=$(BINARIES_DIR) 	\
+		-C $(AT91BOOTSTRAP_DIR) install
 	touch $@
 
 .PHONY: at91bootstrap at91bootstrap-source

index fc7206e..9030696 100644
@@ -12,13 +12,9 @@ AT91BOOTSTRAP:=$(call qstrip,$(BR2_AT91BOOTSTRAP))
 AT91BOOTSTRAP_ZCAT:=$(BZCAT)
 
 AT91BOOTSTRAP_BOARD:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD))
-
 AT91BOOTSTRAP_MEMORY:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY))
-
-AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_VERSION).bin
-
+AT91BOOTSTRAP_BINARY:=$(AT91BOOTSTRAP_BOARD)-$(AT91BOOTSTRAP_MEMORY)boot.bin
 AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY)
-
 AT91BOOTSTRAP_JUMP_ADDR:=$(call qstrip,$(BR2_AT91BOOTSTRAP_JUMP_ADDR))
 AT91BOOTSTRAP_IMG_SIZE:=$(call qstrip,$(BR2_AT91BOOTSTRAP_IMG_SIZE))
 

index c6711c4..25b9723 100644
@@ -2,22 +2,24 @@ menuconfig BR2_TARGET_DATAFLASHBOOT
        depends on BR2_arm
        bool "AT91 DataFlashBoot"
 
+if BR2_TARGET_DATAFLASHBOOT
+
 choice
 	prompt "Target Architecture"
 	default BR2_TARGET_DATAFLASHBOOT_AT91RM9200
-	depends on BR2_TARGET_DATAFLASHBOOT
 	help
 	  Select Chip for which Dataflash boot should be built
 	  Currently only AT91RM9200 Supported
 
 config BR2_TARGET_DATAFLASHBOOT_AT91RM9200
-       depends on BR2_TARGET_AT91RM9200
 	bool "AT91RM9200"
+
 config BR2_TARGET_DATAFLASHBOOT_AT91SAM9261
-       depends on BR2_TARGET_AT91SAM9261
 	bool "AT91SAM9261"
+
 config BR2_TARGET_DATAFLASHBOOT_AT91SAM9261S
-       depends on BR2_TARGET_AT91SAM9261S
 	bool "AT91SAM9261S"
 
 endchoice
+
+endif # BR2_TARGET_DATAFLASHBOOT

index 519328c..dcbe1ef 100644
@@ -5,29 +5,27 @@
 #############################################################
 DATAFLASHBOOT_VERSION:=1.05
 DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION)
-ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR))
-DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR)
+DATAFLASHBOOT_SITE:=ftp://www.at91.com/pub/buildroot/
 DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2
-DATAFLASHBOOT_DIR:=$(BUILD_DIR)/$(DATAFLASHBOOT_NAME)
+DATAFLASHBOOT_DIR:=$(BUILD_DIR)/at91dataflashboot-$(DATAFLASHBOOT_VERSION)
 DATAFLASHBOOT_BINARY:=$(DATAFLASHBOOT_NAME).bin
 
 $(DL_DIR)/$(DATAFLASHBOOT_SOURCE):
 	 $(call DOWNLOAD,$(DATAFLASHBOOT_SITE),$(DATAFLASHBOOT_SOURCE))
 
 $(DATAFLASHBOOT_DIR)/.unpacked: $(DL_DIR)/$(DATAFLASHBOOT_SOURCE)
-	mkdir -p $(BUILD_DIR)
-	ls $(DL_DIR)/$(DATAFLASHBOOT_SOURCE)
-	$(BZCAT) $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	mkdir -p $(@D)
+	$(BZCAT) $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
 	touch $(DATAFLASHBOOT_DIR)/.unpacked
 
 $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY): $(DATAFLASHBOOT_DIR)/.unpacked
 	ls $(DATAFLASHBOOT_DIR)/.unpacked
 	make -C $(DATAFLASHBOOT_DIR) CROSS_COMPILE=$(TARGET_CROSS)
 
-DataflashBoot-clean:
+dataflashboot-clean:
 	make -C $(DATAFLASHBOOT_DIR) clean
 
-DataflashBoot-dirclean:
+dataflashboot-dirclean:
 	rm -rf $(DATAFLASHBOOT_DIR)
 
 dataflash:	 $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY)

index dcbe1ef..d11f842 100644
@@ -18,7 +18,11 @@ $(DATAFLASHBOOT_DIR)/.unpacked: $(DL_DIR)/$(DATAFLASHBOOT_SOURCE)
 	$(BZCAT) $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
 	touch $(DATAFLASHBOOT_DIR)/.unpacked
 
-$(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY): $(DATAFLASHBOOT_DIR)/.unpacked
+$(DATAFLASHBOOT_DIR)/.patched: $(DATAFLASHBOOT_DIR)/.unpacked
+	toolchain/patch-kernel.sh $(@D) boot/at91dataflashboot \
+		at91dataflashboot-$(DATAFLASHBOOT_VERSION)-\*.patch
+
+$(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY): $(DATAFLASHBOOT_DIR)/.patched
 	ls $(DATAFLASHBOOT_DIR)/.unpacked
 	make -C $(DATAFLASHBOOT_DIR) CROSS_COMPILE=$(TARGET_CROSS)
 

new file mode 100644
index 0000000..41d97ad
@@ -0,0 +1,22 @@
+Disable the automatic installation of at91dataflashboot since it tries
+to install things to /tftpboot, which is not possible when not
+building as root.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: at91dataflashboot-1.05/Makefile
+===================================================================
+--- at91dataflashboot-1.05.orig/Makefile
++++ at91dataflashboot-1.05/Makefile
+@@ -40,7 +40,7 @@
+ 
+ I=config.h com.h dataflash.h embedded_services.h main.h stdio.h include/AT91RM9200.h include/lib_AT91RM9200.h 
+ 
+-all: 	clean $(BINNAME) $(LSSNAME) install
++all: 	clean $(BINNAME) $(LSSNAME)
+ 	$(SIZE) $(OUTNAME)
+ 
+ # C objects here

43 lines not on this page · raw message

index 78ff82c..6bcc98a 100644
@@ -1,5 +1,6 @@
 menu "Bootloaders"
 
+source "boot/barebox/Config.in"
 source "boot/grub/Config.in"
 source "boot/grub2/Config.in"
 source "boot/syslinux/Config.in"

new file mode 100644
index 0000000..0c90f03
@@ -0,0 +1,14 @@
+menuconfig BR2_TARGET_BAREBOX
+	bool "Barebox"
+	help
+	  The Barebox bootloader, formerly known as U-Boot v2.
+
+	  http://www.barebox.org
+
+if BR2_TARGET_BAREBOX
+config BR2_TARGET_BAREBOX_BOARD_DEFCONFIG
+	string "board defconfig"
+	help
+	  Name of the board for which Barebox should be built, without
+	  the _defconfig suffix.
+endif

61 lines not on this page · raw message

index d6c8559..645ed2e 100644
@@ -383,7 +383,6 @@ config BR2_LINUX_BIN_BZIMAGE
 config BR2_LINUX_BIN_UIMAGE
 	bool "uImage"
 	depends on BR2_PACKAGE_LINUX
-	select BR2_TARGET_UBOOT
 
 config BR2_LINUX_BIN_VMLINUX
 	bool "vmlinux"

index 86d94ca..cc9d1e1 100644
@@ -137,8 +137,8 @@ endif
 # --------------
 # UIMAGE
 ifeq ($(LINUX26_FORMAT),uImage)
-LINUX26_MKIMAGE_DIR:=$(BUILD_DIR)/u-boot-tools
-LINUX26_MKIMAGE_DEP:=$(LINUX26_MKIMAGE_DIR)/mkimage
+LINUX26_MKIMAGE_DIR:=$(MKIMAGE)
+LINUX26_MKIMAGE_DEP:=$(MKIMAGE)
 ifeq ($(LINUX26_BINLOC),)
 LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
 endif