MIPS: Move CONFIG_SYS_TEXT_BASE to Kconfig

Move CONFIG_SYS_TEXT_BASE to Kconfig, and add default values in board
Kconfig files matching what was present in their config headers. This
will make it cleaner to conditionalise the value for Malta based on 32
vs 64 bit builds.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>

diff --git a/Kconfig b/Kconfig
index f53759a48e1f72b07533093be48073cbb3747255..4b462166656074d5979dee513b80c5c1c1deac02 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -268,7 +268,7 @@ config SYS_EXTRA_OPTIONS
 
 config SYS_TEXT_BASE
        depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \
-               (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE
+               (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS
        depends on !EFI_APP
        hex "Text Base"
        help

diff --git a/board/dbau1x00/Kconfig b/board/dbau1x00/Kconfig
index b813adb840d1ab3a3e3a0101911a7b93b91325a3..342ec59cb7396677b3bde3982a35a861749d6d4e 100644 (file)
--- a/board/dbau1x00/Kconfig
+++ b/board/dbau1x00/Kconfig
@@ -9,6 +9,9 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "dbau1x00"
 
+config SYS_TEXT_BASE
+       default 0xbfc00000
+
 menu "dbau1x00 board options"
 
 choice

diff --git a/board/imgtec/malta/Kconfig b/board/imgtec/malta/Kconfig
index 4c06d0c0d80912eb87df0d7346eefb17c2cdcb26..2bb8e8be16e2077376613d828a1dafcfa8fcafe0 100644 (file)
--- a/board/imgtec/malta/Kconfig
+++ b/board/imgtec/malta/Kconfig
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "malta"
 
+config SYS_TEXT_BASE
+       default 0xbe000000
+
 endif

diff --git a/board/microchip/pic32mzda/Kconfig b/board/microchip/pic32mzda/Kconfig
index 8acb39336984abb8fec8052ff9d3ad6fc7ff9d6e..4f08e98b97a0ef87491905d023bcbc55e3107d85 100644 (file)
--- a/board/microchip/pic32mzda/Kconfig
+++ b/board/microchip/pic32mzda/Kconfig
@@ -10,4 +10,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "pic32mzdask"
 
+config SYS_TEXT_BASE
+       default 0x9d004000
+
 endif

diff --git a/board/micronas/vct/Kconfig b/board/micronas/vct/Kconfig
index c518079efaca962caa1e08c74db2d9ced4f5b05e..535a77b2a32ecdc8610a6c9023767614d31e63aa 100644 (file)
--- a/board/micronas/vct/Kconfig
+++ b/board/micronas/vct/Kconfig
@@ -9,6 +9,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "vct"
 
+config SYS_TEXT_BASE
+       default 0x87000000
+
 menu "vct board options"
 
 choice

diff --git a/board/pb1x00/Kconfig b/board/pb1x00/Kconfig
index 251db6ab637c14d8b83051c5026e9dc78c24117f..236a4108bfc044673e115fde64967b9dcc3148a2 100644 (file)
--- a/board/pb1x00/Kconfig
+++ b/board/pb1x00/Kconfig
@@ -9,4 +9,7 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "pb1x00"
 
+config SYS_TEXT_BASE
+       default 0x83800000
+
 endif

diff --git a/board/qca/ap121/Kconfig b/board/qca/ap121/Kconfig
index f7e768ad586f7a1ccded2e11792ae52ee994a081..c3ecc8f62ff6e3717e02c1186af1114fb73a4f10 100644 (file)
--- a/board/qca/ap121/Kconfig
+++ b/board/qca/ap121/Kconfig
@@ -9,4 +9,7 @@ config SYS_BOARD
 config SYS_CONFIG_NAME
        default "ap121"
 
+config SYS_TEXT_BASE
+       default 0x9f000000
+
 endif

diff --git a/board/qca/ap143/Kconfig b/board/qca/ap143/Kconfig
index 4cdac0d06d052a9e55a5762c87514799bf28e8ce..5ea5d6fbb02455b818d17b390b68d190ad7794f9 100644 (file)
--- a/board/qca/ap143/Kconfig
+++ b/board/qca/ap143/Kconfig
@@ -9,4 +9,7 @@ config SYS_BOARD
 config SYS_CONFIG_NAME
        default "ap143"
 
+config SYS_TEXT_BASE
+       default 0x9f000000
+
 endif

diff --git a/board/qemu-mips/Kconfig b/board/qemu-mips/Kconfig
index 18d78b51008f2f271dc81e23d39579b69d0da7cf..3de1f44a3da4585b4a94ca1424f29a915343799c 100644 (file)
--- a/board/qemu-mips/Kconfig
+++ b/board/qemu-mips/Kconfig
@@ -7,4 +7,8 @@ config SYS_CONFIG_NAME
        default "qemu-mips" if 32BIT
        default "qemu-mips64" if 64BIT
 
+config SYS_TEXT_BASE
+       default 0xbfc00000 if 32BIT
+       default 0xffffffffbfc00000 if 64BIT
+
 endif

diff --git a/board/tplink/wdr4300/Kconfig b/board/tplink/wdr4300/Kconfig
index 902abf560d10a8a4414e0bfbf503bac5e21fd09f..65785bdb9c752a09182b2a0beadb98ef14bfb9ea 100644 (file)
--- a/board/tplink/wdr4300/Kconfig
+++ b/board/tplink/wdr4300/Kconfig
@@ -12,4 +12,7 @@ config SYS_BOARD
 config SYS_CONFIG_NAME
        default "tplink_wdr4300"
 
+config SYS_TEXT_BASE
+       default 0xa1000000
+
 endif

diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index 2beffa4805b33c34e2c1fb8526bc31424185b306..6f69f31503c26aed745fdc13d2b40cbe5beeb573 100644 (file)
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -7,8 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_TEXT_BASE            0x9f000000
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_BOARD_EARLY_INIT_F

diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index 7b69e10be442e948553de8343ce8f159647e61b6..f907c02af922667224d2479b56a30b42a5af1d5c 100644 (file)
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -7,8 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_TEXT_BASE            0x9f000000
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_BOARD_EARLY_INIT_F

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index eb0a87cd592859fff5878442f07149bfb128601a..68d9e36b19cc0b033cedda7f03559f20c0b9b764 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -139,12 +139,6 @@
 #define CONFIG_SYS_FLASH_CFI           1
 #define CONFIG_FLASH_CFI_DRIVER    1
 
-/* The following #defines are needed to get flash environment right */
-/* ROM version */
-#define CONFIG_SYS_TEXT_BASE           0xbfc00000
-/* RAM version */
-/* #define CONFIG_SYS_TEXT_BASE                0x80100000 */
-
 #define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 

diff --git a/include/configs/malta.h b/include/configs/malta.h
index e03935b573282ad2edbc9dd2e6741e5490ce04aa..a36967848c56580f0bcdb826b024df80e393b9fd 100644 (file)
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -37,7 +37,6 @@
 /*
  * Memory map
  */
-#define CONFIG_SYS_TEXT_BASE           0xbe000000 /* Rom version */
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 
 #define CONFIG_SYS_SDRAM_BASE          0x80000000 /* Cached addr */

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index caf75a6b26273e218b30c6558428ea2f14a4aafb..869768add054268d542d18f64802557ae3152247 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -80,12 +80,6 @@
 #define PHYS_FLASH_1           0xbec00000 /* Flash Bank #1 */
 #define PHYS_FLASH_2           0xbfc00000 /* Flash Bank #2 */
 
-/* The following #defines are needed to get flash environment right */
-/* ROM version */
-/* #define CONFIG_SYS_TEXT_BASE                0xbfc00000 */
-/* SDRAM version */
-#define CONFIG_SYS_TEXT_BASE           0x83800000
-
 #define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 

diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 108c6a2d62ff4b1fdc6337e1a7553957a92a9f7e..fb2e41fd92e11351b4b1d52cc9be65fde7987fee 100644 (file)
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -10,7 +10,6 @@
 #define __PIC32MZDASK_CONFIG_H
 
 /* System Configuration */
-#define CONFIG_SYS_TEXT_BASE           0x9d004000 /* .text */
 #define CONFIG_DISPLAY_BOARDINFO
 
 /*--------------------------------------------

diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index 702967c4e8e5cdf93afca6851b13e5d5e60059f6..246ee0173a74755d4b45abaa98bdc0df00eb22de 100644 (file)
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -107,7 +107,6 @@
  * FLASH and environment organization
  */
 /* The following #defines are needed to get flash environment right */
-#define CONFIG_SYS_TEXT_BASE           0xbfc00000 /* Rom version */
 #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)
 

diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index 239454984ae046ea10d25555ed4b307434c84561..60a3a71fbdc5e335a0d3f62b4a42cc1d0438acd9 100644 (file)
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -107,7 +107,6 @@
  * FLASH and environment organization
  */
 /* The following #defines are needed to get flash environment right */
-#define CONFIG_SYS_TEXT_BASE           0xffffffffbfc00000 /* Rom version */
 #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)
 

diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index 2b9e92ed2b18e9a47f8e4a0c0ed2740ee1446ead..09a69fec09d88902bb66f48962179bb316e7c8d4 100644 (file)
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -7,8 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_TEXT_BASE           0xa1000000
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_BOARD_EARLY_INIT_F

diff --git a/include/configs/vct.h b/include/configs/vct.h
index 6489e08173ca0a4bc0f110b1b420ef1954560bf3..68eb0893948faee401614d2bf3f54b6e73edc381 100644 (file)
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -32,7 +32,6 @@
 
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* SDRAM is initialized by the bootstrap code */
 
-#define CONFIG_SYS_TEXT_BASE           0x87000000
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)