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>
8 years ago · ec35e12331
parent 6242aa1374
commit ec35e12331
20 changed files with 29 additions and 24 deletions
--- a/2
+++ b/2
@ -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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)

--- 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 */
--- 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)

--- 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

 /*--------------------------------------------
--- 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)

--- 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)

--- 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
--- 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)