From 86cf1c82850f7c226f23684e19616e526ffaf10f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 16 Aug 2018 08:16:24 -0400 Subject: configs: Migrate CONFIG_NR_DRAM_BANKS We have the following cases: - CONFIG_NR_DRAM_BANKS was defined, migrate normally - CONFIG_NR_DRAM_BANKS_MAX was defined and then used for CONFIG_NR_DRAM_BANKS after a check, just migrate it over now. - CONFIG_NR_DRAM_BANKS was very oddly defined on p2771-0000-* (to 1024 + 2), set this to 8. Signed-off-by: Tom Rini --- arch/arm/include/asm/arch-lpc32xx/config.h | 2 -- arch/arm/mach-kirkwood/include/mach/config.h | 1 - arch/arm/mach-mvebu/include/mach/config.h | 1 - arch/microblaze/include/asm/config.h | 2 -- 4 files changed, 6 deletions(-) (limited to 'arch') diff --git a/arch/arm/include/asm/arch-lpc32xx/config.h b/arch/arm/include/asm/arch-lpc32xx/config.h index de4b3cd34a5..f7a698e72de 100644 --- a/arch/arm/include/asm/arch-lpc32xx/config.h +++ b/arch/arm/include/asm/arch-lpc32xx/config.h @@ -12,8 +12,6 @@ /* Basic CPU architecture */ #define CONFIG_ARCH_CPU_INIT -#define CONFIG_NR_DRAM_BANKS_MAX 2 - /* UART configuration */ #if (CONFIG_SYS_LPC32XX_UART == 1) || (CONFIG_SYS_LPC32XX_UART == 2) || \ (CONFIG_SYS_LPC32XX_UART == 7) diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index f2b2de47d05..e0a67eb0f51 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -38,7 +38,6 @@ /* Kirkwood has 2k of Security SRAM, use it for SP */ #define CONFIG_SYS_INIT_SP_ADDR 0xC8012000 -#define CONFIG_NR_DRAM_BANKS_MAX 2 #define CONFIG_I2C_MVTWSI_BASE0 KW_TWSI_BASE #define MV_UART_CONSOLE_BASE KW_UART0_BASE diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h index 9f51411e43f..b8d18351e11 100644 --- a/arch/arm/mach-mvebu/include/mach/config.h +++ b/arch/arm/mach-mvebu/include/mach/config.h @@ -47,7 +47,6 @@ /* end of 16M scrubbed by training in bootrom */ #define CONFIG_SYS_INIT_SP_ADDR 0x00FF0000 -#define CONFIG_NR_DRAM_BANKS_MAX 2 #define MV_UART_CONSOLE_BASE MVEBU_UART0_BASE diff --git a/arch/microblaze/include/asm/config.h b/arch/microblaze/include/asm/config.h index 93a3fe85fe8..45966eef912 100644 --- a/arch/microblaze/include/asm/config.h +++ b/arch/microblaze/include/asm/config.h @@ -10,6 +10,4 @@ #define CONFIG_NEEDS_MANUAL_RELOC #endif -#define CONFIG_NR_DRAM_BANKS 1 - #endif -- cgit v1.2.3