arc: move SYS_MONITOR_BASE setup in Konfig

Following SPARK ARC now has SYS_MONITOR_BASE setup via Kconfig.
This makes "include/configs/*.h" cleaner and more flexible.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>

diff --git a/Kconfig b/Kconfig
index 861622664fcba27cfbf4445128ce44c8db4b9cb2..e16f1e852e5b69a57745e2e1b1b907826b5312b6 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -138,7 +138,7 @@ config SYS_EXTRA_OPTIONS
          new boards should not use this option.
 
 config SYS_TEXT_BASE
-       depends on SPARC
+       depends on SPARC || ARC
        hex "Text Base"
        help
          TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture

diff --git a/configs/arcangel4-be_defconfig b/configs/arcangel4-be_defconfig
index 5d2e126e2e8957e42f94ab53a6aeed27b31be82d..979f26e6dccece5024974614451e477603dbcea7 100644 (file)
--- a/configs/arcangel4-be_defconfig
+++ b/configs/arcangel4-be_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARC=y
 CONFIG_TARGET_ARCANGEL4=y
 CONFIG_SYS_CLK_FREQ=70000000
 CONFIG_CPU_BIG_ENDIAN=y
+CONFIG_SYS_TEXT_BASE=0x81000000

diff --git a/configs/arcangel4_defconfig b/configs/arcangel4_defconfig
index a63ef21de80ce9cbb26940ee8931db5f69e12ee3..797595f2c30ebc6c270b41a8d360684044dbe696 100644 (file)
--- a/configs/arcangel4_defconfig
+++ b/configs/arcangel4_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARC=y
 CONFIG_TARGET_ARCANGEL4=y
 CONFIG_SYS_CLK_FREQ=70000000
+CONFIG_SYS_TEXT_BASE=0x81000000

diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig
index d165e411caafe27a31a9c68c59c38998746c024a..34ed9633a1362f02e1adcfe7cba6e25b03c92a84 100644 (file)
--- a/configs/axs101_defconfig
+++ b/configs/axs101_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARC=y
 CONFIG_TARGET_AXS101=y
 CONFIG_SYS_CLK_FREQ=750000000
 CONFIG_ARC_CACHE_LINE_SHIFT=5
-CONFIG_SYS_DCACHE_OFF=y
\ No newline at end of file
+CONFIG_SYS_DCACHE_OFF=y
+CONFIG_SYS_TEXT_BASE=0x81000000
\ No newline at end of file

diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig
index e17a4958f5792afd32ce909c40d3c5856dd32a96..b0e8c9f602d9f1e4435b2b29a8738b3b3230fa0f 100644 (file)
--- a/configs/tb100_defconfig
+++ b/configs/tb100_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARC=y
 CONFIG_TARGET_TB100=y
 CONFIG_SYS_CLK_FREQ=500000000
 CONFIG_ARC_CACHE_LINE_SHIFT=5
+CONFIG_SYS_TEXT_BASE=0x84000000

diff --git a/include/configs/arcangel4.h b/include/configs/arcangel4.h
index 80d6438ba152161be4ec708ceb9f8bea7193022f..5e4097fb82e1c9fcf665058c52f8f673e2237338 100644 (file)
--- a/include/configs/arcangel4.h
+++ b/include/configs/arcangel4.h
@@ -15,7 +15,6 @@
 /*
  * Memory configuration
  */
-#define CONFIG_SYS_TEXT_BASE           0x81000000
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000

diff --git a/include/configs/axs101.h b/include/configs/axs101.h
index e9a32314fd32bde07099e9ad965b6b4c2eb13d59..5fb8aca4bca95f3fa307407649e2d084b65ff2af 100644 (file)
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@ -20,7 +20,6 @@
 /*
  * Memory configuration
  */
-#define CONFIG_SYS_TEXT_BASE           0x81000000
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000

diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index 54eca6f5746b383fd60ca681862f69b238aba9b9..46df40661da631bbabb3d629982daf6cb0f7f0f5 100644 (file)
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -17,7 +17,6 @@
 /*
  * Memory configuration
  */
-#define CONFIG_SYS_TEXT_BASE           0x84000000
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000