ARM: rmobile: Zap ad-hoc DRAM configuration macros

These macros are no longer needed since the DRAM configuration is parsed
from the DT. Drop them all.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index dd6863e..2815e24 100644 (file)
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -48,30 +48,12 @@
 #define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_TEXT_BASE
 
 #define DRAM_RSV_SIZE                  0x08000000
-#if defined(CONFIG_R8A7795)
 #define CONFIG_NR_DRAM_BANKS           4
-#define PHYS_SDRAM_1                   (0x40000000 + DRAM_RSV_SIZE)
-#define PHYS_SDRAM_1_SIZE              (0x40000000u - DRAM_RSV_SIZE)
-#define PHYS_SDRAM_2                   0x500000000
-#define PHYS_SDRAM_2_SIZE              0x40000000u
-#define PHYS_SDRAM_3                   0x600000000
-#define PHYS_SDRAM_3_SIZE              0x40000000u
-#define PHYS_SDRAM_4                   0x700000000
-#define PHYS_SDRAM_4_SIZE              0x40000000u
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
-#define CONFIG_SYS_SDRAM_SIZE          PHYS_SDRAM_1_SIZE
-#elif defined(CONFIG_R8A7796)
-#define CONFIG_NR_DRAM_BANKS           2
-#define PHYS_SDRAM_1                   (0x40000000 + DRAM_RSV_SIZE)
-#define PHYS_SDRAM_1_SIZE              (0x80000000u - DRAM_RSV_SIZE)
-#define PHYS_SDRAM_2                   0x0600000000
-#define PHYS_SDRAM_2_SIZE              0x80000000u
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
-#define CONFIG_SYS_SDRAM_SIZE          PHYS_SDRAM_1_SIZE
-#endif
+#define CONFIG_SYS_SDRAM_BASE          (0x40000000 + DRAM_RSV_SIZE)
+#define CONFIG_SYS_SDRAM_SIZE          (0x80000000u - DRAM_RSV_SIZE)
 #define CONFIG_SYS_LOAD_ADDR           0x48080000
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_MAX_MEM_MAPPED          CONFIG_SYS_SDRAM_SIZE
+#define CONFIG_MAX_MEM_MAPPED          (0x80000000u - DRAM_RSV_SIZE)
 
 #define CONFIG_SYS_MONITOR_BASE                0x00000000
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)

diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index 001756c..d6092d5 100644 (file)
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -14,14 +14,6 @@
 
 #include "rcar-gen3-common.h"
 
-/* M3 ULCB has 2 banks, each with 1 GiB of RAM */
-#if defined(CONFIG_R8A7796)
-#undef PHYS_SDRAM_1_SIZE
-#undef PHYS_SDRAM_2_SIZE
-#define PHYS_SDRAM_1_SIZE              (0x40000000u - DRAM_RSV_SIZE)
-#define PHYS_SDRAM_2_SIZE              0x40000000u
-#endif
-
 /* SCIF */
 #define CONFIG_CONS_SCIF2
 #define CONFIG_CONS_INDEX      2