Convert CONFIG_SYS_RAMBOOT to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_RAMBOOT

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index f4f5ebfe0c40a50a8b933d34eb71ea2ff32a0493..9c5b1af8b591a7b9ce1f28aab75e4256e9054f95 100644 (file)
--- 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 ee0dc90e93ccb1deb285b4074ab00aafc01db143..e7a4d538d1cabf23f12c8208015b6bbeee9d9127 100644 (file)
--- 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 if PPC
        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 fc55e5c2f614fc740a33265762d0606139e81d8f..b6621f9a0728a7d71cb14780b87db8ca66145dc9 100644 (file)
--- 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 aea744c826cc7a1738bcfd3da3cd61d158b2afa8..b5e0e2901f0aedcaa7b62cbc6a69afd99a0b4ef2 100644 (file)
--- 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 2dc7da621600a8b958bad939690fcf73c9539a8e..72dd39d2306e9a7999a569888081e8c4cafb178a 100644 (file)
--- 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 159002d1ed8310919b16ebbc03d3b28ef09f9fcf..a93e9d0b58ac20dde4392811cc4e248d252237cb 100644 (file)
--- 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 25d82db0f8e986abb6e45d33aacc0eacf64dd5d8..365640dffc14bccdf01a0e7617cb68dcdc4491a8 100644 (file)
--- 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 969e7f728feb06e9c5f546a11d0d4238485a3b52..2faec638e2ddfc7e0dc4e0fa9e145751ad033235 100644 (file)
--- 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 098125989e951226dd7582f713c43ee8c6c43626..5ed9e1badb3b0cd5ac69250893f50ef87c7f9686 100644 (file)
--- 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 6ec3c6a8c039852611109da100494f51d8f56d86..96e8ff4842b4374d3f5c7f09f3b95a1baa53db08 100644 (file)
--- 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 d8ad45688167e951739d17db0aa977f0db4e9d16..66bd5cb9c0fe1571760a4fb7be8c3bd45b9efcf4 100644 (file)
--- 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 c8929814aaa99dbb209c98c336ff70658c63fb97..9f76f48a5c6bc32532713d829c19e941663ad18b 100644 (file)
--- 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 f4bf2ab830ae2f3b1c75d40f562559f7ba789d02..1c234c76a506b942edaed36138c143c118b94961 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -414,8 +414,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 451ae0e1e6df7741836f40d4c9575c42dc359d86..ce60a3c7421dfbd0aa887eb14efb9d123ec9d48d 100644 (file)
--- 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 */