sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Make generic default environment type a use choice 

So far it was hardcoded for each board if defenv-1 or defenv-2 is used.
Make this a user choice so that a particular board no longer enforces
a defenv type.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2016-09-27 08:09:42 +02:00
parent 4d9734c8a2
commit 790980bf18
15 changed files with 18 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -232,7 +232,6 @@ config ARCH_TEGRA
select CLKDEV_LOOKUP
select GPIOLIB
select GPIO_TEGRA
select HAVE_DEFAULT_ENVIRONMENT_NEW
select HAVE_PBL_MULTI_IMAGES
select OFDEVICE
select OFTREE

3
arch/arm/mach-at91/Kconfig
View File

@ -255,7 +255,6 @@ config MACH_USB_A9260
config MACH_GE863
bool "Telit EVK-PRO3"
select HAVE_DEFAULT_ENVIRONMENT_NEW
help
Say y here if you are using Telit EVK-PRO3 with GE863-PRO3
<http://www.telit.com>
@ -494,13 +493,11 @@ choice
config MACH_SAMA5D4EK
bool "Atmel SAMA5D4 Evaluation Kit"
select HAVE_DEFAULT_ENVIRONMENT_NEW
help
Select this if you are using Atmel's SAMA5D4-EK Evaluation Kit.
config MACH_SAMA5D4_XPLAINED
bool "Atmel SAMA5D4 XPLAINED ULTRA Evaluation Kit"
select HAVE_DEFAULT_ENVIRONMENT_NEW
help
Select this if you are using Atmel's SAMA5D4_XPLAINED ULTRA Evaluation Kit.

1
arch/arm/mach-clps711x/Kconfig
View File

@ -5,7 +5,6 @@ choice
config MACH_CLEP7212
bool "Cirrus Logic CLEP7212"
select HAVE_DEFAULT_ENVIRONMENT_NEW
help
Boards based on the Cirrus Logic 7212/7312 CPU.

1
arch/arm/mach-davinci/Kconfig
View File

@ -9,7 +9,6 @@ choice
config MACH_VIRT2REAL
bool "Virt2Real"
select HAVE_DEFAULT_ENVIRONMENT_NEW
endchoice

1
arch/arm/mach-highbank/Kconfig
View File

@ -10,7 +10,6 @@ choice
config MACH_HIGHBANK
bool "Calxeda Highbank"
select OFTREE
select HAVE_DEFAULT_ENVIRONMENT_NEW
endchoice

9
arch/arm/mach-imx/Kconfig
View File

@ -145,7 +145,6 @@ config ARCH_IMX6SX
config IMX_MULTI_BOARDS
bool "Allow multiple boards to be selected"
select HAVE_DEFAULT_ENVIRONMENT_NEW
select HAVE_PBL_MULTI_IMAGES
if IMX_MULTI_BOARDS
@ -160,7 +159,6 @@ config MACH_TX25
config MACH_PCA100
bool "phyCard-i.MX27"
select ARCH_IMX27
select HAVE_DEFAULT_ENVIRONMENT_NEW
select ARCH_IMX_EXTERNAL_BOOT_NAND
help
Say Y here if you are using Phytec's phyCard-i.MX27 (pca100) equipped
@ -172,7 +170,6 @@ config MACH_PCM038
select SPI
select DRIVER_SPI_IMX
select MFD_MC13XXX
select HAVE_DEFAULT_ENVIRONMENT_NEW
select ARCH_IMX_EXTERNAL_BOOT_NAND
help
Say Y here if you are using Phytec's phyCORE-i.MX27 (pcm038) equipped
@ -266,7 +263,6 @@ config MACH_TX6X
config MACH_SABRELITE
bool "Freescale i.MX6 Sabre Lite"
select ARCH_IMX6
select HAVE_DEFAULT_ENVIRONMENT_NEW
select HAVE_PBL_MULTI_IMAGES
config MACH_SABRESD
@ -398,7 +394,6 @@ config MACH_PCM037
bool "phyCORE-i.MX31"
select ARCH_IMX31
select USB_ULPI if USB
select HAVE_DEFAULT_ENVIRONMENT_NEW
select ARCH_HAS_L2X0
help
Say Y here if you are using Phytec's phyCORE-i.MX31 (pcm037) equipped
@ -408,7 +403,6 @@ config MACH_MX31MOBOARD
bool "mx31moboard-i.MX31"
select ARCH_IMX31
select USB_ULPI if USB
select HAVE_DEFAULT_ENVIRONMENT_NEW
select ARCH_HAS_L2X0
help
Say Y here if you are using EPFL mx31moboard board equipped
@ -441,7 +435,6 @@ config MACH_PCM043
bool "phyCORE-i.MX35"
select ARCH_IMX35
select ARCH_HAS_L2X0
select HAVE_DEFAULT_ENVIRONMENT_NEW
help
Say Y here if you are using Phytec's phyCORE-i.MX35 (pcm043) equipped
with a Freescale i.MX35 Processor
@ -458,7 +451,6 @@ config MACH_KINDLE3
bool "Amazon Kindle3"
select ARCH_IMX35
select ARCH_HAS_L2X0
select HAVE_DEFAULT_ENVIRONMENT_NEW
help
Say Y here if you are using the Amazon Model No. D00901 Kindle
@ -509,7 +501,6 @@ config MACH_FREESCALE_MX53_SMD
config MACH_TX53
bool "Ka-Ro TX53"
select ARCH_IMX53
select HAVE_DEFAULT_ENVIRONMENT_NEW
help
Say Y here if you are using the Ka-Ro tx53 board

5
arch/arm/mach-mxs/Kconfig
View File

@ -45,7 +45,6 @@ config MACH_CHUMBY
config MACH_IMX233_OLINUXINO
bool "Olimex.ltd imx223-olinuxino"
select HAVE_DEFAULT_ENVIRONMENT_NEW
select HAVE_PBL_MULTI_IMAGES
help
Say Y here if you are using the imx233-olinuxino
@ -61,14 +60,12 @@ choice
config MACH_TX28
bool "KARO tx28"
select HAVE_DEFAULT_ENVIRONMENT_NEW
select HAVE_PBL_MULTI_IMAGES
help
Say Y here if you are using the KARO TX28 CPU module.
config MACH_MX28EVK
bool "mx28-evk"
select HAVE_DEFAULT_ENVIRONMENT_NEW
select MXS_OCOTP
select HAVE_PBL_MULTI_IMAGES
help
@ -76,7 +73,6 @@ config MACH_MX28EVK
config MACH_DUCKBILL
bool "Duckbill"
select HAVE_DEFAULT_ENVIRONMENT_NEW
select MXS_OCOTP
select HAVE_PBL_MULTI_IMAGES
help
@ -84,7 +80,6 @@ config MACH_DUCKBILL
config MACH_CFA10036
bool "cfa-10036"
select HAVE_DEFAULT_ENVIRONMENT_NEW
select MXS_OCOTP
select I2C_GPIO
select EEPROM_AT24

3
arch/arm/mach-omap/Kconfig
View File

@ -155,7 +155,6 @@ config OMAP_SERIALBOOT
config OMAP_MULTI_BOARDS
bool "Allow multiple boards to be selected"
select HAVE_DEFAULT_ENVIRONMENT_NEW
select HAVE_PBL_MULTI_IMAGES
if OMAP_MULTI_BOARDS
@ -168,7 +167,6 @@ config MACH_AFI_GF
config MACH_BEAGLE
bool "Texas Instrument's Beagle Board"
select HAVE_DEFAULT_ENVIRONMENT_NEW
select ARCH_OMAP3
help
Say Y here if you are using Beagle Board
@ -204,7 +202,6 @@ config MACH_OMAP3EVM
config MACH_PANDA
bool "Texas Instrument's Panda Board"
select HAVE_DEFAULT_ENVIRONMENT_NEW
select ARCH_OMAP4
help
Say Y here if you are using OMAP4 Panda board

1
arch/arm/mach-samsung/Kconfig
View File

@ -52,7 +52,6 @@ config MACH_MINI2440
select S3C_PLL_INIT
select S3C_SDRAM_INIT
select HAS_DM9000
select HAVE_DEFAULT_ENVIRONMENT_NEW
help
Say Y here if you are using Mini 2440 dev board equipped
with a Samsung S3C2440 Processor

4
arch/arm/mach-socfpga/Kconfig
View File

@ -13,19 +13,15 @@ config ARCH_TEXT_BASE
default 0x00100000 if MACH_SOCFPGA_CYCLONE5
config MACH_SOCFPGA_ALTERA_SOCDK
select HAVE_DEFAULT_ENVIRONMENT_NEW
bool "Altera SoCFPGA Development Kit"
config MACH_SOCFPGA_EBV_SOCRATES
select HAVE_DEFAULT_ENVIRONMENT_NEW
bool "EBV Socrates"
config MACH_SOCFPGA_TERASIC_DE0_NANO_SOC
select HAVE_DEFAULT_ENVIRONMENT_NEW
bool "Terasic DE0-NANO-SoC aka Atlas"
config MACH_SOCFPGA_TERASIC_SOCKIT
select HAVE_DEFAULT_ENVIRONMENT_NEW
bool "Terasic SoCKit"
endif

1
arch/arm/mach-uemd/Kconfig
View File

@ -9,7 +9,6 @@ choice
config MACH_MB7707
bool "MB7707"
select HAVE_DEFAULT_ENVIRONMENT_NEW
endchoice

1
arch/arm/mach-versatile/Kconfig
View File

@ -9,7 +9,6 @@ config MACH_VERSATILEPB
default y
select ARM_AMBA
select CLKDEV_LOOKUP
select HAVE_DEFAULT_ENVIRONMENT_NEW
choice
prompt "ARM Board type"

1
arch/efi/Kconfig
View File

@ -3,7 +3,6 @@ config ARCH_EFI
default y
select HAS_DEBUG_LL
select HAS_KALLSYMS
select HAVE_DEFAULT_ENVIRONMENT_NEW
select EFI_GUID
select EFI_DEVICEPATH
select PRINTF_UUID

1
arch/openrisc/Kconfig
View File

@ -3,7 +3,6 @@ config OPENRISC
select OFTREE
select HAS_CACHE
select HAVE_CONFIGURABLE_MEMORY_LAYOUT
select HAVE_DEFAULT_ENVIRONMENT_NEW
select GENERIC_FIND_NEXT_BIT
default y

42
common/Kconfig
View File

@ -826,11 +826,8 @@ config DEFAULT_COMPRESSION_NONE
endchoice
config HAVE_DEFAULT_ENVIRONMENT_NEW
bool
config DEFAULT_ENVIRONMENT_GENERIC_NEW
bool
bool "Generic environment template"
depends on DEFAULT_ENVIRONMENT
depends on SHELL_HUSH
select BOOTM
@ -849,7 +846,23 @@ config DEFAULT_ENVIRONMENT_GENERIC_NEW
select FLEXIBLE_BOOTARGS
select CMD_BOOT
select NET_CMD_IFUP if NET
prompt "Generic environment template"
config DEFAULT_ENVIRONMENT_GENERIC
bool "Generic environment template (old version)"
depends on DEFAULT_ENVIRONMENT
depends on !DEFAULT_ENVIRONMENT_GENERIC_NEW
depends on SHELL_HUSH
select CMD_GETOPT
select CMD_CRC
select CMD_CRC_CMP
select CMD_GLOBAL
help
With this option barebox will use the generic default
environment found under defaultenv/ in the src tree.
The Directory given with DEFAULT_ENVIRONMENT_PATH
will be added to the default environment. This should
at least contain a /env/config file.
This will be able to overwrite the files from defaultenv.
config DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU
bool
@ -863,25 +876,6 @@ config DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU
depends on USB_GADGET_DFU
default y
config DEFAULT_ENVIRONMENT_GENERIC
bool
depends on !HAVE_DEFAULT_ENVIRONMENT_NEW
depends on DEFAULT_ENVIRONMENT
depends on SHELL_HUSH
select CMD_GETOPT
select CMD_CRC
select CMD_CRC_CMP
select CMD_AUTOMOUNT if HAVE_DEFAULT_ENVIRONMENT_NEW
select CMD_GLOBAL
prompt "Default environment generic"
help
With this option barebox will use the generic default
environment found under defaultenv/ in the src tree.
The Directory given with DEFAULT_ENVIRONMENT_PATH
will be added to the default environment. This should
at least contain a /env/config file.
This will be able to overwrite the files from defaultenv.
config DEFAULT_ENVIRONMENT_PATH
string
depends on DEFAULT_ENVIRONMENT