[PATCH 14/20] Convert CONFIG_SYS_RAMBOOT to Kconfig

This converts the following to Kconfig: CONFIG_SYS_RAMBOOT

Signed-off-by: Tom Rini trini@konsulko.com --- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + boot/Kconfig | 4 ++++ include/configs/MPC837XERDB.h | 6 ------ include/configs/P1010RDB.h | 6 ------ include/configs/P2041RDB.h | 4 ---- include/configs/T102xRDB.h | 4 ---- include/configs/T104xRDB.h | 4 ---- include/configs/T208xQDS.h | 4 ---- include/configs/T208xRDB.h | 4 ---- include/configs/T4240RDB.h | 4 ---- include/configs/corenet_ds.h | 4 ---- include/configs/km/km-mpc83xx.h | 8 -------- include/configs/p1_p2_rdb_pc.h | 2 -- include/configs/qemu-ppce500.h | 2 -- 14 files changed, 5 insertions(+), 52 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index f4f5ebfe0c40..9c5b1af8b591 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -109,6 +109,7 @@ config TARGET_QEMU_PPCE500 bool "Support qemu-ppce500" select ARCH_QEMU_E500 select PHYS_64BIT + select SYS_RAMBOOT imply OF_HAS_PRIOR_STAGE

config TARGET_T1024RDB diff --git a/boot/Kconfig b/boot/Kconfig index ee0dc90e93cc..8e50eef727d9 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -555,8 +555,12 @@ config CHROMEOS_VBOOT distinguishing between booting Chrome OS in a basic way (developer mode) and a full boot.

+config SYS_RAMBOOT + bool + config RAMBOOT_PBL bool "Freescale PBL(pre-boot loader) image format support" + select SYS_RAMBOOT help Some SoCs use PBL to load RCW and/or pre-initialization instructions. For more details refer to doc/README.pblimage diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index fc55e5c2f614..b6621f9a0728 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -126,12 +126,6 @@ * The reserved memory */

-#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) -#define CONFIG_SYS_RAMBOOT -#else -#undef CONFIG_SYS_RAMBOOT -#endif - #define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */

/* diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index aea744c826cc..b5e0e2901f0a 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -342,12 +342,6 @@ extern unsigned long get_sdram_size(void); FTIM2_GPCM_TWP(0x1f)) #define CONFIG_SYS_CS3_FTIM3 0x0

-#if defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH) -#define CONFIG_SYS_RAMBOOT -#else -#undef CONFIG_SYS_RAMBOOT -#endif - #define CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 /* stack in RAM */ #define CONFIG_SYS_INIT_RAM_SIZE 0x00004000 /* End of used area in RAM */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 2dc7da621600..72dd39d2306e 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -129,10 +129,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Write Timeout (ms) */

-#if defined(CONFIG_RAMBOOT_PBL) -#define CONFIG_SYS_RAMBOOT -#endif - /* Nand Flash */ #ifdef CONFIG_NAND_FSL_ELBC #define CONFIG_SYS_NAND_BASE 0xffa00000 diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 159002d1ed83..a93e9d0b58ac 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -287,10 +287,6 @@ #define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NAND_FTIM3 #endif

-#if defined(CONFIG_RAMBOOT_PBL) -#define CONFIG_SYS_RAMBOOT -#endif - #define CONFIG_HWCONFIG

/* define to use L1 as initial stack */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 25d82db0f8e9..365640dffc14 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -259,10 +259,6 @@ #define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NAND_FTIM3 #endif

-#if defined(CONFIG_RAMBOOT_PBL) -#define CONFIG_SYS_RAMBOOT -#endif - #define CONFIG_HWCONFIG

/* define to use L1 as initial stack */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 969e7f728feb..2faec638e2dd 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -267,10 +267,6 @@ #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3 #endif

-#if defined(CONFIG_RAMBOOT_PBL) -#define CONFIG_SYS_RAMBOOT -#endif - #define CONFIG_HWCONFIG

/* define to use L1 as initial stack */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 098125989e95..5ed9e1badb3b 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -226,10 +226,6 @@ #define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NAND_FTIM3 #endif

-#if defined(CONFIG_RAMBOOT_PBL) -#define CONFIG_SYS_RAMBOOT -#endif - #define CONFIG_HWCONFIG

/* define to use L1 as initial stack */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 6ec3c6a8c039..96e8ff4842b4 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -321,10 +321,6 @@ FTIM2_GPCM_TWP(0x1f)) #define CONFIG_SYS_CS3_FTIM3 0x0

-#if defined(CONFIG_RAMBOOT_PBL) -#define CONFIG_SYS_RAMBOOT -#endif - /* I2C */ #define I2C_MUX_PCA_ADDR_PRI 0x77 /* I2C bus multiplexer,primary */ #define I2C_MUX_PCA_ADDR_SEC 0x76 /* I2C bus multiplexer,secondary */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index d8ad45688167..66bd5cb9c0fe 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -119,10 +119,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */

-#if defined(CONFIG_RAMBOOT_PBL) -#define CONFIG_SYS_RAMBOOT -#endif - /* Nand Flash */ #ifdef CONFIG_NAND_FSL_ELBC #define CONFIG_SYS_NAND_BASE 0xffa00000 diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index c8929814aaa9..9f76f48a5c6b 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -25,10 +25,6 @@ */ #define CONFIG_SYS_FLASH_BASE 0xF0000000

-#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) -#define CONFIG_SYS_RAMBOOT -#endif - /* Reserve 768 kB for Mon */ #define CONFIG_SYS_MONITOR_LEN (768 * 1024)

@@ -81,10 +77,6 @@ * Environment */

-#ifndef CONFIG_SYS_RAMBOOT -/* Address and size of Redundant Environment Sector */ -#endif /* CFG_SYS_RAMBOOT */ - /* * Environment Configuration */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 7c00f54dfd75..7410c60cbd2a 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -423,8 +423,6 @@ #ifdef CONFIG_TPL_BUILD #define SPL_ENV_ADDR (CONFIG_SYS_INIT_L2_ADDR + (160 << 10)) #endif -#elif defined(CONFIG_SYS_RAMBOOT) -#define SPL_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #endif

#define CONFIG_LOADS_ECHO /* echo on for serial download */ diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 451ae0e1e6df..ce60a3c7421d 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -9,8 +9,6 @@ #ifndef __QEMU_PPCE500_H #define __QEMU_PPCE500_H

-#define CONFIG_SYS_RAMBOOT - /* Needed to fill the ccsrbar pointer */

/* Virtual address to CCSRBAR */