Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- board/atmark-techno/armadillo-800eva/Kconfig | 2 ++ board/kmc/kzm9g/Kconfig | 3 +++ board/renesas/alt/Kconfig | 4 ++++ board/renesas/blanche/Kconfig | 4 ++++ board/renesas/gose/Kconfig | 4 ++++ board/renesas/koelsch/Kconfig | 4 ++++ board/renesas/lager/Kconfig | 4 ++++ board/renesas/porter/Kconfig | 4 ++++ board/renesas/silk/Kconfig | 4 ++++ board/renesas/stout/Kconfig | 4 ++++ include/configs/alt.h | 6 ------ include/configs/armadillo-800eva.h | 1 - include/configs/blanche.h | 2 -- include/configs/gose.h | 6 ------ include/configs/koelsch.h | 6 ------ include/configs/kzm9g.h | 1 - include/configs/lager.h | 6 ------ include/configs/porter.h | 6 ------ include/configs/silk.h | 6 ------ include/configs/stout.h | 6 ------ 20 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/board/atmark-techno/armadillo-800eva/Kconfig b/board/atmark-techno/armadillo-800eva/Kconfig index cd37dd4861..68ee5efa93 100644 --- a/board/atmark-techno/armadillo-800eva/Kconfig +++ b/board/atmark-techno/armadillo-800eva/Kconfig @@ -9,4 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "armadillo-800eva"
+config SYS_TEXT_BASE + default 0xE80C0000 endif diff --git a/board/kmc/kzm9g/Kconfig b/board/kmc/kzm9g/Kconfig index f163efd989..7d7e6ac244 100644 --- a/board/kmc/kzm9g/Kconfig +++ b/board/kmc/kzm9g/Kconfig @@ -9,4 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kzm9g"
+config SYS_TEXT_BASE + default 0x00000000 + endif diff --git a/board/renesas/alt/Kconfig b/board/renesas/alt/Kconfig index 39d53c185b..a7ed87ecf0 100644 --- a/board/renesas/alt/Kconfig +++ b/board/renesas/alt/Kconfig @@ -9,6 +9,10 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "alt"
+config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + config R8A7794_ETHERNET_B bool "Use ethernet B function" depends on TARGET_ALT diff --git a/board/renesas/blanche/Kconfig b/board/renesas/blanche/Kconfig index ac4730a62f..ed72638870 100644 --- a/board/renesas/blanche/Kconfig +++ b/board/renesas/blanche/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "blanche"
+config SYS_TEXT_BASE + default 0x00000000 if MTD_NOR_FLASH + default 0x40000000 + endif diff --git a/board/renesas/gose/Kconfig b/board/renesas/gose/Kconfig index 930a44559e..5111507dbd 100644 --- a/board/renesas/gose/Kconfig +++ b/board/renesas/gose/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "gose"
+config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/koelsch/Kconfig b/board/renesas/koelsch/Kconfig index 6475f02b66..503da62284 100644 --- a/board/renesas/koelsch/Kconfig +++ b/board/renesas/koelsch/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "koelsch"
+config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/lager/Kconfig b/board/renesas/lager/Kconfig index e990c2019c..0a5e86ded6 100644 --- a/board/renesas/lager/Kconfig +++ b/board/renesas/lager/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "lager"
+config SYS_TEXT_BASE + default 0xB0000000 if RMOBILE_EXTRAM_BOOT + default 0xE8080000 + endif diff --git a/board/renesas/porter/Kconfig b/board/renesas/porter/Kconfig index a6f621b73f..b9ed2f7308 100644 --- a/board/renesas/porter/Kconfig +++ b/board/renesas/porter/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "porter"
+config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/silk/Kconfig b/board/renesas/silk/Kconfig index 07aee0e50f..56b1faa742 100644 --- a/board/renesas/silk/Kconfig +++ b/board/renesas/silk/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "silk"
+config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/stout/Kconfig b/board/renesas/stout/Kconfig index cbbc6dd9e4..06a0d26a2d 100644 --- a/board/renesas/stout/Kconfig +++ b/board/renesas/stout/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "stout"
+config SYS_TEXT_BASE + default 0xB0000000 if RMOBILE_EXTRAM_BOOT + default 0xE8080000 + endif diff --git a/include/configs/alt.h b/include/configs/alt.h index 4021910bb3..d1bb984984 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -15,12 +15,6 @@
#include "rcar-gen2-common.h"
-#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #else diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 135619ef31..ca058bf1a1 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -62,7 +62,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) -#define CONFIG_SYS_TEXT_BASE 0xE80C0000
/* FLASH */ #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/blanche.h b/include/configs/blanche.h index 7f9cc71af3..ee5143cb87 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -38,12 +38,10 @@
/* FLASH */ #if !defined(CONFIG_MTD_NOR_FLASH) -#define CONFIG_SYS_TEXT_BASE 0x40000000 #define CONFIG_SPI #define CONFIG_SH_QSPI #define CONFIG_SH_QSPI_BASE 0xE6B10000 #else -#define CONFIG_SYS_TEXT_BASE 0x00000000 #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_FLASH_CFI_DRIVER diff --git a/include/configs/gose.h b/include/configs/gose.h index c94f7bf252..2f171d358b 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -14,12 +14,6 @@
#include "rcar-gen2-common.h"
-#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - /* STACK */ #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index a0cab809b1..89680b7c8d 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -14,12 +14,6 @@
#include "rcar-gen2-common.h"
-#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - /* STACK */ #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 4eb90db7f2..25e2f79c92 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -67,7 +67,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
-#define CONFIG_SYS_TEXT_BASE 0x00000000 #define CONFIG_STANDALONE_LOAD_ADDR 0x41000000
/* FLASH */ diff --git a/include/configs/lager.h b/include/configs/lager.h index 162828b787..f7ea95fce6 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -15,12 +15,6 @@
#include "rcar-gen2-common.h"
-#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0xB0000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE8080000 -#endif - /* STACK */ #if defined(CONFIGF_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0xB003FFFC diff --git a/include/configs/porter.h b/include/configs/porter.h index a479566146..a966cf3c76 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -16,12 +16,6 @@
#include "rcar-gen2-common.h"
-#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #else diff --git a/include/configs/silk.h b/include/configs/silk.h index 60a51dc282..18c53e6b8c 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -16,12 +16,6 @@
#include "rcar-gen2-common.h"
-#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #else diff --git a/include/configs/stout.h b/include/configs/stout.h index b5de336aa1..92b9f85f92 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -17,12 +17,6 @@
#include "rcar-gen2-common.h"
-#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0xB0000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE8080000 -#endif - /* STACK */ #if defined(CONFIGF_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0xB003FFFC