Browse Source

m68k: move CONFIG_SYS_TEXT_BASE to defconfig files

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 at sysam.it>
Reviewed-by: Simon Glass <sjg@chromium.org>
Masahiro Yamada 8 years ago
parent
commit
c6e18144b6
62 changed files with 67 additions and 144 deletions
  1. 2 1
      Kconfig
  2. 0 9
      board/cobra5272/config.mk
  3. 0 9
      board/freescale/m5208evbe/config.mk
  4. 0 9
      board/freescale/m5249evb/config.mk
  5. 0 9
      board/freescale/m5253demo/config.mk
  6. 0 9
      board/freescale/m5253evbe/config.mk
  7. 0 9
      board/freescale/m5272c3/config.mk
  8. 0 9
      board/freescale/m5275evb/config.mk
  9. 0 9
      board/freescale/m5282evb/config.mk
  10. 0 9
      board/freescale/m53017evb/config.mk
  11. 0 9
      board/freescale/m5329evb/config.mk
  12. 0 9
      board/freescale/m5373evb/config.mk
  13. 0 9
      board/freescale/m547xevb/config.mk
  14. 0 9
      board/freescale/m548xevb/config.mk
  15. 0 7
      board/sysam/amcore/config.mk
  16. 1 0
      configs/M5208EVBE_defconfig
  17. 2 1
      configs/M52277EVB_defconfig
  18. 2 1
      configs/M52277EVB_stmicro_defconfig
  19. 2 1
      configs/M5235EVB_Flash32_defconfig
  20. 1 1
      configs/M5235EVB_defconfig
  21. 1 0
      configs/M5249EVB_defconfig
  22. 1 0
      configs/M5253DEMO_defconfig
  23. 1 0
      configs/M5253EVBE_defconfig
  24. 1 0
      configs/M5272C3_defconfig
  25. 1 0
      configs/M5275EVB_defconfig
  26. 1 0
      configs/M5282EVB_defconfig
  27. 1 0
      configs/M53017EVB_defconfig
  28. 1 0
      configs/M5329AFEE_defconfig
  29. 1 0
      configs/M5329BFEE_defconfig
  30. 1 0
      configs/M5373EVB_defconfig
  31. 2 1
      configs/M54418TWR_defconfig
  32. 2 1
      configs/M54418TWR_nand_mii_defconfig
  33. 2 1
      configs/M54418TWR_nand_rmii_defconfig
  34. 2 1
      configs/M54418TWR_nand_rmii_lowfreq_defconfig
  35. 2 1
      configs/M54418TWR_serial_mii_defconfig
  36. 2 1
      configs/M54418TWR_serial_rmii_defconfig
  37. 2 1
      configs/M54451EVB_defconfig
  38. 2 1
      configs/M54451EVB_stmicro_defconfig
  39. 2 1
      configs/M54455EVB_a66_defconfig
  40. 2 1
      configs/M54455EVB_defconfig
  41. 2 1
      configs/M54455EVB_i66_defconfig
  42. 2 1
      configs/M54455EVB_intel_defconfig
  43. 2 1
      configs/M54455EVB_stm33_defconfig
  44. 1 0
      configs/M5475AFE_defconfig
  45. 1 0
      configs/M5475BFE_defconfig
  46. 1 0
      configs/M5475CFE_defconfig
  47. 1 0
      configs/M5475DFE_defconfig
  48. 1 0
      configs/M5475EFE_defconfig
  49. 1 0
      configs/M5475FFE_defconfig
  50. 1 0
      configs/M5475GFE_defconfig
  51. 1 0
      configs/M5485AFE_defconfig
  52. 1 0
      configs/M5485BFE_defconfig
  53. 1 0
      configs/M5485CFE_defconfig
  54. 1 0
      configs/M5485DFE_defconfig
  55. 1 0
      configs/M5485EFE_defconfig
  56. 1 0
      configs/M5485FFE_defconfig
  57. 1 0
      configs/M5485GFE_defconfig
  58. 1 0
      configs/M5485HFE_defconfig
  59. 1 0
      configs/amcore_defconfig
  60. 1 0
      configs/cobra5272_defconfig
  61. 2 1
      configs/eb_cpu5282_defconfig
  62. 2 1
      configs/eb_cpu5282_internal_defconfig

+ 2 - 1
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

+ 0 - 9
board/cobra5272/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0xffe00000

+ 0 - 9
board/freescale/m5208evbe/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0

+ 0 - 9
board/freescale/m5249evb/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0xffe00000

+ 0 - 9
board/freescale/m5253demo/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0xFF800000

+ 0 - 9
board/freescale/m5253evbe/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0xffe00000

+ 0 - 9
board/freescale/m5272c3/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0xffe00000

+ 0 - 9
board/freescale/m5275evb/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0xffe00000

+ 0 - 9
board/freescale/m5282evb/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0xFFE00000

+ 0 - 9
board/freescale/m53017evb/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0

+ 0 - 9
board/freescale/m5329evb/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0

+ 0 - 9
board/freescale/m5373evb/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0

+ 0 - 9
board/freescale/m547xevb/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0xFF800000

+ 0 - 9
board/freescale/m548xevb/config.mk

@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# Coldfire contribution by Bernhard Kuhn <bkuhn@metrowerks.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0xFF800000

+ 0 - 7
board/sysam/amcore/config.mk

@@ -1,7 +0,0 @@
-#
-# (C) Copyright 2014  Angelo Dureghello <angelo@sysam.it>
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-CONFIG_SYS_TEXT_BASE = 0xffc00000

+ 1 - 0
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 2 - 1
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

+ 2 - 1
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