Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIPS: Move CONFIG_SYS_TEXT_BASE to Kconfig

Browse Source 
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>
master
Paul Burton 8 years ago committed by Daniel Schwierzeck
parent 6242aa1374
commit ec35e12331
20 changed files with 29 additions and 24 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Kconfig
  2. 3
      board/dbau1x00/Kconfig
  3. 3
      board/imgtec/malta/Kconfig
  4. 3
      board/microchip/pic32mzda/Kconfig
  5. 3
      board/micronas/vct/Kconfig
  6. 3
      board/pb1x00/Kconfig
  7. 3
      board/qca/ap121/Kconfig
  8. 3
      board/qca/ap143/Kconfig
  9. 4
      board/qemu-mips/Kconfig
  10. 3
      board/tplink/wdr4300/Kconfig
  11. 2
      include/configs/ap121.h
  12. 2
      include/configs/ap143.h
  13. 6
      include/configs/dbau1x00.h
  14. 1
      include/configs/malta.h
  15. 6
      include/configs/pb1x00.h
  16. 1
      include/configs/pic32mzdask.h
  17. 1
      include/configs/qemu-mips.h
  18. 1
      include/configs/qemu-mips64.h
  19. 2
      include/configs/tplink_wdr4300.h
  20. 1
      include/configs/vct.h

2
Kconfig
Unescape View File

@ -268,7 +268,7 @@ config SYS_EXTRA_OPTIONS
config SYS_TEXT_BASE config SYS_TEXT_BASE
depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \ depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \
(M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS
depends on !EFI_APP depends on !EFI_APP
hex "Text Base" hex "Text Base"
help help

3
board/dbau1x00/Kconfig
Unescape View File

@ -9,6 +9,9 @@ config SYS_SOC
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "dbau1x00" default "dbau1x00"
config SYS_TEXT_BASE
default 0xbfc00000
menu "dbau1x00 board options" menu "dbau1x00 board options"
choice choice

3
board/imgtec/malta/Kconfig
Unescape View File

@ -9,4 +9,7 @@ config SYS_VENDOR
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "malta" default "malta"
config SYS_TEXT_BASE
default 0xbe000000
endif endif

3
board/microchip/pic32mzda/Kconfig
Unescape View File

@ -10,4 +10,7 @@ config SYS_VENDOR
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "pic32mzdask" default "pic32mzdask"
config SYS_TEXT_BASE
default 0x9d004000
endif endif

3
board/micronas/vct/Kconfig
Unescape View File

@ -9,6 +9,9 @@ config SYS_VENDOR
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "vct" default "vct"
config SYS_TEXT_BASE
default 0x87000000
menu "vct board options" menu "vct board options"
choice choice

3
board/pb1x00/Kconfig
Unescape View File

@ -9,4 +9,7 @@ config SYS_SOC
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "pb1x00" default "pb1x00"
config SYS_TEXT_BASE
default 0x83800000
endif endif

3
board/qca/ap121/Kconfig
Unescape View File

@ -9,4 +9,7 @@ config SYS_BOARD
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "ap121" default "ap121"
config SYS_TEXT_BASE
default 0x9f000000
endif endif

3
board/qca/ap143/Kconfig
Unescape View File

@ -9,4 +9,7 @@ config SYS_BOARD
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "ap143" default "ap143"
config SYS_TEXT_BASE
default 0x9f000000
endif endif

4
board/qemu-mips/Kconfig
Unescape View File

@ -7,4 +7,8 @@ config SYS_CONFIG_NAME
default "qemu-mips" if 32BIT default "qemu-mips" if 32BIT
default "qemu-mips64" if 64BIT default "qemu-mips64" if 64BIT
config SYS_TEXT_BASE
default 0xbfc00000 if 32BIT
default 0xffffffffbfc00000 if 64BIT
endif endif

3
board/tplink/wdr4300/Kconfig
Unescape View File

@ -12,4 +12,7 @@ config SYS_BOARD
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "tplink_wdr4300" default "tplink_wdr4300"
config SYS_TEXT_BASE
default 0xa1000000
endif endif

2
include/configs/ap121.h
Unescape View File

@ -7,8 +7,6 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_SYS_TEXT_BASE 0x9f000000
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F

2
include/configs/ap143.h
Unescape View File

@ -7,8 +7,6 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_SYS_TEXT_BASE 0x9f000000
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F

6
include/configs/dbau1x00.h
Unescape View File

@ -139,12 +139,6 @@
#define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_SYS_FLASH_CFI 1
#define CONFIG_FLASH_CFI_DRIVER 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_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_MONITOR_LEN (192 << 10)

1
include/configs/malta.h
Unescape View File

@ -37,7 +37,6 @@
/* /*
* Memory map * Memory map
*/ */
#define CONFIG_SYS_TEXT_BASE 0xbe000000 /* Rom version */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_SDRAM_BASE 0x80000000 /* Cached addr */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* Cached addr */

6
include/configs/pb1x00.h
Unescape View File

@ -80,12 +80,6 @@
#define PHYS_FLASH_1 0xbec00000 /* Flash Bank #1 */ #define PHYS_FLASH_1 0xbec00000 /* Flash Bank #1 */
#define PHYS_FLASH_2 0xbfc00000 /* Flash Bank #2 */ #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_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_MONITOR_LEN (192 << 10)

1
include/configs/pic32mzdask.h
Unescape View File

@ -10,7 +10,6 @@
#define __PIC32MZDASK_CONFIG_H #define __PIC32MZDASK_CONFIG_H
/* System Configuration */ /* System Configuration */
#define CONFIG_SYS_TEXT_BASE 0x9d004000 /* .text */
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
/*-------------------------------------------- /*--------------------------------------------

1
include/configs/qemu-mips.h
Unescape View File

@ -107,7 +107,6 @@
* FLASH and environment organization * FLASH and environment organization
*/ */
/* The following #defines are needed to get flash environment right */ /* 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_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_MONITOR_LEN (192 << 10)

1
include/configs/qemu-mips64.h
Unescape View File

@ -107,7 +107,6 @@
* FLASH and environment organization * FLASH and environment organization
*/ */
/* The following #defines are needed to get flash environment right */ /* 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_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_MONITOR_LEN (192 << 10)

2
include/configs/tplink_wdr4300.h
Unescape View File

@ -7,8 +7,6 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_SYS_TEXT_BASE 0xa1000000
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F

1
include/configs/vct.h
Unescape View File

@ -32,7 +32,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT /* SDRAM is initialized by the bootstrap code */ #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_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_MONITOR_LEN (256 << 10) #define CONFIG_SYS_MONITOR_LEN (256 << 10)
#define CONFIG_SYS_MALLOC_LEN (1 << 20) #define CONFIG_SYS_MALLOC_LEN (1 << 20)

Write Preview
Loading…
Cancel
Save