From 256fe86b600f6664d82d15f57fe3c653ba4b9a7a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 12 Sep 2016 23:18:35 -0600 Subject: Convert CONFIG_SPL_ENV_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass --- include/configs/B4860QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/P1010RDB.h | 3 --- include/configs/P1022DS.h | 3 --- include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/a3m071.h | 1 - include/configs/am335x_evm.h | 2 -- include/configs/am335x_shc.h | 1 - include/configs/am335x_sl50.h | 2 -- include/configs/am43xx_evm.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 2 -- include/configs/dra7xx_evm.h | 1 - include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atwr.h | 1 - include/configs/ls1043a_common.h | 2 -- include/configs/ls2080a_common.h | 1 - include/configs/p1_p2_rdb_pc.h | 3 --- include/configs/pcm051.h | 1 - include/configs/pengwyn.h | 1 - include/configs/sandbox_spl.h | 1 - 27 files changed, 38 deletions(-) (limited to 'include') diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 85ee48a..4ca1af5 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -22,7 +22,6 @@ #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc #else #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 8ec1a90..397c950 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -27,7 +27,6 @@ #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE -#define CONFIG_TPL_ENV_SUPPORT #define CONFIG_SPL_NAND_INIT #define CONFIG_TPL_SERIAL_SUPPORT #define CONFIG_TPL_LIBGENERIC_SUPPORT diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 26ab38b..5b56550 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -20,7 +20,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL @@ -53,7 +52,6 @@ #define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc #else #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT @@ -104,7 +102,6 @@ #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE -#define CONFIG_TPL_ENV_SUPPORT #define CONFIG_SPL_NAND_INIT #define CONFIG_TPL_SERIAL_SUPPORT #define CONFIG_TPL_LIBGENERIC_SUPPORT diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 7e4cd12..1a17235 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -15,7 +15,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL @@ -43,7 +42,6 @@ #ifdef CONFIG_SPIFLASH #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT @@ -78,7 +76,6 @@ #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE -#define CONFIG_TPL_ENV_SUPPORT #define CONFIG_SPL_NAND_INIT #define CONFIG_TPL_SERIAL_SUPPORT #define CONFIG_TPL_LIBGENERIC_SUPPORT diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 37fee3d..88127bf 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_FSL_PBL_PBI board/freescale/t102xqds/t1024_pbi.cfg #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xqds/t1024_rcw.cfg #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index c3cadec..34f6656 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -51,7 +51,6 @@ #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_rcw.cfg #endif #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 96cd22b..685f30f 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -44,7 +44,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #endif #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 9fcb0e1..96c2623 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -54,7 +54,6 @@ #endif #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 262ce60..68b842e 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -43,7 +43,6 @@ #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xrdb/t2080_rcw.cfg #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index b56fb0b..aa323f9 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -26,7 +26,6 @@ #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc #else #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 48f8ddd..3621f99 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -26,7 +26,6 @@ #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc #else #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index ab2477c..b41bbb2 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -408,7 +408,6 @@ #define CONFIG_SPL_BSS_MAX_SIZE (64 << 10) #define CONFIG_SPL_OS_BOOT -#define CONFIG_SPL_ENV_SUPPORT /* Place patched DT blob (fdt) at this address */ #define CONFIG_SYS_SPL_ARGS_ADDR 0x01800000 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index f12ee04..9c8f108 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -337,7 +337,6 @@ #undef CONFIG_EFI_PARTITION /* General network SPL */ #define CONFIG_SPL_NET_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL" #endif @@ -416,7 +415,6 @@ "-(rootfs)" #elif defined(CONFIG_EMMC_BOOT) #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET 0x0 diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 9327c3d..184bb76 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -329,7 +329,6 @@ #define CONFIG_SPL_NET_SUPPORT #define CONFIG_SPL_ETH_SUPPORT #define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL" -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 8454872..b1775cc 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -110,14 +110,12 @@ #undef CONFIG_EFI_PARTITION /* General network SPL */ #define CONFIG_SPL_NET_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL" #endif #if defined(CONFIG_EMMC_BOOT) #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET 0x0 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 495dd8a..889bfff 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -318,7 +318,6 @@ #define CONFIG_PHYLIB #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NET_VCI_STRING "AM43xx U-Boot SPL" #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ETH_SUPPORT) diff --git a/include/configs/baltos.h b/include/configs/baltos.h index fc56c82..db82653 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -229,7 +229,6 @@ /* General network SPL, both CPSW and USB gadget RNDIS */ /*#define CONFIG_SPL_NET_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL"*/ #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds" diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index d8a8c0c..019c936 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -467,7 +467,6 @@ DEFAULT_LINUX_BOOT_ENV \ #undef CONFIG_EFI_PARTITION /* General network SPL */ #define CONFIG_SPL_NET_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NET_VCI_STRING "BAV335x U-Boot SPL" #endif @@ -547,7 +546,6 @@ DEFAULT_LINUX_BOOT_ENV \ #elif defined(CONFIG_EMMC_BOOT) #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET 0x0 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 43d2442..9251040 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -186,7 +186,6 @@ #ifdef CONFIG_SPL_BUILD #undef CONFIG_SPL_MMC_SUPPORT #endif -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index b038fe4..6ca1247 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -69,7 +69,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_LDSCRIPT "arch/$(ARCH)/cpu/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT @@ -106,7 +105,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_LDSCRIPT "arch/$(ARCH)/cpu/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 90ae770..ff9446e 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -114,7 +114,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/$(ARCH)/cpu/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 760221e..d81f00c 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -62,7 +62,6 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_I2C_SUPPORT @@ -92,7 +91,6 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 20e7726..748e7fe 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -265,7 +265,6 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x00100000 -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 3daba70..ca26d68 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -182,7 +182,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL @@ -210,7 +209,6 @@ #ifdef CONFIG_SPIFLASH #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT @@ -241,7 +239,6 @@ #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE -#define CONFIG_TPL_ENV_SUPPORT #define CONFIG_SPL_NAND_INIT #define CONFIG_TPL_SERIAL_SUPPORT #define CONFIG_TPL_LIBGENERIC_SUPPORT diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index e24dcb9..ae92775 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -122,7 +122,6 @@ #define CONFIG_SPL_YMODEM_SUPPORT #define CONFIG_SPL_NET_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NET_VCI_STRING "pcm051 U-Boot SPL" #define CONFIG_SPL_ETH_SUPPORT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds" diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 909ed9d..3409fe9 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -119,7 +119,6 @@ /* General network SPL */ #define CONFIG_SPL_NET_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL" /* NAND support */ diff --git a/include/configs/sandbox_spl.h b/include/configs/sandbox_spl.h index a50ee4a..dc3c18f 100644 --- a/include/configs/sandbox_spl.h +++ b/include/configs/sandbox_spl.h @@ -10,7 +10,6 @@ #define CONFIG_SPL_BOARD_INIT -#define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT -- cgit v1.1