powerpc: Migrate SYS_L2_SIZE to Kconfig

Introduce two options, one for each observed L2 cache size, and have the
size select'd as needed.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 27f069a1fb37f3a457b0ee97053867000f5915c0..7abfe26d35ddc83f2b4d827a4173094f3a322b93 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -113,6 +113,7 @@ config TARGET_P1010RDB_PA
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select SUPPORT_TPL
+       select SYS_L2_SIZE_256KB
        imply CMD_EEPROM
        imply CMD_SATA
        imply PANIC_HANG
@@ -123,6 +124,7 @@ config TARGET_P1010RDB_PB
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select SUPPORT_TPL
+       select SYS_L2_SIZE_256KB
        imply CMD_EEPROM
        imply CMD_SATA
        imply PANIC_HANG
@@ -132,6 +134,7 @@ config TARGET_P1020RDB_PC
        select SUPPORT_SPL
        select SUPPORT_TPL
        select ARCH_P1020
+       select SYS_L2_SIZE_256KB
        imply CMD_EEPROM
        imply CMD_SATA
        imply PANIC_HANG
@@ -141,6 +144,7 @@ config TARGET_P1020RDB_PD
        select SUPPORT_SPL
        select SUPPORT_TPL
        select ARCH_P1020
+       select SYS_L2_SIZE_256KB
        imply CMD_EEPROM
        imply CMD_SATA
        imply PANIC_HANG
@@ -150,6 +154,7 @@ config TARGET_P2020RDB
        select SUPPORT_SPL
        select SUPPORT_TPL
        select ARCH_P2020
+       select SYS_L2_SIZE_512KB
        imply CMD_EEPROM
        imply CMD_SATA
        imply SATA_SIL
@@ -1277,6 +1282,17 @@ config SYS_ETVPE_CLK
        default 1
 endif
 
+config SYS_L2_SIZE_256KB
+       bool
+
+config SYS_L2_SIZE_512KB
+       bool
+
+config SYS_L2_SIZE
+       int
+       default 262144 if SYS_L2_SIZE_256KB
+       default 524288 if SYS_L2_SIZE_512KB
+
 config BACKSIDE_L2_CACHE
        bool
 

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index bf9227a3c2043afdcd512bbc45a69af829f58206..06188cac44f227dd0ad385925c5544bf834115f7 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -311,18 +311,15 @@ extern unsigned long get_sdram_size(void);
 #if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH)
 #define CONFIG_SYS_INIT_L2_ADDR                0xD0000000
 #define CONFIG_SYS_INIT_L2_ADDR_PHYS   CONFIG_SYS_INIT_L2_ADDR
-#define CONFIG_SYS_L2_SIZE             (256 << 10)
 #define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
 #elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SYS_INIT_L2_ADDR                0xD0000000
 #define CONFIG_SYS_INIT_L2_ADDR_PHYS   CONFIG_SYS_INIT_L2_ADDR
-#define CONFIG_SYS_L2_SIZE             (256 << 10)
 #define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
 #else
 #define CONFIG_SYS_INIT_L2_ADDR                0xD0000000
 #define CONFIG_SYS_INIT_L2_ADDR_PHYS   CONFIG_SYS_INIT_L2_ADDR
-#define CONFIG_SYS_L2_SIZE             (256 << 10)
 #define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
 #endif
 #endif

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index ca7d7288115bfd03095857549a4415d8a4f55baf..73bda9dc70efd0fc1b72cce99777454881338ca1 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -27,7 +27,6 @@
 #define __SW_BOOT_NOR_BANK_UP  0x5c /* (__SW_BOOT_NOR | __SW_NOR_BANK_UP) */
 #define __SW_BOOT_NOR_BANK_LO  0x5e /* (__SW_BOOT_NOR | __SW_NOR_BANK_LO) */
 #define __SW_BOOT_NOR_BANK_MASK        0x01 /* (__SW_BOOT_MASK & __SW_NOR_BANK_MASK) */
-#define CONFIG_SYS_L2_SIZE     (256 << 10)
 #endif
 
 /*
@@ -58,7 +57,6 @@
 #define __SW_BOOT_NOR_BANK_UP  0x64 /* (__SW_BOOT_NOR | __SW_NOR_BANK_UP) */
 #define __SW_BOOT_NOR_BANK_LO  0x66 /* (__SW_BOOT_NOR | __SW_NOR_BANK_LO) */
 #define __SW_BOOT_NOR_BANK_MASK        0x01 /* (__SW_BOOT_MASK & __SW_NOR_BANK_MASK) */
-#define CONFIG_SYS_L2_SIZE     (256 << 10)
 /*
  * Dynamic MTD Partition support with mtdparts
  */
@@ -79,7 +77,6 @@
 #define __SW_BOOT_NOR_BANK_UP  0xc8 /* (__SW_BOOT_NOR | __SW_NOR_BANK_UP) */
 #define __SW_BOOT_NOR_BANK_LO  0xca /* (__SW_BOOT_NOR | __SW_NOR_BANK_LO) */
 #define __SW_BOOT_NOR_BANK_MASK        0x01 /* (__SW_BOOT_MASK & __SW_NOR_BANK_MASK) */
-#define CONFIG_SYS_L2_SIZE     (512 << 10)
 /*
  * Dynamic MTD Partition support with mtdparts
  */