From 6bcd872614fbb7cd3295e41da5d68002bdc8663c Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Tue, 6 Jan 2009 14:16:27 +0000 Subject: Use PROJECT-u-boot-VERSION-DATE.bin as u-boot target Provide link using "u-boot.bin" Add BR2_TARGET_UBOOT_DEFAULT_ENV config If this is set, Buildroot will generate a default environment to allow easy downloading of the kernel and root file system Both as compile time data and an autoscript. Make u-boot depend on $(U_BOOT_TARGETS) Add "u-boot-autoscript" to U_BOOT_TARGETS if BR2_TARGET_UBOOT_DEFAULT_ENV is set. Take kernel name from Linux build. Use correct ARCH when mkimaging the autoscript. Do not use TARGET_ATMEL_COPYTO for generic u-boot. Hide dataflash memory configurations when different boot memory is used. --- target/u-boot/Config.in | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'target/u-boot/Config.in') diff --git a/target/u-boot/Config.in b/target/u-boot/Config.in index 2f3963b15..9ab62247a 100644 --- a/target/u-boot/Config.in +++ b/target/u-boot/Config.in @@ -121,7 +121,15 @@ 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" + default n + depends on BR2_TARGET_UBOOT + 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 @@ -183,6 +191,7 @@ 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 @@ -207,6 +216,7 @@ 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 @@ -216,6 +226,7 @@ config BR2_TARGET_UBOOT_DATAFLASH_SIZE 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 @@ -233,7 +244,10 @@ config BR2_TARGET_UBOOT_KERNEL_START config BR2_TARGET_UBOOT_KERNEL_LOCATION string "Kernel flash address" - default "C0042000" + 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 @@ -252,6 +266,8 @@ config BR2_TARGET_UBOOT_FILESYSTEM_START 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 @@ -323,6 +339,8 @@ endif endif +endif + config BR2_BOOTSOURCE_DATAFLASHCARD bool help -- cgit v1.2.3