[U-Boot] [PATCH 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files

Angelo Dureghello
2015-12-13T19:55:11Z

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>