NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target/u-boot: more cleanups

Browse Source 
As discussed on the list.

- No sense in depending on BR2_TARGET_UBOOT when the configurations are
  within a if BR2_TARGET_UBOOT conditional.
- n is default, so remove 'default n'
- clarify nested conditionals
This commit is contained in:
Peter Korsgaard 2009-01-08 14:58:54 +00:00
parent 2b75de900b
commit 9dd66ff7e9
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
target/u-boot/Config.in
View File

@ -6,7 +6,6 @@ menuconfig BR2_TARGET_UBOOT
if BR2_TARGET_UBOOT
config BR2_TARGET_UBOOT_BOARDNAME
string "board name"
depends on BR2_TARGET_UBOOT
default "$(BOARD_NAME)"
help
One of U-Boot supported boards to be built.
@ -20,26 +19,21 @@ choice
config BR2_TARGET_UBOOT_2009_01_RC1
bool "u-boot-2009.01-rc1"
depends on BR2_TARGET_UBOOT
config BR2_TARGET_UBOOT_2008_10
bool "u-boot-2008.10"
depends on BR2_TARGET_UBOOT
config BR2_TARGET_UBOOT_1_3_4
bool "u-boot-1.3.4"
depends on BR2_TARGET_UBOOT
depends on BR2_DEPRECATED
config BR2_TARGET_UBOOT_1_2_0_ATMEL
bool "u-boot-1.2.0-atmel"
depends on BR2_TARGET_AT91
depends on BR2_TARGET_UBOOT
depends on BR2_DEPRECATED
#config BR2_TARGET_UBOOT_2009_01
# bool "u-boot-2009.01"
# depends on BR2_TARGET_UBOOT
endchoice
@ -58,7 +52,6 @@ config BR2_U_BOOT_SITE
config BR2_TARGET_UBOOT_CUSTOM_PATCH
string "custom patch"
depends on BR2_TARGET_UBOOT
help
If your board requires a custom patch, add the path to the file here.
Most users may leave this empty
@ -106,27 +99,22 @@ config BR2_TARGET_UBOOT_BOOTSOURCE
config BR2_TARGET_UBOOT_SILENT
bool "silent console"
depends on BR2_TARGET_UBOOT
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"
depends on BR2_TARGET_UBOOT
help
Install mkimage tool in target.
config BR2_TARGET_UBOOT_TOOL_ENV
bool "fw_printenv tool in target"
depends on BR2_TARGET_UBOOT
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.
@ -237,7 +225,6 @@ config BR2_TARGET_UBOOT_END_OF_FLASH
default "C0041FFF" if BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB
help
config BR2_TARGET_UBOOT_KERNEL_START
string "Kernel SDRAM address"
default "21000000"
@ -285,11 +272,9 @@ config BR2_TARGET_UBOOT_FILESYSTEM_SIZE
default "6000000"
help
menuconfig BR2_TARGET_UBOOT_NETWORK
bool "Network Settings"
default y
depends on BR2_TARGET_UBOOT
help
Network settings for U-boot
@ -297,35 +282,30 @@ if BR2_TARGET_UBOOT_NETWORK
config BR2_TARGET_UBOOT_SERVERIP
string "server ip"
depends on BR2_TARGET_UBOOT
default "10.175.196.221"
help
TFTP server ip address
config BR2_TARGET_UBOOT_IPADDR
string "ip address"
depends on BR2_TARGET_UBOOT
default "10.175.196.18"
help
Target ip address
config BR2_TARGET_UBOOT_GATEWAY
string "gateway ip"
depends on BR2_TARGET_UBOOT
default "10.175.196.1"
help
Gateway ip address
config BR2_TARGET_UBOOT_NETMASK
string "netmask"
depends on BR2_TARGET_UBOOT
default "255.255.255.0"
help
Network Mask
config BR2_TARGET_UBOOT_ETHADDR
string "ethernet address"
depends on BR2_TARGET_UBOOT
default "04:25:fe:ed:00:18"
help
Target MAC address for the ethernet interface.
@ -333,15 +313,15 @@ config BR2_TARGET_UBOOT_ETHADDR
config BR2_TARGET_UBOOT_ETH1ADDR
string "ethernet 2 address"
depends on BR2_TARGET_UBOOT
depends on BR2_TARGET_AVR32
help
Target MAC address for the second ethernet interface.
endif
endif
endif # BR2_TARGET_UBOOT_NETWORK
endif
endif # BR2_TARGET_UBOOT_DEFAULT_ENV
endif # BR2_TARGET_UBOOT
config BR2_BOOTSOURCE_DATAFLASHCARD
bool