diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-10-30 15:30:58 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-04 15:01:46 -0500 |
| commit | 7f7563cec11388451cd81c99abfa86836b1bdd75 (patch) | |
| tree | fdb19d5c982ed1ae1fd23f75441c0ef3928e9ebc | |
| parent | 89bedb0c10d47c3889a218c17c3ee4612ec9af6c (diff) | |
| download | u-boot-imx-7f7563cec11388451cd81c99abfa86836b1bdd75.zip u-boot-imx-7f7563cec11388451cd81c99abfa86836b1bdd75.tar.gz u-boot-imx-7f7563cec11388451cd81c99abfa86836b1bdd75.tar.bz2 | |
sparc: move CONFIG_SYS_TEXT_BASE to Kconfig
Defining CONFIG_SYS_TEXT_BASE in config.mk is very old style.
Create CONFIG_SYS_TEXT_BASE option in Kconfig, but let it
depend on CONFIG_SPARC because we do not want to disturb
the other architectures that still define CONFIG_SYS_TEXT_BASE
in their header files.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Daniel Hellstrom <daniel@gaisler.com>
| -rw-r--r-- | Kconfig | 6 | ||||
| -rw-r--r-- | board/gaisler/gr_cpci_ax2000/config.mk | 19 | ||||
| -rw-r--r-- | board/gaisler/gr_ep2s60/config.mk | 17 | ||||
| -rw-r--r-- | board/gaisler/gr_xc3s_1500/config.mk | 16 | ||||
| -rw-r--r-- | board/gaisler/grsim/config.mk | 16 | ||||
| -rw-r--r-- | board/gaisler/grsim_leon2/config.mk | 16 | ||||
| -rw-r--r-- | configs/gr_cpci_ax2000_defconfig | 1 | ||||
| -rw-r--r-- | configs/gr_ep2s60_defconfig | 1 | ||||
| -rw-r--r-- | configs/gr_xc3s_1500_defconfig | 1 | ||||
| -rw-r--r-- | configs/grsim_defconfig | 1 | ||||
| -rw-r--r-- | configs/grsim_leon2_defconfig | 1 |
11 files changed, 11 insertions, 84 deletions
@@ -107,6 +107,12 @@ config SYS_EXTRA_OPTIONS configuration to Kconfig. Since this option will be removed sometime, new boards should not use this option. +config SYS_TEXT_BASE + depends on SPARC + hex "Text Base" + help + TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture + endmenu # Boot images source "arch/Kconfig" diff --git a/board/gaisler/gr_cpci_ax2000/config.mk b/board/gaisler/gr_cpci_ax2000/config.mk deleted file mode 100644 index 731a539..0000000 --- a/board/gaisler/gr_cpci_ax2000/config.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# (C) Copyright 2008 -# Daniel Hellstrom, Gaisler Research, daniel@gaisler.com. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -# -# GR-CPCI-AX2000 board -# - -# U-BOOT IN FLASH -CONFIG_SYS_TEXT_BASE = 0x00000000 - -# U-BOOT IN RAM or SDRAM with -nosram flag set when starting GRMON -#CONFIG_SYS_TEXT_BASE = 0x40000000 - -# U-BOOT IN SDRAM -#CONFIG_SYS_TEXT_BASE = 0x60000000 diff --git a/board/gaisler/gr_ep2s60/config.mk b/board/gaisler/gr_ep2s60/config.mk deleted file mode 100644 index 6e01f07..0000000 --- a/board/gaisler/gr_ep2s60/config.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# (C) Copyright 2008 -# Daniel Hellstrom, Gaisler Research, daniel@gaisler.com. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -# -# Altera NIOS delopment board Stratix II edition, FPGA device EP2S60, -# with GRLIB Template design (GPL Open Source SPARC/LEON3) -# - -# U-BOOT IN FLASH -CONFIG_SYS_TEXT_BASE = 0x00000000 - -# U-BOOT IN SDRAM -#CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/gaisler/gr_xc3s_1500/config.mk b/board/gaisler/gr_xc3s_1500/config.mk deleted file mode 100644 index e4a66cb..0000000 --- a/board/gaisler/gr_xc3s_1500/config.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -# (C) Copyright 2007 -# Daniel Hellstrom, Gaisler Research, daniel@gaisler.com. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -# -# GR-XC3S-1500 board -# - -# U-BOOT IN FLASH -CONFIG_SYS_TEXT_BASE = 0x00000000 - -# U-BOOT IN RAM -#CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/gaisler/grsim/config.mk b/board/gaisler/grsim/config.mk deleted file mode 100644 index d1f61da..0000000 --- a/board/gaisler/grsim/config.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -# (C) Copyright 2007 -# Daniel Hellstrom, Gaisler Research, daniel@gaisler.com -# -# SPDX-License-Identifier: GPL-2.0+ -# - -# -# GRSIM simulating a LEON3 GR-XC3S-1500 board -# - -# U-BOOT IN FLASH -CONFIG_SYS_TEXT_BASE = 0x00000000 - -# U-BOOT IN RAM -#CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/gaisler/grsim_leon2/config.mk b/board/gaisler/grsim_leon2/config.mk deleted file mode 100644 index f98b23b..0000000 --- a/board/gaisler/grsim_leon2/config.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -# (C) Copyright 2007 -# Daniel Hellstrom, Gaisler Research, daniel@gaisler.com -# -# SPDX-License-Identifier: GPL-2.0+ -# - -# -# GRSIM simulating a LEON2 board -# - -# RUN U-BOOT FROM PROM -CONFIG_SYS_TEXT_BASE = 0x00000000 - -# RUN U-BOOT FROM RAM -#CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/configs/gr_cpci_ax2000_defconfig b/configs/gr_cpci_ax2000_defconfig index 6eb02ad..b59d077 100644 --- a/configs/gr_cpci_ax2000_defconfig +++ b/configs/gr_cpci_ax2000_defconfig @@ -1,2 +1,3 @@ +CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SPARC=y CONFIG_TARGET_GR_CPCI_AX2000=y diff --git a/configs/gr_ep2s60_defconfig b/configs/gr_ep2s60_defconfig index 6e1eb83..2c69efa 100644 --- a/configs/gr_ep2s60_defconfig +++ b/configs/gr_ep2s60_defconfig @@ -1,2 +1,3 @@ +CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SPARC=y CONFIG_TARGET_GR_EP2S60=y diff --git a/configs/gr_xc3s_1500_defconfig b/configs/gr_xc3s_1500_defconfig index da846db..fecdd25 100644 --- a/configs/gr_xc3s_1500_defconfig +++ b/configs/gr_xc3s_1500_defconfig @@ -1,2 +1,3 @@ +CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SPARC=y CONFIG_TARGET_GR_XC3S_1500=y diff --git a/configs/grsim_defconfig b/configs/grsim_defconfig index 2a7e8e7..e3ffd69 100644 --- a/configs/grsim_defconfig +++ b/configs/grsim_defconfig @@ -1,2 +1,3 @@ +CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SPARC=y CONFIG_TARGET_GRSIM=y diff --git a/configs/grsim_leon2_defconfig b/configs/grsim_leon2_defconfig index e91eb96..6090e34 100644 --- a/configs/grsim_leon2_defconfig +++ b/configs/grsim_leon2_defconfig @@ -1,2 +1,3 @@ +CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SPARC=y CONFIG_TARGET_GRSIM_LEON2=y |