* [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE
@ 2015-12-11 3:22 Masahiro Yamada
2015-12-11 3:22 ` [U-Boot] [PATCH 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files Masahiro Yamada
` (9 more replies)
0 siblings, 10 replies; 28+ messages in thread
From: Masahiro Yamada @ 2015-12-11 3:22 UTC (permalink / raw)
To: u-boot
Currently, CONFIG_SYS_TEXT_BASE is defined in various ways:
[1] by board/${VENDOR}/${BOARD}/config.mk
[2] by CONFIG_SYS_EXTRA_OPTIONS
(This was "options" field of boards.cfg before Kconfig conversion)
[3] by include/configs/${BOARD}.h
[4] by configs/${BOARD}_defconfig
Kbuild is still keeping some tricky code for [1].
We have some boards using [1] for M68K, MIPS, PowerPC.
Convert them and drop the workaround code from Kbuild.
I built all the boards and compared the checksum of the binary images
for all of them.
I confirmed no impact on these moves. This series should be OK.
Masahiro Yamada (8):
m68k: move CONFIG_SYS_TEXT_BASE to defconfig files
m68k: M54418TWR: drop board/freescale/m54418twr/config.mk
microblaze: move CONFIG_SYS_TEXT_BASE to defconfig
mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk
mips: dbau1x00: move CONFIG_SYS_TEXT_BASE away from config.mk
mips: pb1x00: move CONFIG_SYS_TEXT_BASE away from config.mk
powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE from config.mk
kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines
Kconfig | 3 ++-
Makefile | 6 ------
arch/m68k/cpu/mcf5445x/start.S | 8 ++++----
board/amcc/yucca/config.mk | 6 ------
board/cobra5272/config.mk | 9 ---------
board/dbau1x00/config.mk | 16 ----------------
board/freescale/m5208evbe/config.mk | 9 ---------
board/freescale/m5249evb/config.mk | 9 ---------
board/freescale/m5253demo/config.mk | 9 ---------
board/freescale/m5253evbe/config.mk | 9 ---------
board/freescale/m5272c3/config.mk | 9 ---------
board/freescale/m5275evb/config.mk | 9 ---------
board/freescale/m5282evb/config.mk | 9 ---------
board/freescale/m53017evb/config.mk | 9 ---------
board/freescale/m5329evb/config.mk | 9 ---------
board/freescale/m5373evb/config.mk | 9 ---------
board/freescale/m54418twr/config.mk | 7 -------
board/freescale/m547xevb/config.mk | 9 ---------
board/freescale/m548xevb/config.mk | 9 ---------
board/micronas/vct/config.mk | 13 -------------
board/pb1x00/config.mk | 16 ----------------
board/sysam/amcore/config.mk | 7 -------
board/xilinx/microblaze-generic/config.mk | 2 --
configs/M5208EVBE_defconfig | 1 +
configs/M52277EVB_defconfig | 3 ++-
configs/M52277EVB_stmicro_defconfig | 3 ++-
configs/M5235EVB_Flash32_defconfig | 3 ++-
configs/M5235EVB_defconfig | 2 +-
configs/M5249EVB_defconfig | 1 +
configs/M5253DEMO_defconfig | 1 +
configs/M5253EVBE_defconfig | 1 +
configs/M5272C3_defconfig | 1 +
configs/M5275EVB_defconfig | 1 +
configs/M5282EVB_defconfig | 1 +
configs/M53017EVB_defconfig | 1 +
configs/M5329AFEE_defconfig | 1 +
configs/M5329BFEE_defconfig | 1 +
configs/M5373EVB_defconfig | 1 +
configs/M54418TWR_defconfig | 3 ++-
configs/M54418TWR_nand_mii_defconfig | 3 ++-
configs/M54418TWR_nand_rmii_defconfig | 3 ++-
configs/M54418TWR_nand_rmii_lowfreq_defconfig | 3 ++-
configs/M54418TWR_serial_mii_defconfig | 3 ++-
configs/M54418TWR_serial_rmii_defconfig | 3 ++-
configs/M54451EVB_defconfig | 3 ++-
configs/M54451EVB_stmicro_defconfig | 3 ++-
configs/M54455EVB_a66_defconfig | 3 ++-
configs/M54455EVB_defconfig | 3 ++-
configs/M54455EVB_i66_defconfig | 3 ++-
configs/M54455EVB_intel_defconfig | 3 ++-
configs/M54455EVB_stm33_defconfig | 3 ++-
configs/M5475AFE_defconfig | 1 +
configs/M5475BFE_defconfig | 1 +
configs/M5475CFE_defconfig | 1 +
configs/M5475DFE_defconfig | 1 +
configs/M5475EFE_defconfig | 1 +
configs/M5475FFE_defconfig | 1 +
configs/M5475GFE_defconfig | 1 +
configs/M5485AFE_defconfig | 1 +
configs/M5485BFE_defconfig | 1 +
configs/M5485CFE_defconfig | 1 +
configs/M5485DFE_defconfig | 1 +
configs/M5485EFE_defconfig | 1 +
configs/M5485FFE_defconfig | 1 +
configs/M5485GFE_defconfig | 1 +
configs/M5485HFE_defconfig | 1 +
configs/amcore_defconfig | 1 +
configs/cobra5272_defconfig | 1 +
configs/eb_cpu5282_defconfig | 3 ++-
configs/eb_cpu5282_internal_defconfig | 3 ++-
configs/microblaze-generic_defconfig | 1 +
include/configs/M54418TWR.h | 2 +-
include/configs/dbau1x00.h | 5 +++++
include/configs/pb1x00.h | 5 +++++
include/configs/vct.h | 1 +
75 files changed, 84 insertions(+), 215 deletions(-)
delete mode 100644 board/cobra5272/config.mk
delete mode 100644 board/dbau1x00/config.mk
delete mode 100644 board/freescale/m5208evbe/config.mk
delete mode 100644 board/freescale/m5249evb/config.mk
delete mode 100644 board/freescale/m5253demo/config.mk
delete mode 100644 board/freescale/m5253evbe/config.mk
delete mode 100644 board/freescale/m5272c3/config.mk
delete mode 100644 board/freescale/m5275evb/config.mk
delete mode 100644 board/freescale/m5282evb/config.mk
delete mode 100644 board/freescale/m53017evb/config.mk
delete mode 100644 board/freescale/m5329evb/config.mk
delete mode 100644 board/freescale/m5373evb/config.mk
delete mode 100644 board/freescale/m54418twr/config.mk
delete mode 100644 board/freescale/m547xevb/config.mk
delete mode 100644 board/freescale/m548xevb/config.mk
delete mode 100644 board/micronas/vct/config.mk
delete mode 100644 board/pb1x00/config.mk
delete mode 100644 board/sysam/amcore/config.mk
--
1.9.1
^ permalink raw reply [flat|nested] 28+ messages in thread* [U-Boot] [PATCH 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files 2015-12-11 3:22 [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Masahiro Yamada @ 2015-12-11 3:22 ` Masahiro Yamada 2015-12-13 19:55 ` Angelo Dureghello ` (2 more replies) 2015-12-11 3:22 ` [U-Boot] [PATCH 2/8] m68k: M54418TWR: drop board/freescale/m54418twr/config.mk Masahiro Yamada ` (8 subsequent siblings) 9 siblings, 3 replies; 28+ messages in thread From: Masahiro Yamada @ 2015-12-11 3:22 UTC (permalink / raw) To: u-boot For historical reason, CONFIG_SYS_TEXT_BASE has been specified in various ways: [1] by board/${VENDOR}/${BOARD}/config.mk [2] by CONFIG_SYS_EXTRA_OPTIONS (This was "options" field of boards.cfg before Kconfig conversion) [3] by include/configs/${BOARD}.h [4] by configs/${BOARD}_defconfig Most of M68K boards use either [1] or [2], both of which we want to deprecate. Switch them into [4], which is the newest way (Kconfig). We still allow [3] too, because it is still used by many boards and we expect much time for conversion. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Kconfig | 3 ++- board/cobra5272/config.mk | 9 --------- board/freescale/m5208evbe/config.mk | 9 --------- board/freescale/m5249evb/config.mk | 9 --------- board/freescale/m5253demo/config.mk | 9 --------- board/freescale/m5253evbe/config.mk | 9 --------- board/freescale/m5272c3/config.mk | 9 --------- board/freescale/m5275evb/config.mk | 9 --------- board/freescale/m5282evb/config.mk | 9 --------- board/freescale/m53017evb/config.mk | 9 --------- board/freescale/m5329evb/config.mk | 9 --------- board/freescale/m5373evb/config.mk | 9 --------- board/freescale/m547xevb/config.mk | 9 --------- board/freescale/m548xevb/config.mk | 9 --------- board/sysam/amcore/config.mk | 7 ------- configs/M5208EVBE_defconfig | 1 + configs/M52277EVB_defconfig | 3 ++- configs/M52277EVB_stmicro_defconfig | 3 ++- configs/M5235EVB_Flash32_defconfig | 3 ++- configs/M5235EVB_defconfig | 2 +- configs/M5249EVB_defconfig | 1 + configs/M5253DEMO_defconfig | 1 + configs/M5253EVBE_defconfig | 1 + configs/M5272C3_defconfig | 1 + configs/M5275EVB_defconfig | 1 + configs/M5282EVB_defconfig | 1 + configs/M53017EVB_defconfig | 1 + configs/M5329AFEE_defconfig | 1 + configs/M5329BFEE_defconfig | 1 + configs/M5373EVB_defconfig | 1 + configs/M54418TWR_defconfig | 3 ++- configs/M54418TWR_nand_mii_defconfig | 3 ++- configs/M54418TWR_nand_rmii_defconfig | 3 ++- configs/M54418TWR_nand_rmii_lowfreq_defconfig | 3 ++- configs/M54418TWR_serial_mii_defconfig | 3 ++- configs/M54418TWR_serial_rmii_defconfig | 3 ++- configs/M54451EVB_defconfig | 3 ++- configs/M54451EVB_stmicro_defconfig | 3 ++- configs/M54455EVB_a66_defconfig | 3 ++- configs/M54455EVB_defconfig | 3 ++- configs/M54455EVB_i66_defconfig | 3 ++- configs/M54455EVB_intel_defconfig | 3 ++- configs/M54455EVB_stm33_defconfig | 3 ++- configs/M5475AFE_defconfig | 1 + configs/M5475BFE_defconfig | 1 + configs/M5475CFE_defconfig | 1 + configs/M5475DFE_defconfig | 1 + configs/M5475EFE_defconfig | 1 + configs/M5475FFE_defconfig | 1 + configs/M5475GFE_defconfig | 1 + configs/M5485AFE_defconfig | 1 + configs/M5485BFE_defconfig | 1 + configs/M5485CFE_defconfig | 1 + configs/M5485DFE_defconfig | 1 + configs/M5485EFE_defconfig | 1 + configs/M5485FFE_defconfig | 1 + configs/M5485GFE_defconfig | 1 + configs/M5485HFE_defconfig | 1 + configs/amcore_defconfig | 1 + configs/cobra5272_defconfig | 1 + configs/eb_cpu5282_defconfig | 3 ++- configs/eb_cpu5282_internal_defconfig | 3 ++- 62 files changed, 67 insertions(+), 144 deletions(-) delete mode 100644 board/cobra5272/config.mk delete mode 100644 board/freescale/m5208evbe/config.mk delete mode 100644 board/freescale/m5249evb/config.mk delete mode 100644 board/freescale/m5253demo/config.mk delete mode 100644 board/freescale/m5253evbe/config.mk delete mode 100644 board/freescale/m5272c3/config.mk delete mode 100644 board/freescale/m5275evb/config.mk delete mode 100644 board/freescale/m5282evb/config.mk delete mode 100644 board/freescale/m53017evb/config.mk delete mode 100644 board/freescale/m5329evb/config.mk delete mode 100644 board/freescale/m5373evb/config.mk delete mode 100644 board/freescale/m547xevb/config.mk delete mode 100644 board/freescale/m548xevb/config.mk delete mode 100644 board/sysam/amcore/config.mk diff --git a/Kconfig b/Kconfig index 821b464..9b07838 100644 --- a/Kconfig +++ b/Kconfig @@ -208,7 +208,8 @@ config SYS_EXTRA_OPTIONS new boards should not use this option. 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) depends on !EFI_APP hex "Text Base" help diff --git a/board/cobra5272/config.mk b/board/cobra5272/config.mk deleted file mode 100644 index 1af25e1..0000000 --- a/board/cobra5272/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0xffe00000 diff --git a/board/freescale/m5208evbe/config.mk b/board/freescale/m5208evbe/config.mk deleted file mode 100644 index c15a9cf..0000000 --- a/board/freescale/m5208evbe/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/freescale/m5249evb/config.mk b/board/freescale/m5249evb/config.mk deleted file mode 100644 index 1af25e1..0000000 --- a/board/freescale/m5249evb/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0xffe00000 diff --git a/board/freescale/m5253demo/config.mk b/board/freescale/m5253demo/config.mk deleted file mode 100644 index 4547465..0000000 --- a/board/freescale/m5253demo/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0xFF800000 diff --git a/board/freescale/m5253evbe/config.mk b/board/freescale/m5253evbe/config.mk deleted file mode 100644 index 1af25e1..0000000 --- a/board/freescale/m5253evbe/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0xffe00000 diff --git a/board/freescale/m5272c3/config.mk b/board/freescale/m5272c3/config.mk deleted file mode 100644 index 1af25e1..0000000 --- a/board/freescale/m5272c3/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0xffe00000 diff --git a/board/freescale/m5275evb/config.mk b/board/freescale/m5275evb/config.mk deleted file mode 100644 index 1af25e1..0000000 --- a/board/freescale/m5275evb/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0xffe00000 diff --git a/board/freescale/m5282evb/config.mk b/board/freescale/m5282evb/config.mk deleted file mode 100644 index e2ac27e..0000000 --- a/board/freescale/m5282evb/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0xFFE00000 diff --git a/board/freescale/m53017evb/config.mk b/board/freescale/m53017evb/config.mk deleted file mode 100644 index c15a9cf..0000000 --- a/board/freescale/m53017evb/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/freescale/m5329evb/config.mk b/board/freescale/m5329evb/config.mk deleted file mode 100644 index c15a9cf..0000000 --- a/board/freescale/m5329evb/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/freescale/m5373evb/config.mk b/board/freescale/m5373evb/config.mk deleted file mode 100644 index c15a9cf..0000000 --- a/board/freescale/m5373evb/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/freescale/m547xevb/config.mk b/board/freescale/m547xevb/config.mk deleted file mode 100644 index 4547465..0000000 --- a/board/freescale/m547xevb/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0xFF800000 diff --git a/board/freescale/m548xevb/config.mk b/board/freescale/m548xevb/config.mk deleted file mode 100644 index 4547465..0000000 --- a/board/freescale/m548xevb/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0xFF800000 diff --git a/board/sysam/amcore/config.mk b/board/sysam/amcore/config.mk deleted file mode 100644 index d01a8bb..0000000 --- a/board/sysam/amcore/config.mk +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2014 Angelo Dureghello <angelo@sysam.it> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -CONFIG_SYS_TEXT_BASE = 0xffc00000 diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig index f30a7fb..7a12522 100644 --- a/configs/M5208EVBE_defconfig +++ b/configs/M5208EVBE_defconfig @@ -1,4 +1,5 @@ CONFIG_M68K=y CONFIG_TARGET_M5208EVBE=y +CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig index b2ad88a..711a411 100644 --- a/configs/M52277EVB_defconfig +++ b/configs/M52277EVB_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M52277EVB=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000" +CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set diff --git a/configs/M52277EVB_stmicro_defconfig b/configs/M52277EVB_stmicro_defconfig index ea39356..05d20d6 100644 --- a/configs/M52277EVB_stmicro_defconfig +++ b/configs/M52277EVB_stmicro_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M52277EVB=y -CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000" +CONFIG_SYS_TEXT_BASE=0x43E00000 +CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT" # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig index 5f381e2..b8fb413 100644 --- a/configs/M5235EVB_Flash32_defconfig +++ b/configs/M5235EVB_Flash32_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M5235EVB=y -CONFIG_SYS_EXTRA_OPTIONS="NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000" +CONFIG_SYS_TEXT_BASE=0xFFC00000 +CONFIG_SYS_EXTRA_OPTIONS="NORFLASH_PS32BIT" # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig index a10ae8d..fdf2dd0 100644 --- a/configs/M5235EVB_defconfig +++ b/configs/M5235EVB_defconfig @@ -1,6 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5235EVB=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFE00000" +CONFIG_SYS_TEXT_BASE=0xFFE00000 CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig index 1467b16..2358d24 100644 --- a/configs/M5249EVB_defconfig +++ b/configs/M5249EVB_defconfig @@ -1,4 +1,5 @@ CONFIG_M68K=y CONFIG_TARGET_M5249EVB=y +CONFIG_SYS_TEXT_BASE=0xffe00000 # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig index 89e7e75..c4da196 100644 --- a/configs/M5253DEMO_defconfig +++ b/configs/M5253DEMO_defconfig @@ -1,3 +1,4 @@ CONFIG_M68K=y CONFIG_TARGET_M5253DEMO=y +CONFIG_SYS_TEXT_BASE=0xFF800000 # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5253EVBE_defconfig b/configs/M5253EVBE_defconfig index e337f32..2e82cce 100644 --- a/configs/M5253EVBE_defconfig +++ b/configs/M5253EVBE_defconfig @@ -1,4 +1,5 @@ CONFIG_M68K=y CONFIG_TARGET_M5253EVBE=y +CONFIG_SYS_TEXT_BASE=0xFFE00000 # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig index 6e9609f..6153a5c 100644 --- a/configs/M5272C3_defconfig +++ b/configs/M5272C3_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5272C3=y +CONFIG_SYS_TEXT_BASE=0xffe00000 CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig index 5eb2373..d70fea1 100644 --- a/configs/M5275EVB_defconfig +++ b/configs/M5275EVB_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5275EVB=y +CONFIG_SYS_TEXT_BASE=0xffe00000 CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig index e0af388..10a3043 100644 --- a/configs/M5282EVB_defconfig +++ b/configs/M5282EVB_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5282EVB=y +CONFIG_SYS_TEXT_BASE=0xFFE00000 CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig index ca538f4..e86fe5b 100644 --- a/configs/M53017EVB_defconfig +++ b/configs/M53017EVB_defconfig @@ -1,4 +1,5 @@ CONFIG_M68K=y CONFIG_TARGET_M53017EVB=y +CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig index d5c6c7b..2379a1e 100644 --- a/configs/M5329AFEE_defconfig +++ b/configs/M5329AFEE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5329EVB=y +CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=0" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig index 3524206..38a996b 100644 --- a/configs/M5329BFEE_defconfig +++ b/configs/M5329BFEE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5329EVB=y +CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig index 2fdff5b..6595feb 100644 --- a/configs/M5373EVB_defconfig +++ b/configs/M5373EVB_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5373EVB=y +CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig index 7c22abe..62cebda 100644 --- a/configs/M54418TWR_defconfig +++ b/configs/M54418TWR_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54418TWR=y -CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000" +CONFIG_SYS_TEXT_BASE=0x47E00000 +CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=50000000" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADB is not set diff --git a/configs/M54418TWR_nand_mii_defconfig b/configs/M54418TWR_nand_mii_defconfig index 373845b..de73e30 100644 --- a/configs/M54418TWR_nand_mii_defconfig +++ b/configs/M54418TWR_nand_mii_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54418TWR=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000" +CONFIG_SYS_TEXT_BASE=0x47E00000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_INPUT_CLKSRC=25000000" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADB is not set diff --git a/configs/M54418TWR_nand_rmii_defconfig b/configs/M54418TWR_nand_rmii_defconfig index 08c45b2..139811c 100644 --- a/configs/M54418TWR_nand_rmii_defconfig +++ b/configs/M54418TWR_nand_rmii_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54418TWR=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000" +CONFIG_SYS_TEXT_BASE=0x47E00000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_INPUT_CLKSRC=50000000" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADB is not set diff --git a/configs/M54418TWR_nand_rmii_lowfreq_defconfig b/configs/M54418TWR_nand_rmii_lowfreq_defconfig index c5bf10e..a3cf48b 100644 --- a/configs/M54418TWR_nand_rmii_lowfreq_defconfig +++ b/configs/M54418TWR_nand_rmii_lowfreq_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54418TWR=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000" +CONFIG_SYS_TEXT_BASE=0x47E00000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_INPUT_CLKSRC=50000000" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADB is not set diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig index 9e81827..ad29d52 100644 --- a/configs/M54418TWR_serial_mii_defconfig +++ b/configs/M54418TWR_serial_mii_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54418TWR=y -CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000" +CONFIG_SYS_TEXT_BASE=0x47E00000 +CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=25000000" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADB is not set diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig index 7c22abe..62cebda 100644 --- a/configs/M54418TWR_serial_rmii_defconfig +++ b/configs/M54418TWR_serial_rmii_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54418TWR=y -CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000" +CONFIG_SYS_TEXT_BASE=0x47E00000 +CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=50000000" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADB is not set diff --git a/configs/M54451EVB_defconfig b/configs/M54451EVB_defconfig index 3b96dfb..a9fe02f 100644 --- a/configs/M54451EVB_defconfig +++ b/configs/M54451EVB_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54451EVB=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000" +CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_INPUT_CLKSRC=24000000" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/configs/M54451EVB_stmicro_defconfig b/configs/M54451EVB_stmicro_defconfig index 21a2687..f10e86c 100644 --- a/configs/M54451EVB_stmicro_defconfig +++ b/configs/M54451EVB_stmicro_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54451EVB=y -CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x47e00000,SYS_INPUT_CLKSRC=24000000" +CONFIG_SYS_TEXT_BASE=0x47e00000 +CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_INPUT_CLKSRC=24000000" # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M54455EVB_a66_defconfig b/configs/M54455EVB_a66_defconfig index e810273..3053514 100644 --- a/configs/M54455EVB_a66_defconfig +++ b/configs/M54455EVB_a66_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54455EVB=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=66666666" +CONFIG_SYS_TEXT_BASE=0x04000000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=66666666" # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig index 3d9cb12..9f70f7e 100644 --- a/configs/M54455EVB_defconfig +++ b/configs/M54455EVB_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54455EVB=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=33333333" +CONFIG_SYS_TEXT_BASE=0x04000000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=33333333" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/configs/M54455EVB_i66_defconfig b/configs/M54455EVB_i66_defconfig index b5cbfdc..8421393 100644 --- a/configs/M54455EVB_i66_defconfig +++ b/configs/M54455EVB_i66_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54455EVB=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=66666666" +CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=66666666" # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M54455EVB_intel_defconfig b/configs/M54455EVB_intel_defconfig index 8ed05a6..c630108 100644 --- a/configs/M54455EVB_intel_defconfig +++ b/configs/M54455EVB_intel_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54455EVB=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=33333333" +CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=33333333" # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M54455EVB_stm33_defconfig b/configs/M54455EVB_stm33_defconfig index 0a64580..4e8aee4 100644 --- a/configs/M54455EVB_stm33_defconfig +++ b/configs/M54455EVB_stm33_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54455EVB=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_STMICRO_BOOT,CF_SBF,SYS_TEXT_BASE=0x4FE00000,SYS_INPUT_CLKSRC=33333333" +CONFIG_SYS_TEXT_BASE=0x4FE00000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_STMICRO_BOOT,CF_SBF,SYS_INPUT_CLKSRC=33333333" # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5475AFE_defconfig b/configs/M5475AFE_defconfig index 11d14e6..edfb9fc 100644 --- a/configs/M5475AFE_defconfig +++ b/configs/M5475AFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5475EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5475BFE_defconfig b/configs/M5475BFE_defconfig index 24f4256..5177eb9 100644 --- a/configs/M5475BFE_defconfig +++ b/configs/M5475BFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5475EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5475CFE_defconfig b/configs/M5475CFE_defconfig index a899601..431a264 100644 --- a/configs/M5475CFE_defconfig +++ b/configs/M5475CFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5475EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5475DFE_defconfig b/configs/M5475DFE_defconfig index 66523cc..46d9964 100644 --- a/configs/M5475DFE_defconfig +++ b/configs/M5475DFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5475EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5475EFE_defconfig b/configs/M5475EFE_defconfig index 410e150..4a2284d 100644 --- a/configs/M5475EFE_defconfig +++ b/configs/M5475EFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5475EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5475FFE_defconfig b/configs/M5475FFE_defconfig index b590fd9..f8d53be 100644 --- a/configs/M5475FFE_defconfig +++ b/configs/M5475FFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5475EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5475GFE_defconfig b/configs/M5475GFE_defconfig index ea41ec2..61a3c56 100644 --- a/configs/M5475GFE_defconfig +++ b/configs/M5475GFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5475EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=4,SYS_DRAMSZ=64" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5485AFE_defconfig b/configs/M5485AFE_defconfig index e3f2f9e..a8afe71 100644 --- a/configs/M5485AFE_defconfig +++ b/configs/M5485AFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5485EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5485BFE_defconfig b/configs/M5485BFE_defconfig index b3ec7ae..b9bdd4b 100644 --- a/configs/M5485BFE_defconfig +++ b/configs/M5485BFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5485EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5485CFE_defconfig b/configs/M5485CFE_defconfig index 6637fdc..c5ec396 100644 --- a/configs/M5485CFE_defconfig +++ b/configs/M5485CFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5485EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5485DFE_defconfig b/configs/M5485DFE_defconfig index 34dd51e..6872865 100644 --- a/configs/M5485DFE_defconfig +++ b/configs/M5485DFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5485EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5485EFE_defconfig b/configs/M5485EFE_defconfig index 1f5c4ea..c0d1e06 100644 --- a/configs/M5485EFE_defconfig +++ b/configs/M5485EFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5485EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5485FFE_defconfig b/configs/M5485FFE_defconfig index 737411b..904a639 100644 --- a/configs/M5485FFE_defconfig +++ b/configs/M5485FFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5485EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5485GFE_defconfig b/configs/M5485GFE_defconfig index 2def6ea..cb6f2c7 100644 --- a/configs/M5485GFE_defconfig +++ b/configs/M5485GFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5485EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M5485HFE_defconfig b/configs/M5485HFE_defconfig index 4263f40..a3ef210 100644 --- a/configs/M5485HFE_defconfig +++ b/configs/M5485HFE_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_M5485EVB=y +CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig index ad69f0a..9c83849 100644 --- a/configs/amcore_defconfig +++ b/configs/amcore_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_AMCORE=y +CONFIG_SYS_TEXT_BASE=0xffc00000 CONFIG_SYS_PROMPT="amcore $ " # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_XIMG is not set diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig index 5cb6a80..2e845e7 100644 --- a/configs/cobra5272_defconfig +++ b/configs/cobra5272_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_COBRA5272=y +CONFIG_SYS_TEXT_BASE=0xffe00000 CONFIG_SYS_PROMPT="COBRA > " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig index 52f4a24..1e204bf 100644 --- a/configs/eb_cpu5282_defconfig +++ b/configs/eb_cpu5282_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_EB_CPU5282=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400" +CONFIG_SYS_TEXT_BASE=0xFF000000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_MONITOR_BASE=0xFF000400" CONFIG_SYS_PROMPT="\nEB+CPU5282> " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig index 5af19a0..2db895c 100644 --- a/configs/eb_cpu5282_internal_defconfig +++ b/configs/eb_cpu5282_internal_defconfig @@ -1,5 +1,6 @@ CONFIG_M68K=y CONFIG_TARGET_EB_CPU5282=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF0000000,SYS_MONITOR_BASE=0xF0000418" +CONFIG_SYS_TEXT_BASE=0xF0000000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_MONITOR_BASE=0xF0000418" # CONFIG_CMD_LOADB is not set # CONFIG_CMD_SETEXPR is not set -- 1.9.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files 2015-12-11 3:22 ` [U-Boot] [PATCH 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files Masahiro Yamada @ 2015-12-13 19:55 ` Angelo Dureghello 2016-01-06 0:24 ` Simon Glass 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 2 siblings, 0 replies; 28+ messages in thread From: Angelo Dureghello @ 2015-12-13 19:55 UTC (permalink / raw) To: u-boot On 11/12/2015 04:22, Masahiro Yamada wrote: > For historical reason, CONFIG_SYS_TEXT_BASE has been specified > in various ways: > > [1] by board/${VENDOR}/${BOARD}/config.mk > > [2] by CONFIG_SYS_EXTRA_OPTIONS > (This was "options" field of boards.cfg before Kconfig conversion) > > [3] by include/configs/${BOARD}.h > > [4] by configs/${BOARD}_defconfig > > Most of M68K boards use either [1] or [2], both of which we want to > deprecate. Switch them into [4], which is the newest way (Kconfig). > > We still allow [3] too, because it is still used by many boards and > we expect much time for conversion. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > Kconfig | 3 ++- > board/cobra5272/config.mk | 9 --------- > board/freescale/m5208evbe/config.mk | 9 --------- > board/freescale/m5249evb/config.mk | 9 --------- > board/freescale/m5253demo/config.mk | 9 --------- > board/freescale/m5253evbe/config.mk | 9 --------- > board/freescale/m5272c3/config.mk | 9 --------- > board/freescale/m5275evb/config.mk | 9 --------- > board/freescale/m5282evb/config.mk | 9 --------- > board/freescale/m53017evb/config.mk | 9 --------- > board/freescale/m5329evb/config.mk | 9 --------- > board/freescale/m5373evb/config.mk | 9 --------- > board/freescale/m547xevb/config.mk | 9 --------- > board/freescale/m548xevb/config.mk | 9 --------- > board/sysam/amcore/config.mk | 7 ------- > configs/M5208EVBE_defconfig | 1 + > configs/M52277EVB_defconfig | 3 ++- > configs/M52277EVB_stmicro_defconfig | 3 ++- > configs/M5235EVB_Flash32_defconfig | 3 ++- > configs/M5235EVB_defconfig | 2 +- > configs/M5249EVB_defconfig | 1 + > configs/M5253DEMO_defconfig | 1 + > configs/M5253EVBE_defconfig | 1 + > configs/M5272C3_defconfig | 1 + > configs/M5275EVB_defconfig | 1 + > configs/M5282EVB_defconfig | 1 + > configs/M53017EVB_defconfig | 1 + > configs/M5329AFEE_defconfig | 1 + > configs/M5329BFEE_defconfig | 1 + > configs/M5373EVB_defconfig | 1 + > configs/M54418TWR_defconfig | 3 ++- > configs/M54418TWR_nand_mii_defconfig | 3 ++- > configs/M54418TWR_nand_rmii_defconfig | 3 ++- > configs/M54418TWR_nand_rmii_lowfreq_defconfig | 3 ++- > configs/M54418TWR_serial_mii_defconfig | 3 ++- > configs/M54418TWR_serial_rmii_defconfig | 3 ++- > configs/M54451EVB_defconfig | 3 ++- > configs/M54451EVB_stmicro_defconfig | 3 ++- > configs/M54455EVB_a66_defconfig | 3 ++- > configs/M54455EVB_defconfig | 3 ++- > configs/M54455EVB_i66_defconfig | 3 ++- > configs/M54455EVB_intel_defconfig | 3 ++- > configs/M54455EVB_stm33_defconfig | 3 ++- > configs/M5475AFE_defconfig | 1 + > configs/M5475BFE_defconfig | 1 + > configs/M5475CFE_defconfig | 1 + > configs/M5475DFE_defconfig | 1 + > configs/M5475EFE_defconfig | 1 + > configs/M5475FFE_defconfig | 1 + > configs/M5475GFE_defconfig | 1 + > configs/M5485AFE_defconfig | 1 + > configs/M5485BFE_defconfig | 1 + > configs/M5485CFE_defconfig | 1 + > configs/M5485DFE_defconfig | 1 + > configs/M5485EFE_defconfig | 1 + > configs/M5485FFE_defconfig | 1 + > configs/M5485GFE_defconfig | 1 + > configs/M5485HFE_defconfig | 1 + > configs/amcore_defconfig | 1 + > configs/cobra5272_defconfig | 1 + > configs/eb_cpu5282_defconfig | 3 ++- > configs/eb_cpu5282_internal_defconfig | 3 ++- > 62 files changed, 67 insertions(+), 144 deletions(-) > delete mode 100644 board/cobra5272/config.mk > delete mode 100644 board/freescale/m5208evbe/config.mk > delete mode 100644 board/freescale/m5249evb/config.mk > delete mode 100644 board/freescale/m5253demo/config.mk > delete mode 100644 board/freescale/m5253evbe/config.mk > delete mode 100644 board/freescale/m5272c3/config.mk > delete mode 100644 board/freescale/m5275evb/config.mk > delete mode 100644 board/freescale/m5282evb/config.mk > delete mode 100644 board/freescale/m53017evb/config.mk > delete mode 100644 board/freescale/m5329evb/config.mk > delete mode 100644 board/freescale/m5373evb/config.mk > delete mode 100644 board/freescale/m547xevb/config.mk > delete mode 100644 board/freescale/m548xevb/config.mk > delete mode 100644 board/sysam/amcore/config.mk > > diff --git a/Kconfig b/Kconfig > index 821b464..9b07838 100644 > --- a/Kconfig > +++ b/Kconfig > @@ -208,7 +208,8 @@ config SYS_EXTRA_OPTIONS > new boards should not use this option. > > 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) > depends on !EFI_APP > hex "Text Base" > help > diff --git a/board/cobra5272/config.mk b/board/cobra5272/config.mk > deleted file mode 100644 > index 1af25e1..0000000 > --- a/board/cobra5272/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0xffe00000 > diff --git a/board/freescale/m5208evbe/config.mk b/board/freescale/m5208evbe/config.mk > deleted file mode 100644 > index c15a9cf..0000000 > --- a/board/freescale/m5208evbe/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0 > diff --git a/board/freescale/m5249evb/config.mk b/board/freescale/m5249evb/config.mk > deleted file mode 100644 > index 1af25e1..0000000 > --- a/board/freescale/m5249evb/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0xffe00000 > diff --git a/board/freescale/m5253demo/config.mk b/board/freescale/m5253demo/config.mk > deleted file mode 100644 > index 4547465..0000000 > --- a/board/freescale/m5253demo/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0xFF800000 > diff --git a/board/freescale/m5253evbe/config.mk b/board/freescale/m5253evbe/config.mk > deleted file mode 100644 > index 1af25e1..0000000 > --- a/board/freescale/m5253evbe/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0xffe00000 > diff --git a/board/freescale/m5272c3/config.mk b/board/freescale/m5272c3/config.mk > deleted file mode 100644 > index 1af25e1..0000000 > --- a/board/freescale/m5272c3/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0xffe00000 > diff --git a/board/freescale/m5275evb/config.mk b/board/freescale/m5275evb/config.mk > deleted file mode 100644 > index 1af25e1..0000000 > --- a/board/freescale/m5275evb/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0xffe00000 > diff --git a/board/freescale/m5282evb/config.mk b/board/freescale/m5282evb/config.mk > deleted file mode 100644 > index e2ac27e..0000000 > --- a/board/freescale/m5282evb/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0xFFE00000 > diff --git a/board/freescale/m53017evb/config.mk b/board/freescale/m53017evb/config.mk > deleted file mode 100644 > index c15a9cf..0000000 > --- a/board/freescale/m53017evb/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0 > diff --git a/board/freescale/m5329evb/config.mk b/board/freescale/m5329evb/config.mk > deleted file mode 100644 > index c15a9cf..0000000 > --- a/board/freescale/m5329evb/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0 > diff --git a/board/freescale/m5373evb/config.mk b/board/freescale/m5373evb/config.mk > deleted file mode 100644 > index c15a9cf..0000000 > --- a/board/freescale/m5373evb/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0 > diff --git a/board/freescale/m547xevb/config.mk b/board/freescale/m547xevb/config.mk > deleted file mode 100644 > index 4547465..0000000 > --- a/board/freescale/m547xevb/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0xFF800000 > diff --git a/board/freescale/m548xevb/config.mk b/board/freescale/m548xevb/config.mk > deleted file mode 100644 > index 4547465..0000000 > --- a/board/freescale/m548xevb/config.mk > +++ /dev/null > @@ -1,9 +0,0 @@ > -# > -# (C) Copyright 2000-2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0xFF800000 > diff --git a/board/sysam/amcore/config.mk b/board/sysam/amcore/config.mk > deleted file mode 100644 > index d01a8bb..0000000 > --- a/board/sysam/amcore/config.mk > +++ /dev/null > @@ -1,7 +0,0 @@ > -# > -# (C) Copyright 2014 Angelo Dureghello <angelo@sysam.it> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -CONFIG_SYS_TEXT_BASE = 0xffc00000 > diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig > index f30a7fb..7a12522 100644 > --- a/configs/M5208EVBE_defconfig > +++ b/configs/M5208EVBE_defconfig > @@ -1,4 +1,5 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5208EVBE=y > +CONFIG_SYS_TEXT_BASE=0x00000000 > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig > index b2ad88a..711a411 100644 > --- a/configs/M52277EVB_defconfig > +++ b/configs/M52277EVB_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M52277EVB=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000" > +CONFIG_SYS_TEXT_BASE=0x00000000 > +CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > # CONFIG_CMD_NET is not set > diff --git a/configs/M52277EVB_stmicro_defconfig b/configs/M52277EVB_stmicro_defconfig > index ea39356..05d20d6 100644 > --- a/configs/M52277EVB_stmicro_defconfig > +++ b/configs/M52277EVB_stmicro_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M52277EVB=y > -CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000" > +CONFIG_SYS_TEXT_BASE=0x43E00000 > +CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT" > # CONFIG_CMD_SETEXPR is not set > # CONFIG_CMD_NET is not set > # CONFIG_CMD_NFS is not set > diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig > index 5f381e2..b8fb413 100644 > --- a/configs/M5235EVB_Flash32_defconfig > +++ b/configs/M5235EVB_Flash32_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5235EVB=y > -CONFIG_SYS_EXTRA_OPTIONS="NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000" > +CONFIG_SYS_TEXT_BASE=0xFFC00000 > +CONFIG_SYS_EXTRA_OPTIONS="NORFLASH_PS32BIT" > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig > index a10ae8d..fdf2dd0 100644 > --- a/configs/M5235EVB_defconfig > +++ b/configs/M5235EVB_defconfig > @@ -1,6 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5235EVB=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFE00000" > +CONFIG_SYS_TEXT_BASE=0xFFE00000 > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig > index 1467b16..2358d24 100644 > --- a/configs/M5249EVB_defconfig > +++ b/configs/M5249EVB_defconfig > @@ -1,4 +1,5 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5249EVB=y > +CONFIG_SYS_TEXT_BASE=0xffe00000 > # CONFIG_CMD_SETEXPR is not set > # CONFIG_CMD_NET is not set > diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig > index 89e7e75..c4da196 100644 > --- a/configs/M5253DEMO_defconfig > +++ b/configs/M5253DEMO_defconfig > @@ -1,3 +1,4 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5253DEMO=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5253EVBE_defconfig b/configs/M5253EVBE_defconfig > index e337f32..2e82cce 100644 > --- a/configs/M5253EVBE_defconfig > +++ b/configs/M5253EVBE_defconfig > @@ -1,4 +1,5 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5253EVBE=y > +CONFIG_SYS_TEXT_BASE=0xFFE00000 > # CONFIG_CMD_SETEXPR is not set > # CONFIG_CMD_NET is not set > diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig > index 6e9609f..6153a5c 100644 > --- a/configs/M5272C3_defconfig > +++ b/configs/M5272C3_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5272C3=y > +CONFIG_SYS_TEXT_BASE=0xffe00000 > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig > index 5eb2373..d70fea1 100644 > --- a/configs/M5275EVB_defconfig > +++ b/configs/M5275EVB_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5275EVB=y > +CONFIG_SYS_TEXT_BASE=0xffe00000 > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig > index e0af388..10a3043 100644 > --- a/configs/M5282EVB_defconfig > +++ b/configs/M5282EVB_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5282EVB=y > +CONFIG_SYS_TEXT_BASE=0xFFE00000 > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig > index ca538f4..e86fe5b 100644 > --- a/configs/M53017EVB_defconfig > +++ b/configs/M53017EVB_defconfig > @@ -1,4 +1,5 @@ > CONFIG_M68K=y > CONFIG_TARGET_M53017EVB=y > +CONFIG_SYS_TEXT_BASE=0x00000000 > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig > index d5c6c7b..2379a1e 100644 > --- a/configs/M5329AFEE_defconfig > +++ b/configs/M5329AFEE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5329EVB=y > +CONFIG_SYS_TEXT_BASE=0x00000000 > CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=0" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig > index 3524206..38a996b 100644 > --- a/configs/M5329BFEE_defconfig > +++ b/configs/M5329BFEE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5329EVB=y > +CONFIG_SYS_TEXT_BASE=0x00000000 > CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig > index 2fdff5b..6595feb 100644 > --- a/configs/M5373EVB_defconfig > +++ b/configs/M5373EVB_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5373EVB=y > +CONFIG_SYS_TEXT_BASE=0x00000000 > CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig > index 7c22abe..62cebda 100644 > --- a/configs/M54418TWR_defconfig > +++ b/configs/M54418TWR_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54418TWR=y > -CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000" > +CONFIG_SYS_TEXT_BASE=0x47E00000 > +CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=50000000" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_IMLS is not set > # CONFIG_CMD_LOADB is not set > diff --git a/configs/M54418TWR_nand_mii_defconfig b/configs/M54418TWR_nand_mii_defconfig > index 373845b..de73e30 100644 > --- a/configs/M54418TWR_nand_mii_defconfig > +++ b/configs/M54418TWR_nand_mii_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54418TWR=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000" > +CONFIG_SYS_TEXT_BASE=0x47E00000 > +CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_INPUT_CLKSRC=25000000" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_IMLS is not set > # CONFIG_CMD_LOADB is not set > diff --git a/configs/M54418TWR_nand_rmii_defconfig b/configs/M54418TWR_nand_rmii_defconfig > index 08c45b2..139811c 100644 > --- a/configs/M54418TWR_nand_rmii_defconfig > +++ b/configs/M54418TWR_nand_rmii_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54418TWR=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000" > +CONFIG_SYS_TEXT_BASE=0x47E00000 > +CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_INPUT_CLKSRC=50000000" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_IMLS is not set > # CONFIG_CMD_LOADB is not set > diff --git a/configs/M54418TWR_nand_rmii_lowfreq_defconfig b/configs/M54418TWR_nand_rmii_lowfreq_defconfig > index c5bf10e..a3cf48b 100644 > --- a/configs/M54418TWR_nand_rmii_lowfreq_defconfig > +++ b/configs/M54418TWR_nand_rmii_lowfreq_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54418TWR=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000" > +CONFIG_SYS_TEXT_BASE=0x47E00000 > +CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_INPUT_CLKSRC=50000000" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_IMLS is not set > # CONFIG_CMD_LOADB is not set > diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig > index 9e81827..ad29d52 100644 > --- a/configs/M54418TWR_serial_mii_defconfig > +++ b/configs/M54418TWR_serial_mii_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54418TWR=y > -CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000" > +CONFIG_SYS_TEXT_BASE=0x47E00000 > +CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=25000000" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_IMLS is not set > # CONFIG_CMD_LOADB is not set > diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig > index 7c22abe..62cebda 100644 > --- a/configs/M54418TWR_serial_rmii_defconfig > +++ b/configs/M54418TWR_serial_rmii_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54418TWR=y > -CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000" > +CONFIG_SYS_TEXT_BASE=0x47E00000 > +CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=50000000" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_IMLS is not set > # CONFIG_CMD_LOADB is not set > diff --git a/configs/M54451EVB_defconfig b/configs/M54451EVB_defconfig > index 3b96dfb..a9fe02f 100644 > --- a/configs/M54451EVB_defconfig > +++ b/configs/M54451EVB_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54451EVB=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000" > +CONFIG_SYS_TEXT_BASE=0x00000000 > +CONFIG_SYS_EXTRA_OPTIONS="SYS_INPUT_CLKSRC=24000000" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > diff --git a/configs/M54451EVB_stmicro_defconfig b/configs/M54451EVB_stmicro_defconfig > index 21a2687..f10e86c 100644 > --- a/configs/M54451EVB_stmicro_defconfig > +++ b/configs/M54451EVB_stmicro_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54451EVB=y > -CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x47e00000,SYS_INPUT_CLKSRC=24000000" > +CONFIG_SYS_TEXT_BASE=0x47e00000 > +CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_INPUT_CLKSRC=24000000" > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M54455EVB_a66_defconfig b/configs/M54455EVB_a66_defconfig > index e810273..3053514 100644 > --- a/configs/M54455EVB_a66_defconfig > +++ b/configs/M54455EVB_a66_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54455EVB=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=66666666" > +CONFIG_SYS_TEXT_BASE=0x04000000 > +CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=66666666" > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig > index 3d9cb12..9f70f7e 100644 > --- a/configs/M54455EVB_defconfig > +++ b/configs/M54455EVB_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54455EVB=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=33333333" > +CONFIG_SYS_TEXT_BASE=0x04000000 > +CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=33333333" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > diff --git a/configs/M54455EVB_i66_defconfig b/configs/M54455EVB_i66_defconfig > index b5cbfdc..8421393 100644 > --- a/configs/M54455EVB_i66_defconfig > +++ b/configs/M54455EVB_i66_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54455EVB=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=66666666" > +CONFIG_SYS_TEXT_BASE=0x00000000 > +CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=66666666" > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M54455EVB_intel_defconfig b/configs/M54455EVB_intel_defconfig > index 8ed05a6..c630108 100644 > --- a/configs/M54455EVB_intel_defconfig > +++ b/configs/M54455EVB_intel_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54455EVB=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=33333333" > +CONFIG_SYS_TEXT_BASE=0x00000000 > +CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=33333333" > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M54455EVB_stm33_defconfig b/configs/M54455EVB_stm33_defconfig > index 0a64580..4e8aee4 100644 > --- a/configs/M54455EVB_stm33_defconfig > +++ b/configs/M54455EVB_stm33_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_M54455EVB=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_STMICRO_BOOT,CF_SBF,SYS_TEXT_BASE=0x4FE00000,SYS_INPUT_CLKSRC=33333333" > +CONFIG_SYS_TEXT_BASE=0x4FE00000 > +CONFIG_SYS_EXTRA_OPTIONS="SYS_STMICRO_BOOT,CF_SBF,SYS_INPUT_CLKSRC=33333333" > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5475AFE_defconfig b/configs/M5475AFE_defconfig > index 11d14e6..edfb9fc 100644 > --- a/configs/M5475AFE_defconfig > +++ b/configs/M5475AFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5475EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5475BFE_defconfig b/configs/M5475BFE_defconfig > index 24f4256..5177eb9 100644 > --- a/configs/M5475BFE_defconfig > +++ b/configs/M5475BFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5475EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5475CFE_defconfig b/configs/M5475CFE_defconfig > index a899601..431a264 100644 > --- a/configs/M5475CFE_defconfig > +++ b/configs/M5475CFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5475EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5475DFE_defconfig b/configs/M5475DFE_defconfig > index 66523cc..46d9964 100644 > --- a/configs/M5475DFE_defconfig > +++ b/configs/M5475DFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5475EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5475EFE_defconfig b/configs/M5475EFE_defconfig > index 410e150..4a2284d 100644 > --- a/configs/M5475EFE_defconfig > +++ b/configs/M5475EFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5475EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5475FFE_defconfig b/configs/M5475FFE_defconfig > index b590fd9..f8d53be 100644 > --- a/configs/M5475FFE_defconfig > +++ b/configs/M5475FFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5475EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5475GFE_defconfig b/configs/M5475GFE_defconfig > index ea41ec2..61a3c56 100644 > --- a/configs/M5475GFE_defconfig > +++ b/configs/M5475GFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5475EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=4,SYS_DRAMSZ=64" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5485AFE_defconfig b/configs/M5485AFE_defconfig > index e3f2f9e..a8afe71 100644 > --- a/configs/M5485AFE_defconfig > +++ b/configs/M5485AFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5485EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5485BFE_defconfig b/configs/M5485BFE_defconfig > index b3ec7ae..b9bdd4b 100644 > --- a/configs/M5485BFE_defconfig > +++ b/configs/M5485BFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5485EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5485CFE_defconfig b/configs/M5485CFE_defconfig > index 6637fdc..c5ec396 100644 > --- a/configs/M5485CFE_defconfig > +++ b/configs/M5485CFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5485EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5485DFE_defconfig b/configs/M5485DFE_defconfig > index 34dd51e..6872865 100644 > --- a/configs/M5485DFE_defconfig > +++ b/configs/M5485DFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5485EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5485EFE_defconfig b/configs/M5485EFE_defconfig > index 1f5c4ea..c0d1e06 100644 > --- a/configs/M5485EFE_defconfig > +++ b/configs/M5485EFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5485EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5485FFE_defconfig b/configs/M5485FFE_defconfig > index 737411b..904a639 100644 > --- a/configs/M5485FFE_defconfig > +++ b/configs/M5485FFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5485EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5485GFE_defconfig b/configs/M5485GFE_defconfig > index 2def6ea..cb6f2c7 100644 > --- a/configs/M5485GFE_defconfig > +++ b/configs/M5485GFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5485EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/M5485HFE_defconfig b/configs/M5485HFE_defconfig > index 4263f40..a3ef210 100644 > --- a/configs/M5485HFE_defconfig > +++ b/configs/M5485HFE_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_M5485EVB=y > +CONFIG_SYS_TEXT_BASE=0xFF800000 > CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO" > CONFIG_SYS_PROMPT="-> " > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig > index ad69f0a..9c83849 100644 > --- a/configs/amcore_defconfig > +++ b/configs/amcore_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_AMCORE=y > +CONFIG_SYS_TEXT_BASE=0xffc00000 > CONFIG_SYS_PROMPT="amcore $ " > # CONFIG_CMD_BOOTD is not set > # CONFIG_CMD_XIMG is not set > diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig > index 5cb6a80..2e845e7 100644 > --- a/configs/cobra5272_defconfig > +++ b/configs/cobra5272_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_COBRA5272=y > +CONFIG_SYS_TEXT_BASE=0xffe00000 > CONFIG_SYS_PROMPT="COBRA > " > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig > index 52f4a24..1e204bf 100644 > --- a/configs/eb_cpu5282_defconfig > +++ b/configs/eb_cpu5282_defconfig > @@ -1,6 +1,7 @@ > CONFIG_M68K=y > CONFIG_TARGET_EB_CPU5282=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400" > +CONFIG_SYS_TEXT_BASE=0xFF000000 > +CONFIG_SYS_EXTRA_OPTIONS="SYS_MONITOR_BASE=0xFF000400" > CONFIG_SYS_PROMPT="\nEB+CPU5282> " > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_SETEXPR is not set > diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig > index 5af19a0..2db895c 100644 > --- a/configs/eb_cpu5282_internal_defconfig > +++ b/configs/eb_cpu5282_internal_defconfig > @@ -1,5 +1,6 @@ > CONFIG_M68K=y > CONFIG_TARGET_EB_CPU5282=y > -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF0000000,SYS_MONITOR_BASE=0xF0000418" > +CONFIG_SYS_TEXT_BASE=0xF0000000 > +CONFIG_SYS_EXTRA_OPTIONS="SYS_MONITOR_BASE=0xF0000418" > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_SETEXPR is not set > Acked-by: Angelo Dureghello <angelo@sysam.it> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files 2015-12-11 3:22 ` [U-Boot] [PATCH 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files Masahiro Yamada 2015-12-13 19:55 ` Angelo Dureghello @ 2016-01-06 0:24 ` Simon Glass 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 2 siblings, 0 replies; 28+ messages in thread From: Simon Glass @ 2016-01-06 0:24 UTC (permalink / raw) To: u-boot On 10 December 2015 at 20:22, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > For historical reason, CONFIG_SYS_TEXT_BASE has been specified > in various ways: > > [1] by board/${VENDOR}/${BOARD}/config.mk > > [2] by CONFIG_SYS_EXTRA_OPTIONS > (This was "options" field of boards.cfg before Kconfig conversion) > > [3] by include/configs/${BOARD}.h > > [4] by configs/${BOARD}_defconfig > > Most of M68K boards use either [1] or [2], both of which we want to > deprecate. Switch them into [4], which is the newest way (Kconfig). > > We still allow [3] too, because it is still used by many boards and > we expect much time for conversion. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- Reviewed-by: Simon Glass <sjg@chromium.org> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [U-Boot, 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files 2015-12-11 3:22 ` [U-Boot] [PATCH 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files Masahiro Yamada 2015-12-13 19:55 ` Angelo Dureghello 2016-01-06 0:24 ` Simon Glass @ 2016-01-20 21:00 ` Tom Rini 2 siblings, 0 replies; 28+ messages in thread From: Tom Rini @ 2016-01-20 21:00 UTC (permalink / raw) To: u-boot On Fri, Dec 11, 2015 at 12:22:24PM +0900, Masahiro Yamada wrote: > For historical reason, CONFIG_SYS_TEXT_BASE has been specified > in various ways: > > [1] by board/${VENDOR}/${BOARD}/config.mk > > [2] by CONFIG_SYS_EXTRA_OPTIONS > (This was "options" field of boards.cfg before Kconfig conversion) > > [3] by include/configs/${BOARD}.h > > [4] by configs/${BOARD}_defconfig > > Most of M68K boards use either [1] or [2], both of which we want to > deprecate. Switch them into [4], which is the newest way (Kconfig). > > We still allow [3] too, because it is still used by many boards and > we expect much time for conversion. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Acked-by: Angelo Dureghello <angelo@sysam.it> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/6e3d2602/attachment.sig> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 2/8] m68k: M54418TWR: drop board/freescale/m54418twr/config.mk 2015-12-11 3:22 [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Masahiro Yamada 2015-12-11 3:22 ` [U-Boot] [PATCH 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files Masahiro Yamada @ 2015-12-11 3:22 ` Masahiro Yamada 2015-12-13 19:55 ` Angelo Dureghello 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 3/8] microblaze: move CONFIG_SYS_TEXT_BASE to defconfig Masahiro Yamada ` (7 subsequent siblings) 9 siblings, 2 replies; 28+ messages in thread From: Masahiro Yamada @ 2015-12-11 3:22 UTC (permalink / raw) To: u-boot The board/freescale/m54418twr/config.mk defined TEXT_BASE, which has the same value as CONFIG_SYS_TEXT_BASE. The TEXT_BASE is referenced by two files: - arch/m68k/cpu/mcf5445x/start.S and include/ - include/configs/M54418TWR.h Replace the references with CONFIG_SYS_TEXT_BASE and delete board/freescale/m54418twr/config.mk. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/m68k/cpu/mcf5445x/start.S | 8 ++++---- board/freescale/m54418twr/config.mk | 7 ------- include/configs/M54418TWR.h | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 board/freescale/m54418twr/config.mk diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S index 979eb5a..ae261b1 100644 --- a/arch/m68k/cpu/mcf5445x/start.S +++ b/arch/m68k/cpu/mcf5445x/start.S @@ -34,7 +34,7 @@ #if defined(CONFIG_SERIAL_BOOT) #define ASM_DRAMINIT (asm_dram_init - CONFIG_SYS_TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR) -#define ASM_DRAMINIT_N (asm_dram_init - TEXT_BASE) +#define ASM_DRAMINIT_N (asm_dram_init - CONFIG_SYS_TEXT_BASE) #define ASM_SBF_IMG_HDR (asm_sbf_img_hdr - CONFIG_SYS_TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR) #endif @@ -490,7 +490,7 @@ asm_dspi_rd_status: /* copy 4 boot pages to dram as soon as possible */ /* each page is 996 bytes (1056 total with 60 ECC bytes */ move.l #0x00000000, %a1 /* src */ - move.l #TEXT_BASE, %a2 /* dst */ + move.l #CONFIG_SYS_TEXT_BASE, %a2 /* dst */ move.l #0x3E0, %d0 /* sz in long */ asm_boot_nand_copy: @@ -571,7 +571,7 @@ asm_nand_init: move.l #4, %d2 /* start at 4 */ move.l #0xFC0FFF04, %a0 /* cmd2 */ move.l #0xFC0FFF0C, %a1 /* rar */ - move.l #(TEXT_BASE + 0xF80), %a2 /* dst */ + move.l #(CONFIG_SYS_TEXT_BASE + 0xF80), %a2 /* dst */ asm_nand_read: move.l #0x11000000, %d0 /* rar */ @@ -609,7 +609,7 @@ asm_nand_copy: bgt asm_nand_read /* jump to memory and execute */ - move.l #(TEXT_BASE + 0x400), %a0 + move.l #(CONFIG_SYS_TEXT_BASE + 0x400), %a0 jmp (%a0) #endif /* CONFIG_SYS_NAND_BOOT */ diff --git a/board/freescale/m54418twr/config.mk b/board/freescale/m54418twr/config.mk deleted file mode 100644 index 07f52e0..0000000 --- a/board/freescale/m54418twr/config.mk +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2010-2012 Freescale Semiconductor, Inc. -# TsiChung Liew (Tsi-Chung.Liew at freescale.com) -# -# SPDX-License-Identifier: GPL-2.0+ -# - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 05ba13b..826de5b 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -267,7 +267,7 @@ #endif #if defined(CONFIG_SERIAL_BOOT) -#define CONFIG_SYS_MONITOR_BASE (TEXT_BASE + 0x400) +#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x400) #else #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) #endif -- 1.9.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 2/8] m68k: M54418TWR: drop board/freescale/m54418twr/config.mk 2015-12-11 3:22 ` [U-Boot] [PATCH 2/8] m68k: M54418TWR: drop board/freescale/m54418twr/config.mk Masahiro Yamada @ 2015-12-13 19:55 ` Angelo Dureghello 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Angelo Dureghello @ 2015-12-13 19:55 UTC (permalink / raw) To: u-boot On 11/12/2015 04:22, Masahiro Yamada wrote: > The board/freescale/m54418twr/config.mk defined TEXT_BASE, which has > the same value as CONFIG_SYS_TEXT_BASE. The TEXT_BASE is referenced > by two files: > - arch/m68k/cpu/mcf5445x/start.S and include/ > - include/configs/M54418TWR.h > > Replace the references with CONFIG_SYS_TEXT_BASE and delete > board/freescale/m54418twr/config.mk. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > arch/m68k/cpu/mcf5445x/start.S | 8 ++++---- > board/freescale/m54418twr/config.mk | 7 ------- > include/configs/M54418TWR.h | 2 +- > 3 files changed, 5 insertions(+), 12 deletions(-) > delete mode 100644 board/freescale/m54418twr/config.mk > > diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S > index 979eb5a..ae261b1 100644 > --- a/arch/m68k/cpu/mcf5445x/start.S > +++ b/arch/m68k/cpu/mcf5445x/start.S > @@ -34,7 +34,7 @@ > > #if defined(CONFIG_SERIAL_BOOT) > #define ASM_DRAMINIT (asm_dram_init - CONFIG_SYS_TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR) > -#define ASM_DRAMINIT_N (asm_dram_init - TEXT_BASE) > +#define ASM_DRAMINIT_N (asm_dram_init - CONFIG_SYS_TEXT_BASE) > #define ASM_SBF_IMG_HDR (asm_sbf_img_hdr - CONFIG_SYS_TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR) > #endif > > @@ -490,7 +490,7 @@ asm_dspi_rd_status: > /* copy 4 boot pages to dram as soon as possible */ > /* each page is 996 bytes (1056 total with 60 ECC bytes */ > move.l #0x00000000, %a1 /* src */ > - move.l #TEXT_BASE, %a2 /* dst */ > + move.l #CONFIG_SYS_TEXT_BASE, %a2 /* dst */ > move.l #0x3E0, %d0 /* sz in long */ > > asm_boot_nand_copy: > @@ -571,7 +571,7 @@ asm_nand_init: > move.l #4, %d2 /* start at 4 */ > move.l #0xFC0FFF04, %a0 /* cmd2 */ > move.l #0xFC0FFF0C, %a1 /* rar */ > - move.l #(TEXT_BASE + 0xF80), %a2 /* dst */ > + move.l #(CONFIG_SYS_TEXT_BASE + 0xF80), %a2 /* dst */ > > asm_nand_read: > move.l #0x11000000, %d0 /* rar */ > @@ -609,7 +609,7 @@ asm_nand_copy: > bgt asm_nand_read > > /* jump to memory and execute */ > - move.l #(TEXT_BASE + 0x400), %a0 > + move.l #(CONFIG_SYS_TEXT_BASE + 0x400), %a0 > jmp (%a0) > > #endif /* CONFIG_SYS_NAND_BOOT */ > diff --git a/board/freescale/m54418twr/config.mk b/board/freescale/m54418twr/config.mk > deleted file mode 100644 > index 07f52e0..0000000 > --- a/board/freescale/m54418twr/config.mk > +++ /dev/null > @@ -1,7 +0,0 @@ > -# Copyright 2010-2012 Freescale Semiconductor, Inc. > -# TsiChung Liew (Tsi-Chung.Liew at freescale.com) > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(CONFIG_SYS_TEXT_BASE) > diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h > index 05ba13b..826de5b 100644 > --- a/include/configs/M54418TWR.h > +++ b/include/configs/M54418TWR.h > @@ -267,7 +267,7 @@ > #endif > > #if defined(CONFIG_SERIAL_BOOT) > -#define CONFIG_SYS_MONITOR_BASE (TEXT_BASE + 0x400) > +#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x400) > #else > #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) > #endif > Acked-by: Angelo Dureghello <angelo@sysam.it> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [U-Boot, 2/8] m68k: M54418TWR: drop board/freescale/m54418twr/config.mk 2015-12-11 3:22 ` [U-Boot] [PATCH 2/8] m68k: M54418TWR: drop board/freescale/m54418twr/config.mk Masahiro Yamada 2015-12-13 19:55 ` Angelo Dureghello @ 2016-01-20 21:00 ` Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Tom Rini @ 2016-01-20 21:00 UTC (permalink / raw) To: u-boot On Fri, Dec 11, 2015 at 12:22:25PM +0900, Masahiro Yamada wrote: > The board/freescale/m54418twr/config.mk defined TEXT_BASE, which has > the same value as CONFIG_SYS_TEXT_BASE. The TEXT_BASE is referenced > by two files: > - arch/m68k/cpu/mcf5445x/start.S and include/ > - include/configs/M54418TWR.h > > Replace the references with CONFIG_SYS_TEXT_BASE and delete > board/freescale/m54418twr/config.mk. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Acked-by: Angelo Dureghello <angelo@sysam.it> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/e4d0cf84/attachment.sig> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 3/8] microblaze: move CONFIG_SYS_TEXT_BASE to defconfig 2015-12-11 3:22 [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Masahiro Yamada 2015-12-11 3:22 ` [U-Boot] [PATCH 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files Masahiro Yamada 2015-12-11 3:22 ` [U-Boot] [PATCH 2/8] m68k: M54418TWR: drop board/freescale/m54418twr/config.mk Masahiro Yamada @ 2015-12-11 3:22 ` Masahiro Yamada 2015-12-11 7:32 ` Michal Simek 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 4/8] mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk Masahiro Yamada ` (6 subsequent siblings) 9 siblings, 2 replies; 28+ messages in thread From: Masahiro Yamada @ 2015-12-11 3:22 UTC (permalink / raw) To: u-boot This is how CONFIG options are defined by Kconfig. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Kconfig | 2 +- board/xilinx/microblaze-generic/config.mk | 2 -- configs/microblaze-generic_defconfig | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Kconfig b/Kconfig index 9b07838..ee4e060 100644 --- a/Kconfig +++ b/Kconfig @@ -209,7 +209,7 @@ config SYS_EXTRA_OPTIONS config SYS_TEXT_BASE depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \ - (M68K && !TARGET_ASTRO_MCF5373L) + (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE depends on !EFI_APP hex "Text Base" help diff --git a/board/xilinx/microblaze-generic/config.mk b/board/xilinx/microblaze-generic/config.mk index 36bdd96..95ef9c0 100644 --- a/board/xilinx/microblaze-generic/config.mk +++ b/board/xilinx/microblaze-generic/config.mk @@ -11,8 +11,6 @@ # the generated file from your Xilinx design flow. # -CONFIG_SYS_TEXT_BASE = 0x29000000 - PLATFORM_CPPFLAGS += -mno-xl-soft-mul PLATFORM_CPPFLAGS += -mno-xl-soft-div PLATFORM_CPPFLAGS += -mxl-barrel-shift diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 1fe2e0f..66d0e97 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -1,5 +1,6 @@ CONFIG_MICROBLAZE=y CONFIG_TARGET_MICROBLAZE_GENERIC=y +CONFIG_SYS_TEXT_BASE=0x29000000 CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic" CONFIG_SPL=y CONFIG_SYS_PROMPT="U-Boot-mONStR> " -- 1.9.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 3/8] microblaze: move CONFIG_SYS_TEXT_BASE to defconfig 2015-12-11 3:22 ` [U-Boot] [PATCH 3/8] microblaze: move CONFIG_SYS_TEXT_BASE to defconfig Masahiro Yamada @ 2015-12-11 7:32 ` Michal Simek 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Michal Simek @ 2015-12-11 7:32 UTC (permalink / raw) To: u-boot On 11.12.2015 04:22, Masahiro Yamada wrote: > This is how CONFIG options are defined by Kconfig. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > Kconfig | 2 +- > board/xilinx/microblaze-generic/config.mk | 2 -- > configs/microblaze-generic_defconfig | 1 + > 3 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/Kconfig b/Kconfig > index 9b07838..ee4e060 100644 > --- a/Kconfig > +++ b/Kconfig > @@ -209,7 +209,7 @@ config SYS_EXTRA_OPTIONS > > config SYS_TEXT_BASE > depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \ > - (M68K && !TARGET_ASTRO_MCF5373L) > + (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE > depends on !EFI_APP > hex "Text Base" > help > diff --git a/board/xilinx/microblaze-generic/config.mk b/board/xilinx/microblaze-generic/config.mk > index 36bdd96..95ef9c0 100644 > --- a/board/xilinx/microblaze-generic/config.mk > +++ b/board/xilinx/microblaze-generic/config.mk > @@ -11,8 +11,6 @@ > # the generated file from your Xilinx design flow. > # > > -CONFIG_SYS_TEXT_BASE = 0x29000000 > - > PLATFORM_CPPFLAGS += -mno-xl-soft-mul > PLATFORM_CPPFLAGS += -mno-xl-soft-div > PLATFORM_CPPFLAGS += -mxl-barrel-shift > diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig > index 1fe2e0f..66d0e97 100644 > --- a/configs/microblaze-generic_defconfig > +++ b/configs/microblaze-generic_defconfig > @@ -1,5 +1,6 @@ > CONFIG_MICROBLAZE=y > CONFIG_TARGET_MICROBLAZE_GENERIC=y > +CONFIG_SYS_TEXT_BASE=0x29000000 > CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic" > CONFIG_SPL=y > CONFIG_SYS_PROMPT="U-Boot-mONStR> " > I have made the same patch recently but you were first that's why. Acked-by: Michal Simek <michal.simek@xilinx.com> Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151211/34a0a60a/attachment.sig> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [U-Boot, 3/8] microblaze: move CONFIG_SYS_TEXT_BASE to defconfig 2015-12-11 3:22 ` [U-Boot] [PATCH 3/8] microblaze: move CONFIG_SYS_TEXT_BASE to defconfig Masahiro Yamada 2015-12-11 7:32 ` Michal Simek @ 2016-01-20 21:00 ` Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Tom Rini @ 2016-01-20 21:00 UTC (permalink / raw) To: u-boot On Fri, Dec 11, 2015 at 12:22:26PM +0900, Masahiro Yamada wrote: > This is how CONFIG options are defined by Kconfig. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Acked-by: Michal Simek <michal.simek@xilinx.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/3b17b4a1/attachment.sig> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 4/8] mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk 2015-12-11 3:22 [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Masahiro Yamada ` (2 preceding siblings ...) 2015-12-11 3:22 ` [U-Boot] [PATCH 3/8] microblaze: move CONFIG_SYS_TEXT_BASE to defconfig Masahiro Yamada @ 2015-12-11 3:22 ` Masahiro Yamada 2015-12-11 13:45 ` Daniel Schwierzeck 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 5/8] mips: dbau1x00: " Masahiro Yamada ` (5 subsequent siblings) 9 siblings, 2 replies; 28+ messages in thread From: Masahiro Yamada @ 2015-12-11 3:22 UTC (permalink / raw) To: u-boot We can delete board/micronas/vct/config.mk by moving the define of CONFIG_SYS_TEXT_BASE to somewhere else. Other MIPS boards are still defining it in include/config/${BOARD}.h, so I am following that way here. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- board/micronas/vct/config.mk | 13 ------------- include/configs/vct.h | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 board/micronas/vct/config.mk diff --git a/board/micronas/vct/config.mk b/board/micronas/vct/config.mk deleted file mode 100644 index 354d918..0000000 --- a/board/micronas/vct/config.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -# (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering -# -# SPDX-License-Identifier: GPL-2.0+ -# - -# -# vct_xxx boards with MIPS 4Kc CPU core -# - -ifndef CONFIG_SYS_TEXT_BASE -CONFIG_SYS_TEXT_BASE = 0x87000000 -endif diff --git a/include/configs/vct.h b/include/configs/vct.h index 872f2f0..ea6e3c0 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -32,6 +32,7 @@ #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) -- 1.9.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 4/8] mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk 2015-12-11 3:22 ` [U-Boot] [PATCH 4/8] mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk Masahiro Yamada @ 2015-12-11 13:45 ` Daniel Schwierzeck 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Daniel Schwierzeck @ 2015-12-11 13:45 UTC (permalink / raw) To: u-boot Am 11.12.2015 um 04:22 schrieb Masahiro Yamada: > We can delete board/micronas/vct/config.mk by moving the define of > CONFIG_SYS_TEXT_BASE to somewhere else. Other MIPS boards are > still defining it in include/config/${BOARD}.h, so I am following > that way here. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- > > board/micronas/vct/config.mk | 13 ------------- > include/configs/vct.h | 1 + 2 files changed, 1 > insertion(+), 13 deletions(-) delete mode 100644 > board/micronas/vct/config.mk > > diff --git a/board/micronas/vct/config.mk > b/board/micronas/vct/config.mk deleted file mode 100644 index > 354d918..0000000 --- a/board/micronas/vct/config.mk +++ /dev/null > @@ -1,13 +0,0 @@ -# -# (C) Copyright 2008 Stefan Roese > <sr@denx.de>, DENX Software Engineering -# -# > SPDX-License-Identifier: GPL-2.0+ -# - -# -# vct_xxx boards with > MIPS 4Kc CPU core -# - -ifndef CONFIG_SYS_TEXT_BASE > -CONFIG_SYS_TEXT_BASE = 0x87000000 -endif diff --git > a/include/configs/vct.h b/include/configs/vct.h index > 872f2f0..ea6e3c0 100644 --- a/include/configs/vct.h +++ > b/include/configs/vct.h @@ -32,6 +32,7 @@ > > #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) > Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> -- - Daniel ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [U-Boot, 4/8] mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk 2015-12-11 3:22 ` [U-Boot] [PATCH 4/8] mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk Masahiro Yamada 2015-12-11 13:45 ` Daniel Schwierzeck @ 2016-01-20 21:00 ` Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Tom Rini @ 2016-01-20 21:00 UTC (permalink / raw) To: u-boot On Fri, Dec 11, 2015 at 12:22:27PM +0900, Masahiro Yamada wrote: > We can delete board/micronas/vct/config.mk by moving the define of > CONFIG_SYS_TEXT_BASE to somewhere else. Other MIPS boards are > still defining it in include/config/${BOARD}.h, so I am following > that way here. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/840f5084/attachment.sig> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 5/8] mips: dbau1x00: move CONFIG_SYS_TEXT_BASE away from config.mk 2015-12-11 3:22 [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Masahiro Yamada ` (3 preceding siblings ...) 2015-12-11 3:22 ` [U-Boot] [PATCH 4/8] mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk Masahiro Yamada @ 2015-12-11 3:22 ` Masahiro Yamada 2015-12-11 13:46 ` Daniel Schwierzeck 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 6/8] mips: pb1x00: " Masahiro Yamada ` (4 subsequent siblings) 9 siblings, 2 replies; 28+ messages in thread From: Masahiro Yamada @ 2015-12-11 3:22 UTC (permalink / raw) To: u-boot We can delete board/dbau1x00/config.mk by moving the define of CONFIG_SYS_TEXT_BASE to somewhere else. Other MIPS boards are still defining it in include/config/${BOARD}.h, so I am following that way here. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- board/dbau1x00/config.mk | 16 ---------------- include/configs/dbau1x00.h | 5 +++++ 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 board/dbau1x00/config.mk diff --git a/board/dbau1x00/config.mk b/board/dbau1x00/config.mk deleted file mode 100644 index b378ac8..0000000 --- a/board/dbau1x00/config.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -# -# AMD development board AMD Alchemy DbAu1x00, MIPS32 core -# - -# ROM version -CONFIG_SYS_TEXT_BASE = 0xbfc00000 - -# RAM version -#CONFIG_SYS_TEXT_BASE = 0x80100000 diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index 3be44d4..817676f 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -147,6 +147,11 @@ #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) -- 1.9.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 5/8] mips: dbau1x00: move CONFIG_SYS_TEXT_BASE away from config.mk 2015-12-11 3:22 ` [U-Boot] [PATCH 5/8] mips: dbau1x00: " Masahiro Yamada @ 2015-12-11 13:46 ` Daniel Schwierzeck 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Daniel Schwierzeck @ 2015-12-11 13:46 UTC (permalink / raw) To: u-boot Am 11.12.2015 um 04:22 schrieb Masahiro Yamada: > We can delete board/dbau1x00/config.mk by moving the define of > CONFIG_SYS_TEXT_BASE to somewhere else. Other MIPS boards are > still defining it in include/config/${BOARD}.h, so I am following > that way here. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > board/dbau1x00/config.mk | 16 ---------------- > include/configs/dbau1x00.h | 5 +++++ > 2 files changed, 5 insertions(+), 16 deletions(-) > delete mode 100644 board/dbau1x00/config.mk > > diff --git a/board/dbau1x00/config.mk b/board/dbau1x00/config.mk > deleted file mode 100644 > index b378ac8..0000000 > --- a/board/dbau1x00/config.mk > +++ /dev/null > @@ -1,16 +0,0 @@ > -# > -# (C) Copyright 2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -# > -# AMD development board AMD Alchemy DbAu1x00, MIPS32 core > -# > - > -# ROM version > -CONFIG_SYS_TEXT_BASE = 0xbfc00000 > - > -# RAM version > -#CONFIG_SYS_TEXT_BASE = 0x80100000 > diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h > index 3be44d4..817676f 100644 > --- a/include/configs/dbau1x00.h > +++ b/include/configs/dbau1x00.h > @@ -147,6 +147,11 @@ > #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) > > Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> -- - Daniel ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [U-Boot, 5/8] mips: dbau1x00: move CONFIG_SYS_TEXT_BASE away from config.mk 2015-12-11 3:22 ` [U-Boot] [PATCH 5/8] mips: dbau1x00: " Masahiro Yamada 2015-12-11 13:46 ` Daniel Schwierzeck @ 2016-01-20 21:00 ` Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Tom Rini @ 2016-01-20 21:00 UTC (permalink / raw) To: u-boot On Fri, Dec 11, 2015 at 12:22:28PM +0900, Masahiro Yamada wrote: > We can delete board/dbau1x00/config.mk by moving the define of > CONFIG_SYS_TEXT_BASE to somewhere else. Other MIPS boards are > still defining it in include/config/${BOARD}.h, so I am following > that way here. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/10c479d1/attachment.sig> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 6/8] mips: pb1x00: move CONFIG_SYS_TEXT_BASE away from config.mk 2015-12-11 3:22 [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Masahiro Yamada ` (4 preceding siblings ...) 2015-12-11 3:22 ` [U-Boot] [PATCH 5/8] mips: dbau1x00: " Masahiro Yamada @ 2015-12-11 3:22 ` Masahiro Yamada 2015-12-11 13:46 ` Daniel Schwierzeck 2016-01-20 21:01 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 7/8] powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE " Masahiro Yamada ` (3 subsequent siblings) 9 siblings, 2 replies; 28+ messages in thread From: Masahiro Yamada @ 2015-12-11 3:22 UTC (permalink / raw) To: u-boot We can delete board/pb1x00/config.mk by moving the define of CONFIG_SYS_TEXT_BASE to somewhere else. Other MIPS boards are still defining it in include/config/${BOARD}.h, so I am following that way here. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- board/pb1x00/config.mk | 16 ---------------- include/configs/pb1x00.h | 5 +++++ 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 board/pb1x00/config.mk diff --git a/board/pb1x00/config.mk b/board/pb1x00/config.mk deleted file mode 100644 index 8f13301..0000000 --- a/board/pb1x00/config.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -# -# AMD development board AMD Alchemy Pb1x00, MIPS32 core -# - -# ROM version -#CONFIG_SYS_TEXT_BASE = 0xbfc00000 - -# SDRAM version -CONFIG_SYS_TEXT_BASE = 0x83800000 diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index 41b7393..f490e79 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -81,6 +81,11 @@ #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) -- 1.9.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 6/8] mips: pb1x00: move CONFIG_SYS_TEXT_BASE away from config.mk 2015-12-11 3:22 ` [U-Boot] [PATCH 6/8] mips: pb1x00: " Masahiro Yamada @ 2015-12-11 13:46 ` Daniel Schwierzeck 2016-01-20 21:01 ` [U-Boot] [U-Boot, " Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Daniel Schwierzeck @ 2015-12-11 13:46 UTC (permalink / raw) To: u-boot Am 11.12.2015 um 04:22 schrieb Masahiro Yamada: > We can delete board/pb1x00/config.mk by moving the define of > CONFIG_SYS_TEXT_BASE to somewhere else. Other MIPS boards are > still defining it in include/config/${BOARD}.h, so I am following > that way here. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > board/pb1x00/config.mk | 16 ---------------- > include/configs/pb1x00.h | 5 +++++ > 2 files changed, 5 insertions(+), 16 deletions(-) > delete mode 100644 board/pb1x00/config.mk > > diff --git a/board/pb1x00/config.mk b/board/pb1x00/config.mk > deleted file mode 100644 > index 8f13301..0000000 > --- a/board/pb1x00/config.mk > +++ /dev/null > @@ -1,16 +0,0 @@ > -# > -# (C) Copyright 2003 > -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -# > -# AMD development board AMD Alchemy Pb1x00, MIPS32 core > -# > - > -# ROM version > -#CONFIG_SYS_TEXT_BASE = 0xbfc00000 > - > -# SDRAM version > -CONFIG_SYS_TEXT_BASE = 0x83800000 > diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h > index 41b7393..f490e79 100644 > --- a/include/configs/pb1x00.h > +++ b/include/configs/pb1x00.h > @@ -81,6 +81,11 @@ > #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) > > Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> -- - Daniel ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [U-Boot, 6/8] mips: pb1x00: move CONFIG_SYS_TEXT_BASE away from config.mk 2015-12-11 3:22 ` [U-Boot] [PATCH 6/8] mips: pb1x00: " Masahiro Yamada 2015-12-11 13:46 ` Daniel Schwierzeck @ 2016-01-20 21:01 ` Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Tom Rini @ 2016-01-20 21:01 UTC (permalink / raw) To: u-boot On Fri, Dec 11, 2015 at 12:22:29PM +0900, Masahiro Yamada wrote: > We can delete board/pb1x00/config.mk by moving the define of > CONFIG_SYS_TEXT_BASE to somewhere else. Other MIPS boards are > still defining it in include/config/${BOARD}.h, so I am following > that way here. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/50a12e40/attachment.sig> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 7/8] powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE from config.mk 2015-12-11 3:22 [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Masahiro Yamada ` (5 preceding siblings ...) 2015-12-11 3:22 ` [U-Boot] [PATCH 6/8] mips: pb1x00: " Masahiro Yamada @ 2015-12-11 3:22 ` Masahiro Yamada 2015-12-11 4:04 ` Stefan Roese 2016-01-20 21:01 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 8/8] kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines Masahiro Yamada ` (2 subsequent siblings) 9 siblings, 2 replies; 28+ messages in thread From: Masahiro Yamada @ 2015-12-11 3:22 UTC (permalink / raw) To: u-boot The include/configs/yucca.h already has the same define: #define CONFIG_SYS_TEXT_BASE 0xfffb0000 Remove the redundant one from board/amcc/yucca/config.mk. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- board/amcc/yucca/config.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/board/amcc/yucca/config.mk b/board/amcc/yucca/config.mk index 05a4162..53d3f34 100644 --- a/board/amcc/yucca/config.mk +++ b/board/amcc/yucca/config.mk @@ -9,12 +9,6 @@ # AMCC 440SPe Reference Platform (yucca) board # -ifeq ($(ramsym),1) -CONFIG_SYS_TEXT_BASE = 0x07FD0000 -else -CONFIG_SYS_TEXT_BASE = 0xfffb0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) -- 1.9.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 7/8] powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE from config.mk 2015-12-11 3:22 ` [U-Boot] [PATCH 7/8] powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE " Masahiro Yamada @ 2015-12-11 4:04 ` Stefan Roese 2016-01-20 21:01 ` [U-Boot] [U-Boot, " Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Stefan Roese @ 2015-12-11 4:04 UTC (permalink / raw) To: u-boot On 11.12.2015 04:22, Masahiro Yamada wrote: > The include/configs/yucca.h already has the same define: > #define CONFIG_SYS_TEXT_BASE 0xfffb0000 > > Remove the redundant one from board/amcc/yucca/config.mk. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > board/amcc/yucca/config.mk | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/board/amcc/yucca/config.mk b/board/amcc/yucca/config.mk > index 05a4162..53d3f34 100644 > --- a/board/amcc/yucca/config.mk > +++ b/board/amcc/yucca/config.mk > @@ -9,12 +9,6 @@ > # AMCC 440SPe Reference Platform (yucca) board > # > > -ifeq ($(ramsym),1) > -CONFIG_SYS_TEXT_BASE = 0x07FD0000 > -else > -CONFIG_SYS_TEXT_BASE = 0xfffb0000 > -endif > - > PLATFORM_CPPFLAGS += -DCONFIG_440=1 > > ifeq ($(debug),1) > Acked-by: Stefan Roese <sr@denx.de> Thanks, Stefan ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [U-Boot, 7/8] powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE from config.mk 2015-12-11 3:22 ` [U-Boot] [PATCH 7/8] powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE " Masahiro Yamada 2015-12-11 4:04 ` Stefan Roese @ 2016-01-20 21:01 ` Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Tom Rini @ 2016-01-20 21:01 UTC (permalink / raw) To: u-boot On Fri, Dec 11, 2015 at 12:22:30PM +0900, Masahiro Yamada wrote: > The include/configs/yucca.h already has the same define: > #define CONFIG_SYS_TEXT_BASE 0xfffb0000 > > Remove the redundant one from board/amcc/yucca/config.mk. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Acked-by: Stefan Roese <sr@denx.de> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/002fd53f/attachment.sig> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 8/8] kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines 2015-12-11 3:22 [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Masahiro Yamada ` (6 preceding siblings ...) 2015-12-11 3:22 ` [U-Boot] [PATCH 7/8] powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE " Masahiro Yamada @ 2015-12-11 3:22 ` Masahiro Yamada 2015-12-11 4:05 ` Stefan Roese 2016-01-20 21:01 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-13 19:54 ` [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Angelo Dureghello 2015-12-14 9:52 ` Angelo Dureghello 9 siblings, 2 replies; 28+ messages in thread From: Masahiro Yamada @ 2015-12-11 3:22 UTC (permalink / raw) To: u-boot Now, there is no board defining CONFIG_SYS_TEXT_BASE by its config.mk, so this workaround is no longer needed. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Makefile b/Makefile index 028f0be..1b18300 100644 --- a/Makefile +++ b/Makefile @@ -591,12 +591,6 @@ endif # Prohibit date/time macros, which would make the build non-deterministic KBUILD_CFLAGS += $(call cc-option,-Werror=date-time) -ifneq ($(CONFIG_SYS_TEXT_BASE),) -KBUILD_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) -endif - -export CONFIG_SYS_TEXT_BASE - include scripts/Makefile.extrawarn # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments -- 1.9.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 8/8] kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines 2015-12-11 3:22 ` [U-Boot] [PATCH 8/8] kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines Masahiro Yamada @ 2015-12-11 4:05 ` Stefan Roese 2016-01-20 21:01 ` [U-Boot] [U-Boot, " Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Stefan Roese @ 2015-12-11 4:05 UTC (permalink / raw) To: u-boot On 11.12.2015 04:22, Masahiro Yamada wrote: > Now, there is no board defining CONFIG_SYS_TEXT_BASE by its config.mk, > so this workaround is no longer needed. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > Makefile | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/Makefile b/Makefile > index 028f0be..1b18300 100644 > --- a/Makefile > +++ b/Makefile > @@ -591,12 +591,6 @@ endif > # Prohibit date/time macros, which would make the build non-deterministic > KBUILD_CFLAGS += $(call cc-option,-Werror=date-time) > > -ifneq ($(CONFIG_SYS_TEXT_BASE),) > -KBUILD_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) > -endif > - > -export CONFIG_SYS_TEXT_BASE > - > include scripts/Makefile.extrawarn > > # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments > Acked-by: Stefan Roese <sr@denx.de> Thanks, Stefan ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [U-Boot, 8/8] kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines 2015-12-11 3:22 ` [U-Boot] [PATCH 8/8] kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines Masahiro Yamada 2015-12-11 4:05 ` Stefan Roese @ 2016-01-20 21:01 ` Tom Rini 1 sibling, 0 replies; 28+ messages in thread From: Tom Rini @ 2016-01-20 21:01 UTC (permalink / raw) To: u-boot On Fri, Dec 11, 2015 at 12:22:31PM +0900, Masahiro Yamada wrote: > Now, there is no board defining CONFIG_SYS_TEXT_BASE by its config.mk, > so this workaround is no longer needed. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Acked-by: Stefan Roese <sr@denx.de> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/cb61fe87/attachment.sig> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE 2015-12-11 3:22 [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Masahiro Yamada ` (7 preceding siblings ...) 2015-12-11 3:22 ` [U-Boot] [PATCH 8/8] kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines Masahiro Yamada @ 2015-12-13 19:54 ` Angelo Dureghello 2015-12-14 9:52 ` Angelo Dureghello 9 siblings, 0 replies; 28+ messages in thread From: Angelo Dureghello @ 2015-12-13 19:54 UTC (permalink / raw) To: u-boot On 11/12/2015 04:22, Masahiro Yamada wrote: > Currently, CONFIG_SYS_TEXT_BASE is defined in various ways: > > [1] by board/${VENDOR}/${BOARD}/config.mk > > [2] by CONFIG_SYS_EXTRA_OPTIONS > (This was "options" field of boards.cfg before Kconfig conversion) > > [3] by include/configs/${BOARD}.h > > [4] by configs/${BOARD}_defconfig > > Kbuild is still keeping some tricky code for [1]. > We have some boards using [1] for M68K, MIPS, PowerPC. > > Convert them and drop the workaround code from Kbuild. > > I built all the boards and compared the checksum of the binary images > for all of them. > I confirmed no impact on these moves. This series should be OK. > > > > Masahiro Yamada (8): > m68k: move CONFIG_SYS_TEXT_BASE to defconfig files > m68k: M54418TWR: drop board/freescale/m54418twr/config.mk > microblaze: move CONFIG_SYS_TEXT_BASE to defconfig > mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk > mips: dbau1x00: move CONFIG_SYS_TEXT_BASE away from config.mk > mips: pb1x00: move CONFIG_SYS_TEXT_BASE away from config.mk > powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE from config.mk > kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines > > Kconfig | 3 ++- > Makefile | 6 ------ > arch/m68k/cpu/mcf5445x/start.S | 8 ++++---- > board/amcc/yucca/config.mk | 6 ------ > board/cobra5272/config.mk | 9 --------- > board/dbau1x00/config.mk | 16 ---------------- > board/freescale/m5208evbe/config.mk | 9 --------- > board/freescale/m5249evb/config.mk | 9 --------- > board/freescale/m5253demo/config.mk | 9 --------- > board/freescale/m5253evbe/config.mk | 9 --------- > board/freescale/m5272c3/config.mk | 9 --------- > board/freescale/m5275evb/config.mk | 9 --------- > board/freescale/m5282evb/config.mk | 9 --------- > board/freescale/m53017evb/config.mk | 9 --------- > board/freescale/m5329evb/config.mk | 9 --------- > board/freescale/m5373evb/config.mk | 9 --------- > board/freescale/m54418twr/config.mk | 7 ------- > board/freescale/m547xevb/config.mk | 9 --------- > board/freescale/m548xevb/config.mk | 9 --------- > board/micronas/vct/config.mk | 13 ------------- > board/pb1x00/config.mk | 16 ---------------- > board/sysam/amcore/config.mk | 7 ------- > board/xilinx/microblaze-generic/config.mk | 2 -- > configs/M5208EVBE_defconfig | 1 + > configs/M52277EVB_defconfig | 3 ++- > configs/M52277EVB_stmicro_defconfig | 3 ++- > configs/M5235EVB_Flash32_defconfig | 3 ++- > configs/M5235EVB_defconfig | 2 +- > configs/M5249EVB_defconfig | 1 + > configs/M5253DEMO_defconfig | 1 + > configs/M5253EVBE_defconfig | 1 + > configs/M5272C3_defconfig | 1 + > configs/M5275EVB_defconfig | 1 + > configs/M5282EVB_defconfig | 1 + > configs/M53017EVB_defconfig | 1 + > configs/M5329AFEE_defconfig | 1 + > configs/M5329BFEE_defconfig | 1 + > configs/M5373EVB_defconfig | 1 + > configs/M54418TWR_defconfig | 3 ++- > configs/M54418TWR_nand_mii_defconfig | 3 ++- > configs/M54418TWR_nand_rmii_defconfig | 3 ++- > configs/M54418TWR_nand_rmii_lowfreq_defconfig | 3 ++- > configs/M54418TWR_serial_mii_defconfig | 3 ++- > configs/M54418TWR_serial_rmii_defconfig | 3 ++- > configs/M54451EVB_defconfig | 3 ++- > configs/M54451EVB_stmicro_defconfig | 3 ++- > configs/M54455EVB_a66_defconfig | 3 ++- > configs/M54455EVB_defconfig | 3 ++- > configs/M54455EVB_i66_defconfig | 3 ++- > configs/M54455EVB_intel_defconfig | 3 ++- > configs/M54455EVB_stm33_defconfig | 3 ++- > configs/M5475AFE_defconfig | 1 + > configs/M5475BFE_defconfig | 1 + > configs/M5475CFE_defconfig | 1 + > configs/M5475DFE_defconfig | 1 + > configs/M5475EFE_defconfig | 1 + > configs/M5475FFE_defconfig | 1 + > configs/M5475GFE_defconfig | 1 + > configs/M5485AFE_defconfig | 1 + > configs/M5485BFE_defconfig | 1 + > configs/M5485CFE_defconfig | 1 + > configs/M5485DFE_defconfig | 1 + > configs/M5485EFE_defconfig | 1 + > configs/M5485FFE_defconfig | 1 + > configs/M5485GFE_defconfig | 1 + > configs/M5485HFE_defconfig | 1 + > configs/amcore_defconfig | 1 + > configs/cobra5272_defconfig | 1 + > configs/eb_cpu5282_defconfig | 3 ++- > configs/eb_cpu5282_internal_defconfig | 3 ++- > configs/microblaze-generic_defconfig | 1 + > include/configs/M54418TWR.h | 2 +- > include/configs/dbau1x00.h | 5 +++++ > include/configs/pb1x00.h | 5 +++++ > include/configs/vct.h | 1 + > 75 files changed, 84 insertions(+), 215 deletions(-) > delete mode 100644 board/cobra5272/config.mk > delete mode 100644 board/dbau1x00/config.mk > delete mode 100644 board/freescale/m5208evbe/config.mk > delete mode 100644 board/freescale/m5249evb/config.mk > delete mode 100644 board/freescale/m5253demo/config.mk > delete mode 100644 board/freescale/m5253evbe/config.mk > delete mode 100644 board/freescale/m5272c3/config.mk > delete mode 100644 board/freescale/m5275evb/config.mk > delete mode 100644 board/freescale/m5282evb/config.mk > delete mode 100644 board/freescale/m53017evb/config.mk > delete mode 100644 board/freescale/m5329evb/config.mk > delete mode 100644 board/freescale/m5373evb/config.mk > delete mode 100644 board/freescale/m54418twr/config.mk > delete mode 100644 board/freescale/m547xevb/config.mk > delete mode 100644 board/freescale/m548xevb/config.mk > delete mode 100644 board/micronas/vct/config.mk > delete mode 100644 board/pb1x00/config.mk > delete mode 100644 board/sysam/amcore/config.mk > Acked-by: Angelo Dureghello <angelo@sysam.it> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE 2015-12-11 3:22 [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Masahiro Yamada ` (8 preceding siblings ...) 2015-12-13 19:54 ` [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Angelo Dureghello @ 2015-12-14 9:52 ` Angelo Dureghello 9 siblings, 0 replies; 28+ messages in thread From: Angelo Dureghello @ 2015-12-14 9:52 UTC (permalink / raw) To: u-boot On 11/12/2015 04:22, Masahiro Yamada wrote: > Currently, CONFIG_SYS_TEXT_BASE is defined in various ways: > > [1] by board/${VENDOR}/${BOARD}/config.mk > > [2] by CONFIG_SYS_EXTRA_OPTIONS > (This was "options" field of boards.cfg before Kconfig conversion) > > [3] by include/configs/${BOARD}.h > > [4] by configs/${BOARD}_defconfig > > Kbuild is still keeping some tricky code for [1]. > We have some boards using [1] for M68K, MIPS, PowerPC. > > Convert them and drop the workaround code from Kbuild. > > I built all the boards and compared the checksum of the binary images > for all of them. > I confirmed no impact on these moves. This series should be OK. > > > > Masahiro Yamada (8): > m68k: move CONFIG_SYS_TEXT_BASE to defconfig files > m68k: M54418TWR: drop board/freescale/m54418twr/config.mk > microblaze: move CONFIG_SYS_TEXT_BASE to defconfig > mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk > mips: dbau1x00: move CONFIG_SYS_TEXT_BASE away from config.mk > mips: pb1x00: move CONFIG_SYS_TEXT_BASE away from config.mk > powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE from config.mk > kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines > > Kconfig | 3 ++- > Makefile | 6 ------ > arch/m68k/cpu/mcf5445x/start.S | 8 ++++---- > board/amcc/yucca/config.mk | 6 ------ > board/cobra5272/config.mk | 9 --------- > board/dbau1x00/config.mk | 16 ---------------- > board/freescale/m5208evbe/config.mk | 9 --------- > board/freescale/m5249evb/config.mk | 9 --------- > board/freescale/m5253demo/config.mk | 9 --------- > board/freescale/m5253evbe/config.mk | 9 --------- > board/freescale/m5272c3/config.mk | 9 --------- > board/freescale/m5275evb/config.mk | 9 --------- > board/freescale/m5282evb/config.mk | 9 --------- > board/freescale/m53017evb/config.mk | 9 --------- > board/freescale/m5329evb/config.mk | 9 --------- > board/freescale/m5373evb/config.mk | 9 --------- > board/freescale/m54418twr/config.mk | 7 ------- > board/freescale/m547xevb/config.mk | 9 --------- > board/freescale/m548xevb/config.mk | 9 --------- > board/micronas/vct/config.mk | 13 ------------- > board/pb1x00/config.mk | 16 ---------------- > board/sysam/amcore/config.mk | 7 ------- > board/xilinx/microblaze-generic/config.mk | 2 -- > configs/M5208EVBE_defconfig | 1 + > configs/M52277EVB_defconfig | 3 ++- > configs/M52277EVB_stmicro_defconfig | 3 ++- > configs/M5235EVB_Flash32_defconfig | 3 ++- > configs/M5235EVB_defconfig | 2 +- > configs/M5249EVB_defconfig | 1 + > configs/M5253DEMO_defconfig | 1 + > configs/M5253EVBE_defconfig | 1 + > configs/M5272C3_defconfig | 1 + > configs/M5275EVB_defconfig | 1 + > configs/M5282EVB_defconfig | 1 + > configs/M53017EVB_defconfig | 1 + > configs/M5329AFEE_defconfig | 1 + > configs/M5329BFEE_defconfig | 1 + > configs/M5373EVB_defconfig | 1 + > configs/M54418TWR_defconfig | 3 ++- > configs/M54418TWR_nand_mii_defconfig | 3 ++- > configs/M54418TWR_nand_rmii_defconfig | 3 ++- > configs/M54418TWR_nand_rmii_lowfreq_defconfig | 3 ++- > configs/M54418TWR_serial_mii_defconfig | 3 ++- > configs/M54418TWR_serial_rmii_defconfig | 3 ++- > configs/M54451EVB_defconfig | 3 ++- > configs/M54451EVB_stmicro_defconfig | 3 ++- > configs/M54455EVB_a66_defconfig | 3 ++- > configs/M54455EVB_defconfig | 3 ++- > configs/M54455EVB_i66_defconfig | 3 ++- > configs/M54455EVB_intel_defconfig | 3 ++- > configs/M54455EVB_stm33_defconfig | 3 ++- > configs/M5475AFE_defconfig | 1 + > configs/M5475BFE_defconfig | 1 + > configs/M5475CFE_defconfig | 1 + > configs/M5475DFE_defconfig | 1 + > configs/M5475EFE_defconfig | 1 + > configs/M5475FFE_defconfig | 1 + > configs/M5475GFE_defconfig | 1 + > configs/M5485AFE_defconfig | 1 + > configs/M5485BFE_defconfig | 1 + > configs/M5485CFE_defconfig | 1 + > configs/M5485DFE_defconfig | 1 + > configs/M5485EFE_defconfig | 1 + > configs/M5485FFE_defconfig | 1 + > configs/M5485GFE_defconfig | 1 + > configs/M5485HFE_defconfig | 1 + > configs/amcore_defconfig | 1 + > configs/cobra5272_defconfig | 1 + > configs/eb_cpu5282_defconfig | 3 ++- > configs/eb_cpu5282_internal_defconfig | 3 ++- > configs/microblaze-generic_defconfig | 1 + > include/configs/M54418TWR.h | 2 +- > include/configs/dbau1x00.h | 5 +++++ > include/configs/pb1x00.h | 5 +++++ > include/configs/vct.h | 1 + > 75 files changed, 84 insertions(+), 215 deletions(-) > delete mode 100644 board/cobra5272/config.mk > delete mode 100644 board/dbau1x00/config.mk > delete mode 100644 board/freescale/m5208evbe/config.mk > delete mode 100644 board/freescale/m5249evb/config.mk > delete mode 100644 board/freescale/m5253demo/config.mk > delete mode 100644 board/freescale/m5253evbe/config.mk > delete mode 100644 board/freescale/m5272c3/config.mk > delete mode 100644 board/freescale/m5275evb/config.mk > delete mode 100644 board/freescale/m5282evb/config.mk > delete mode 100644 board/freescale/m53017evb/config.mk > delete mode 100644 board/freescale/m5329evb/config.mk > delete mode 100644 board/freescale/m5373evb/config.mk > delete mode 100644 board/freescale/m54418twr/config.mk > delete mode 100644 board/freescale/m547xevb/config.mk > delete mode 100644 board/freescale/m548xevb/config.mk > delete mode 100644 board/micronas/vct/config.mk > delete mode 100644 board/pb1x00/config.mk > delete mode 100644 board/sysam/amcore/config.mk > Acked-by: Angelo Dureghello <angelo@sysam.it> ^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2016-01-20 21:01 UTC | newest] Thread overview: 28+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-12-11 3:22 [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Masahiro Yamada 2015-12-11 3:22 ` [U-Boot] [PATCH 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files Masahiro Yamada 2015-12-13 19:55 ` Angelo Dureghello 2016-01-06 0:24 ` Simon Glass 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 2/8] m68k: M54418TWR: drop board/freescale/m54418twr/config.mk Masahiro Yamada 2015-12-13 19:55 ` Angelo Dureghello 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 3/8] microblaze: move CONFIG_SYS_TEXT_BASE to defconfig Masahiro Yamada 2015-12-11 7:32 ` Michal Simek 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 4/8] mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk Masahiro Yamada 2015-12-11 13:45 ` Daniel Schwierzeck 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 5/8] mips: dbau1x00: " Masahiro Yamada 2015-12-11 13:46 ` Daniel Schwierzeck 2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 6/8] mips: pb1x00: " Masahiro Yamada 2015-12-11 13:46 ` Daniel Schwierzeck 2016-01-20 21:01 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 7/8] powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE " Masahiro Yamada 2015-12-11 4:04 ` Stefan Roese 2016-01-20 21:01 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-11 3:22 ` [U-Boot] [PATCH 8/8] kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines Masahiro Yamada 2015-12-11 4:05 ` Stefan Roese 2016-01-20 21:01 ` [U-Boot] [U-Boot, " Tom Rini 2015-12-13 19:54 ` [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Angelo Dureghello 2015-12-14 9:52 ` Angelo Dureghello
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox