From c7066b18079daef160592168e51479e82ae4f586 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Sat, 3 Jan 2009 15:50:38 +0000 Subject: Generate an autoscript for configuring u-boot in $(BINARIES_DIR) mkimage the autoscript to autoscript.$(PROJECT)- Move build of u-boot-1.2.0-atmel to target/u-boot Only visible for AT91 targets. Fetch prepatched 1.2.0-atmel tarball from $(BR2_ATMEL_MIRROR) Rest from normal location. Introduce U_BOOT_CONFIGURE_OPTS Set to NOSOFT_FLOAT for u-boot-1.2.0-atmel Disable target/device/Atmel/u-boot Keep files in target/device/Atmel/u-boot during a test period. Files: M target/device/Atmel/Makefile.in M target/device/Atmel/Config.in M target/u-boot/Makefile.in M target/u-boot/Config.in A target/u-boot/1.2.0-atmel --- target/device/Atmel/Config.in | 2 +- target/device/Atmel/Makefile.in | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'target/device/Atmel') diff --git a/target/device/Atmel/Config.in b/target/device/Atmel/Config.in index 9f6305b7d..d19234549 100644 --- a/target/device/Atmel/Config.in +++ b/target/device/Atmel/Config.in @@ -65,7 +65,7 @@ config BR2_BOARD_PATH endmenu -source "target/device/Atmel/u-boot/Config.in" +# source "target/device/Atmel/u-boot/Config.in" source "target/device/Atmel/DataFlashBoot/Config.in" diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in index 44eec8928..b6ca1be1a 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -54,6 +54,8 @@ DFB_BOARD_NAME:=$(BOARD_NAME) #BR2_PACKAGE_BUSYBOX_CONFIG:=$(BR2_BOARD_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config +U_BOOT_VERSION:=$(strip $(subst ",,$(BR2_UBOOT_VERSION))) +#")) # Update things in board specific makefiles include target/device/Atmel/*/Makefile.in @@ -63,9 +65,9 @@ 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_UBOOT_AT91),y) +#include $(ATMEL_PATH)/u-boot/u-boot.mk +#endif ifeq ($(BR2_TARGET_DATAFLASHBOOT),y) include $(ATMEL_PATH)/DataFlashBoot/DataflashBoot.mk -- cgit v1.2.3