diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-07 21:51:12 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-18 22:07:10 +0200 |
| commit | 14d0a02a168b36e87665b8d7f42fa3e88263d26d (patch) | |
| tree | 576843229c10eb3e8836dc40a12d3f6f0c26a3ce /board | |
| parent | d24f2d321d8e78e990d100000d8efc4845c78b1c (diff) | |
Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE
The change is currently needed to be able to remove the board
configuration scripting from the top level Makefile and replace it by
a simple, table driven script.
Moving this configuration setting into the "CONFIG_*" name space is
also desirable because it is needed if we ever should move forward to
a Kconfig driven configuration system.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board')
515 files changed, 902 insertions, 847 deletions
diff --git a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c index 1f76dd91c..d64ad1b70 100644 --- a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c +++ b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c @@ -43,7 +43,7 @@ unsigned long display_height; int checkboard (void) { puts ("Board: MCF-EV1 + MCF-EV23 (BuS Elektronik GmbH & Co. KG)\n"); -#if (TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) +#if (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) puts (" Boot from Internal FLASH\n"); #endif diff --git a/board/BuS/EB+MCF-EV123/config.mk b/board/BuS/EB+MCF-EV123/config.mk index f03e3962d..50185aead 100644 --- a/board/BuS/EB+MCF-EV123/config.mk +++ b/board/BuS/EB+MCF-EV123/config.mk @@ -23,6 +23,6 @@ # sinclude $(OBJTREE)/board/$(BOARDDIR)/textbase.mk -ifndef TEXT_BASE -TEXT_BASE = 0xFE000000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFE000000 endif diff --git a/board/BuS/EB+MCF-EV123/textbase.mk b/board/BuS/EB+MCF-EV123/textbase.mk index ecde6ed8b..b97c034b2 100644 --- a/board/BuS/EB+MCF-EV123/textbase.mk +++ b/board/BuS/EB+MCF-EV123/textbase.mk @@ -1 +1 @@ -TEXT_BASE = 0xFFE00000 +CONFIG_SYS_TEXT_BASE = 0xFFE00000 diff --git a/board/BuS/eb_cpux9k2/config.mk b/board/BuS/eb_cpux9k2/config.mk index ff2cfd170..e554a4500 100644 --- a/board/BuS/eb_cpux9k2/config.mk +++ b/board/BuS/eb_cpux9k2/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x23f00000 +CONFIG_SYS_TEXT_BASE = 0x23f00000 diff --git a/board/LEOX/elpt860/config.mk b/board/LEOX/elpt860/config.mk index defc36080..c9ba3ff8a 100644 --- a/board/LEOX/elpt860/config.mk +++ b/board/LEOX/elpt860/config.mk @@ -32,5 +32,5 @@ # ELPT860 board # -TEXT_BASE = 0x02000000 -#TEXT_BASE = 0x00FB0000 +CONFIG_SYS_TEXT_BASE = 0x02000000 +#CONFIG_SYS_TEXT_BASE = 0x00FB0000 diff --git a/board/LaCie/edminiv2/config.mk b/board/LaCie/edminiv2/config.mk index 3dec1aaee..d07642f5c 100644 --- a/board/LaCie/edminiv2/config.mk +++ b/board/LaCie/edminiv2/config.mk @@ -24,4 +24,4 @@ # MA 02110-1301 USA # -TEXT_BASE = 0x00100000 +CONFIG_SYS_TEXT_BASE = 0x00100000 diff --git a/board/Marvell/db64360/config.mk b/board/Marvell/db64360/config.mk index 0e42b48e1..776050530 100644 --- a/board/Marvell/db64360/config.mk +++ b/board/Marvell/db64360/config.mk @@ -25,4 +25,4 @@ # EVB64360 boards # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 diff --git a/board/Marvell/db64460/config.mk b/board/Marvell/db64460/config.mk index 5a434d9bc..bcb50620a 100644 --- a/board/Marvell/db64460/config.mk +++ b/board/Marvell/db64460/config.mk @@ -25,4 +25,4 @@ # EVB64460 boards # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 diff --git a/board/Marvell/guruplug/config.mk b/board/Marvell/guruplug/config.mk index caa26b6cf..12d7737be 100644 --- a/board/Marvell/guruplug/config.mk +++ b/board/Marvell/guruplug/config.mk @@ -22,6 +22,6 @@ # MA 02110-1301 USA # -TEXT_BASE = 0x00600000 +CONFIG_SYS_TEXT_BASE = 0x00600000 KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg diff --git a/board/Marvell/mv88f6281gtw_ge/config.mk b/board/Marvell/mv88f6281gtw_ge/config.mk index 2bd9f79fc..761c2bb74 100644 --- a/board/Marvell/mv88f6281gtw_ge/config.mk +++ b/board/Marvell/mv88f6281gtw_ge/config.mk @@ -22,7 +22,7 @@ # MA 02110-1301 USA # -TEXT_BASE = 0x00600000 +CONFIG_SYS_TEXT_BASE = 0x00600000 # Kirkwood Boot Image configuration file KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg diff --git a/board/Marvell/openrd_base/config.mk b/board/Marvell/openrd_base/config.mk index 8ae355eb3..5a49280e7 100644 --- a/board/Marvell/openrd_base/config.mk +++ b/board/Marvell/openrd_base/config.mk @@ -27,7 +27,7 @@ # MA 02110-1301 USA # -TEXT_BASE = 0x00600000 +CONFIG_SYS_TEXT_BASE = 0x00600000 # Kirkwood Boot Image configuration file KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg diff --git a/board/Marvell/rd6281a/config.mk b/board/Marvell/rd6281a/config.mk index 2bd9f79fc..761c2bb74 100644 --- a/board/Marvell/rd6281a/config.mk +++ b/board/Marvell/rd6281a/config.mk @@ -22,7 +22,7 @@ # MA 02110-1301 USA # -TEXT_BASE = 0x00600000 +CONFIG_SYS_TEXT_BASE = 0x00600000 # Kirkwood Boot Image configuration file KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg diff --git a/board/Marvell/sheevaplug/config.mk b/board/Marvell/sheevaplug/config.mk index 2bd9f79fc..761c2bb74 100644 --- a/board/Marvell/sheevaplug/config.mk +++ b/board/Marvell/sheevaplug/config.mk @@ -22,7 +22,7 @@ # MA 02110-1301 USA # -TEXT_BASE = 0x00600000 +CONFIG_SYS_TEXT_BASE = 0x00600000 # Kirkwood Boot Image configuration file KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg diff --git a/board/RPXClassic/config.mk b/board/RPXClassic/config.mk index ae455e120..77c7308fd 100644 --- a/board/RPXClassic/config.mk +++ b/board/RPXClassic/config.mk @@ -26,4 +26,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xff000000 +CONFIG_SYS_TEXT_BASE = 0xff000000 diff --git a/board/RPXlite/config.mk b/board/RPXlite/config.mk index 6536b7761..dfc2f0577 100644 --- a/board/RPXlite/config.mk +++ b/board/RPXlite/config.mk @@ -25,4 +25,4 @@ # RPXlite boards # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 diff --git a/board/RPXlite_dw/config.mk b/board/RPXlite_dw/config.mk index 797091095..95b6f669c 100644 --- a/board/RPXlite_dw/config.mk +++ b/board/RPXlite_dw/config.mk @@ -26,4 +26,4 @@ # RPXlite dw boards : lite_dw # -TEXT_BASE = 0xff000000 +CONFIG_SYS_TEXT_BASE = 0xff000000 diff --git a/board/RRvision/config.mk b/board/RRvision/config.mk index ab1c8d6cc..a39b2306c 100644 --- a/board/RRvision/config.mk +++ b/board/RRvision/config.mk @@ -25,4 +25,4 @@ # RedRock vision boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/a3000/config.mk b/board/a3000/config.mk index 798e0321d..7ab93bc16 100644 --- a/board/a3000/config.mk +++ b/board/a3000/config.mk @@ -25,6 +25,6 @@ # Artis A-3000 boards # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/actux1/config.mk b/board/actux1/config.mk index a0dbe0bc4..dd1d8d3ad 100644 --- a/board/actux1/config.mk +++ b/board/actux1/config.mk @@ -1,4 +1,4 @@ -TEXT_BASE = 0x00e00000 +CONFIG_SYS_TEXT_BASE = 0x00e00000 # include NPE ethernet driver BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a diff --git a/board/actux2/config.mk b/board/actux2/config.mk index a0dbe0bc4..dd1d8d3ad 100644 --- a/board/actux2/config.mk +++ b/board/actux2/config.mk @@ -1,4 +1,4 @@ -TEXT_BASE = 0x00e00000 +CONFIG_SYS_TEXT_BASE = 0x00e00000 # include NPE ethernet driver BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a diff --git a/board/actux3/config.mk b/board/actux3/config.mk index a0dbe0bc4..dd1d8d3ad 100644 --- a/board/actux3/config.mk +++ b/board/actux3/config.mk @@ -1,4 +1,4 @@ -TEXT_BASE = 0x00e00000 +CONFIG_SYS_TEXT_BASE = 0x00e00000 # include NPE ethernet driver BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a diff --git a/board/actux4/config.mk b/board/actux4/config.mk index f2b5fc911..09ae58900 100644 --- a/board/actux4/config.mk +++ b/board/actux4/config.mk @@ -1,4 +1,4 @@ -TEXT_BASE = 0x00e00000 +CONFIG_SYS_TEXT_BASE = 0x00e00000 # include NPE ethernet driver BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a diff --git a/board/adder/config.mk b/board/adder/config.mk index 4691a69ef..aa123887b 100644 --- a/board/adder/config.mk +++ b/board/adder/config.mk @@ -24,4 +24,4 @@ # # Analogue&Micro Adder boards family # -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 diff --git a/board/afeb9260/config.mk b/board/afeb9260/config.mk index 9ce161e55..207769233 100644 --- a/board/afeb9260/config.mk +++ b/board/afeb9260/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x21f00000 +CONFIG_SYS_TEXT_BASE = 0x21f00000 diff --git a/board/alaska/config.mk b/board/alaska/config.mk index 99d28a54f..00d26d2f4 100644 --- a/board/alaska/config.mk +++ b/board/alaska/config.mk @@ -25,7 +25,8 @@ # alaska board # -TEXT_BASE = 0xfff00000 -# TEXT_BASE = 0x00100000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 +# CONFIG_SYS_TEXT_BASE = 0x00100000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/altera/nios2-generic/config.mk b/board/altera/nios2-generic/config.mk index d500133ea..95e75af03 100644 --- a/board/altera/nios2-generic/config.mk +++ b/board/altera/nios2-generic/config.mk @@ -22,7 +22,7 @@ # # we get text_base from board config header, so do not use this -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include diff --git a/board/amcc/acadia/config.mk b/board/amcc/acadia/config.mk index 01db41c37..d5c9ae772 100644 --- a/board/amcc/acadia/config.mk +++ b/board/amcc/acadia/config.mk @@ -27,8 +27,8 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFFF80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFFF80000 endif ifeq ($(debug),1) diff --git a/board/amcc/bamboo/config.mk b/board/amcc/bamboo/config.mk index 72b6bc0c0..cdf8f11c7 100644 --- a/board/amcc/bamboo/config.mk +++ b/board/amcc/bamboo/config.mk @@ -23,8 +23,8 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/bluestone/config.mk b/board/amcc/bluestone/config.mk index e2194e4e0..efb2de48a 100644 --- a/board/amcc/bluestone/config.mk +++ b/board/amcc/bluestone/config.mk @@ -25,8 +25,8 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/bubinga/config.mk b/board/amcc/bubinga/config.mk index 1bdf5e4fc..1646d3423 100644 --- a/board/amcc/bubinga/config.mk +++ b/board/amcc/bubinga/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk index 3d6a6085c..9dd9c4bf8 100644 --- a/board/amcc/canyonlands/config.mk +++ b/board/amcc/canyonlands/config.mk @@ -26,8 +26,8 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFFF80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFFF80000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/ebony/config.mk b/board/amcc/ebony/config.mk index 60d3bf4d2..0b628cfac 100644 --- a/board/amcc/ebony/config.mk +++ b/board/amcc/ebony/config.mk @@ -25,12 +25,12 @@ # esd ADCIOP boards # -#TEXT_BASE = 0xFFFE0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 +CONFIG_SYS_TEXT_BASE = 0x07FD0000 else -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/katmai/config.mk b/board/amcc/katmai/config.mk index ef0cf9672..ca86dca49 100644 --- a/board/amcc/katmai/config.mk +++ b/board/amcc/katmai/config.mk @@ -25,7 +25,7 @@ # AMCC 440SPe Evaluation (Katmai) board # -TEXT_BASE = 0xFFFA0000 +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/kilauea/config.mk b/board/amcc/kilauea/config.mk index b3d3f227f..17ef0d30c 100644 --- a/board/amcc/kilauea/config.mk +++ b/board/amcc/kilauea/config.mk @@ -23,8 +23,8 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 endif ifeq ($(debug),1) diff --git a/board/amcc/luan/config.mk b/board/amcc/luan/config.mk index 5e4182d5b..d8790ceb3 100644 --- a/board/amcc/luan/config.mk +++ b/board/amcc/luan/config.mk @@ -25,12 +25,12 @@ # esd ADCIOP boards # -#TEXT_BASE = 0x00001000 +#CONFIG_SYS_TEXT_BASE = 0x00001000 ifeq ($(ramsym),1) -TEXT_BASE = 0xFBD00000 +CONFIG_SYS_TEXT_BASE = 0xFBD00000 else -TEXT_BASE = 0xFFFB0000 +CONFIG_SYS_TEXT_BASE = 0xFFFB0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/makalu/config.mk b/board/amcc/makalu/config.mk index a46b19724..e0ad62394 100644 --- a/board/amcc/makalu/config.mk +++ b/board/amcc/makalu/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFA0000 +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 diff --git a/board/amcc/ocotea/config.mk b/board/amcc/ocotea/config.mk index b62e776d3..06c519abd 100644 --- a/board/amcc/ocotea/config.mk +++ b/board/amcc/ocotea/config.mk @@ -25,12 +25,12 @@ # AMCC 440GX Reference Platform (Ocotea) board # -#TEXT_BASE = 0xFFFE0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 +CONFIG_SYS_TEXT_BASE = 0x07FD0000 else -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/redwood/config.mk b/board/amcc/redwood/config.mk index 381f2b23d..0d167b298 100644 --- a/board/amcc/redwood/config.mk +++ b/board/amcc/redwood/config.mk @@ -26,9 +26,9 @@ # ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 +CONFIG_SYS_TEXT_BASE = 0x07FD0000 else -TEXT_BASE = 0xfffb0000 +CONFIG_SYS_TEXT_BASE = 0xfffb0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/sequoia/config.mk b/board/amcc/sequoia/config.mk index c8e2dff21..5bce05596 100644 --- a/board/amcc/sequoia/config.mk +++ b/board/amcc/sequoia/config.mk @@ -26,8 +26,8 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFFF80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFFF80000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/taihu/config.mk b/board/amcc/taihu/config.mk index 1bdf5e4fc..1646d3423 100644 --- a/board/amcc/taihu/config.mk +++ b/board/amcc/taihu/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/amcc/taishan/config.mk b/board/amcc/taishan/config.mk index ee5eb1ba6..0b22b6ee0 100644 --- a/board/amcc/taishan/config.mk +++ b/board/amcc/taishan/config.mk @@ -25,12 +25,12 @@ # AMCC 440GX Reference Platform (Taishan) board # -#TEXT_BASE = 0xFFFE0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 +CONFIG_SYS_TEXT_BASE = 0x07FD0000 else -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/walnut/config.mk b/board/amcc/walnut/config.mk index 1bdf5e4fc..1646d3423 100644 --- a/board/amcc/walnut/config.mk +++ b/board/amcc/walnut/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/amcc/yosemite/config.mk b/board/amcc/yosemite/config.mk index df5466e2c..0523aa3b4 100644 --- a/board/amcc/yosemite/config.mk +++ b/board/amcc/yosemite/config.mk @@ -25,12 +25,12 @@ # esd ADCIOP boards # -#TEXT_BASE = 0x00001000 +#CONFIG_SYS_TEXT_BASE = 0x00001000 ifeq ($(ramsym),1) -TEXT_BASE = 0xFBD00000 +CONFIG_SYS_TEXT_BASE = 0xFBD00000 else -TEXT_BASE = 0xFFF80000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/yucca/config.mk b/board/amcc/yucca/config.mk index 3ce3cc171..179df6491 100644 --- a/board/amcc/yucca/config.mk +++ b/board/amcc/yucca/config.mk @@ -26,9 +26,9 @@ # ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 +CONFIG_SYS_TEXT_BASE = 0x07FD0000 else -TEXT_BASE = 0xfffb0000 +CONFIG_SYS_TEXT_BASE = 0xfffb0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amirix/ap1000/config.mk b/board/amirix/ap1000/config.mk index 09c6efa5a..1fdca054d 100644 --- a/board/amirix/ap1000/config.mk +++ b/board/amirix/ap1000/config.mk @@ -24,7 +24,7 @@ # Start at bottom of RAM, but at an aliased address so that it looks # like it's not in RAM. This is a bit of voodoo to allow it to be # run from RAM instead of Flash. -TEXT_BASE = 0x08000000 +CONFIG_SYS_TEXT_BASE = 0x08000000 # Use board specific linker script LDSCRIPT := $(SRCTREE)/board/amirix/ap1000/u-boot.lds diff --git a/board/apollon/config.mk b/board/apollon/config.mk index 2b464e787..66005d427 100644 --- a/board/apollon/config.mk +++ b/board/apollon/config.mk @@ -13,13 +13,13 @@ # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000 # (mem base + reserved) # For use with external or internal boots. -TEXT_BASE = 0x83e80000 +CONFIG_SYS_TEXT_BASE = 0x83e80000 # Used with full SRAM boot. # This is either with a GP system or a signed boot image. # easiest, and safest way to go if you can. -#TEXT_BASE = 0x40270000 +#CONFIG_SYS_TEXT_BASE = 0x40270000 # Handy to get symbols to debug ROM version. -#TEXT_BASE = 0x0 -#TEXT_BASE = 0x08000000 +#CONFIG_SYS_TEXT_BASE = 0x0 +#CONFIG_SYS_TEXT_BASE = 0x08000000 diff --git a/board/apollon/lowlevel_init.S b/board/apollon/lowlevel_init.S index 64550f61e..f066fe44e 100644 --- a/board/apollon/lowlevel_init.S +++ b/board/apollon/lowlevel_init.S @@ -46,7 +46,7 @@ #define SDRAM_BASE_ADDRESS 0x80008000 _TEXT_BASE: - .word TEXT_BASE /* sdram load addr from config.mk */ + .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */ .globl lowlevel_init lowlevel_init: diff --git a/board/armadillo/config.mk b/board/armadillo/config.mk index 23c432f16..ecb8b745c 100644 --- a/board/armadillo/config.mk +++ b/board/armadillo/config.mk @@ -26,4 +26,4 @@ # #address where u-boot will be relocated -TEXT_BASE = 0xc0f80000 +CONFIG_SYS_TEXT_BASE = 0xc0f80000 diff --git a/board/armltd/integrator/config.mk b/board/armltd/integrator/config.mk index 25b79b3e7..8b57af1c5 100644 --- a/board/armltd/integrator/config.mk +++ b/board/armltd/integrator/config.mk @@ -2,4 +2,4 @@ # image should be loaded at 0x01000000 # -TEXT_BASE = 0x01000000 +CONFIG_SYS_TEXT_BASE = 0x01000000 diff --git a/board/armltd/versatile/config.mk b/board/armltd/versatile/config.mk index 25b79b3e7..8b57af1c5 100644 --- a/board/armltd/versatile/config.mk +++ b/board/armltd/versatile/config.mk @@ -2,4 +2,4 @@ # image should be loaded at 0x01000000 # -TEXT_BASE = 0x01000000 +CONFIG_SYS_TEXT_BASE = 0x01000000 diff --git a/board/assabet/config.mk b/board/assabet/config.mk index 74cb41941..d9866a0eb 100644 --- a/board/assabet/config.mk +++ b/board/assabet/config.mk @@ -4,4 +4,4 @@ # The Intel Assabet 1 bank of 32 MiB SDRAM # -TEXT_BASE = 0xc1f00000 +CONFIG_SYS_TEXT_BASE = 0xc1f00000 diff --git a/board/astro/mcf5373l/config.mk b/board/astro/mcf5373l/config.mk index 6316a3029..ad63dd1aa 100644 --- a/board/astro/mcf5373l/config.mk +++ b/board/astro/mcf5373l/config.mk @@ -22,6 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = $(CONFIG_TEXT_BASE) - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/atc/config.mk b/board/atc/config.mk index dd854e7e4..ff00840cd 100644 --- a/board/atc/config.mk +++ b/board/atc/config.mk @@ -30,9 +30,10 @@ # in RAM where U-Boot is loaded at for debugging. # -TEXT_BASE := 0xFF000000 +CONFIG_SYS_TEXT_BASE := 0xFF000000 # RAM version -#TEXT_BASE := 0x100000 +#CONFIG_SYS_TEXT_BASE := 0x100000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/atmel/at91cap9adk/config.mk b/board/atmel/at91cap9adk/config.mk index e241aeea0..797da0eaf 100644 --- a/board/atmel/at91cap9adk/config.mk +++ b/board/atmel/at91cap9adk/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x73000000 +CONFIG_SYS_TEXT_BASE = 0x73000000 diff --git a/board/atmel/at91rm9200dk/config.mk b/board/atmel/at91rm9200dk/config.mk index 9ce161e55..207769233 100644 --- a/board/atmel/at91rm9200dk/config.mk +++ b/board/atmel/at91rm9200dk/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x21f00000 +CONFIG_SYS_TEXT_BASE = 0x21f00000 diff --git a/board/atmel/at91rm9200ek/config.mk b/board/atmel/at91rm9200ek/config.mk index 9ce161e55..207769233 100644 --- a/board/atmel/at91rm9200ek/config.mk +++ b/board/atmel/at91rm9200ek/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x21f00000 +CONFIG_SYS_TEXT_BASE = 0x21f00000 diff --git a/board/atmel/at91sam9260ek/config.mk b/board/atmel/at91sam9260ek/config.mk index ff2cfd170..e554a4500 100644 --- a/board/atmel/at91sam9260ek/config.mk +++ b/board/atmel/at91sam9260ek/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x23f00000 +CONFIG_SYS_TEXT_BASE = 0x23f00000 diff --git a/board/atmel/at91sam9261ek/config.mk b/board/atmel/at91sam9261ek/config.mk index ff2cfd170..e554a4500 100644 --- a/board/atmel/at91sam9261ek/config.mk +++ b/board/atmel/at91sam9261ek/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x23f00000 +CONFIG_SYS_TEXT_BASE = 0x23f00000 diff --git a/board/atmel/at91sam9263ek/config.mk b/board/atmel/at91sam9263ek/config.mk index ff2cfd170..e554a4500 100644 --- a/board/atmel/at91sam9263ek/config.mk +++ b/board/atmel/at91sam9263ek/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x23f00000 +CONFIG_SYS_TEXT_BASE = 0x23f00000 diff --git a/board/atmel/at91sam9m10g45ek/config.mk b/board/atmel/at91sam9m10g45ek/config.mk index 7fe9d0313..9d3c5ae27 100644 --- a/board/atmel/at91sam9m10g45ek/config.mk +++ b/board/atmel/at91sam9m10g45ek/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x73f00000 +CONFIG_SYS_TEXT_BASE = 0x73f00000 diff --git a/board/atmel/at91sam9rlek/config.mk b/board/atmel/at91sam9rlek/config.mk index ff2cfd170..e554a4500 100644 --- a/board/atmel/at91sam9rlek/config.mk +++ b/board/atmel/at91sam9rlek/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x23f00000 +CONFIG_SYS_TEXT_BASE = 0x23f00000 diff --git a/board/atmel/atngw100/config.mk b/board/atmel/atngw100/config.mk index 9a794e5c6..ea76d05df 100644 --- a/board/atmel/atngw100/config.mk +++ b/board/atmel/atngw100/config.mk @@ -1,3 +1,3 @@ -TEXT_BASE = 0x00000000 +CONFIG_SYS_TEXT_BASE = 0x00000000 PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_LDFLAGS += --gc-sections diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk index 40e55fefe..8c03b77f7 100644 --- a/board/atmel/atstk1000/config.mk +++ b/board/atmel/atstk1000/config.mk @@ -1,4 +1,4 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_LDFLAGS += --gc-sections -TEXT_BASE = 0x00000000 +CONFIG_SYS_TEXT_BASE = 0x00000000 LDSCRIPT = $(src)board/atmel/atstk1000/u-boot.lds diff --git a/board/atum8548/config.mk b/board/atum8548/config.mk index a13f52d38..f191e62a6 100644 --- a/board/atum8548/config.mk +++ b/board/atum8548/config.mk @@ -22,8 +22,8 @@ # # atum8548 board -# TEXT_BASE = 0xfff80000 -# TEXT_BASE = 0xfffff000 -ifndef TEXT_BASE -TEXT_BASE = 0xfff80000 +# CONFIG_SYS_TEXT_BASE = 0xfff80000 +# CONFIG_SYS_TEXT_BASE = 0xfffff000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xfff80000 endif diff --git a/board/barco/config.mk b/board/barco/config.mk index f950c07b0..94da3b76c 100644 --- a/board/barco/config.mk +++ b/board/barco/config.mk @@ -25,6 +25,6 @@ # Barco Hydra/SCN boards # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/bc3450/config.mk b/board/bc3450/config.mk index 47e995578..162ac52b0 100644 --- a/board/bc3450/config.mk +++ b/board/bc3450/config.mk @@ -24,18 +24,19 @@ # # BC3450 board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFC000000 boot low (standard configuration with room for max 64 MByte # Flash ROM) # 0x00100000 boot from RAM (for testing only) # -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot low -TEXT_BASE = 0xFC000000 +CONFIG_SYS_TEXT_BASE = 0xFC000000 ## For testing: boot from RAM -# TEXT_BASE = 0x00100000 +# CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/bct-brettl2/config.mk b/board/bct-brettl2/config.mk index dfd94569e..0c02d440d 100644 --- a/board/bct-brettl2/config.mk +++ b/board/bct-brettl2/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf536-0.3 diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk index 30b92a3c4..9a54dbfb8 100644 --- a/board/bf518f-ezbrd/config.mk +++ b/board/bf518f-ezbrd/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf518-0.0 diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk index aaf4541fe..46c09ea8f 100644 --- a/board/bf526-ezbrd/config.mk +++ b/board/bf526-ezbrd/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf526-0.0 diff --git a/board/bf527-ad7160-eval/config.mk b/board/bf527-ad7160-eval/config.mk index 9784810af..a6c272aea 100644 --- a/board/bf527-ad7160-eval/config.mk +++ b/board/bf527-ad7160-eval/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf527-0.2 diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk index 78eebff32..790fe99b0 100644 --- a/board/bf527-ezkit/config.mk +++ b/board/bf527-ezkit/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf527-0.0 diff --git a/board/bf527-sdp/config.mk b/board/bf527-sdp/config.mk index 744e7a5d0..7cb935a2a 100644 --- a/board/bf527-sdp/config.mk +++ b/board/bf527-sdp/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf527-0.2 diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk index 60ec6b6c1..a0d174924 100644 --- a/board/bf533-ezkit/config.mk +++ b/board/bf533-ezkit/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf533-0.3 diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk index 60ec6b6c1..a0d174924 100644 --- a/board/bf533-stamp/config.mk +++ b/board/bf533-stamp/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf533-0.3 diff --git a/board/bf537-minotaur/config.mk b/board/bf537-minotaur/config.mk index 59e9a9c44..de026356d 100644 --- a/board/bf537-minotaur/config.mk +++ b/board/bf537-minotaur/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf537-0.2 diff --git a/board/bf537-pnav/config.mk b/board/bf537-pnav/config.mk index ce8ef3b49..e29d87f59 100644 --- a/board/bf537-pnav/config.mk +++ b/board/bf537-pnav/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf537-0.2 diff --git a/board/bf537-srv1/config.mk b/board/bf537-srv1/config.mk index 59e9a9c44..de026356d 100644 --- a/board/bf537-srv1/config.mk +++ b/board/bf537-srv1/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf537-0.2 diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk index 3bac0adf3..6694f0661 100644 --- a/board/bf537-stamp/config.mk +++ b/board/bf537-stamp/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf537-0.2 diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk index 170a2d56d..4ab139731 100644 --- a/board/bf538f-ezkit/config.mk +++ b/board/bf538f-ezkit/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf538-0.4 diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk index ec3c28e0b..9aa176151 100644 --- a/board/bf548-ezkit/config.mk +++ b/board/bf548-ezkit/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf548-0.0 diff --git a/board/bf561-acvilon/config.mk b/board/bf561-acvilon/config.mk index 221de6524..5c88114ac 100644 --- a/board/bf561-acvilon/config.mk +++ b/board/bf561-acvilon/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf561-0.5 diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk index ff19190a2..19cdefc14 100644 --- a/board/bf561-ezkit/config.mk +++ b/board/bf561-ezkit/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf561-0.3 diff --git a/board/blackstamp/config.mk b/board/blackstamp/config.mk index 5035cb9c5..0ca3c904a 100644 --- a/board/blackstamp/config.mk +++ b/board/blackstamp/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf532-0.5 diff --git a/board/blackvme/config.mk b/board/blackvme/config.mk index 8d0fe3934..4d6e0ba8c 100644 --- a/board/blackvme/config.mk +++ b/board/blackvme/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf561-0.5 diff --git a/board/bmw/config.mk b/board/bmw/config.mk index f9915496a..4a05c8c12 100644 --- a/board/bmw/config.mk +++ b/board/bmw/config.mk @@ -25,8 +25,8 @@ # CU824 board # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 # NOTE: The flags below affect how the BCM570x driver is compiled PLATFORM_CPPFLAGS += -DEMBEDDED -DBIG_ENDIAN_HOST -DINCLUDE_5701_AX_FIX=1\ -DDBG=0 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256\ - -DTEXT_BASE=$(TEXT_BASE) + -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/c2mon/config.mk b/board/c2mon/config.mk index c2d21e2e4..ab80867b8 100644 --- a/board/c2mon/config.mk +++ b/board/c2mon/config.mk @@ -25,4 +25,4 @@ # TTTech C2MON boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/calao/sbc35_a9g20/config.mk b/board/calao/sbc35_a9g20/config.mk index ff2cfd170..e554a4500 100644 --- a/board/calao/sbc35_a9g20/config.mk +++ b/board/calao/sbc35_a9g20/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x23f00000 +CONFIG_SYS_TEXT_BASE = 0x23f00000 diff --git a/board/calao/tny_a9260/config.mk b/board/calao/tny_a9260/config.mk index ff2cfd170..e554a4500 100644 --- a/board/calao/tny_a9260/config.mk +++ b/board/calao/tny_a9260/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x23f00000 +CONFIG_SYS_TEXT_BASE = 0x23f00000 diff --git a/board/canmb/config.mk b/board/canmb/config.mk index a163b34d6..ad367bba7 100644 --- a/board/canmb/config.mk +++ b/board/canmb/config.mk @@ -27,13 +27,14 @@ # # CANMB board # -# allowed and functional TEXT_BASE values: +# allowed and functional CONFIG_SYS_TEXT_BASE values: # # 0xfe000000 low boot at 0x00000100 (default board setting) # 0x00100000 RAM load and test # -TEXT_BASE = 0xFE000000 -#TEXT_BASE = 0x00100000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 +#CONFIG_SYS_TEXT_BASE = 0x00100000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/cerf250/config.mk b/board/cerf250/config.mk index 1a86cc998..c2d46b2be 100644 --- a/board/cerf250/config.mk +++ b/board/cerf250/config.mk @@ -2,4 +2,4 @@ # Cerf board with PXA250 cpu # # -TEXT_BASE = 0xa3080000 +CONFIG_SYS_TEXT_BASE = 0xa3080000 diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk index 78eebff32..790fe99b0 100644 --- a/board/cm-bf527/config.mk +++ b/board/cm-bf527/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf527-0.0 diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk index 60ec6b6c1..a0d174924 100644 --- a/board/cm-bf533/config.mk +++ b/board/cm-bf533/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf533-0.3 diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk index 1281da4be..c5d45c7db 100644 --- a/board/cm-bf537e/config.mk +++ b/board/cm-bf537e/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf537-0.2 diff --git a/board/cm-bf537u/config.mk b/board/cm-bf537u/config.mk index 1281da4be..c5d45c7db 100644 --- a/board/cm-bf537u/config.mk +++ b/board/cm-bf537u/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf537-0.2 diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk index bce60e5ba..da6aa52df 100644 --- a/board/cm-bf548/config.mk +++ b/board/cm-bf548/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf548-0.0 diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk index ff19190a2..19cdefc14 100644 --- a/board/cm-bf561/config.mk +++ b/board/cm-bf561/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf561-0.3 diff --git a/board/cm4008/config.mk b/board/cm4008/config.mk index 74eaeb0e6..0d5923b94 100644 --- a/board/cm4008/config.mk +++ b/board/cm4008/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x00f00000 +CONFIG_SYS_TEXT_BASE = 0x00f00000 diff --git a/board/cm41xx/config.mk b/board/cm41xx/config.mk index 74eaeb0e6..0d5923b94 100644 --- a/board/cm41xx/config.mk +++ b/board/cm41xx/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x00f00000 +CONFIG_SYS_TEXT_BASE = 0x00f00000 diff --git a/board/cm5200/config.mk b/board/cm5200/config.mk index 7f061391a..0b07aba63 100644 --- a/board/cm5200/config.mk +++ b/board/cm5200/config.mk @@ -21,6 +21,7 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xfc000000 +CONFIG_SYS_TEXT_BASE = 0xfc000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/cmc_pu2/config.mk b/board/cmc_pu2/config.mk index 7116eea87..cdb8a5f57 100644 --- a/board/cmc_pu2/config.mk +++ b/board/cmc_pu2/config.mk @@ -1,3 +1,3 @@ -TEXT_BASE = 0x20F00000 +CONFIG_SYS_TEXT_BASE = 0x20F00000 ## For testing: load at 0x20100000 and "go" at 0x201000A4 -#TEXT_BASE = 0x20100000 +#CONFIG_SYS_TEXT_BASE = 0x20100000 diff --git a/board/cmi/config.mk b/board/cmi/config.mk index 564f638a3..b0655451d 100644 --- a/board/cmi/config.mk +++ b/board/cmi/config.mk @@ -26,6 +26,7 @@ # # Boot from flash at location 0x00000000 -TEXT_BASE = 0x02000000 +CONFIG_SYS_TEXT_BASE = 0x02000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/cobra5272/config.mk b/board/cobra5272/config.mk index ccb2cf735..5b8c60862 100644 --- a/board/cobra5272/config.mk +++ b/board/cobra5272/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xffe00000 +CONFIG_SYS_TEXT_BASE = 0xffe00000 diff --git a/board/cogent/README b/board/cogent/README index 31ca187b5..4343f733f 100644 --- a/board/cogent/README +++ b/board/cogent/README @@ -87,11 +87,11 @@ want the serial console on motherboard serial port A or on one of the 8xx SMC ports, and set CONFIG_8xx_CONS_{SMC1,SMC2,NONE} accordingly (NONE means use Cogent motherboard serial port A). -Then edit the file "cogent/config.mk". Firstly, set TEXT_BASE to be +Then edit the file "cogent/config.mk". Firstly, set CONFIG_SYS_TEXT_BASE to be the base address of the EPROM for the CPU module. This should be the same as the value selected for CONFIG_SYS_MONITOR_BASE in "include/config_cogent_*.h" (in fact, I have made this automatic via -the -DTEXT_BASE=... option in CPPFLAGS). +the -CONFIG_SYS_TEXT_BASE=... option in CPPFLAGS). Finally, set the values of the make variables $(CMA_MB) and $(CMA_IOMS). diff --git a/board/cogent/config.mk b/board/cogent/config.mk index 35a5ed3d0..0a5f28667 100644 --- a/board/cogent/config.mk +++ b/board/cogent/config.mk @@ -26,8 +26,9 @@ # # Boot EPROM location -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) LDSCRIPT := $(SRCTREE)/board/cogent/u-boot.lds diff --git a/board/colibri_pxa270/config.mk b/board/colibri_pxa270/config.mk index 1d650acd9..0f10662ce 100644 --- a/board/colibri_pxa270/config.mk +++ b/board/colibri_pxa270/config.mk @@ -1 +1 @@ -TEXT_BASE = 0xa1000000 +CONFIG_SYS_TEXT_BASE = 0xa1000000 diff --git a/board/cpc45/config.mk b/board/cpc45/config.mk index bf9d9debc..ab79b2cf7 100644 --- a/board/cpc45/config.mk +++ b/board/cpc45/config.mk @@ -27,10 +27,11 @@ ifeq ($(CONFIG_BOOT_ROM),y) - TEXT_BASE := 0xFFF00000 + CONFIG_SYS_TEXT_BASE := 0xFFF00000 PLATFORM_CPPFLAGS += -DCONFIG_BOOT_ROM else - TEXT_BASE := 0xFFF00000 + CONFIG_SYS_TEXT_BASE := 0xFFF00000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/cpu86/config.mk b/board/cpu86/config.mk index 5fe0ca088..3469e7366 100644 --- a/board/cpu86/config.mk +++ b/board/cpu86/config.mk @@ -31,10 +31,11 @@ # ifeq ($(CONFIG_BOOT_ROM),y) - TEXT_BASE := 0xFF800000 + CONFIG_SYS_TEXT_BASE := 0xFF800000 PLATFORM_CPPFLAGS += -DCONFIG_BOOT_ROM else - TEXT_BASE := 0xFF000000 + CONFIG_SYS_TEXT_BASE := 0xFF000000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/cpu87/config.mk b/board/cpu87/config.mk index 6a694a405..eba303651 100644 --- a/board/cpu87/config.mk +++ b/board/cpu87/config.mk @@ -31,10 +31,11 @@ # ifeq ($(CONFIG_BOOT_ROM),y) - TEXT_BASE := 0xFF800000 + CONFIG_SYS_TEXT_BASE := 0xFF800000 PLATFORM_CPPFLAGS += -DCONFIG_BOOT_ROM else - TEXT_BASE := 0xFF000000 + CONFIG_SYS_TEXT_BASE := 0xFF000000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/cradle/config.mk b/board/cradle/config.mk index aa4038881..6656bddee 100644 --- a/board/cradle/config.mk +++ b/board/cradle/config.mk @@ -1,2 +1,2 @@ -TEXT_BASE = 0xa0f80000 -#TEXT_BASE = 0 +CONFIG_SYS_TEXT_BASE = 0xa0f80000 +#CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/cray/L1/config.mk b/board/cray/L1/config.mk index b69fe8ee0..28924f91f 100644 --- a/board/cray/L1/config.mk +++ b/board/cray/L1/config.mk @@ -23,4 +23,4 @@ # Note: I make an "image" from U-Boot itself, which prefixes 0x40 bytes of # header info, hence start address is thus shifted. -TEXT_BASE = 0xFFFD0040 +CONFIG_SYS_TEXT_BASE = 0xFFFD0040 diff --git a/board/csb226/config.mk b/board/csb226/config.mk index 23543920c..9e4655585 100644 --- a/board/csb226/config.mk +++ b/board/csb226/config.mk @@ -7,9 +7,9 @@ # # This is the address where U-Boot lives in flash: -#TEXT_BASE = 0 +#CONFIG_SYS_TEXT_BASE = 0 # FIXME: armboot does only work correctly when being compiled # for the addresses _after_ relocation to RAM!! Otherwhise the # .bss segment is assumed in flash... -TEXT_BASE = 0xa1fe0000 +CONFIG_SYS_TEXT_BASE = 0xa1fe0000 diff --git a/board/csb226/lowlevel_init.S b/board/csb226/lowlevel_init.S index 9892430a1..55169be45 100644 --- a/board/csb226/lowlevel_init.S +++ b/board/csb226/lowlevel_init.S @@ -39,7 +39,7 @@ DRAM_SIZE: .long CONFIG_SYS_DRAM_SIZE .endm _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE /* diff --git a/board/csb272/config.mk b/board/csb272/config.mk index 4672f0817..a47b00582 100644 --- a/board/csb272/config.mk +++ b/board/csb272/config.mk @@ -30,7 +30,7 @@ LDFLAGS += $(LINKER_UNDEFS) -TEXT_BASE := 0xFFFC0000 -#TEXT_BASE := 0x00100000 +CONFIG_SYS_TEXT_BASE := 0xFFFC0000 +#CONFIG_SYS_TEXT_BASE := 0x00100000 PLATFORM_RELFLAGS := $(PLATFORM_RELFLAGS) diff --git a/board/csb472/config.mk b/board/csb472/config.mk index 04aefd1f8..594163222 100644 --- a/board/csb472/config.mk +++ b/board/csb472/config.mk @@ -30,7 +30,7 @@ LDFLAGS += $(LINKER_UNDEFS) -TEXT_BASE := 0xFFFC0000 -#TEXT_BASE := 0x00100000 +CONFIG_SYS_TEXT_BASE := 0xFFFC0000 +#CONFIG_SYS_TEXT_BASE := 0x00100000 PLATFORM_RELFLAGS := $(PLATFORM_RELFLAGS) diff --git a/board/csb637/config.mk b/board/csb637/config.mk index 4c6f63113..e2cc8a6ee 100644 --- a/board/csb637/config.mk +++ b/board/csb637/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x23fc0000 +CONFIG_SYS_TEXT_BASE = 0x23fc0000 diff --git a/board/cu824/config.mk b/board/cu824/config.mk index 18673e16d..721dd19a5 100644 --- a/board/cu824/config.mk +++ b/board/cu824/config.mk @@ -25,6 +25,6 @@ # CU824 board # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/dave/B2/config.mk b/board/dave/B2/config.mk index 521662207..f7b686a1e 100644 --- a/board/dave/B2/config.mk +++ b/board/dave/B2/config.mk @@ -25,6 +25,6 @@ # MA 02111-1307 USA # -TEXT_BASE = 0x0C100000 +CONFIG_SYS_TEXT_BASE = 0x0C100000 PLATFORM_CPPFLAGS += -Uarm diff --git a/board/dave/PPChameleonEVB/config.mk b/board/dave/PPChameleonEVB/config.mk index 9083aacfa..d47a232ef 100644 --- a/board/dave/PPChameleonEVB/config.mk +++ b/board/dave/PPChameleonEVB/config.mk @@ -22,7 +22,7 @@ # # Reserve 256 kB for Monitor -#TEXT_BASE = 0xFFFC0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFC0000 # Reserve 320 kB for Monitor -TEXT_BASE = 0xFFFB0000 +CONFIG_SYS_TEXT_BASE = 0xFFFB0000 diff --git a/board/davedenx/aria/config.mk b/board/davedenx/aria/config.mk index 838a01849..d52b342cd 100644 --- a/board/davedenx/aria/config.mk +++ b/board/davedenx/aria/config.mk @@ -20,4 +20,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 diff --git a/board/davedenx/qong/config.mk b/board/davedenx/qong/config.mk index 39c1203f5..ea1c1b029 100644 --- a/board/davedenx/qong/config.mk +++ b/board/davedenx/qong/config.mk @@ -1,3 +1,3 @@ -TEXT_BASE = 0xa0000000 +CONFIG_SYS_TEXT_BASE = 0xa0000000 # PLATFORM_CPPFLAGS += -DDEBUG diff --git a/board/davinci/da8xxevm/config.mk b/board/davinci/da8xxevm/config.mk index 6da29a979..e176f7d51 100644 --- a/board/davinci/da8xxevm/config.mk +++ b/board/davinci/da8xxevm/config.mk @@ -40,4 +40,4 @@ #Provide at least 16MB spacing between us and the Linux Kernel image -TEXT_BASE = 0xC1080000 +CONFIG_SYS_TEXT_BASE = 0xC1080000 diff --git a/board/davinci/dm355evm/config.mk b/board/davinci/dm355evm/config.mk index c4e6e07b7..9a063000c 100644 --- a/board/davinci/dm355evm/config.mk +++ b/board/davinci/dm355evm/config.mk @@ -8,4 +8,4 @@ # #Provide at least 16MB spacing between us and the Linux Kernel image -TEXT_BASE = 0x81080000 +CONFIG_SYS_TEXT_BASE = 0x81080000 diff --git a/board/davinci/dm355leopard/config.mk b/board/davinci/dm355leopard/config.mk index d67df02cc..28ff3f3d9 100644 --- a/board/davinci/dm355leopard/config.mk +++ b/board/davinci/dm355leopard/config.mk @@ -3,4 +3,4 @@ # #Provide at least 16MB spacing between us and the Linux Kernel image -TEXT_BASE = 0x81080000 +CONFIG_SYS_TEXT_BASE = 0x81080000 diff --git a/board/davinci/dm365evm/config.mk b/board/davinci/dm365evm/config.mk index 86472ff59..7b1e900e8 100644 --- a/board/davinci/dm365evm/config.mk +++ b/board/davinci/dm365evm/config.mk @@ -8,4 +8,4 @@ # #Provide at least 16MB spacing between us and the Linux Kernel image -TEXT_BASE = 0x81080000 +CONFIG_SYS_TEXT_BASE = 0x81080000 diff --git a/board/davinci/dm6467evm/config.mk b/board/davinci/dm6467evm/config.mk index ca801c273..375104389 100644 --- a/board/davinci/dm6467evm/config.mk +++ b/board/davinci/dm6467evm/config.mk @@ -1,2 +1,2 @@ #Provide at least 16MB spacing between us and the Linux Kernel image -TEXT_BASE = 0x81080000 +CONFIG_SYS_TEXT_BASE = 0x81080000 diff --git a/board/davinci/dvevm/config.mk b/board/davinci/dvevm/config.mk index c24ced799..ed8070723 100644 --- a/board/davinci/dvevm/config.mk +++ b/board/davinci/dvevm/config.mk @@ -36,4 +36,4 @@ # #Provide at least 16MB spacing between us and the Linux Kernel image -TEXT_BASE = 0x81080000 +CONFIG_SYS_TEXT_BASE = 0x81080000 diff --git a/board/davinci/schmoogie/config.mk b/board/davinci/schmoogie/config.mk index c24ced799..ed8070723 100644 --- a/board/davinci/schmoogie/config.mk +++ b/board/davinci/schmoogie/config.mk @@ -36,4 +36,4 @@ # #Provide at least 16MB spacing between us and the Linux Kernel image -TEXT_BASE = 0x81080000 +CONFIG_SYS_TEXT_BASE = 0x81080000 diff --git a/board/davinci/sffsdr/config.mk b/board/davinci/sffsdr/config.mk index 31a1c9ec4..4fe900799 100644 --- a/board/davinci/sffsdr/config.mk +++ b/board/davinci/sffsdr/config.mk @@ -20,4 +20,4 @@ # # we load ourself to 8400'0000 to provide at least 32MB spacing # between us and the Integrity kernel image -TEXT_BASE = 0x84000000 +CONFIG_SYS_TEXT_BASE = 0x84000000 diff --git a/board/davinci/sonata/config.mk b/board/davinci/sonata/config.mk index c24ced799..ed8070723 100644 --- a/board/davinci/sonata/config.mk +++ b/board/davinci/sonata/config.mk @@ -36,4 +36,4 @@ # #Provide at least 16MB spacing between us and the Linux Kernel image -TEXT_BASE = 0x81080000 +CONFIG_SYS_TEXT_BASE = 0x81080000 diff --git a/board/dbau1x00/README b/board/dbau1x00/README index b37ff3616..b1e949411 100644 --- a/board/dbau1x00/README +++ b/board/dbau1x00/README @@ -26,7 +26,7 @@ boot loader delivered with board. NOTE! When you switch between the two boot flashes, the base addresses will be swapped. -Have this in mind when you compile u-boot. TEXT_BASE has +Have this in mind when you compile u-boot. CONFIG_SYS_TEXT_BASE has to match the address where u-boot is located when you actually launch. diff --git a/board/dbau1x00/config.mk b/board/dbau1x00/config.mk index 39eb60a17..3516b42c4 100644 --- a/board/dbau1x00/config.mk +++ b/board/dbau1x00/config.mk @@ -26,7 +26,7 @@ # # ROM version -TEXT_BASE = 0xbfc00000 +CONFIG_SYS_TEXT_BASE = 0xbfc00000 # RAM version -#TEXT_BASE = 0x80100000 +#CONFIG_SYS_TEXT_BASE = 0x80100000 diff --git a/board/delta/config.mk b/board/delta/config.mk index 3fe406ca0..8b2404456 100644 --- a/board/delta/config.mk +++ b/board/delta/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x83008000 +CONFIG_SYS_TEXT_BASE = 0x83008000 diff --git a/board/digsy_mtc/config.mk b/board/digsy_mtc/config.mk index e2f14b0ce..40e557c95 100644 --- a/board/digsy_mtc/config.mk +++ b/board/digsy_mtc/config.mk @@ -5,7 +5,7 @@ # # digsyMTC board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFF00000 boot high (standard configuration) # 0xFE000000 boot low @@ -14,11 +14,12 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 ## For testing: boot from RAM -# TEXT_BASE = 0x00100000 +# CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/dnp1110/config.mk b/board/dnp1110/config.mk index 4f6af46f8..ccf82775d 100644 --- a/board/dnp1110/config.mk +++ b/board/dnp1110/config.mk @@ -14,4 +14,4 @@ # we load ourself to c1f8'0000, the upper 1 MB of the first (only) bank # -TEXT_BASE = 0xc1f80000 +CONFIG_SYS_TEXT_BASE = 0xc1f80000 diff --git a/board/eNET/config.mk b/board/eNET/config.mk index 63a58fdc5..c4242add1 100644 --- a/board/eNET/config.mk +++ b/board/eNET/config.mk @@ -21,7 +21,7 @@ # MA 02111-1307 USA # -TEXT_BASE = 0x06000000 +CONFIG_SYS_TEXT_BASE = 0x06000000 CFLAGS_common/dlmalloc.o += -Wa,--no-warn -fno-strict-aliasing PLATFORM_RELFLAGS += -fvisibility=hidden PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm diff --git a/board/eXalion/config.mk b/board/eXalion/config.mk index b3f65ebe5..4a316ce5a 100644 --- a/board/eXalion/config.mk +++ b/board/eXalion/config.mk @@ -25,7 +25,7 @@ # Sandpoint boards # -#TEXT_BASE = 0x00090000 -TEXT_BASE = 0xFFF00000 +#CONFIG_SYS_TEXT_BASE = 0x00090000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk index 5c919cd64..f8bc88dbe 100644 --- a/board/earthlcd/favr-32-ezkit/config.mk +++ b/board/earthlcd/favr-32-ezkit/config.mk @@ -1,4 +1,4 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_LDFLAGS += --gc-sections -TEXT_BASE = 0x00000000 +CONFIG_SYS_TEXT_BASE = 0x00000000 LDSCRIPT = $(src)board/earthlcd/favr-32-ezkit/u-boot.lds diff --git a/board/edb93xx/config.mk b/board/edb93xx/config.mk index b627869c2..fab59ef73 100644 --- a/board/edb93xx/config.mk +++ b/board/edb93xx/config.mk @@ -1,33 +1,33 @@ LDSCRIPT := $(SRCTREE)/arch/arm/cpu/arm920t/ep93xx/u-boot.lds ifdef CONFIG_EDB9301 -TEXT_BASE = 0x05700000 +CONFIG_SYS_TEXT_BASE = 0x05700000 endif ifdef CONFIG_EDB9302 -TEXT_BASE = 0x05700000 +CONFIG_SYS_TEXT_BASE = 0x05700000 endif ifdef CONFIG_EDB9302A -TEXT_BASE = 0xc5700000 +CONFIG_SYS_TEXT_BASE = 0xc5700000 endif ifdef CONFIG_EDB9307 -TEXT_BASE = 0x01f00000 +CONFIG_SYS_TEXT_BASE = 0x01f00000 endif ifdef CONFIG_EDB9307A -TEXT_BASE = 0xc1f00000 +CONFIG_SYS_TEXT_BASE = 0xc1f00000 endif ifdef CONFIG_EDB9312 -TEXT_BASE = 0x01f00000 +CONFIG_SYS_TEXT_BASE = 0x01f00000 endif ifdef CONFIG_EDB9315 -TEXT_BASE = 0x01f00000 +CONFIG_SYS_TEXT_BASE = 0x01f00000 endif ifdef CONFIG_EDB9315A -TEXT_BASE = 0xc1f00000 +CONFIG_SYS_TEXT_BASE = 0xc1f00000 endif diff --git a/board/eltec/bab7xx/config.mk b/board/eltec/bab7xx/config.mk index aa463c5dc..3c6732872 100644 --- a/board/eltec/bab7xx/config.mk +++ b/board/eltec/bab7xx/config.mk @@ -21,6 +21,6 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/eltec/elppc/config.mk b/board/eltec/elppc/config.mk index aa463c5dc..3c6732872 100644 --- a/board/eltec/elppc/config.mk +++ b/board/eltec/elppc/config.mk @@ -21,6 +21,6 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/eltec/mhpc/config.mk b/board/eltec/mhpc/config.mk index 03934de3f..6e2827391 100644 --- a/board/eltec/mhpc/config.mk +++ b/board/eltec/mhpc/config.mk @@ -29,5 +29,5 @@ # MHPC boards # -TEXT_BASE = 0xfe000000 -/*TEXT_BASE = 0x00200000 */ +CONFIG_SYS_TEXT_BASE = 0xfe000000 +/*CONFIG_SYS_TEXT_BASE = 0x00200000 */ diff --git a/board/emk/top5200/config.mk b/board/emk/top5200/config.mk index 84131fef1..586d07e40 100644 --- a/board/emk/top5200/config.mk +++ b/board/emk/top5200/config.mk @@ -27,15 +27,16 @@ # # TOP5200 board, on optional MINI5200 and EVAL5200 boards # -# allowed and functional TEXT_BASE values: +# allowed and functional CONFIG_SYS_TEXT_BASE values: # # 0xff000000 low boot at 0x00000100 (default board setting) # 0xfff00000 high boot at 0xfff00100 (board needs modification) # 0x00100000 RAM load and test # -TEXT_BASE = 0xff000000 -#TEXT_BASE = 0xfff00000 -#TEXT_BASE = 0x00100000 +CONFIG_SYS_TEXT_BASE = 0xff000000 +#CONFIG_SYS_TEXT_BASE = 0xfff00000 +#CONFIG_SYS_TEXT_BASE = 0x00100000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/emk/top860/config.mk b/board/emk/top860/config.mk index 7b940cb81..25457e735 100644 --- a/board/emk/top860/config.mk +++ b/board/emk/top860/config.mk @@ -25,4 +25,4 @@ # TOP860 board # -TEXT_BASE = 0x80000000 +CONFIG_SYS_TEXT_BASE = 0x80000000 diff --git a/board/ep7312/config.mk b/board/ep7312/config.mk index 0ae16a2ef..bdd08b846 100644 --- a/board/ep7312/config.mk +++ b/board/ep7312/config.mk @@ -25,4 +25,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xc0f80000 +CONFIG_SYS_TEXT_BASE = 0xc0f80000 diff --git a/board/ep8248/config.mk b/board/ep8248/config.mk index eda523be2..384e07c9a 100644 --- a/board/ep8248/config.mk +++ b/board/ep8248/config.mk @@ -27,4 +27,4 @@ # EP82xx series boards by Embedded Planet # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 diff --git a/board/ep8260/config.mk b/board/ep8260/config.mk index 1225830be..a5aef489b 100644 --- a/board/ep8260/config.mk +++ b/board/ep8260/config.mk @@ -29,8 +29,9 @@ # for the "final" configuration, with U-Boot in flash, or the address # in RAM where U-Boot is loaded at for debugging. # -#TEXT_BASE = 0x00100000 -#TEXT_BASE = 0xFF000000 -TEXT_BASE = 0xFFF00000 +#CONFIG_SYS_TEXT_BASE = 0x00100000 +#CONFIG_SYS_TEXT_BASE = 0xFF000000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/ep82xxm/config.mk b/board/ep82xxm/config.mk index da039e21b..4b8c259eb 100644 --- a/board/ep82xxm/config.mk +++ b/board/ep82xxm/config.mk @@ -23,4 +23,4 @@ # EP82xxM series boards by Embedded Planet -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 diff --git a/board/ep88x/config.mk b/board/ep88x/config.mk index 72b326c32..0fc941e87 100644 --- a/board/ep88x/config.mk +++ b/board/ep88x/config.mk @@ -24,4 +24,4 @@ # # Embedded Planet EP88x boards # -TEXT_BASE = 0xFC000000 +CONFIG_SYS_TEXT_BASE = 0xFC000000 diff --git a/board/eric/config.mk b/board/eric/config.mk index dd0b41209..bae887f3b 100644 --- a/board/eric/config.mk +++ b/board/eric/config.mk @@ -25,5 +25,5 @@ # esd ADCIOP boards # -#TEXT_BASE = 0xFFF80000 -TEXT_BASE = 0xFFFC0000 +#CONFIG_SYS_TEXT_BASE = 0xFFF80000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/adciop/config.mk b/board/esd/adciop/config.mk index 747f29f77..854bfeca0 100644 --- a/board/esd/adciop/config.mk +++ b/board/esd/adciop/config.mk @@ -26,8 +26,8 @@ # # FLASH: -#TEXT_BASE = 0xFFFE0000 -TEXT_BASE = 0xFFFD0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 +CONFIG_SYS_TEXT_BASE = 0xFFFD0000 # SDRAM: -#TEXT_BASE = 0x00FE0000 +#CONFIG_SYS_TEXT_BASE = 0x00FE0000 diff --git a/board/esd/apc405/config.mk b/board/esd/apc405/config.mk index 11faad2e0..884565fef 100644 --- a/board/esd/apc405/config.mk +++ b/board/esd/apc405/config.mk @@ -25,4 +25,4 @@ # esd ABG405 boards # -TEXT_BASE = 0xFFF80000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 diff --git a/board/esd/ar405/config.mk b/board/esd/ar405/config.mk index da7c10728..a5f29ec54 100644 --- a/board/esd/ar405/config.mk +++ b/board/esd/ar405/config.mk @@ -20,4 +20,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # -TEXT_BASE = 0xFFFA0000 +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 diff --git a/board/esd/ash405/config.mk b/board/esd/ash405/config.mk index 1d743a9f8..40e83089d 100644 --- a/board/esd/ash405/config.mk +++ b/board/esd/ash405/config.mk @@ -25,4 +25,4 @@ # esd ASH405 boards # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/canbt/config.mk b/board/esd/canbt/config.mk index ae855dc05..805d67bfe 100644 --- a/board/esd/canbt/config.mk +++ b/board/esd/canbt/config.mk @@ -20,4 +20,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/cms700/config.mk b/board/esd/cms700/config.mk index 8e48bcd6c..cdc2eafe3 100644 --- a/board/esd/cms700/config.mk +++ b/board/esd/cms700/config.mk @@ -20,4 +20,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC8000 +CONFIG_SYS_TEXT_BASE = 0xFFFC8000 diff --git a/board/esd/cpci2dp/config.mk b/board/esd/cpci2dp/config.mk index 2da4c9f76..188558e3f 100644 --- a/board/esd/cpci2dp/config.mk +++ b/board/esd/cpci2dp/config.mk @@ -25,4 +25,4 @@ # esd CPCI2DP board # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/cpci405/config.mk b/board/esd/cpci405/config.mk index 1bdf5e4fc..1646d3423 100644 --- a/board/esd/cpci405/config.mk +++ b/board/esd/cpci405/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/cpci5200/config.mk b/board/esd/cpci5200/config.mk index 170779d6c..106498d05 100644 --- a/board/esd/cpci5200/config.mk +++ b/board/esd/cpci5200/config.mk @@ -24,7 +24,7 @@ # # IceCube board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFF00000 boot high (standard configuration) # 0xFF000000 boot low for 16 MiB boards @@ -34,11 +34,12 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 ## For testing: boot from RAM -# TEXT_BASE = 0x00100000 +# CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/esd/cpci750/config.mk b/board/esd/cpci750/config.mk index 7795dfa81..d17e13981 100644 --- a/board/esd/cpci750/config.mk +++ b/board/esd/cpci750/config.mk @@ -25,4 +25,4 @@ # cpci750 board # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 diff --git a/board/esd/cpciiser4/config.mk b/board/esd/cpciiser4/config.mk index 58574cb04..b044413de 100644 --- a/board/esd/cpciiser4/config.mk +++ b/board/esd/cpciiser4/config.mk @@ -25,6 +25,6 @@ # esd CPCIISER4 boards # -#TEXT_BASE = 0xFFFE0000 -#TEXT_BASE = 0xFFFD0000 -TEXT_BASE = 0xFFFC0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFD0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/dasa_sim/config.mk b/board/esd/dasa_sim/config.mk index 4fe3774ff..67919a90a 100644 --- a/board/esd/dasa_sim/config.mk +++ b/board/esd/dasa_sim/config.mk @@ -20,7 +20,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 # Use board specific linker script LDSCRIPT := $(SRCTREE)/board/esd/dasa_sim/u-boot.lds diff --git a/board/esd/dp405/config.mk b/board/esd/dp405/config.mk index 9b1a8bebb..69f2e3677 100644 --- a/board/esd/dp405/config.mk +++ b/board/esd/dp405/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFD0000 +CONFIG_SYS_TEXT_BASE = 0xFFFD0000 diff --git a/board/esd/du405/config.mk b/board/esd/du405/config.mk index d091d96ec..a876bbea9 100644 --- a/board/esd/du405/config.mk +++ b/board/esd/du405/config.mk @@ -25,6 +25,6 @@ # esd CPCIISER4 boards # -#TEXT_BASE = 0xFFFE0000 -TEXT_BASE = 0xFFFD0000 -#TEXT_BASE = 0xFFFC0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 +CONFIG_SYS_TEXT_BASE = 0xFFFD0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/du440/config.mk b/board/esd/du440/config.mk index 91e65ec8a..2fd5d707f 100644 --- a/board/esd/du440/config.mk +++ b/board/esd/du440/config.mk @@ -22,8 +22,8 @@ # sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/esd/hh405/config.mk b/board/esd/hh405/config.mk index 7129ad568..f26622d72 100644 --- a/board/esd/hh405/config.mk +++ b/board/esd/hh405/config.mk @@ -25,7 +25,7 @@ # esd VOH405 boards # -#TEXT_BASE = 0xFFF00000 -TEXT_BASE = 0xFFF80000 -#TEXT_BASE = 0xFFFC0000 -#TEXT_BASE = 0x00FC0000 +#CONFIG_SYS_TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 +#CONFIG_SYS_TEXT_BASE = 0xFFFC0000 +#CONFIG_SYS_TEXT_BASE = 0x00FC0000 diff --git a/board/esd/hub405/config.mk b/board/esd/hub405/config.mk index a6d31aad2..0fe7793f5 100644 --- a/board/esd/hub405/config.mk +++ b/board/esd/hub405/config.mk @@ -25,4 +25,4 @@ # esd HUB405 boards # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/mecp5123/config.mk b/board/esd/mecp5123/config.mk index 838a01849..d52b342cd 100644 --- a/board/esd/mecp5123/config.mk +++ b/board/esd/mecp5123/config.mk @@ -20,4 +20,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 diff --git a/board/esd/mecp5200/config.mk b/board/esd/mecp5200/config.mk index 170779d6c..106498d05 100644 --- a/board/esd/mecp5200/config.mk +++ b/board/esd/mecp5200/config.mk @@ -24,7 +24,7 @@ # # IceCube board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFF00000 boot high (standard configuration) # 0xFF000000 boot low for 16 MiB boards @@ -34,11 +34,12 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 ## For testing: boot from RAM -# TEXT_BASE = 0x00100000 +# CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/esd/meesc/config.mk b/board/esd/meesc/config.mk index 9ce161e55..207769233 100644 --- a/board/esd/meesc/config.mk +++ b/board/esd/meesc/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x21f00000 +CONFIG_SYS_TEXT_BASE = 0x21f00000 diff --git a/board/esd/ocrtc/config.mk b/board/esd/ocrtc/config.mk index f12331994..64671b314 100644 --- a/board/esd/ocrtc/config.mk +++ b/board/esd/ocrtc/config.mk @@ -25,5 +25,5 @@ # esd ADCIOP boards # -#TEXT_BASE = 0xFFFE0000 -TEXT_BASE = 0xFFFD0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 +CONFIG_SYS_TEXT_BASE = 0xFFFD0000 diff --git a/board/esd/otc570/config.mk b/board/esd/otc570/config.mk index ff2cfd170..e554a4500 100644 --- a/board/esd/otc570/config.mk +++ b/board/esd/otc570/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x23f00000 +CONFIG_SYS_TEXT_BASE = 0x23f00000 diff --git a/board/esd/pci405/config.mk b/board/esd/pci405/config.mk index 83f07fe79..e094e9165 100644 --- a/board/esd/pci405/config.mk +++ b/board/esd/pci405/config.mk @@ -25,5 +25,5 @@ # esd ADCIOP boards # -#TEXT_BASE = 0xFFFE0000 -TEXT_BASE = 0xFFFD0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 +CONFIG_SYS_TEXT_BASE = 0xFFFD0000 diff --git a/board/esd/pf5200/config.mk b/board/esd/pf5200/config.mk index 170779d6c..106498d05 100644 --- a/board/esd/pf5200/config.mk +++ b/board/esd/pf5200/config.mk @@ -24,7 +24,7 @@ # # IceCube board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFF00000 boot high (standard configuration) # 0xFF000000 boot low for 16 MiB boards @@ -34,11 +34,12 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 ## For testing: boot from RAM -# TEXT_BASE = 0x00100000 +# CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/esd/plu405/config.mk b/board/esd/plu405/config.mk index 0a4dbaa54..a36dd5d81 100644 --- a/board/esd/plu405/config.mk +++ b/board/esd/plu405/config.mk @@ -25,4 +25,4 @@ # esd PLU405 boards # -TEXT_BASE = 0xFFF80000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 diff --git a/board/esd/pmc405/config.mk b/board/esd/pmc405/config.mk index 5a3fc4be7..249353ef7 100644 --- a/board/esd/pmc405/config.mk +++ b/board/esd/pmc405/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFF80000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 diff --git a/board/esd/pmc405de/config.mk b/board/esd/pmc405de/config.mk index ae855dc05..805d67bfe 100644 --- a/board/esd/pmc405de/config.mk +++ b/board/esd/pmc405de/config.mk @@ -20,4 +20,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/pmc440/config.mk b/board/esd/pmc440/config.mk index 6e9f735f4..1c75f0188 100644 --- a/board/esd/pmc440/config.mk +++ b/board/esd/pmc440/config.mk @@ -22,8 +22,8 @@ # sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFFF90000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFFF90000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/esd/tasreg/config.mk b/board/esd/tasreg/config.mk index 69fd8b6b7..7ee47770b 100644 --- a/board/esd/tasreg/config.mk +++ b/board/esd/tasreg/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xffc00000 +CONFIG_SYS_TEXT_BASE = 0xffc00000 diff --git a/board/esd/vme8349/config.mk b/board/esd/vme8349/config.mk index 1ae26caad..512b82e9c 100644 --- a/board/esd/vme8349/config.mk +++ b/board/esd/vme8349/config.mk @@ -25,4 +25,4 @@ # VME8349E # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 diff --git a/board/esd/voh405/config.mk b/board/esd/voh405/config.mk index 219a4eba1..ae2c07709 100644 --- a/board/esd/voh405/config.mk +++ b/board/esd/voh405/config.mk @@ -25,4 +25,4 @@ # esd VOH405 boards # -TEXT_BASE = 0xFFF80000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 diff --git a/board/esd/vom405/config.mk b/board/esd/vom405/config.mk index 8e48bcd6c..cdc2eafe3 100644 --- a/board/esd/vom405/config.mk +++ b/board/esd/vom405/config.mk @@ -20,4 +20,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC8000 +CONFIG_SYS_TEXT_BASE = 0xFFFC8000 diff --git a/board/esd/wuh405/config.mk b/board/esd/wuh405/config.mk index 1d743a9f8..40e83089d 100644 --- a/board/esd/wuh405/config.mk +++ b/board/esd/wuh405/config.mk @@ -25,4 +25,4 @@ # esd ASH405 boards # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/espt/config.mk b/board/espt/config.mk index 006b4326f..21b51de76 100644 --- a/board/espt/config.mk +++ b/board/espt/config.mk @@ -1,9 +1,9 @@ # # board/espt/config.mk # -# TEXT_BASE refers to image _after_ relocation. +# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation. # # NOTE: Must match value used in u-boot.lds (in this directory). # -TEXT_BASE = 0x8FFC0000 +CONFIG_SYS_TEXT_BASE = 0x8FFC0000 diff --git a/board/esteem192e/config.mk b/board/esteem192e/config.mk index 9d6080b84..017dc83a2 100644 --- a/board/esteem192e/config.mk +++ b/board/esteem192e/config.mk @@ -25,4 +25,4 @@ # TQM8xxL boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/etin/debris/config.mk b/board/etin/debris/config.mk index 64debf5ef..68b8fb428 100644 --- a/board/etin/debris/config.mk +++ b/board/etin/debris/config.mk @@ -25,7 +25,7 @@ # Debris boards # -#TEXT_BASE = 0x00090000 -TEXT_BASE = 0xFFF00000 +#CONFIG_SYS_TEXT_BASE = 0x00090000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/etin/kvme080/config.mk b/board/etin/kvme080/config.mk index 45abdc0e8..f2c116aa7 100644 --- a/board/etin/kvme080/config.mk +++ b/board/etin/kvme080/config.mk @@ -25,6 +25,6 @@ # KVME080 board # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/etx094/config.mk b/board/etx094/config.mk index 655c2db45..08f0c7acf 100644 --- a/board/etx094/config.mk +++ b/board/etx094/config.mk @@ -25,4 +25,4 @@ # ETX_094 Boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/eukrea/cpu9260/config.mk b/board/eukrea/cpu9260/config.mk index 9ce161e55..207769233 100644 --- a/board/eukrea/cpu9260/config.mk +++ b/board/eukrea/cpu9260/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x21f00000 +CONFIG_SYS_TEXT_BASE = 0x21f00000 diff --git a/board/eukrea/cpuat91/config.mk b/board/eukrea/cpuat91/config.mk index ef8dda03a..463f46bc5 100644 --- a/board/eukrea/cpuat91/config.mk +++ b/board/eukrea/cpuat91/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x21F00000 +CONFIG_SYS_TEXT_BASE = 0x21F00000 diff --git a/board/evb4510/config.mk b/board/evb4510/config.mk index 4d1a019c2..140c98943 100644 --- a/board/evb4510/config.mk +++ b/board/evb4510/config.mk @@ -24,4 +24,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0x007d0000 +CONFIG_SYS_TEXT_BASE = 0x007d0000 diff --git a/board/evb64260/config.mk b/board/evb64260/config.mk index 0646a3eb5..f45b5b140 100644 --- a/board/evb64260/config.mk +++ b/board/evb64260/config.mk @@ -25,4 +25,4 @@ # EVB64260 boards # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 diff --git a/board/fads/config.mk b/board/fads/config.mk index 61060907e..1df3c5f5b 100644 --- a/board/fads/config.mk +++ b/board/fads/config.mk @@ -28,7 +28,7 @@ # MPC885ADS boards # -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/fads HOSTCFLAGS += -I$(TOPDIR)/board/fads HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/fads diff --git a/board/fads/fads.h b/board/fads/fads.h index 4ab4b2615..aa94d47b5 100644 --- a/board/fads/fads.h +++ b/board/fads/fads.h @@ -205,7 +205,7 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 KB for monitor */ #ifdef CONFIG_BZIP2 diff --git a/board/faraday/a320evb/config.mk b/board/faraday/a320evb/config.mk index aa25b9895..b751d0d6b 100644 --- a/board/faraday/a320evb/config.mk +++ b/board/faraday/a320evb/config.mk @@ -32,4 +32,4 @@ # # download area is 1200'0000 -TEXT_BASE = 0x13f80000 +CONFIG_SYS_TEXT_BASE = 0x13f80000 diff --git a/board/flagadm/config.mk b/board/flagadm/config.mk index 9c72c79d3..198068773 100644 --- a/board/flagadm/config.mk +++ b/board/flagadm/config.mk @@ -25,4 +25,4 @@ # TQM8xxL boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/freescale/corenet_ds/config.mk b/board/freescale/corenet_ds/config.mk index 72db24ebd..70b2b986a 100644 --- a/board/freescale/corenet_ds/config.mk +++ b/board/freescale/corenet_ds/config.mk @@ -23,8 +23,8 @@ # # P4080DS board # -ifndef TEXT_BASE -TEXT_BASE = 0xeff80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xeff80000 endif RESET_VECTOR_ADDRESS = 0xeffffffc diff --git a/board/freescale/m5208evbe/config.mk b/board/freescale/m5208evbe/config.mk index ce014edca..21dece4b0 100644 --- a/board/freescale/m5208evbe/config.mk +++ b/board/freescale/m5208evbe/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0 +CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/freescale/m52277evb/config.mk b/board/freescale/m52277evb/config.mk index b42fcc94c..4ed60f236 100644 --- a/board/freescale/m52277evb/config.mk +++ b/board/freescale/m52277evb/config.mk @@ -24,4 +24,4 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/freescale/m5235evb/config.mk b/board/freescale/m5235evb/config.mk index ada38dd95..2a4381a14 100644 --- a/board/freescale/m5235evb/config.mk +++ b/board/freescale/m5235evb/config.mk @@ -22,7 +22,7 @@ # MA 02111-1307 USA # -/*TEXT_BASE = 0xFFC00000*/ +/*CONFIG_SYS_TEXT_BASE = 0xFFC00000*/ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
\ No newline at end of file +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/freescale/m5249evb/config.mk b/board/freescale/m5249evb/config.mk index ccb2cf735..5b8c60862 100644 --- a/board/freescale/m5249evb/config.mk +++ b/board/freescale/m5249evb/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xffe00000 +CONFIG_SYS_TEXT_BASE = 0xffe00000 diff --git a/board/freescale/m5253demo/config.mk b/board/freescale/m5253demo/config.mk index fa66b75f4..93fce15f0 100644 --- a/board/freescale/m5253demo/config.mk +++ b/board/freescale/m5253demo/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFF800000 +CONFIG_SYS_TEXT_BASE = 0xFF800000 diff --git a/board/freescale/m5253evbe/config.mk b/board/freescale/m5253evbe/config.mk index ccb2cf735..5b8c60862 100644 --- a/board/freescale/m5253evbe/config.mk +++ b/board/freescale/m5253evbe/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xffe00000 +CONFIG_SYS_TEXT_BASE = 0xffe00000 diff --git a/board/freescale/m5271evb/config.mk b/board/freescale/m5271evb/config.mk index 9a7af7c2c..cf6d375aa 100644 --- a/board/freescale/m5271evb/config.mk +++ b/board/freescale/m5271evb/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xffe00000 +CONFIG_SYS_TEXT_BASE = 0xffe00000 diff --git a/board/freescale/m5272c3/config.mk b/board/freescale/m5272c3/config.mk index ccb2cf735..5b8c60862 100644 --- a/board/freescale/m5272c3/config.mk +++ b/board/freescale/m5272c3/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xffe00000 +CONFIG_SYS_TEXT_BASE = 0xffe00000 diff --git a/board/freescale/m5275evb/config.mk b/board/freescale/m5275evb/config.mk index ccb2cf735..5b8c60862 100644 --- a/board/freescale/m5275evb/config.mk +++ b/board/freescale/m5275evb/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xffe00000 +CONFIG_SYS_TEXT_BASE = 0xffe00000 diff --git a/board/freescale/m5282evb/config.mk b/board/freescale/m5282evb/config.mk index 0aa236122..882f93aa5 100644 --- a/board/freescale/m5282evb/config.mk +++ b/board/freescale/m5282evb/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFE00000 +CONFIG_SYS_TEXT_BASE = 0xFFE00000 diff --git a/board/freescale/m53017evb/config.mk b/board/freescale/m53017evb/config.mk index ce014edca..21dece4b0 100644 --- a/board/freescale/m53017evb/config.mk +++ b/board/freescale/m53017evb/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0 +CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/freescale/m5329evb/config.mk b/board/freescale/m5329evb/config.mk index ce014edca..21dece4b0 100644 --- a/board/freescale/m5329evb/config.mk +++ b/board/freescale/m5329evb/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0 +CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/freescale/m5373evb/config.mk b/board/freescale/m5373evb/config.mk index ce014edca..21dece4b0 100644 --- a/board/freescale/m5373evb/config.mk +++ b/board/freescale/m5373evb/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0 +CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/freescale/m54451evb/config.mk b/board/freescale/m54451evb/config.mk index b42fcc94c..4ed60f236 100644 --- a/board/freescale/m54451evb/config.mk +++ b/board/freescale/m54451evb/config.mk @@ -24,4 +24,4 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/freescale/m54455evb/config.mk b/board/freescale/m54455evb/config.mk index b42fcc94c..4ed60f236 100644 --- a/board/freescale/m54455evb/config.mk +++ b/board/freescale/m54455evb/config.mk @@ -24,4 +24,4 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/freescale/m547xevb/config.mk b/board/freescale/m547xevb/config.mk index fa66b75f4..93fce15f0 100644 --- a/board/freescale/m547xevb/config.mk +++ b/board/freescale/m547xevb/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFF800000 +CONFIG_SYS_TEXT_BASE = 0xFF800000 diff --git a/board/freescale/m548xevb/config.mk b/board/freescale/m548xevb/config.mk index fa66b75f4..93fce15f0 100644 --- a/board/freescale/m548xevb/config.mk +++ b/board/freescale/m548xevb/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFF800000 +CONFIG_SYS_TEXT_BASE = 0xFF800000 diff --git a/board/freescale/mpc5121ads/config.mk b/board/freescale/mpc5121ads/config.mk index 14998f475..788de528b 100644 --- a/board/freescale/mpc5121ads/config.mk +++ b/board/freescale/mpc5121ads/config.mk @@ -20,4 +20,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 diff --git a/board/freescale/mpc7448hpc2/config.mk b/board/freescale/mpc7448hpc2/config.mk index 2e58858c4..8ae134a55 100644 --- a/board/freescale/mpc7448hpc2/config.mk +++ b/board/freescale/mpc7448hpc2/config.mk @@ -21,8 +21,9 @@ # # Flash address -TEXT_BASE = 0xFF000000 +CONFIG_SYS_TEXT_BASE = 0xFF000000 # RAM address -#TEXT_BASE = 0x00400000 +#CONFIG_SYS_TEXT_BASE = 0x00400000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -maltivec -mabi=altivec -msoft-float +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -maltivec -mabi=altivec -msoft-float diff --git a/board/freescale/mpc8260ads/config.mk b/board/freescale/mpc8260ads/config.mk index e99e181dd..569ef314d 100644 --- a/board/freescale/mpc8260ads/config.mk +++ b/board/freescale/mpc8260ads/config.mk @@ -31,7 +31,7 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 endif diff --git a/board/freescale/mpc8266ads/config.mk b/board/freescale/mpc8266ads/config.mk index ecc2a7db6..248e9b20a 100644 --- a/board/freescale/mpc8266ads/config.mk +++ b/board/freescale/mpc8266ads/config.mk @@ -27,6 +27,7 @@ # mpc8260ads board # -TEXT_BASE = 0xfe000000 +CONFIG_SYS_TEXT_BASE = 0xfe000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/freescale/mpc8308rdb/config.mk b/board/freescale/mpc8308rdb/config.mk index f76826495..613083d2b 100644 --- a/board/freescale/mpc8308rdb/config.mk +++ b/board/freescale/mpc8308rdb/config.mk @@ -1 +1 @@ -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc8313erdb/config.mk b/board/freescale/mpc8313erdb/config.mk index fd72a1402..bd0d2158e 100644 --- a/board/freescale/mpc8313erdb/config.mk +++ b/board/freescale/mpc8313erdb/config.mk @@ -2,6 +2,6 @@ ifndef NAND_SPL sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp endif -ifndef TEXT_BASE -TEXT_BASE = 0xFE000000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFE000000 endif diff --git a/board/freescale/mpc8315erdb/config.mk b/board/freescale/mpc8315erdb/config.mk index b60160154..5a9212fe4 100644 --- a/board/freescale/mpc8315erdb/config.mk +++ b/board/freescale/mpc8315erdb/config.mk @@ -1,9 +1,9 @@ ifndef NAND_SPL ifeq ($(CONFIG_NAND), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) endif endif -ifndef TEXT_BASE -TEXT_BASE = 0xFE000000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFE000000 endif diff --git a/board/freescale/mpc8323erdb/config.mk b/board/freescale/mpc8323erdb/config.mk index fe0d37d42..fa5324bae 100644 --- a/board/freescale/mpc8323erdb/config.mk +++ b/board/freescale/mpc8323erdb/config.mk @@ -25,4 +25,4 @@ # MPC8323ERDB # -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc832xemds/config.mk b/board/freescale/mpc832xemds/config.mk index 6c3eca753..3ba2046bd 100644 --- a/board/freescale/mpc832xemds/config.mk +++ b/board/freescale/mpc832xemds/config.mk @@ -25,4 +25,4 @@ # MPC832XEMDS # -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc8349emds/config.mk b/board/freescale/mpc8349emds/config.mk index edf64d150..678cd5d65 100644 --- a/board/freescale/mpc8349emds/config.mk +++ b/board/freescale/mpc8349emds/config.mk @@ -25,4 +25,4 @@ # MPC8349EMDS # -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc8349itx/config.mk b/board/freescale/mpc8349itx/config.mk index 61b6a9015..6b44e1152 100644 --- a/board/freescale/mpc8349itx/config.mk +++ b/board/freescale/mpc8349itx/config.mk @@ -26,6 +26,6 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFEF00000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFEF00000 endif diff --git a/board/freescale/mpc8360emds/config.mk b/board/freescale/mpc8360emds/config.mk index 9ace8860c..6c8605b8e 100644 --- a/board/freescale/mpc8360emds/config.mk +++ b/board/freescale/mpc8360emds/config.mk @@ -25,4 +25,4 @@ # MPC8360EMDS # -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc8360erdk/config.mk b/board/freescale/mpc8360erdk/config.mk index 87dd746a6..ae7f3df01 100644 --- a/board/freescale/mpc8360erdk/config.mk +++ b/board/freescale/mpc8360erdk/config.mk @@ -25,4 +25,4 @@ # MPC8360ERDK # -TEXT_BASE = 0xFF800000 +CONFIG_SYS_TEXT_BASE = 0xFF800000 diff --git a/board/freescale/mpc837xemds/config.mk b/board/freescale/mpc837xemds/config.mk index 63c5fc3c3..a1327787c 100644 --- a/board/freescale/mpc837xemds/config.mk +++ b/board/freescale/mpc837xemds/config.mk @@ -25,4 +25,4 @@ # MPC837xEMDS # -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc837xerdb/config.mk b/board/freescale/mpc837xerdb/config.mk index 5675f81e1..593083cfa 100644 --- a/board/freescale/mpc837xerdb/config.mk +++ b/board/freescale/mpc837xerdb/config.mk @@ -25,4 +25,4 @@ # MPC837xERDB # -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc8536ds/config.mk b/board/freescale/mpc8536ds/config.mk index ac15ff380..7acedcba2 100644 --- a/board/freescale/mpc8536ds/config.mk +++ b/board/freescale/mpc8536ds/config.mk @@ -25,23 +25,23 @@ # ifndef NAND_SPL ifeq ($(CONFIG_NAND), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds endif endif ifeq ($(CONFIG_SDCARD), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) RESET_VECTOR_ADDRESS = 0xf8fffffc endif ifeq ($(CONFIG_SPIFLASH), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) RESET_VECTOR_ADDRESS = 0xf8fffffc endif -ifndef TEXT_BASE -TEXT_BASE = 0xeff80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xeff80000 endif ifndef RESET_VECTOR_ADDRESS diff --git a/board/freescale/mpc8540ads/config.mk b/board/freescale/mpc8540ads/config.mk index 7ae5e61d9..3a9030fba 100644 --- a/board/freescale/mpc8540ads/config.mk +++ b/board/freescale/mpc8540ads/config.mk @@ -26,4 +26,4 @@ # default CCARBAR is at 0xff700000 # assume U-Boot is less than 0.5MB # -TEXT_BASE = 0xfff80000 +CONFIG_SYS_TEXT_BASE = 0xfff80000 diff --git a/board/freescale/mpc8541cds/config.mk b/board/freescale/mpc8541cds/config.mk index e7a0b347b..4b6bf6705 100644 --- a/board/freescale/mpc8541cds/config.mk +++ b/board/freescale/mpc8541cds/config.mk @@ -23,4 +23,4 @@ # # mpc8541cds board # -TEXT_BASE = 0xfff80000 +CONFIG_SYS_TEXT_BASE = 0xfff80000 diff --git a/board/freescale/mpc8544ds/config.mk b/board/freescale/mpc8544ds/config.mk index a09dac189..bd85cf7c3 100644 --- a/board/freescale/mpc8544ds/config.mk +++ b/board/freescale/mpc8544ds/config.mk @@ -23,6 +23,6 @@ # # mpc8544ds board # -ifndef TEXT_BASE -TEXT_BASE = 0xfff80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xfff80000 endif diff --git a/board/freescale/mpc8548cds/config.mk b/board/freescale/mpc8548cds/config.mk index 81c8737a9..bbd0c6a3d 100644 --- a/board/freescale/mpc8548cds/config.mk +++ b/board/freescale/mpc8548cds/config.mk @@ -23,6 +23,6 @@ # # mpc8548cds board # -ifndef TEXT_BASE -TEXT_BASE = 0xfff80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xfff80000 endif diff --git a/board/freescale/mpc8555cds/config.mk b/board/freescale/mpc8555cds/config.mk index 798be3975..8f62e5aee 100644 --- a/board/freescale/mpc8555cds/config.mk +++ b/board/freescale/mpc8555cds/config.mk @@ -23,4 +23,4 @@ # # mpc8555cds board # -TEXT_BASE = 0xfff80000 +CONFIG_SYS_TEXT_BASE = 0xfff80000 diff --git a/board/freescale/mpc8560ads/config.mk b/board/freescale/mpc8560ads/config.mk index 37dc7a165..6ccdcda65 100644 --- a/board/freescale/mpc8560ads/config.mk +++ b/board/freescale/mpc8560ads/config.mk @@ -26,4 +26,4 @@ # default CCARBAR is at 0xff700000 # assume U-Boot is less than 0.5MB # -TEXT_BASE = 0xfff80000 +CONFIG_SYS_TEXT_BASE = 0xfff80000 diff --git a/board/freescale/mpc8568mds/config.mk b/board/freescale/mpc8568mds/config.mk index ed4b10167..65de86445 100644 --- a/board/freescale/mpc8568mds/config.mk +++ b/board/freescale/mpc8568mds/config.mk @@ -23,4 +23,4 @@ # # mpc8568mds board # -TEXT_BASE = 0xfff80000 +CONFIG_SYS_TEXT_BASE = 0xfff80000 diff --git a/board/freescale/mpc8569mds/config.mk b/board/freescale/mpc8569mds/config.mk index 4f7e18da3..9adc60604 100644 --- a/board/freescale/mpc8569mds/config.mk +++ b/board/freescale/mpc8569mds/config.mk @@ -25,11 +25,11 @@ # ifndef NAND_SPL ifeq ($(CONFIG_NAND), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds endif endif -ifndef TEXT_BASE -TEXT_BASE = 0xfff80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xfff80000 endif diff --git a/board/freescale/mpc8572ds/config.mk b/board/freescale/mpc8572ds/config.mk index 67394c9b7..ac31b94fe 100644 --- a/board/freescale/mpc8572ds/config.mk +++ b/board/freescale/mpc8572ds/config.mk @@ -23,8 +23,8 @@ # # mpc8572ds board # -ifndef TEXT_BASE -TEXT_BASE = 0xeff80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xeff80000 endif RESET_VECTOR_ADDRESS = 0xeffffffc diff --git a/board/freescale/mpc8610hpcd/config.mk b/board/freescale/mpc8610hpcd/config.mk index 798f60a96..61356aca3 100644 --- a/board/freescale/mpc8610hpcd/config.mk +++ b/board/freescale/mpc8610hpcd/config.mk @@ -19,4 +19,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 diff --git a/board/freescale/mpc8641hpcn/config.mk b/board/freescale/mpc8641hpcn/config.mk index 3315d25e9..23d36b1cd 100644 --- a/board/freescale/mpc8641hpcn/config.mk +++ b/board/freescale/mpc8641hpcn/config.mk @@ -25,4 +25,4 @@ # default CCSRBAR is at 0xff700000 # assume U-Boot is less than 0.5MB # -TEXT_BASE = 0xeff00000 +CONFIG_SYS_TEXT_BASE = 0xeff00000 diff --git a/board/freescale/mx31ads/config.mk b/board/freescale/mx31ads/config.mk index 7ec0fe2cd..2303f30bd 100644 --- a/board/freescale/mx31ads/config.mk +++ b/board/freescale/mx31ads/config.mk @@ -1,3 +1,3 @@ -TEXT_BASE = 0x87f00000 +CONFIG_SYS_TEXT_BASE = 0x87f00000 LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/freescale/mx31pdk/config.mk b/board/freescale/mx31pdk/config.mk index dcaa09ff8..de2c6429c 100644 --- a/board/freescale/mx31pdk/config.mk +++ b/board/freescale/mx31pdk/config.mk @@ -1,5 +1,5 @@ ifdef CONFIG_NAND_SPL -TEXT_BASE = 0x87ec0000 +CONFIG_SYS_TEXT_BASE = 0x87ec0000 else -TEXT_BASE = 0x87f00000 +CONFIG_SYS_TEXT_BASE = 0x87f00000 endif diff --git a/board/freescale/mx51evk/config.mk b/board/freescale/mx51evk/config.mk index dd4a2c299..716fca9d2 100644 --- a/board/freescale/mx51evk/config.mk +++ b/board/freescale/mx51evk/config.mk @@ -21,6 +21,6 @@ # LDSCRIPT = $(CPUDIR)/$(SOC)/u-boot.lds -TEXT_BASE = 0x97800000 +CONFIG_SYS_TEXT_BASE = 0x97800000 IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage.cfg ALL += $(obj)u-boot.imx diff --git a/board/freescale/p1022ds/config.mk b/board/freescale/p1022ds/config.mk index 4581d20c3..5ad81e062 100644 --- a/board/freescale/p1022ds/config.mk +++ b/board/freescale/p1022ds/config.mk @@ -7,8 +7,8 @@ # any later version. # -ifndef TEXT_BASE -TEXT_BASE = 0xeff80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xeff80000 endif RESET_VECTOR_ADDRESS = 0xeffffffc diff --git a/board/freescale/p1_p2_rdb/config.mk b/board/freescale/p1_p2_rdb/config.mk index 2d306bb6d..18da01024 100644 --- a/board/freescale/p1_p2_rdb/config.mk +++ b/board/freescale/p1_p2_rdb/config.mk @@ -26,23 +26,23 @@ ifndef NAND_SPL ifeq ($(CONFIG_NAND), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds endif endif ifeq ($(CONFIG_SDCARD), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) RESET_VECTOR_ADDRESS = 0xf8fffffc endif ifeq ($(CONFIG_SPIFLASH), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) RESET_VECTOR_ADDRESS = 0xf8fffffc endif -ifndef TEXT_BASE -TEXT_BASE = 0xeff80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xeff80000 endif ifndef RESET_VECTOR_ADDRESS diff --git a/board/freescale/p2020ds/config.mk b/board/freescale/p2020ds/config.mk index 4fcd69c5d..4268c191b 100644 --- a/board/freescale/p2020ds/config.mk +++ b/board/freescale/p2020ds/config.mk @@ -23,8 +23,8 @@ # # p2020ds board # -ifndef TEXT_BASE -TEXT_BASE = 0xeff80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xeff80000 endif RESET_VECTOR_ADDRESS = 0xeffffffc diff --git a/board/funkwerk/vovpn-gw/config.mk b/board/funkwerk/vovpn-gw/config.mk index e59b4831d..5adb69187 100644 --- a/board/funkwerk/vovpn-gw/config.mk +++ b/board/funkwerk/vovpn-gw/config.mk @@ -18,4 +18,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 diff --git a/board/g2000/config.mk b/board/g2000/config.mk index 25b210579..c5f8c6efc 100644 --- a/board/g2000/config.mk +++ b/board/g2000/config.mk @@ -25,5 +25,5 @@ # esd PLU405 boards # -TEXT_BASE = 0xFFFC0000 -#TEXT_BASE = 0x00FC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 +#CONFIG_SYS_TEXT_BASE = 0x00FC0000 diff --git a/board/gaisler/gr_cpci_ax2000/config.mk b/board/gaisler/gr_cpci_ax2000/config.mk index 6c4d56b90..e8df9a35d 100644 --- a/board/gaisler/gr_cpci_ax2000/config.mk +++ b/board/gaisler/gr_cpci_ax2000/config.mk @@ -26,12 +26,13 @@ # # U-BOOT IN FLASH -TEXT_BASE = 0x00000000 +CONFIG_SYS_TEXT_BASE = 0x00000000 # U-BOOT IN RAM or SDRAM with -nosram flag set when starting GRMON -#TEXT_BASE = 0x40000000 +#CONFIG_SYS_TEXT_BASE = 0x40000000 # U-BOOT IN SDRAM -#TEXT_BASE = 0x60000000 +#CONFIG_SYS_TEXT_BASE = 0x60000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/gaisler/gr_ep2s60/config.mk b/board/gaisler/gr_ep2s60/config.mk index 2ee0957a3..ce8246949 100644 --- a/board/gaisler/gr_ep2s60/config.mk +++ b/board/gaisler/gr_ep2s60/config.mk @@ -27,9 +27,10 @@ # # U-BOOT IN FLASH -TEXT_BASE = 0x00000000 +CONFIG_SYS_TEXT_BASE = 0x00000000 # U-BOOT IN SDRAM -#TEXT_BASE = 0x40000000 +#CONFIG_SYS_TEXT_BASE = 0x40000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/gaisler/gr_xc3s_1500/config.mk b/board/gaisler/gr_xc3s_1500/config.mk index 35cbc1bb2..c60ef7b54 100644 --- a/board/gaisler/gr_xc3s_1500/config.mk +++ b/board/gaisler/gr_xc3s_1500/config.mk @@ -26,9 +26,10 @@ # # U-BOOT IN FLASH -TEXT_BASE = 0x00000000 +CONFIG_SYS_TEXT_BASE = 0x00000000 # U-BOOT IN RAM -#TEXT_BASE = 0x40000000 +#CONFIG_SYS_TEXT_BASE = 0x40000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/gaisler/grsim/config.mk b/board/gaisler/grsim/config.mk index 81cd415e8..c2e82684d 100644 --- a/board/gaisler/grsim/config.mk +++ b/board/gaisler/grsim/config.mk @@ -26,9 +26,10 @@ # # U-BOOT IN FLASH -TEXT_BASE = 0x00000000 +CONFIG_SYS_TEXT_BASE = 0x00000000 # U-BOOT IN RAM -#TEXT_BASE = 0x40000000 +#CONFIG_SYS_TEXT_BASE = 0x40000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/gaisler/grsim_leon2/config.mk b/board/gaisler/grsim_leon2/config.mk index 65eba1bb7..4d886919d 100644 --- a/board/gaisler/grsim_leon2/config.mk +++ b/board/gaisler/grsim_leon2/config.mk @@ -26,9 +26,10 @@ # # RUN U-BOOT FROM PROM -TEXT_BASE = 0x00000000 +CONFIG_SYS_TEXT_BASE = 0x00000000 # RUN U-BOOT FROM RAM -#TEXT_BASE = 0x40000000 +#CONFIG_SYS_TEXT_BASE = 0x40000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/galaxy5200/config.mk b/board/galaxy5200/config.mk index c6398b26e..c46e51a72 100644 --- a/board/galaxy5200/config.mk +++ b/board/galaxy5200/config.mk @@ -24,7 +24,7 @@ # # galaxy5200 board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFF00000 boot high (standard configuration) # 0xFE000000 boot low @@ -34,12 +34,13 @@ sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp ifdef CONFIG_galaxy5200_LOWBOOT -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 endif -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/gcplus/config.mk b/board/gcplus/config.mk index 57326b854..a9bd3ff01 100644 --- a/board/gcplus/config.mk +++ b/board/gcplus/config.mk @@ -10,4 +10,4 @@ # bootp;tftp;bootm, repeat, etc.,. # -TEXT_BASE = 0xc8f00000 +CONFIG_SYS_TEXT_BASE = 0xc8f00000 diff --git a/board/gdsys/dlvision/config.mk b/board/gdsys/dlvision/config.mk index 1bdf5e4fc..1646d3423 100644 --- a/board/gdsys/dlvision/config.mk +++ b/board/gdsys/dlvision/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/gdsys/gdppc440etx/config.mk b/board/gdsys/gdppc440etx/config.mk index 045f3e98b..1e01ec586 100644 --- a/board/gdsys/gdppc440etx/config.mk +++ b/board/gdsys/gdppc440etx/config.mk @@ -25,12 +25,12 @@ # G&D 440EP/GR ETX-Module # -#TEXT_BASE = 0x00001000 +#CONFIG_SYS_TEXT_BASE = 0x00001000 ifeq ($(ramsym),1) -TEXT_BASE = 0xFBD00000 +CONFIG_SYS_TEXT_BASE = 0xFBD00000 else -TEXT_BASE = 0xFFF80000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/gdsys/intip/config.mk b/board/gdsys/intip/config.mk index 56e397d77..75aee0d0a 100644 --- a/board/gdsys/intip/config.mk +++ b/board/gdsys/intip/config.mk @@ -26,8 +26,8 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/gdsys/neo/config.mk b/board/gdsys/neo/config.mk index 1bdf5e4fc..1646d3423 100644 --- a/board/gdsys/neo/config.mk +++ b/board/gdsys/neo/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/gen860t/config.mk b/board/gen860t/config.mk index 7acd90493..b788092bf 100644 --- a/board/gen860t/config.mk +++ b/board/gen860t/config.mk @@ -25,4 +25,4 @@ # FLASH base address for GEN860T board # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/genietv/config.mk b/board/genietv/config.mk index 69ab21fcf..72b0ec02a 100644 --- a/board/genietv/config.mk +++ b/board/genietv/config.mk @@ -21,5 +21,5 @@ # MA 02111-1307 USA # -TEXT_BASE = 0x00000000 +CONFIG_SYS_TEXT_BASE = 0x00000000 OBJCFLAGS = --set-section-flags=.ppcenv=contents,alloc,load,data diff --git a/board/gth2/config.mk b/board/gth2/config.mk index 2bc1338e3..c9050492e 100644 --- a/board/gth2/config.mk +++ b/board/gth2/config.mk @@ -26,16 +26,16 @@ # ifeq ($(TBASE),0) -TEXT_BASE = 0 +CONFIG_SYS_TEXT_BASE = 0 else ifeq ($(TBASE),1) -TEXT_BASE = 0xbfc10070 +CONFIG_SYS_TEXT_BASE = 0xbfc10070 else ifeq ($(TBASE),2) -TEXT_BASE = 0xbfc30070 +CONFIG_SYS_TEXT_BASE = 0xbfc30070 else ## Only to make ordinary make work -TEXT_BASE = 0x90000000 +CONFIG_SYS_TEXT_BASE = 0x90000000 endif endif endif diff --git a/board/gw8260/config.mk b/board/gw8260/config.mk index ca0540d70..ad3c2d7fa 100644 --- a/board/gw8260/config.mk +++ b/board/gw8260/config.mk @@ -29,6 +29,7 @@ # MBX8xx boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/hermes/config.mk b/board/hermes/config.mk index 008165fa6..b77f5bf03 100644 --- a/board/hermes/config.mk +++ b/board/hermes/config.mk @@ -25,4 +25,4 @@ # Multidata HERMES-PRO ISDN Routers # -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 diff --git a/board/hidden_dragon/config.mk b/board/hidden_dragon/config.mk index 5c36d05fe..96b6262ad 100644 --- a/board/hidden_dragon/config.mk +++ b/board/hidden_dragon/config.mk @@ -25,6 +25,6 @@ # Hidden Dragon boards # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/hymod/config.mk b/board/hymod/config.mk index 2df321fdd..af448291e 100644 --- a/board/hymod/config.mk +++ b/board/hymod/config.mk @@ -25,7 +25,7 @@ # HYMOD boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 PLATFORM_CPPFLAGS += -I$(TOPDIR) diff --git a/board/ibf-dsp561/config.mk b/board/ibf-dsp561/config.mk index 1fec4d020..80b527c6c 100644 --- a/board/ibf-dsp561/config.mk +++ b/board/ibf-dsp561/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf561-0.5 diff --git a/board/icecube/config.mk b/board/icecube/config.mk index 170779d6c..106498d05 100644 --- a/board/icecube/config.mk +++ b/board/icecube/config.mk @@ -24,7 +24,7 @@ # # IceCube board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFF00000 boot high (standard configuration) # 0xFF000000 boot low for 16 MiB boards @@ -34,11 +34,12 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 ## For testing: boot from RAM -# TEXT_BASE = 0x00100000 +# CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/icu862/config.mk b/board/icu862/config.mk index 315e70d76..ed8e9def1 100644 --- a/board/icu862/config.mk +++ b/board/icu862/config.mk @@ -25,5 +25,5 @@ # ICU862 boards # -TEXT_BASE = 0x40F00000 +CONFIG_SYS_TEXT_BASE = 0x40F00000 OBJCFLAGS = --set-section-flags=.ppcenv=contents,alloc,load,data diff --git a/board/idmr/config.mk b/board/idmr/config.mk index f7c2258a8..95b0f9e34 100644 --- a/board/idmr/config.mk +++ b/board/idmr/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xff800000 +CONFIG_SYS_TEXT_BASE = 0xff800000 diff --git a/board/ids8247/config.mk b/board/ids8247/config.mk index 2a7f3dd12..1aee97c75 100644 --- a/board/ids8247/config.mk +++ b/board/ids8247/config.mk @@ -29,6 +29,7 @@ # for the "final" configuration, with U-Boot in flash, or the address # in RAM where U-Boot is loaded at for debugging. # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/impa7/config.mk b/board/impa7/config.mk index 417d6a8e2..15e7f04ca 100644 --- a/board/impa7/config.mk +++ b/board/impa7/config.mk @@ -25,4 +25,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xc1780000 +CONFIG_SYS_TEXT_BASE = 0xc1780000 diff --git a/board/imx31_phycore/config.mk b/board/imx31_phycore/config.mk index d34dc02d9..0131edfbe 100644 --- a/board/imx31_phycore/config.mk +++ b/board/imx31_phycore/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x87f00000 +CONFIG_SYS_TEXT_BASE = 0x87f00000 diff --git a/board/incaip/config.mk b/board/incaip/config.mk index 0cecc011e..7ef5a6640 100644 --- a/board/incaip/config.mk +++ b/board/incaip/config.mk @@ -26,7 +26,7 @@ # # ROM version -TEXT_BASE = 0xB0000000 +CONFIG_SYS_TEXT_BASE = 0xB0000000 # RAM version -#TEXT_BASE = 0x80100000 +#CONFIG_SYS_TEXT_BASE = 0x80100000 diff --git a/board/inka4x0/config.mk b/board/inka4x0/config.mk index 9f6fb3b68..145496f84 100644 --- a/board/inka4x0/config.mk +++ b/board/inka4x0/config.mk @@ -24,19 +24,20 @@ # # INKA 4X0 board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFE00000 boot low # # 0x00100000 boot from RAM (for testing only) # -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot low -TEXT_BASE = 0xFFE00000 +CONFIG_SYS_TEXT_BASE = 0xFFE00000 ## For testing: boot from RAM -#TEXT_BASE = 0x00100000 +#CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds diff --git a/board/innokom/config.mk b/board/innokom/config.mk index 23543920c..9e4655585 100644 --- a/board/innokom/config.mk +++ b/board/innokom/config.mk @@ -7,9 +7,9 @@ # # This is the address where U-Boot lives in flash: -#TEXT_BASE = 0 +#CONFIG_SYS_TEXT_BASE = 0 # FIXME: armboot does only work correctly when being compiled # for the addresses _after_ relocation to RAM!! Otherwhise the # .bss segment is assumed in flash... -TEXT_BASE = 0xa1fe0000 +CONFIG_SYS_TEXT_BASE = 0xa1fe0000 diff --git a/board/innokom/lowlevel_init.S b/board/innokom/lowlevel_init.S index 9892430a1..55169be45 100644 --- a/board/innokom/lowlevel_init.S +++ b/board/innokom/lowlevel_init.S @@ -39,7 +39,7 @@ DRAM_SIZE: .long CONFIG_SYS_DRAM_SIZE .endm _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE /* diff --git a/board/ip04/config.mk b/board/ip04/config.mk index 683101b82..fc818fba4 100644 --- a/board/ip04/config.mk +++ b/board/ip04/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf532-0.5 diff --git a/board/ip860/config.mk b/board/ip860/config.mk index ea3b8735e..f5184a929 100644 --- a/board/ip860/config.mk +++ b/board/ip860/config.mk @@ -25,4 +25,4 @@ # MicroSys IP860 VMEBus Systems # -TEXT_BASE = 0x10000000 +CONFIG_SYS_TEXT_BASE = 0x10000000 diff --git a/board/ipek01/config.mk b/board/ipek01/config.mk index c8ecb2944..4937019c8 100644 --- a/board/ipek01/config.mk +++ b/board/ipek01/config.mk @@ -25,6 +25,7 @@ # IPEK01 board # -TEXT_BASE = 0xfc000000 +CONFIG_SYS_TEXT_BASE = 0xfc000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/iphase4539/config.mk b/board/iphase4539/config.mk index 632c1d2ac..23cb835d0 100644 --- a/board/iphase4539/config.mk +++ b/board/iphase4539/config.mk @@ -24,6 +24,7 @@ # iphase4539 board # -TEXT_BASE = 0xffb00000 +CONFIG_SYS_TEXT_BASE = 0xffb00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/ispan/config.mk b/board/ispan/config.mk index 4600dbb06..c7fb39713 100644 --- a/board/ispan/config.mk +++ b/board/ispan/config.mk @@ -24,6 +24,6 @@ # # Interphase iSPAN Communications Controllers # -#TEXT_BASE = 0xFF800000 -#TEXT_BASE = 0xFFBA0000 -TEXT_BASE = 0xFE7A0000 +#CONFIG_SYS_TEXT_BASE = 0xFF800000 +#CONFIG_SYS_TEXT_BASE = 0xFFBA0000 +CONFIG_SYS_TEXT_BASE = 0xFE7A0000 diff --git a/board/ivm/config.mk b/board/ivm/config.mk index 37e718573..be913a8dc 100644 --- a/board/ivm/config.mk +++ b/board/ivm/config.mk @@ -26,4 +26,4 @@ # IVM boards # -TEXT_BASE = 0xFF000000 +CONFIG_SYS_TEXT_BASE = 0xFF000000 diff --git a/board/ixdp425/config.mk b/board/ixdp425/config.mk index ecff8d741..509c894a2 100644 --- a/board/ixdp425/config.mk +++ b/board/ixdp425/config.mk @@ -1,2 +1,2 @@ # -TEXT_BASE = 0x00f80000 +CONFIG_SYS_TEXT_BASE = 0x00f80000 diff --git a/board/jse/config.mk b/board/jse/config.mk index 03ec08501..30ad1c24b 100644 --- a/board/jse/config.mk +++ b/board/jse/config.mk @@ -21,4 +21,4 @@ # Picture Elements, Inc. JSE boards # -TEXT_BASE = 0xFFF80000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 diff --git a/board/jupiter/config.mk b/board/jupiter/config.mk index 5f4da96da..d876436f4 100644 --- a/board/jupiter/config.mk +++ b/board/jupiter/config.mk @@ -24,18 +24,20 @@ # # Jupiter board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFF00000 boot high (standard configuration) # 0x00100000 boot from RAM (for testing only) # -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 ## For testing: boot from RAM -# TEXT_BASE = 0x00100000 +# CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board -#PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -DDEBUG -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board +#PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ +# -DDEBUG -I$(TOPDIR)/board diff --git a/board/karo/tx25/config.mk b/board/karo/tx25/config.mk index 51ca1ab0f..4283c3e34 100644 --- a/board/karo/tx25/config.mk +++ b/board/karo/tx25/config.mk @@ -1,5 +1,5 @@ ifdef CONFIG_NAND_SPL -TEXT_BASE = 0x810c0000 +CONFIG_SYS_TEXT_BASE = 0x810c0000 else -TEXT_BASE = 0x81fc0000 +CONFIG_SYS_TEXT_BASE = 0x81fc0000 endif diff --git a/board/kb9202/config.mk b/board/kb9202/config.mk index 9ce161e55..207769233 100644 --- a/board/kb9202/config.mk +++ b/board/kb9202/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x21f00000 +CONFIG_SYS_TEXT_BASE = 0x21f00000 diff --git a/board/keymile/km8xx/config.mk b/board/keymile/km8xx/config.mk index 8625cea56..5f5dc2db1 100644 --- a/board/keymile/km8xx/config.mk +++ b/board/keymile/km8xx/config.mk @@ -25,4 +25,4 @@ # mgsvud boards # -TEXT_BASE = 0xf0000000 +CONFIG_SYS_TEXT_BASE = 0xf0000000 diff --git a/board/keymile/km_arm/config.mk b/board/keymile/km_arm/config.mk index b9e81b26b..df4828cdc 100644 --- a/board/keymile/km_arm/config.mk +++ b/board/keymile/km_arm/config.mk @@ -22,7 +22,7 @@ # MA 02110-1301 USA # -TEXT_BASE = 0x004000000 +CONFIG_SYS_TEXT_BASE = 0x004000000 # Kirkwood Boot Image configuration file KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg diff --git a/board/keymile/kmeter1/config.mk b/board/keymile/kmeter1/config.mk index 20f298bdb..a3b92c812 100644 --- a/board/keymile/kmeter1/config.mk +++ b/board/keymile/kmeter1/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xF0000000 +CONFIG_SYS_TEXT_BASE = 0xF0000000 diff --git a/board/keymile/mgcoge/config.mk b/board/keymile/mgcoge/config.mk index 143bc9f76..c91358a47 100644 --- a/board/keymile/mgcoge/config.mk +++ b/board/keymile/mgcoge/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 diff --git a/board/korat/config.mk b/board/korat/config.mk index 73180dbd8..828b22dcf 100644 --- a/board/korat/config.mk +++ b/board/korat/config.mk @@ -40,8 +40,8 @@ endif ifeq ($(perm),1) PLATFORM_CPPFLAGS += -DCONFIG_KORAT_PERMANENT -TEXT_BASE = 0xFFFA0000 +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 else -TEXT_BASE = 0xF7F60000 +CONFIG_SYS_TEXT_BASE = 0xF7F60000 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-F7FC.lds endif diff --git a/board/kup/kup4k/config.mk b/board/kup/kup4k/config.mk index 22e30b2ca..8d2419fc4 100644 --- a/board/kup/kup4k/config.mk +++ b/board/kup/kup4k/config.mk @@ -25,4 +25,4 @@ # KUP4K board # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/kup/kup4x/config.mk b/board/kup/kup4x/config.mk index 61d4e09f6..a705f5330 100644 --- a/board/kup/kup4x/config.mk +++ b/board/kup/kup4x/config.mk @@ -25,4 +25,4 @@ # KUP4X board # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/lantec/config.mk b/board/lantec/config.mk index 05ea3b914..1914609c5 100644 --- a/board/lantec/config.mk +++ b/board/lantec/config.mk @@ -25,4 +25,4 @@ # Lantec board (based on TQM8xxL config). # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/lart/config.mk b/board/lart/config.mk index 3033c4fba..b6b5e4da3 100644 --- a/board/lart/config.mk +++ b/board/lart/config.mk @@ -20,4 +20,4 @@ # -TEXT_BASE = 0xc1780000 +CONFIG_SYS_TEXT_BASE = 0xc1780000 diff --git a/board/linkstation/config.mk b/board/linkstation/config.mk index d04829014..e43a7364a 100644 --- a/board/linkstation/config.mk +++ b/board/linkstation/config.mk @@ -23,7 +23,7 @@ # LinkStation/LinkStation-HG: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # Standard configuration - all models # 0xFFF00000 boot from flash @@ -37,14 +37,14 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE # For flash image - all models -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 # For RAM image # HLAN and LAN -#TEXT_BASE = 0x03F00000 +#CONFIG_SYS_TEXT_BASE = 0x03F00000 # HGLAN and HGTL -#TEXT_BASE = 0x07F00000 +#CONFIG_SYS_TEXT_BASE = 0x07F00000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/logicpd/am3517evm/config.mk b/board/logicpd/am3517evm/config.mk index f7a35ce1b..102d32b91 100644 --- a/board/logicpd/am3517evm/config.mk +++ b/board/logicpd/am3517evm/config.mk @@ -27,4 +27,4 @@ # (mem base + reserved) # For use with external or internal boots. -TEXT_BASE = 0x80e80000 +CONFIG_SYS_TEXT_BASE = 0x80e80000 diff --git a/board/logicpd/imx27lite/config.mk b/board/logicpd/imx27lite/config.mk index 2f9c4e629..7f22154c6 100644 --- a/board/logicpd/imx27lite/config.mk +++ b/board/logicpd/imx27lite/config.mk @@ -1 +1 @@ -TEXT_BASE = 0xc0000000 +CONFIG_SYS_TEXT_BASE = 0xc0000000 diff --git a/board/logicpd/imx31_litekit/config.mk b/board/logicpd/imx31_litekit/config.mk index d34dc02d9..0131edfbe 100644 --- a/board/logicpd/imx31_litekit/config.mk +++ b/board/logicpd/imx31_litekit/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x87f00000 +CONFIG_SYS_TEXT_BASE = 0x87f00000 diff --git a/board/logicpd/zoom1/config.mk b/board/logicpd/zoom1/config.mk index 7347497ec..39a94dc4c 100644 --- a/board/logicpd/zoom1/config.mk +++ b/board/logicpd/zoom1/config.mk @@ -30,4 +30,4 @@ # (mem base + reserved) # For use with external or internal boots. -TEXT_BASE = 0x80e80000 +CONFIG_SYS_TEXT_BASE = 0x80e80000 diff --git a/board/logicpd/zoom2/config.mk b/board/logicpd/zoom2/config.mk index 33f394b85..8a8adc785 100644 --- a/board/logicpd/zoom2/config.mk +++ b/board/logicpd/zoom2/config.mk @@ -30,4 +30,4 @@ # (mem base + reserved) # For use with external or internal boots. -TEXT_BASE = 0x80e80000 +CONFIG_SYS_TEXT_BASE = 0x80e80000 diff --git a/board/lpc2292sodimm/config.mk b/board/lpc2292sodimm/config.mk index b28f418df..48917928e 100644 --- a/board/lpc2292sodimm/config.mk +++ b/board/lpc2292sodimm/config.mk @@ -26,5 +26,5 @@ # #address where u-boot will be relocated -#TEXT_BASE = 0x0 -TEXT_BASE = 0x81500000 +#CONFIG_SYS_TEXT_BASE = 0x0 +CONFIG_SYS_TEXT_BASE = 0x81500000 diff --git a/board/lpc2292sodimm/lowlevel_init.S b/board/lpc2292sodimm/lowlevel_init.S index 4e8eb893e..f579a1a47 100644 --- a/board/lpc2292sodimm/lowlevel_init.S +++ b/board/lpc2292sodimm/lowlevel_init.S @@ -29,7 +29,7 @@ #define BCFG1_VALUE 0x10001C61 _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE MEMMAP_ADR: .word MEMMAP BCFG0_ADR: diff --git a/board/lpd7a40x/config.mk b/board/lpd7a40x/config.mk index bc03874a4..003e70740 100644 --- a/board/lpd7a40x/config.mk +++ b/board/lpd7a40x/config.mk @@ -34,5 +34,5 @@ # download area is 0xc0f00000 # -TEXT_BASE = 0xc1fc0000 -#TEXT_BASE = 0x00000000 +CONFIG_SYS_TEXT_BASE = 0xc1fc0000 +#CONFIG_SYS_TEXT_BASE = 0x00000000 diff --git a/board/lpd7a40x/lowlevel_init.S b/board/lpd7a40x/lowlevel_init.S index 780b931be..de34fc6f0 100644 --- a/board/lpd7a40x/lowlevel_init.S +++ b/board/lpd7a40x/lowlevel_init.S @@ -129,7 +129,7 @@ #define DO_MEM_READ 2 _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE .globl lowlevel_init lowlevel_init: diff --git a/board/lubbock/config.mk b/board/lubbock/config.mk index 55c8b270a..f30f695de 100644 --- a/board/lubbock/config.mk +++ b/board/lubbock/config.mk @@ -1,3 +1,3 @@ -#TEXT_BASE = 0xa1700000 -TEXT_BASE = 0xa3080000 -#TEXT_BASE = 0 +#CONFIG_SYS_TEXT_BASE = 0xa1700000 +CONFIG_SYS_TEXT_BASE = 0xa3080000 +#CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/lwmon/config.mk b/board/lwmon/config.mk index dfa952add..de48fd748 100644 --- a/board/lwmon/config.mk +++ b/board/lwmon/config.mk @@ -26,5 +26,5 @@ # LWE Monitorcontroller Litronic LCD IV boards # -TEXT_BASE = 0x40000000 -#TEXT_BASE = 0x41000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 +#CONFIG_SYS_TEXT_BASE = 0x41000000 diff --git a/board/lwmon5/config.mk b/board/lwmon5/config.mk index 3c6d04172..3679d9070 100644 --- a/board/lwmon5/config.mk +++ b/board/lwmon5/config.mk @@ -24,8 +24,8 @@ # lwmon5 (440EPx) # -ifndef TEXT_BASE -TEXT_BASE = 0xFFF80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFFF80000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/m501sk/config.mk b/board/m501sk/config.mk index 9ce161e55..207769233 100644 --- a/board/m501sk/config.mk +++ b/board/m501sk/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x21f00000 +CONFIG_SYS_TEXT_BASE = 0x21f00000 diff --git a/board/manroland/hmi1001/config.mk b/board/manroland/hmi1001/config.mk index 8ccf33e15..b5a7125cf 100644 --- a/board/manroland/hmi1001/config.mk +++ b/board/manroland/hmi1001/config.mk @@ -24,19 +24,20 @@ # # INKA 4X0 board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFE00000 boot high # # 0x00100000 boot from RAM (for testing only) # -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 ## For testing: boot from RAM -#TEXT_BASE = 0x00100000 +#CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds diff --git a/board/manroland/mucmc52/config.mk b/board/manroland/mucmc52/config.mk index 685072833..cb2218fce 100644 --- a/board/manroland/mucmc52/config.mk +++ b/board/manroland/mucmc52/config.mk @@ -27,19 +27,20 @@ # # MUCMC52 board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFE00000 boot high # # 0x00100000 boot from RAM (for testing only) # -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 ## For testing: boot from RAM -#TEXT_BASE = 0x00100000 +#CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot.lds diff --git a/board/manroland/uc100/config.mk b/board/manroland/uc100/config.mk index a65a8ba2c..4308eedc5 100644 --- a/board/manroland/uc100/config.mk +++ b/board/manroland/uc100/config.mk @@ -25,5 +25,5 @@ # UC100 boards # -#TEXT_BASE = 0x40000000 -TEXT_BASE = 0x40700000 +#CONFIG_SYS_TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40700000 diff --git a/board/manroland/uc101/config.mk b/board/manroland/uc101/config.mk index 8ccf33e15..b5a7125cf 100644 --- a/board/manroland/uc101/config.mk +++ b/board/manroland/uc101/config.mk @@ -24,19 +24,20 @@ # # INKA 4X0 board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFE00000 boot high # # 0x00100000 boot from RAM (for testing only) # -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 ## For testing: boot from RAM -#TEXT_BASE = 0x00100000 +#CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds diff --git a/board/matrix_vision/mvbc_p/config.mk b/board/matrix_vision/mvbc_p/config.mk index c2c09f4fd..6677b3aba 100644 --- a/board/matrix_vision/mvbc_p/config.mk +++ b/board/matrix_vision/mvbc_p/config.mk @@ -23,8 +23,9 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFF800000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFF800000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/matrix_vision/mvblm7/config.mk b/board/matrix_vision/mvblm7/config.mk index d48fc3105..73396356e 100644 --- a/board/matrix_vision/mvblm7/config.mk +++ b/board/matrix_vision/mvblm7/config.mk @@ -22,4 +22,4 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 diff --git a/board/matrix_vision/mvsmr/config.mk b/board/matrix_vision/mvsmr/config.mk index b1da812c4..3886fe1cc 100644 --- a/board/matrix_vision/mvsmr/config.mk +++ b/board/matrix_vision/mvsmr/config.mk @@ -23,9 +23,10 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFF800000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFF800000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board LDSCRIPT := $(SRCTREE)/board/matrix_vision/mvsmr/u-boot.lds diff --git a/board/mbx8xx/config.mk b/board/mbx8xx/config.mk index d5e8ed264..e984ecdc5 100644 --- a/board/mbx8xx/config.mk +++ b/board/mbx8xx/config.mk @@ -29,5 +29,5 @@ # MBX8xx boards # -TEXT_BASE = 0xfe000000 -/*TEXT_BASE = 0x00200000 */ +CONFIG_SYS_TEXT_BASE = 0xfe000000 +/*CONFIG_SYS_TEXT_BASE = 0x00200000 */ diff --git a/board/mcc200/config.mk b/board/mcc200/config.mk index d0f9289fe..c5d50aa7a 100644 --- a/board/mcc200/config.mk +++ b/board/mcc200/config.mk @@ -24,7 +24,7 @@ # # MCC200, PRS200 boards: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFC000000 boot low (standard configuration) # 0xFFF00000 boot high @@ -33,13 +33,14 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot low -TEXT_BASE = 0xFC000000 +CONFIG_SYS_TEXT_BASE = 0xFC000000 ## Boot high -# TEXT_BASE = 0xFFF00000 +# CONFIG_SYS_TEXT_BASE = 0xFFF00000 ## For testing: boot from RAM -# TEXT_BASE = 0x00100000 +# CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/micronas/vct/config.mk b/board/micronas/vct/config.mk index 2a71dad66..ae7c58f17 100644 --- a/board/micronas/vct/config.mk +++ b/board/micronas/vct/config.mk @@ -26,6 +26,6 @@ sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0x87000000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0x87000000 endif diff --git a/board/mimc/mimc200/config.mk b/board/mimc/mimc200/config.mk index 9a794e5c6..ea76d05df 100644 --- a/board/mimc/mimc200/config.mk +++ b/board/mimc/mimc200/config.mk @@ -1,3 +1,3 @@ -TEXT_BASE = 0x00000000 +CONFIG_SYS_TEXT_BASE = 0x00000000 PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_LDFLAGS += --gc-sections diff --git a/board/miromico/hammerhead/config.mk b/board/miromico/hammerhead/config.mk index 9a794e5c6..ea76d05df 100644 --- a/board/miromico/hammerhead/config.mk +++ b/board/miromico/hammerhead/config.mk @@ -1,3 +1,3 @@ -TEXT_BASE = 0x00000000 +CONFIG_SYS_TEXT_BASE = 0x00000000 PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_LDFLAGS += --gc-sections diff --git a/board/ml2/config.mk b/board/ml2/config.mk index 5e0bdae91..77e81e2c9 100644 --- a/board/ml2/config.mk +++ b/board/ml2/config.mk @@ -25,8 +25,8 @@ # esd ADCIOP boards # -#TEXT_BASE = 0xFFFE0000 -TEXT_BASE = 0x18000000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 +CONFIG_SYS_TEXT_BASE = 0x18000000 # Use board specific linker script LDSCRIPT := $(SRCTREE)/board/ml2/u-boot.lds diff --git a/board/modnet50/config.mk b/board/modnet50/config.mk index 49d4836c0..4e4d3059a 100644 --- a/board/modnet50/config.mk +++ b/board/modnet50/config.mk @@ -25,5 +25,5 @@ # MA 02111-1307 USA # -TEXT_BASE = 0x00f00000 +CONFIG_SYS_TEXT_BASE = 0x00f00000 #CROSS_COMPILE = arm-elf- diff --git a/board/modnet50/lowlevel_init.S b/board/modnet50/lowlevel_init.S index c98c15545..52ef2a812 100644 --- a/board/modnet50/lowlevel_init.S +++ b/board/modnet50/lowlevel_init.S @@ -55,7 +55,7 @@ lowlevel_init: #if defined(CONFIG_MODNET50) - ldr pc, =(_jump_to_high + NETARM_MMAP_CS0_BASE - TEXT_BASE) + ldr pc, =(_jump_to_high + NETARM_MMAP_CS0_BASE - CONFIG_SYS_TEXT_BASE) _jump_to_high: /* diff --git a/board/mosaixtech/icon/config.mk b/board/mosaixtech/icon/config.mk index b2748cecc..1797b9ab5 100644 --- a/board/mosaixtech/icon/config.mk +++ b/board/mosaixtech/icon/config.mk @@ -21,7 +21,7 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFA0000 +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/motionpro/config.mk b/board/motionpro/config.mk index e7934d29c..c41b3dbd1 100644 --- a/board/motionpro/config.mk +++ b/board/motionpro/config.mk @@ -25,6 +25,7 @@ # Promess Motion-PRO # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/mousse/config.mk b/board/mousse/config.mk index 933e6b32a..c9dc87c26 100644 --- a/board/mousse/config.mk +++ b/board/mousse/config.mk @@ -24,7 +24,7 @@ # # MOUSSE boards # -TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +CONFIG_SYS_TEXT_BASE = 0xFFF00000 +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) LDSCRIPT := $(SRCTREE)/board/mousse/u-boot.lds diff --git a/board/mp2usb/config.mk b/board/mp2usb/config.mk index e299bfd5e..948e4ffb6 100644 --- a/board/mp2usb/config.mk +++ b/board/mp2usb/config.mk @@ -1,3 +1,3 @@ -TEXT_BASE = 0x27F00000 +CONFIG_SYS_TEXT_BASE = 0x27F00000 ## For testing: load at 0x20100000 and "go" at 0x201000A4 -#TEXT_BASE = 0x20100000 +#CONFIG_SYS_TEXT_BASE = 0x20100000 diff --git a/board/mpc8308_p1m/config.mk b/board/mpc8308_p1m/config.mk index 183d3e869..b3f0ab907 100644 --- a/board/mpc8308_p1m/config.mk +++ b/board/mpc8308_p1m/config.mk @@ -1,3 +1,3 @@ -ifndef TEXT_BASE -TEXT_BASE = 0xFC000000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFC000000 endif diff --git a/board/mpc8540eval/config.mk b/board/mpc8540eval/config.mk index 20b868175..1ef7ee17b 100644 --- a/board/mpc8540eval/config.mk +++ b/board/mpc8540eval/config.mk @@ -25,5 +25,5 @@ # default CCARBAR is at 0xff700000 # assume U-Boot is less than 0.5MB # -#TEXT_BASE = 0x1000000 -TEXT_BASE = 0xfff80000 +#CONFIG_SYS_TEXT_BASE = 0x1000000 +CONFIG_SYS_TEXT_BASE = 0xfff80000 diff --git a/board/mpl/mip405/config.mk b/board/mpl/mip405/config.mk index 0f8d153d8..8fe11e52e 100644 --- a/board/mpl/mip405/config.mk +++ b/board/mpl/mip405/config.mk @@ -25,5 +25,5 @@ # esd ADCIOP boards # -#TEXT_BASE = 0xFFFE0000 -TEXT_BASE = 0xFFF80000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 diff --git a/board/mpl/pati/config.mk b/board/mpl/pati/config.mk index b8a098591..ba2e42b10 100644 --- a/board/mpl/pati/config.mk +++ b/board/mpl/pati/config.mk @@ -26,6 +26,7 @@ # # Boot from flash at location 0x00000000 -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/mpl/pip405/config.mk b/board/mpl/pip405/config.mk index 0f8d153d8..8fe11e52e 100644 --- a/board/mpl/pip405/config.mk +++ b/board/mpl/pip405/config.mk @@ -25,5 +25,5 @@ # esd ADCIOP boards # -#TEXT_BASE = 0xFFFE0000 -TEXT_BASE = 0xFFF80000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 diff --git a/board/mpl/vcma9/config.mk b/board/mpl/vcma9/config.mk index 1fa09c97b..e3459133b 100644 --- a/board/mpl/vcma9/config.mk +++ b/board/mpl/vcma9/config.mk @@ -20,5 +20,5 @@ # -#TEXT_BASE = 0x30F80000 -TEXT_BASE = 0x33F80000 +#CONFIG_SYS_TEXT_BASE = 0x30F80000 +CONFIG_SYS_TEXT_BASE = 0x33F80000 diff --git a/board/mpl/vcma9/lowlevel_init.S b/board/mpl/vcma9/lowlevel_init.S index e3af07309..062e868a3 100644 --- a/board/mpl/vcma9/lowlevel_init.S +++ b/board/mpl/vcma9/lowlevel_init.S @@ -128,7 +128,7 @@ /**************************************/ _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE .globl lowlevel_init lowlevel_init: diff --git a/board/mpr2/config.mk b/board/mpr2/config.mk index 6d41d97cb..4a4bca17d 100644 --- a/board/mpr2/config.mk +++ b/board/mpr2/config.mk @@ -29,9 +29,9 @@ # MA 02111-1307 USA # -# TEXT_BASE refers to image _after_ relocation. +# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation. # # NOTE: Must match value used in u-boot.lds (in this directory). # -TEXT_BASE = 0x8FFC0000 +CONFIG_SYS_TEXT_BASE = 0x8FFC0000 diff --git a/board/ms7720se/config.mk b/board/ms7720se/config.mk index cad8d3a36..d2944a6b2 100644 --- a/board/ms7720se/config.mk +++ b/board/ms7720se/config.mk @@ -26,9 +26,9 @@ # MA 02111-1307 USA # -# TEXT_BASE refers to image _after_ relocation. +# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation. # # NOTE: Must match value used in u-boot.lds (in this directory). # -TEXT_BASE = 0x8FFC0000 +CONFIG_SYS_TEXT_BASE = 0x8FFC0000 diff --git a/board/ms7722se/config.mk b/board/ms7722se/config.mk index 4797d6f8f..3f1606bf8 100644 --- a/board/ms7722se/config.mk +++ b/board/ms7722se/config.mk @@ -23,9 +23,9 @@ # MA 02111-1307 USA # -# TEXT_BASE refers to image _after_ relocation. +# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation. # # NOTE: Must match value used in u-boot.lds (in this directory). # -TEXT_BASE = 0x8FFC0000 +CONFIG_SYS_TEXT_BASE = 0x8FFC0000 diff --git a/board/ms7750se/config.mk b/board/ms7750se/config.mk index 1eed5802e..ba4d15591 100644 --- a/board/ms7750se/config.mk +++ b/board/ms7750se/config.mk @@ -20,4 +20,4 @@ # # NOTE: Must match value used in u-boot.lds (in this directory). # -TEXT_BASE = 0x8FFC0000 +CONFIG_SYS_TEXT_BASE = 0x8FFC0000 diff --git a/board/muas3001/config.mk b/board/muas3001/config.mk index cdd0ec9a9..857435e1d 100644 --- a/board/muas3001/config.mk +++ b/board/muas3001/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFF000000 +CONFIG_SYS_TEXT_BASE = 0xFF000000 diff --git a/board/munices/config.mk b/board/munices/config.mk index 1b573bc88..9dcc24148 100644 --- a/board/munices/config.mk +++ b/board/munices/config.mk @@ -24,15 +24,16 @@ # # MUNICes board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFF00000 boot high (standard configuration) # sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFFF00000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFFF00000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/musenki/config.mk b/board/musenki/config.mk index 18673e16d..721dd19a5 100644 --- a/board/musenki/config.mk +++ b/board/musenki/config.mk @@ -25,6 +25,6 @@ # CU824 board # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/mvblue/config.mk b/board/mvblue/config.mk index 6e0ce4efb..5db48c292 100644 --- a/board/mvblue/config.mk +++ b/board/mvblue/config.mk @@ -21,6 +21,6 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/mx1ads/config.mk b/board/mx1ads/config.mk index f6ac40d34..2bc5b1560 100644 --- a/board/mx1ads/config.mk +++ b/board/mx1ads/config.mk @@ -22,4 +22,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA -TEXT_BASE = 0x08400000 +CONFIG_SYS_TEXT_BASE = 0x08400000 diff --git a/board/mx1ads/lowlevel_init.S b/board/mx1ads/lowlevel_init.S index 6967fb2b4..a7400b3dd 100644 --- a/board/mx1ads/lowlevel_init.S +++ b/board/mx1ads/lowlevel_init.S @@ -31,7 +31,7 @@ _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE .globl lowlevel_init lowlevel_init: diff --git a/board/mx1fs2/config.mk b/board/mx1fs2/config.mk index 59ab54246..eb4d04693 100644 --- a/board/mx1fs2/config.mk +++ b/board/mx1fs2/config.mk @@ -1,10 +1,10 @@ # # This config file is used for compilation of IMX sources # -# You might change location of U-Boot in memory by setting right TEXT_BASE. +# You might change location of U-Boot in memory by setting right CONFIG_SYS_TEXT_BASE. # This allows for example having one copy located at the end of ram and stored # in flash device and later on while developing use other location to test # the code in RAM device only. # -TEXT_BASE = 0x08f00000 +CONFIG_SYS_TEXT_BASE = 0x08f00000 diff --git a/board/nc650/config.mk b/board/nc650/config.mk index 9d9b89260..3b457c215 100644 --- a/board/nc650/config.mk +++ b/board/nc650/config.mk @@ -26,4 +26,4 @@ # NC650 board # -TEXT_BASE = 0x40700000 +CONFIG_SYS_TEXT_BASE = 0x40700000 diff --git a/board/netphone/config.mk b/board/netphone/config.mk index 8497ebc81..65a27fd49 100644 --- a/board/netphone/config.mk +++ b/board/netphone/config.mk @@ -25,4 +25,4 @@ # netVia Boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/netstal/hcu4/config.mk b/board/netstal/hcu4/config.mk index 580f18cb2..73ed7be50 100644 --- a/board/netstal/hcu4/config.mk +++ b/board/netstal/hcu4/config.mk @@ -21,7 +21,7 @@ # Netstal Maschinen AG: HCU4 boards # -TEXT_BASE = 0xFFFB0000 +CONFIG_SYS_TEXT_BASE = 0xFFFB0000 ifeq ($(debug),1) PLATFORM_CPPFLAGS += -DDEBUG -g diff --git a/board/netstal/hcu5/config.mk b/board/netstal/hcu5/config.mk index 51ddb76cd..a768544f5 100644 --- a/board/netstal/hcu5/config.mk +++ b/board/netstal/hcu5/config.mk @@ -21,7 +21,7 @@ # Netstal Maschinen AG: HCU5 boards # -TEXT_BASE = 0xFFFB0000 +CONFIG_SYS_TEXT_BASE = 0xFFFB0000 PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/netstal/mcu25/config.mk b/board/netstal/mcu25/config.mk index f0f2ea176..b4a59d68f 100644 --- a/board/netstal/mcu25/config.mk +++ b/board/netstal/mcu25/config.mk @@ -20,7 +20,7 @@ # # Netstal Maschinen AG: MCU25 board # -TEXT_BASE = 0xFFFB0000 +CONFIG_SYS_TEXT_BASE = 0xFFFB0000 ifeq ($(debug),1) PLATFORM_CPPFLAGS += -DDEBUG -g diff --git a/board/netstar/config.mk b/board/netstar/config.mk index 8b73e9759..9e1446e4b 100644 --- a/board/netstar/config.mk +++ b/board/netstar/config.mk @@ -3,9 +3,9 @@ # entry 1000'8000 (mem base + reserved) # # We load ourself to internal RAM at 2001'2000 -# Check map file when changing TEXT_BASE. +# Check map file when changing CONFIG_SYS_TEXT_BASE. # Everything has fit into 192kB internal SRAM! # -# XXX TEXT_BASE = 0x20012000 -TEXT_BASE = 0x13FC0000 +# XXX CONFIG_SYS_TEXT_BASE = 0x20012000 +CONFIG_SYS_TEXT_BASE = 0x13FC0000 diff --git a/board/netstar/setup.S b/board/netstar/setup.S index 3c2d46797..72e18112f 100644 --- a/board/netstar/setup.S +++ b/board/netstar/setup.S @@ -27,7 +27,7 @@ #include <version.h> _TEXT_BASE: - .word TEXT_BASE /* SDRAM load addr from config.mk */ + .word CONFIG_SYS_TEXT_BASE /* SDRAM load addr from config.mk */ OMAP5910_LPG1_BASE: .word 0xfffbd000 OMAP5910_TIPB_SWITCHES_BASE: .word 0xfffbc800 diff --git a/board/netta/config.mk b/board/netta/config.mk index 8497ebc81..65a27fd49 100644 --- a/board/netta/config.mk +++ b/board/netta/config.mk @@ -25,4 +25,4 @@ # netVia Boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/netta2/config.mk b/board/netta2/config.mk index 8497ebc81..65a27fd49 100644 --- a/board/netta2/config.mk +++ b/board/netta2/config.mk @@ -25,4 +25,4 @@ # netVia Boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/netvia/config.mk b/board/netvia/config.mk index 9dddaad54..5b3600fa0 100644 --- a/board/netvia/config.mk +++ b/board/netvia/config.mk @@ -25,4 +25,4 @@ # netVia Boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/ns9750dev/config.mk b/board/ns9750dev/config.mk index 6a22cee51..e5d87029d 100644 --- a/board/ns9750dev/config.mk +++ b/board/ns9750dev/config.mk @@ -13,4 +13,4 @@ # -TEXT_BASE = 0x00780000 +CONFIG_SYS_TEXT_BASE = 0x00780000 diff --git a/board/ns9750dev/lowlevel_init.S b/board/ns9750dev/lowlevel_init.S index 3a0978663..ba5ff8124 100644 --- a/board/ns9750dev/lowlevel_init.S +++ b/board/ns9750dev/lowlevel_init.S @@ -68,7 +68,7 @@ .endm _TEXT_BASE: - .word TEXT_BASE @ sdram load addr from config.mk + .word CONFIG_SYS_TEXT_BASE @ sdram load addr from config.mk _PHYS_FLASH: .word PHYS_FLASH_1 @ real flash address (without mirroring) _CAS_LATENCY: diff --git a/board/nx823/config.mk b/board/nx823/config.mk index 3b3ea1e23..1913b2ee3 100644 --- a/board/nx823/config.mk +++ b/board/nx823/config.mk @@ -25,4 +25,4 @@ # Nexus boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/o2dnt/config.mk b/board/o2dnt/config.mk index b87337680..a0dafedd6 100644 --- a/board/o2dnt/config.mk +++ b/board/o2dnt/config.mk @@ -22,6 +22,7 @@ # # boot low for 16 MiB boards -TEXT_BASE = 0xFF000000 +CONFIG_SYS_TEXT_BASE = 0xFF000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/overo/config.mk b/board/overo/config.mk index 59b651f60..e7c471cc2 100644 --- a/board/overo/config.mk +++ b/board/overo/config.mk @@ -25,5 +25,4 @@ # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000 # (mem base + reserved) -# For use with external or internal boots. -TEXT_BASE = 0x80008000 +CONFIG_SYS_TEXT_BASE = 0x80008000 diff --git a/board/oxc/config.mk b/board/oxc/config.mk index 7a5bcfc19..9a6a7f473 100644 --- a/board/oxc/config.mk +++ b/board/oxc/config.mk @@ -25,7 +25,7 @@ # OXC boards # -#TEXT_BASE = 0x00090000 -TEXT_BASE = 0xFFF00000 +#CONFIG_SYS_TEXT_BASE = 0x00090000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/pandora/config.mk b/board/pandora/config.mk index 6b1f69a04..0fab80c92 100644 --- a/board/pandora/config.mk +++ b/board/pandora/config.mk @@ -30,4 +30,4 @@ # (mem base + reserved) # For use with external or internal boots. -TEXT_BASE = 0x80e80000 +CONFIG_SYS_TEXT_BASE = 0x80e80000 diff --git a/board/pb1x00/README b/board/pb1x00/README index b37ff3616..b1e949411 100644 --- a/board/pb1x00/README +++ b/board/pb1x00/README @@ -26,7 +26,7 @@ boot loader delivered with board. NOTE! When you switch between the two boot flashes, the base addresses will be swapped. -Have this in mind when you compile u-boot. TEXT_BASE has +Have this in mind when you compile u-boot. CONFIG_SYS_TEXT_BASE has to match the address where u-boot is located when you actually launch. diff --git a/board/pb1x00/config.mk b/board/pb1x00/config.mk index 396a0454a..6f3dc08e3 100644 --- a/board/pb1x00/config.mk +++ b/board/pb1x00/config.mk @@ -26,7 +26,7 @@ # # ROM version -#TEXT_BASE = 0xbfc00000 +#CONFIG_SYS_TEXT_BASE = 0xbfc00000 # SDRAM version -TEXT_BASE = 0x83800000 +CONFIG_SYS_TEXT_BASE = 0x83800000 diff --git a/board/pcippc2/config.mk b/board/pcippc2/config.mk index 92d37c936..07c910dc6 100644 --- a/board/pcippc2/config.mk +++ b/board/pcippc2/config.mk @@ -25,6 +25,6 @@ # PCIPPC-2 boards # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/pcs440ep/config.mk b/board/pcs440ep/config.mk index 0844e98e8..4dedfaaff 100644 --- a/board/pcs440ep/config.mk +++ b/board/pcs440ep/config.mk @@ -28,12 +28,12 @@ # Check the U-Boot Image with a SHA1 checksum ALL += $(obj)u-boot.sha1 -#TEXT_BASE = 0x00001000 +#CONFIG_SYS_TEXT_BASE = 0x00001000 ifeq ($(ramsym),1) -TEXT_BASE = 0xFBD00000 +CONFIG_SYS_TEXT_BASE = 0xFBD00000 else -TEXT_BASE = 0xFFFA0000 +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/pdm360ng/config.mk b/board/pdm360ng/config.mk index c3b07ddc1..a1f2b5a23 100644 --- a/board/pdm360ng/config.mk +++ b/board/pdm360ng/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xF0000000 +CONFIG_SYS_TEXT_BASE = 0xF0000000 diff --git a/board/phytec/pcm030/config.mk b/board/phytec/pcm030/config.mk index 92fecc63c..73bb0c144 100644 --- a/board/phytec/pcm030/config.mk +++ b/board/phytec/pcm030/config.mk @@ -24,7 +24,7 @@ # # phyCORE-MPC5200B tiny board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFF00000 boot high (standard configuration) # 0xFF000000 boot low @@ -33,9 +33,10 @@ sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/pleb2/config.mk b/board/pleb2/config.mk index 6958a636a..079f58eb2 100644 --- a/board/pleb2/config.mk +++ b/board/pleb2/config.mk @@ -1,3 +1,3 @@ -TEXT_BASE = 0xa1F80000 -#TEXT_BASE = 0xa3080000 -#TEXT_BASE = 0 +CONFIG_SYS_TEXT_BASE = 0xa1F80000 +#CONFIG_SYS_TEXT_BASE = 0xa3080000 +#CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/pm520/config.mk b/board/pm520/config.mk index ad689f33b..55cf02738 100644 --- a/board/pm520/config.mk +++ b/board/pm520/config.mk @@ -25,7 +25,8 @@ # PM520 board # -TEXT_BASE = 0xfff00000 -# TEXT_BASE = 0x00100000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 +# CONFIG_SYS_TEXT_BASE = 0x00100000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/pm826/config.mk b/board/pm826/config.mk index 48ac299fa..d1c7c70d0 100644 --- a/board/pm826/config.mk +++ b/board/pm826/config.mk @@ -28,10 +28,11 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot 64-bit flash -TEXT_BASE = 0xFF000000 +CONFIG_SYS_TEXT_BASE = 0xFF000000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/pm828/config.mk b/board/pm828/config.mk index 6288431a5..66b6dcb20 100644 --- a/board/pm828/config.mk +++ b/board/pm828/config.mk @@ -28,10 +28,11 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot 64-bit flash -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/pm854/config.mk b/board/pm854/config.mk index 0b28f4efd..92e6276bf 100644 --- a/board/pm854/config.mk +++ b/board/pm854/config.mk @@ -26,4 +26,4 @@ # default CCARBAR is at 0xff700000 # assume U-Boot is less than 0.5MB # -TEXT_BASE = 0xfff80000 +CONFIG_SYS_TEXT_BASE = 0xfff80000 diff --git a/board/pm856/config.mk b/board/pm856/config.mk index 822930584..25adde5ec 100644 --- a/board/pm856/config.mk +++ b/board/pm856/config.mk @@ -26,4 +26,4 @@ # default CCARBAR is at 0xff700000 # assume U-Boot is less than 0.5MB # -TEXT_BASE = 0xfff80000 +CONFIG_SYS_TEXT_BASE = 0xfff80000 diff --git a/board/pn62/config.mk b/board/pn62/config.mk index a2b6f059a..637deea3e 100644 --- a/board/pn62/config.mk +++ b/board/pn62/config.mk @@ -25,6 +25,6 @@ # PN62 boards # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/ppmc7xx/config.mk b/board/ppmc7xx/config.mk index b5b46dc56..7b65ed781 100644 --- a/board/ppmc7xx/config.mk +++ b/board/ppmc7xx/config.mk @@ -23,6 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 TEXT_END = 0xFFF40000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/ppmc8260/config.mk b/board/ppmc8260/config.mk index d06fcead2..537c2d8e5 100644 --- a/board/ppmc8260/config.mk +++ b/board/ppmc8260/config.mk @@ -29,6 +29,7 @@ # MBX8xx boards # -TEXT_BASE = 0xfe000000 +CONFIG_SYS_TEXT_BASE = 0xfe000000 TEXT_END = 0xfe080000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/prodrive/alpr/config.mk b/board/prodrive/alpr/config.mk index b62e776d3..06c519abd 100644 --- a/board/prodrive/alpr/config.mk +++ b/board/prodrive/alpr/config.mk @@ -25,12 +25,12 @@ # AMCC 440GX Reference Platform (Ocotea) board # -#TEXT_BASE = 0xFFFE0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 +CONFIG_SYS_TEXT_BASE = 0x07FD0000 else -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/prodrive/p3mx/config.mk b/board/prodrive/p3mx/config.mk index 35bf1c155..475438b1e 100644 --- a/board/prodrive/p3mx/config.mk +++ b/board/prodrive/p3mx/config.mk @@ -25,4 +25,4 @@ # p3mx boards (P3M750 & P3M7448) # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 diff --git a/board/prodrive/p3p440/config.mk b/board/prodrive/p3p440/config.mk index 60d3bf4d2..0b628cfac 100644 --- a/board/prodrive/p3p440/config.mk +++ b/board/prodrive/p3p440/config.mk @@ -25,12 +25,12 @@ # esd ADCIOP boards # -#TEXT_BASE = 0xFFFE0000 +#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 +CONFIG_SYS_TEXT_BASE = 0x07FD0000 else -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/prodrive/pdnb3/config.mk b/board/prodrive/pdnb3/config.mk index 51dee86ae..817541f97 100644 --- a/board/prodrive/pdnb3/config.mk +++ b/board/prodrive/pdnb3/config.mk @@ -1,2 +1,2 @@ # -TEXT_BASE = 0x01f00000 +CONFIG_SYS_TEXT_BASE = 0x01f00000 diff --git a/board/psyent/pci5441/config.mk b/board/psyent/pci5441/config.mk index d72bceed2..863a4cb33 100644 --- a/board/psyent/pci5441/config.mk +++ b/board/psyent/pci5441/config.mk @@ -21,7 +21,7 @@ # MA 02111-1307 USA # -TEXT_BASE = 0x018e0000 +CONFIG_SYS_TEXT_BASE = 0x018e0000 PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include diff --git a/board/psyent/pk1c20/config.mk b/board/psyent/pk1c20/config.mk index d65780dd9..3913a2464 100644 --- a/board/psyent/pk1c20/config.mk +++ b/board/psyent/pk1c20/config.mk @@ -21,7 +21,7 @@ # MA 02111-1307 USA # -TEXT_BASE = 0x01fc0000 +CONFIG_SYS_TEXT_BASE = 0x01fc0000 PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include diff --git a/board/purple/config.mk b/board/purple/config.mk index ea478edb1..404c3fb31 100644 --- a/board/purple/config.mk +++ b/board/purple/config.mk @@ -26,7 +26,7 @@ # # ROM version -TEXT_BASE = 0xB0000000 +CONFIG_SYS_TEXT_BASE = 0xB0000000 # RAM version -#TEXT_BASE = 0x80100000 +#CONFIG_SYS_TEXT_BASE = 0x80100000 diff --git a/board/purple/purple.c b/board/purple/purple.c index 54bef651c..4e9e7004f 100644 --- a/board/purple/purple.c +++ b/board/purple/purple.c @@ -222,10 +222,10 @@ static void programLoad(void) FUNCPTR absEntry; ulong *src,*dst; - src = (ulong *)(TEXT_BASE + 0x428); + src = (ulong *)(CONFIG_SYS_TEXT_BASE + 0x428); dst = (ulong *)0xbf0081d0; - absEntry = (FUNCPTR)(TEXT_BASE + 0x400); + absEntry = (FUNCPTR)(CONFIG_SYS_TEXT_BASE + 0x400); absEntry(src,dst,0x6); src = (ulong *)((ulong)copydwords & 0xfffffff8); diff --git a/board/pxa255_idp/config.mk b/board/pxa255_idp/config.mk index 55c8b270a..f30f695de 100644 --- a/board/pxa255_idp/config.mk +++ b/board/pxa255_idp/config.mk @@ -1,3 +1,3 @@ -#TEXT_BASE = 0xa1700000 -TEXT_BASE = 0xa3080000 -#TEXT_BASE = 0 +#CONFIG_SYS_TEXT_BASE = 0xa1700000 +CONFIG_SYS_TEXT_BASE = 0xa3080000 +#CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/qemu-mips/config.mk b/board/qemu-mips/config.mk index 4d4078a40..27cd34ac3 100644 --- a/board/qemu-mips/config.mk +++ b/board/qemu-mips/config.mk @@ -4,7 +4,7 @@ # # ROM version -TEXT_BASE = 0xbfc00000 +CONFIG_SYS_TEXT_BASE = 0xbfc00000 # RAM version -#TEXT_BASE = 0x80001000 +#CONFIG_SYS_TEXT_BASE = 0x80001000 diff --git a/board/quad100hd/config.mk b/board/quad100hd/config.mk index 1bdf5e4fc..1646d3423 100644 --- a/board/quad100hd/config.mk +++ b/board/quad100hd/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/quantum/config.mk b/board/quantum/config.mk index 7cb374eb8..b583a70bf 100644 --- a/board/quantum/config.mk +++ b/board/quantum/config.mk @@ -25,4 +25,4 @@ # RMU boards # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 diff --git a/board/r360mpi/config.mk b/board/r360mpi/config.mk index 9d6080b84..017dc83a2 100644 --- a/board/r360mpi/config.mk +++ b/board/r360mpi/config.mk @@ -25,4 +25,4 @@ # TQM8xxL boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/rattler/config.mk b/board/rattler/config.mk index 5fca8c7c6..7a83dba3c 100644 --- a/board/rattler/config.mk +++ b/board/rattler/config.mk @@ -27,4 +27,4 @@ # Rattler series boards by Analogue & Micro # -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 diff --git a/board/rbc823/config.mk b/board/rbc823/config.mk index 199ea3c1f..05be7764b 100644 --- a/board/rbc823/config.mk +++ b/board/rbc823/config.mk @@ -25,4 +25,4 @@ # RBC823 boards # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 diff --git a/board/renesas/MigoR/config.mk b/board/renesas/MigoR/config.mk index 2c5085a91..ffe954c10 100644 --- a/board/renesas/MigoR/config.mk +++ b/board/renesas/MigoR/config.mk @@ -23,9 +23,9 @@ # MA 02111-1307 USA # -# TEXT_BASE refers to image _after_ relocation. +# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation. # # NOTE: Must match value used in u-boot.lds (in this directory). # -TEXT_BASE = 0x8FFC0000 +CONFIG_SYS_TEXT_BASE = 0x8FFC0000 diff --git a/board/renesas/ap325rxa/config.mk b/board/renesas/ap325rxa/config.mk index b52a5e5cb..f572afdd7 100644 --- a/board/renesas/ap325rxa/config.mk +++ b/board/renesas/ap325rxa/config.mk @@ -18,9 +18,9 @@ # MA 02111-1307 USA # -# TEXT_BASE refers to image _after_ relocation. +# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation. # # NOTE: Must match value used in u-boot.lds (in this directory). # -TEXT_BASE = 0x8FFC0000 +CONFIG_SYS_TEXT_BASE = 0x8FFC0000 diff --git a/board/renesas/r2dplus/config.mk b/board/renesas/r2dplus/config.mk index 1ec7dcc60..55163b925 100644 --- a/board/renesas/r2dplus/config.mk +++ b/board/renesas/r2dplus/config.mk @@ -20,4 +20,4 @@ # # NOTE: Must match value used in u-boot.lds (in this directory). # -TEXT_BASE = 0x0FFC0000 +CONFIG_SYS_TEXT_BASE = 0x0FFC0000 diff --git a/board/renesas/r7780mp/config.mk b/board/renesas/r7780mp/config.mk index 6a045a15c..70ee3fd25 100644 --- a/board/renesas/r7780mp/config.mk +++ b/board/renesas/r7780mp/config.mk @@ -19,9 +19,9 @@ # MA 02111-1307 USA # -# TEXT_BASE refers to image _after_ relocation. +# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation. # # NOTE: Must match value used in u-boot.lds (in this directory). # -TEXT_BASE = 0x0FFC0000 +CONFIG_SYS_TEXT_BASE = 0x0FFC0000 diff --git a/board/renesas/rsk7203/config.mk b/board/renesas/rsk7203/config.mk index 61aa51f2b..5b533f65b 100644 --- a/board/renesas/rsk7203/config.mk +++ b/board/renesas/rsk7203/config.mk @@ -20,9 +20,9 @@ # MA 02111-1307 USA # -# TEXT_BASE refers to image _after_ relocation. +# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation. # # NOTE: Must match value used in u-boot.lds (in this directory). # -TEXT_BASE = 0x0C7C0000 +CONFIG_SYS_TEXT_BASE = 0x0C7C0000 diff --git a/board/renesas/sh7763rdp/config.mk b/board/renesas/sh7763rdp/config.mk index c52dbfd7b..54c1a5b3e 100644 --- a/board/renesas/sh7763rdp/config.mk +++ b/board/renesas/sh7763rdp/config.mk @@ -1,11 +1,11 @@ # # board/sh7763rdp/config.mk # -# TEXT_BASE refers to image _after_ relocation. +# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation. # # NOTE: Must match value used in u-boot.lds (in this directory). # -TEXT_BASE = 0x8FFC0000 +CONFIG_SYS_TEXT_BASE = 0x8FFC0000 # PLATFORM_CPPFLAGS += -DCONFIG_MULTIBOOT diff --git a/board/renesas/sh7785lcr/config.mk b/board/renesas/sh7785lcr/config.mk index 66d35cb21..1a9038c75 100644 --- a/board/renesas/sh7785lcr/config.mk +++ b/board/renesas/sh7785lcr/config.mk @@ -18,12 +18,12 @@ # MA 02111-1307 USA # -# TEXT_BASE refers to image _after_ relocation. +# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation. # # NOTE: Must match value used in u-boot.lds (in this directory). # sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0x0ff80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0x0ff80000 endif diff --git a/board/rmu/config.mk b/board/rmu/config.mk index 7cb374eb8..b583a70bf 100644 --- a/board/rmu/config.mk +++ b/board/rmu/config.mk @@ -25,4 +25,4 @@ # RMU boards # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 diff --git a/board/ronetix/pm9261/config.mk b/board/ronetix/pm9261/config.mk index 71854192f..975522a89 100644 --- a/board/ronetix/pm9261/config.mk +++ b/board/ronetix/pm9261/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x23f00000
\ No newline at end of file +CONFIG_SYS_TEXT_BASE = 0x23f00000
\ No newline at end of file diff --git a/board/ronetix/pm9263/config.mk b/board/ronetix/pm9263/config.mk index ff2cfd170..e554a4500 100644 --- a/board/ronetix/pm9263/config.mk +++ b/board/ronetix/pm9263/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x23f00000 +CONFIG_SYS_TEXT_BASE = 0x23f00000 diff --git a/board/ronetix/pm9g45/config.mk b/board/ronetix/pm9g45/config.mk index 7fe9d0313..9d3c5ae27 100644 --- a/board/ronetix/pm9g45/config.mk +++ b/board/ronetix/pm9g45/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x73f00000 +CONFIG_SYS_TEXT_BASE = 0x73f00000 diff --git a/board/rpxsuper/config.mk b/board/rpxsuper/config.mk index 4b8c5d31f..705a5ac0e 100644 --- a/board/rpxsuper/config.mk +++ b/board/rpxsuper/config.mk @@ -29,6 +29,7 @@ # MBX8xx boards # -TEXT_BASE = 0x80F00000 +CONFIG_SYS_TEXT_BASE = 0x80F00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/rsdproto/config.mk b/board/rsdproto/config.mk index 35c3d8c76..f52d54515 100644 --- a/board/rsdproto/config.mk +++ b/board/rsdproto/config.mk @@ -29,7 +29,7 @@ # MBX8xx boards # -TEXT_BASE = 0xff000000 -/*TEXT_BASE = 0x00200000 */ +CONFIG_SYS_TEXT_BASE = 0xff000000 +/*CONFIG_SYS_TEXT_BASE = 0x00200000 */ LDSCRIPT := $(SRCTREE)/board/rsdproto/u-boot.lds diff --git a/board/sacsng/config.mk b/board/sacsng/config.mk index 220b218a7..c33543d77 100644 --- a/board/sacsng/config.mk +++ b/board/sacsng/config.mk @@ -29,6 +29,7 @@ # 82xx boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/samsung/goni/config.mk b/board/samsung/goni/config.mk index 0e9dd45f2..e4581ca83 100644 --- a/board/samsung/goni/config.mk +++ b/board/samsung/goni/config.mk @@ -31,4 +31,4 @@ # 0x30000000 to 0x35000000 (80MiB) # 0x40000000 to 0x50000000 (256MiB) # -TEXT_BASE = 0x34800000 +CONFIG_SYS_TEXT_BASE = 0x34800000 diff --git a/board/samsung/goni/lowlevel_init.S b/board/samsung/goni/lowlevel_init.S index 62737aba1..30a5835ab 100644 --- a/board/samsung/goni/lowlevel_init.S +++ b/board/samsung/goni/lowlevel_init.S @@ -39,7 +39,7 @@ */ _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE .globl lowlevel_init lowlevel_init: diff --git a/board/samsung/smdk2400/config.mk b/board/samsung/smdk2400/config.mk index 4e019e3a0..4c27dc304 100644 --- a/board/samsung/smdk2400/config.mk +++ b/board/samsung/smdk2400/config.mk @@ -22,4 +22,4 @@ # -TEXT_BASE = 0x0CF80000 +CONFIG_SYS_TEXT_BASE = 0x0CF80000 diff --git a/board/samsung/smdk2400/lowlevel_init.S b/board/samsung/smdk2400/lowlevel_init.S index 9c808c093..c275c07e7 100644 --- a/board/samsung/smdk2400/lowlevel_init.S +++ b/board/samsung/smdk2400/lowlevel_init.S @@ -123,7 +123,7 @@ _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE .globl lowlevel_init lowlevel_init: diff --git a/board/samsung/smdk2410/config.mk b/board/samsung/smdk2410/config.mk index 3642b0a12..c8d1b1f38 100644 --- a/board/samsung/smdk2410/config.mk +++ b/board/samsung/smdk2410/config.mk @@ -22,4 +22,4 @@ # -TEXT_BASE = 0x33F80000 +CONFIG_SYS_TEXT_BASE = 0x33F80000 diff --git a/board/samsung/smdk2410/lowlevel_init.S b/board/samsung/smdk2410/lowlevel_init.S index ab6afdd48..a2bf570c8 100644 --- a/board/samsung/smdk2410/lowlevel_init.S +++ b/board/samsung/smdk2410/lowlevel_init.S @@ -127,7 +127,7 @@ /**************************************/ _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE .globl lowlevel_init lowlevel_init: diff --git a/board/samsung/smdk6400/config.mk b/board/samsung/smdk6400/config.mk index 4ab1d7e54..90cbcf25d 100644 --- a/board/samsung/smdk6400/config.mk +++ b/board/samsung/smdk6400/config.mk @@ -24,9 +24,9 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp ifndef CONFIG_NAND_SPL -TEXT_BASE = $(RAM_TEXT) +CONFIG_SYS_TEXT_BASE = $(RAM_TEXT) else -TEXT_BASE = 0 +CONFIG_SYS_TEXT_BASE = 0 endif LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot-nand.lds diff --git a/board/samsung/smdk6400/lowlevel_init.S b/board/samsung/smdk6400/lowlevel_init.S index 30d88780d..f7ce17694 100644 --- a/board/samsung/smdk6400/lowlevel_init.S +++ b/board/samsung/smdk6400/lowlevel_init.S @@ -45,7 +45,7 @@ #endif _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE .globl lowlevel_init lowlevel_init: diff --git a/board/samsung/smdkc100/config.mk b/board/samsung/smdkc100/config.mk index ebab42081..3a08bb17a 100644 --- a/board/samsung/smdkc100/config.mk +++ b/board/samsung/smdkc100/config.mk @@ -13,4 +13,4 @@ # 0x30000000 to 0x35000000 (80MiB) # 0x40000000 to 0x48000000 (128MiB) # -TEXT_BASE = 0x34800000 +CONFIG_SYS_TEXT_BASE = 0x34800000 diff --git a/board/samsung/smdkc100/lowlevel_init.S b/board/samsung/smdkc100/lowlevel_init.S index 30d0d06a4..6d18835ac 100644 --- a/board/samsung/smdkc100/lowlevel_init.S +++ b/board/samsung/smdkc100/lowlevel_init.S @@ -34,7 +34,7 @@ */ _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE .globl lowlevel_init lowlevel_init: diff --git a/board/sandburst/karef/config.mk b/board/sandburst/karef/config.mk index f2f94c5f6..46f5b249b 100644 --- a/board/sandburst/karef/config.mk +++ b/board/sandburst/karef/config.mk @@ -27,9 +27,9 @@ # ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 +CONFIG_SYS_TEXT_BASE = 0x07FD0000 else -TEXT_BASE = 0xFFF80000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/sandburst/metrobox/config.mk b/board/sandburst/metrobox/config.mk index 565e826b8..93bcdec07 100644 --- a/board/sandburst/metrobox/config.mk +++ b/board/sandburst/metrobox/config.mk @@ -22,9 +22,9 @@ # ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 +CONFIG_SYS_TEXT_BASE = 0x07FD0000 else -TEXT_BASE = 0xFFF80000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/sandpoint/config.mk b/board/sandpoint/config.mk index b3f65ebe5..4a316ce5a 100644 --- a/board/sandpoint/config.mk +++ b/board/sandpoint/config.mk @@ -25,7 +25,7 @@ # Sandpoint boards # -#TEXT_BASE = 0x00090000 -TEXT_BASE = 0xFFF00000 +#CONFIG_SYS_TEXT_BASE = 0x00090000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/sbc2410x/config.mk b/board/sbc2410x/config.mk index dc59d0880..bc01a2d9f 100644 --- a/board/sbc2410x/config.mk +++ b/board/sbc2410x/config.mk @@ -20,4 +20,4 @@ # # download area is 3300'0000 -TEXT_BASE = 0x33F80000 +CONFIG_SYS_TEXT_BASE = 0x33F80000 diff --git a/board/sbc2410x/lowlevel_init.S b/board/sbc2410x/lowlevel_init.S index 3df63cdae..3de91661d 100644 --- a/board/sbc2410x/lowlevel_init.S +++ b/board/sbc2410x/lowlevel_init.S @@ -123,7 +123,7 @@ /**************************************/ _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE .globl lowlevel_init lowlevel_init: diff --git a/board/sbc405/config.mk b/board/sbc405/config.mk index bd5721781..77bb9e4b3 100644 --- a/board/sbc405/config.mk +++ b/board/sbc405/config.mk @@ -25,4 +25,4 @@ # Wind River sbc405 boards # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/sbc8240/config.mk b/board/sbc8240/config.mk index 1e9796052..84f4d5e90 100644 --- a/board/sbc8240/config.mk +++ b/board/sbc8240/config.mk @@ -25,6 +25,6 @@ # sbc8240 board # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/sbc8260/config.mk b/board/sbc8260/config.mk index 1f18260dd..b8b2a7a1f 100644 --- a/board/sbc8260/config.mk +++ b/board/sbc8260/config.mk @@ -29,6 +29,7 @@ # MBX8xx boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/sbc8349/config.mk b/board/sbc8349/config.mk index eacb27eec..0a1e003e4 100644 --- a/board/sbc8349/config.mk +++ b/board/sbc8349/config.mk @@ -24,4 +24,4 @@ # SBC8349E # -TEXT_BASE = 0xFF800000 +CONFIG_SYS_TEXT_BASE = 0xFF800000 diff --git a/board/sbc8548/config.mk b/board/sbc8548/config.mk index b2013d667..df6f92c8a 100644 --- a/board/sbc8548/config.mk +++ b/board/sbc8548/config.mk @@ -23,6 +23,6 @@ # # sbc8548 board # -ifndef TEXT_BASE -TEXT_BASE = 0xfffa0000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xfffa0000 endif diff --git a/board/sbc8560/config.mk b/board/sbc8560/config.mk index 995dadaff..453019270 100644 --- a/board/sbc8560/config.mk +++ b/board/sbc8560/config.mk @@ -27,4 +27,4 @@ # default CCARBAR is at 0xff700000 # assume U-Boot is less than 256K # -TEXT_BASE = 0xfffc0000 +CONFIG_SYS_TEXT_BASE = 0xfffc0000 diff --git a/board/sbc8641d/config.mk b/board/sbc8641d/config.mk index d1456b91d..37a777a9b 100644 --- a/board/sbc8641d/config.mk +++ b/board/sbc8641d/config.mk @@ -24,4 +24,4 @@ # sbc8641 board # default CCSRBAR is at 0xff700000 # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 diff --git a/board/sc3/config.mk b/board/sc3/config.mk index a46b19724..e0ad62394 100644 --- a/board/sc3/config.mk +++ b/board/sc3/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFA0000 +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 diff --git a/board/scb9328/config.mk b/board/scb9328/config.mk index 8d1d79ac9..7c5e067cb 100644 --- a/board/scb9328/config.mk +++ b/board/scb9328/config.mk @@ -1,10 +1,10 @@ # # This config file is used for compilation of scb93328 sources # -# You might change location of U-Boot in memory by setting right TEXT_BASE. +# You might change location of U-Boot in memory by setting right CONFIG_SYS_TEXT_BASE. # This allows for example having one copy located at the end of ram and stored # in flash device and later on while developing use other location to test # the code in RAM device only. # -TEXT_BASE = 0x08f00000 +CONFIG_SYS_TEXT_BASE = 0x08f00000 diff --git a/board/shannon/config.mk b/board/shannon/config.mk index ca45733af..6afa2d3c7 100644 --- a/board/shannon/config.mk +++ b/board/shannon/config.mk @@ -20,4 +20,4 @@ # -TEXT_BASE = 0xd8380000 +CONFIG_SYS_TEXT_BASE = 0xd8380000 diff --git a/board/sheldon/simpc8313/config.mk b/board/sheldon/simpc8313/config.mk index ce1c0d8d9..7a8aa424e 100644 --- a/board/sheldon/simpc8313/config.mk +++ b/board/sheldon/simpc8313/config.mk @@ -2,8 +2,8 @@ ifndef NAND_SPL sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp endif -ifndef TEXT_BASE -TEXT_BASE = 0x00100000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0x00100000 endif ifdef CONFIG_NAND_LP diff --git a/board/siemens/IAD210/config.mk b/board/siemens/IAD210/config.mk index c30abcb27..2204f8d52 100644 --- a/board/siemens/IAD210/config.mk +++ b/board/siemens/IAD210/config.mk @@ -29,5 +29,5 @@ # iad210 boards # -TEXT_BASE = 0x08000000 -/*TEXT_BASE = 0x00200000 */ +CONFIG_SYS_TEXT_BASE = 0x08000000 +/*CONFIG_SYS_TEXT_BASE = 0x00200000 */ diff --git a/board/siemens/SCM/config.mk b/board/siemens/SCM/config.mk index 5d0898be6..50446d3e6 100644 --- a/board/siemens/SCM/config.mk +++ b/board/siemens/SCM/config.mk @@ -29,6 +29,7 @@ # for the "final" configuration, with U-Boot in flash, or the address # in RAM where U-Boot is loaded at for debugging. # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/siemens/SMN42/config.mk b/board/siemens/SMN42/config.mk index b28f418df..48917928e 100644 --- a/board/siemens/SMN42/config.mk +++ b/board/siemens/SMN42/config.mk @@ -26,5 +26,5 @@ # #address where u-boot will be relocated -#TEXT_BASE = 0x0 -TEXT_BASE = 0x81500000 +#CONFIG_SYS_TEXT_BASE = 0x0 +CONFIG_SYS_TEXT_BASE = 0x81500000 diff --git a/board/siemens/SMN42/lowlevel_init.S b/board/siemens/SMN42/lowlevel_init.S index f13d9b982..44e209b5d 100644 --- a/board/siemens/SMN42/lowlevel_init.S +++ b/board/siemens/SMN42/lowlevel_init.S @@ -38,7 +38,7 @@ #define IO0_VALUE 0x4000C _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE MEMMAP_ADR: .word MEMMAP BCFG0_ADR: diff --git a/board/sixnet/config.mk b/board/sixnet/config.mk index 0cd8f4414..830f96387 100644 --- a/board/sixnet/config.mk +++ b/board/sixnet/config.mk @@ -25,4 +25,4 @@ # SIXNET boards # -TEXT_BASE = 0xF8000000 +CONFIG_SYS_TEXT_BASE = 0xF8000000 diff --git a/board/snmc/qs850/config.mk b/board/snmc/qs850/config.mk index 905f69269..30e3f251f 100644 --- a/board/snmc/qs850/config.mk +++ b/board/snmc/qs850/config.mk @@ -26,4 +26,4 @@ # Start address of Bootloader in Flash # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 diff --git a/board/snmc/qs860t/config.mk b/board/snmc/qs860t/config.mk index f6ab2607b..96e497a39 100644 --- a/board/snmc/qs860t/config.mk +++ b/board/snmc/qs860t/config.mk @@ -26,4 +26,4 @@ # Start address of 512K Socketed Flash # -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 diff --git a/board/socrates/config.mk b/board/socrates/config.mk index 7ea37b5d5..96f1ff304 100644 --- a/board/socrates/config.mk +++ b/board/socrates/config.mk @@ -26,4 +26,4 @@ # socrates board # default CCARBAR is at 0xff700000 # -TEXT_BASE = 0xfff80000 +CONFIG_SYS_TEXT_BASE = 0xfff80000 diff --git a/board/sorcery/config.mk b/board/sorcery/config.mk index 25de0b5a3..b159c653b 100644 --- a/board/sorcery/config.mk +++ b/board/sorcery/config.mk @@ -25,5 +25,6 @@ # sorcery board # -TEXT_BASE = 0xfff00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +CONFIG_SYS_TEXT_BASE = 0xfff00000 +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/spc1920/config.mk b/board/spc1920/config.mk index 8dacc178f..61e6fba3a 100644 --- a/board/spc1920/config.mk +++ b/board/spc1920/config.mk @@ -28,8 +28,8 @@ # MPC885ADS boards # -#TEXT_BASE = 0xFE000000 -TEXT_BASE = 0xFFF00000 +#CONFIG_SYS_TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/spc1920 HOSTCFLAGS += -I$(TOPDIR)/board/spc1920 HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/spc1920 diff --git a/board/spd8xx/config.mk b/board/spd8xx/config.mk index e1e01929b..b6d5a19d5 100644 --- a/board/spd8xx/config.mk +++ b/board/spd8xx/config.mk @@ -26,4 +26,4 @@ # SPD823TS boards # -TEXT_BASE = 0xFF000000 +CONFIG_SYS_TEXT_BASE = 0xFF000000 diff --git a/board/spear/spear300/config.mk b/board/spear/spear300/config.mk index 35646f219..11da2c333 100644 --- a/board/spear/spear300/config.mk +++ b/board/spear/spear300/config.mk @@ -23,7 +23,7 @@ ######################################################################### -TEXT_BASE = 0x00700000 +CONFIG_SYS_TEXT_BASE = 0x00700000 ALL += $(obj)u-boot.img diff --git a/board/spear/spear310/config.mk b/board/spear/spear310/config.mk index cba843620..2b59c39e7 100644 --- a/board/spear/spear310/config.mk +++ b/board/spear/spear310/config.mk @@ -23,7 +23,7 @@ ######################################################################### -TEXT_BASE = 0x00700000 +CONFIG_SYS_TEXT_BASE = 0x00700000 ALL += $(obj)u-boot.img diff --git a/board/spear/spear320/config.mk b/board/spear/spear320/config.mk index cba843620..2b59c39e7 100644 --- a/board/spear/spear320/config.mk +++ b/board/spear/spear320/config.mk @@ -23,7 +23,7 @@ ######################################################################### -TEXT_BASE = 0x00700000 +CONFIG_SYS_TEXT_BASE = 0x00700000 ALL += $(obj)u-boot.img diff --git a/board/spear/spear600/config.mk b/board/spear/spear600/config.mk index 35646f219..11da2c333 100644 --- a/board/spear/spear600/config.mk +++ b/board/spear/spear600/config.mk @@ -23,7 +23,7 @@ ######################################################################### -TEXT_BASE = 0x00700000 +CONFIG_SYS_TEXT_BASE = 0x00700000 ALL += $(obj)u-boot.img diff --git a/board/st/nhk8815/config.mk b/board/st/nhk8815/config.mk index 590393bd6..1789717fc 100644 --- a/board/st/nhk8815/config.mk +++ b/board/st/nhk8815/config.mk @@ -23,4 +23,4 @@ # image should be loaded at 0x01000000 # -TEXT_BASE = 0x03F80000 +CONFIG_SYS_TEXT_BASE = 0x03F80000 diff --git a/board/stx/stxgp3/config.mk b/board/stx/stxgp3/config.mk index 47e44aa08..4921ddc50 100644 --- a/board/stx/stxgp3/config.mk +++ b/board/stx/stxgp3/config.mk @@ -26,4 +26,4 @@ # default CCARBAR is at 0xff700000 # assume U-Boot is less than 0.5MB # -TEXT_BASE = 0xfff80000 +CONFIG_SYS_TEXT_BASE = 0xfff80000 diff --git a/board/stx/stxssa/config.mk b/board/stx/stxssa/config.mk index 57fe5d621..b69ff6a81 100644 --- a/board/stx/stxssa/config.mk +++ b/board/stx/stxssa/config.mk @@ -27,4 +27,4 @@ # U-Boot is less than 256K, so push # it further up into the flash # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/stx/stxxtc/config.mk b/board/stx/stxxtc/config.mk index f5dc03425..d7c8b02c8 100644 --- a/board/stx/stxxtc/config.mk +++ b/board/stx/stxxtc/config.mk @@ -25,4 +25,4 @@ # STx XTc # -TEXT_BASE = 0x40F00000 +CONFIG_SYS_TEXT_BASE = 0x40F00000 diff --git a/board/svm_sc8xx/config.mk b/board/svm_sc8xx/config.mk index 4bec9cbe8..11e2c264a 100644 --- a/board/svm_sc8xx/config.mk +++ b/board/svm_sc8xx/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/sx1/config.mk b/board/sx1/config.mk index 4902e8233..441bea2a0 100644 --- a/board/sx1/config.mk +++ b/board/sx1/config.mk @@ -16,4 +16,4 @@ # # -TEXT_BASE = 0x11080000 +CONFIG_SYS_TEXT_BASE = 0x11080000 diff --git a/board/sx1/lowlevel_init.S b/board/sx1/lowlevel_init.S index bdf812e05..c1a811aa8 100644 --- a/board/sx1/lowlevel_init.S +++ b/board/sx1/lowlevel_init.S @@ -37,7 +37,7 @@ _TEXT_BASE: - .word TEXT_BASE /* sdram load addr from config.mk */ + .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */ .globl lowlevel_init lowlevel_init: diff --git a/board/syteco/jadecpu/config.mk b/board/syteco/jadecpu/config.mk index 91994b0c3..617603d52 100644 --- a/board/syteco/jadecpu/config.mk +++ b/board/syteco/jadecpu/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x10000000 +CONFIG_SYS_TEXT_BASE = 0x10000000 diff --git a/board/t3corp/config.mk b/board/t3corp/config.mk index 616aa1982..640389e32 100644 --- a/board/t3corp/config.mk +++ b/board/t3corp/config.mk @@ -24,8 +24,8 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xFFFA0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/tb0229/config.mk b/board/tb0229/config.mk index 9a508502c..017511d1f 100644 --- a/board/tb0229/config.mk +++ b/board/tb0229/config.mk @@ -24,7 +24,7 @@ # # ROM version -TEXT_BASE = 0xBFC00000 +CONFIG_SYS_TEXT_BASE = 0xBFC00000 # RAM version -#TEXT_BASE = 0x80400000 +#CONFIG_SYS_TEXT_BASE = 0x80400000 diff --git a/board/tcm-bf518/config.mk b/board/tcm-bf518/config.mk index 30b92a3c4..9a54dbfb8 100644 --- a/board/tcm-bf518/config.mk +++ b/board/tcm-bf518/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf518-0.0 diff --git a/board/tcm-bf537/config.mk b/board/tcm-bf537/config.mk index 1281da4be..c5d45c7db 100644 --- a/board/tcm-bf537/config.mk +++ b/board/tcm-bf537/config.mk @@ -24,7 +24,7 @@ # # This is not actually used for Blackfin boards so do not change it -#TEXT_BASE = do-not-use-me +#CONFIG_SYS_TEXT_BASE = do-not-use-me CONFIG_BFIN_CPU = bf537-0.2 diff --git a/board/ti/beagle/config.mk b/board/ti/beagle/config.mk index 6fb10e31e..cf055db62 100644 --- a/board/ti/beagle/config.mk +++ b/board/ti/beagle/config.mk @@ -30,4 +30,4 @@ # (mem base + reserved) # For use with external or internal boots. -TEXT_BASE = 0x80008000 +CONFIG_SYS_TEXT_BASE = 0x80008000 diff --git a/board/ti/evm/config.mk b/board/ti/evm/config.mk index 4d873ebac..b92d3b054 100644 --- a/board/ti/evm/config.mk +++ b/board/ti/evm/config.mk @@ -30,4 +30,4 @@ # (mem base + reserved) # For use with external or internal boots. -TEXT_BASE = 0x80e80000 +CONFIG_SYS_TEXT_BASE = 0x80e80000 diff --git a/board/ti/omap1510inn/config.mk b/board/ti/omap1510inn/config.mk index 9cd74246b..67fe0bdf8 100644 --- a/board/ti/omap1510inn/config.mk +++ b/board/ti/omap1510inn/config.mk @@ -22,4 +22,4 @@ # -TEXT_BASE = 0x11080000 +CONFIG_SYS_TEXT_BASE = 0x11080000 diff --git a/board/ti/omap1510inn/lowlevel_init.S b/board/ti/omap1510inn/lowlevel_init.S index 1c68e5b81..0e0184122 100644 --- a/board/ti/omap1510inn/lowlevel_init.S +++ b/board/ti/omap1510inn/lowlevel_init.S @@ -37,7 +37,7 @@ _TEXT_BASE: - .word TEXT_BASE /* sdram load addr from config.mk */ + .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */ .globl lowlevel_init lowlevel_init: diff --git a/board/ti/omap1610inn/config.mk b/board/ti/omap1610inn/config.mk index 1c5b7b5c7..ee0aa0aec 100644 --- a/board/ti/omap1610inn/config.mk +++ b/board/ti/omap1610inn/config.mk @@ -23,4 +23,4 @@ # -TEXT_BASE = 0x11080000 +CONFIG_SYS_TEXT_BASE = 0x11080000 diff --git a/board/ti/omap1610inn/lowlevel_init.S b/board/ti/omap1610inn/lowlevel_init.S index e4ed9f3c6..b376ba5d0 100644 --- a/board/ti/omap1610inn/lowlevel_init.S +++ b/board/ti/omap1610inn/lowlevel_init.S @@ -35,7 +35,7 @@ _TEXT_BASE: - .word TEXT_BASE /* sdram load addr from config.mk */ + .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */ .globl lowlevel_init lowlevel_init: diff --git a/board/ti/omap2420h4/config.mk b/board/ti/omap2420h4/config.mk index 3edcde018..ca5ebdf96 100644 --- a/board/ti/omap2420h4/config.mk +++ b/board/ti/omap2420h4/config.mk @@ -14,15 +14,15 @@ # (mem base + reserved) # For use with external or internal boots. -TEXT_BASE = 0x80e80000 +CONFIG_SYS_TEXT_BASE = 0x80e80000 # Used with full SRAM boot. # This is either with a GP system or a signed boot image. # easiest, and safest way to go if you can. -#TEXT_BASE = 0x40270000 +#CONFIG_SYS_TEXT_BASE = 0x40270000 # Handy to get symbols to debug ROM version. -#TEXT_BASE = 0x0 -#TEXT_BASE = 0x08000000 -#TEXT_BASE = 0x04000000 +#CONFIG_SYS_TEXT_BASE = 0x0 +#CONFIG_SYS_TEXT_BASE = 0x08000000 +#CONFIG_SYS_TEXT_BASE = 0x04000000 diff --git a/board/ti/omap2420h4/lowlevel_init.S b/board/ti/omap2420h4/lowlevel_init.S index 9752fc488..731c552e7 100644 --- a/board/ti/omap2420h4/lowlevel_init.S +++ b/board/ti/omap2420h4/lowlevel_init.S @@ -31,7 +31,7 @@ #include <asm/arch/clocks.h> _TEXT_BASE: - .word TEXT_BASE /* sdram load addr from config.mk */ + .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */ /************************************************************************** * cpy_clk_code: relocates clock code into SRAM where its safer to execute diff --git a/board/ti/omap5912osk/config.mk b/board/ti/omap5912osk/config.mk index 5362a4f42..0ed7d8a6a 100644 --- a/board/ti/omap5912osk/config.mk +++ b/board/ti/omap5912osk/config.mk @@ -27,4 +27,4 @@ # -TEXT_BASE = 0x11080000 +CONFIG_SYS_TEXT_BASE = 0x11080000 diff --git a/board/ti/omap5912osk/lowlevel_init.S b/board/ti/omap5912osk/lowlevel_init.S index 7bfdb2632..e60161eba 100644 --- a/board/ti/omap5912osk/lowlevel_init.S +++ b/board/ti/omap5912osk/lowlevel_init.S @@ -36,7 +36,7 @@ _TEXT_BASE: - .word TEXT_BASE /* sdram load addr from config.mk */ + .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */ .globl lowlevel_init lowlevel_init: diff --git a/board/ti/omap730p2/config.mk b/board/ti/omap730p2/config.mk index 6940320c3..86188204e 100644 --- a/board/ti/omap730p2/config.mk +++ b/board/ti/omap730p2/config.mk @@ -22,4 +22,4 @@ # # -TEXT_BASE = 0x11080000 +CONFIG_SYS_TEXT_BASE = 0x11080000 diff --git a/board/ti/omap730p2/lowlevel_init.S b/board/ti/omap730p2/lowlevel_init.S index d4e97a5aa..6c574f1ed 100644 --- a/board/ti/omap730p2/lowlevel_init.S +++ b/board/ti/omap730p2/lowlevel_init.S @@ -41,7 +41,7 @@ #endif _TEXT_BASE: - .word TEXT_BASE /* sdram load addr from config.mk */ + .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */ .globl lowlevel_init lowlevel_init: diff --git a/board/ti/panda/config.mk b/board/ti/panda/config.mk index 7176c14fc..33901a77b 100644 --- a/board/ti/panda/config.mk +++ b/board/ti/panda/config.mk @@ -27,4 +27,5 @@ # 8000'0000 - 9fff'ffff (512 MB) # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000 # (mem base + reserved) -TEXT_BASE = 0x80e80000 + +CONFIG_SYS_TEXT_BASE = 0x80e80000 diff --git a/board/ti/sdp3430/config.mk b/board/ti/sdp3430/config.mk index 18e4761ab..2ca03dd81 100644 --- a/board/ti/sdp3430/config.mk +++ b/board/ti/sdp3430/config.mk @@ -30,4 +30,4 @@ # (mem base + reserved) # For use with external or internal boots. -TEXT_BASE = 0x80e80000 +CONFIG_SYS_TEXT_BASE = 0x80e80000 diff --git a/board/ti/sdp4430/config.mk b/board/ti/sdp4430/config.mk index 7bb947349..33901a77b 100644 --- a/board/ti/sdp4430/config.mk +++ b/board/ti/sdp4430/config.mk @@ -28,4 +28,4 @@ # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000 # (mem base + reserved) -TEXT_BASE = 0x80e80000 +CONFIG_SYS_TEXT_BASE = 0x80e80000 diff --git a/board/ti/tnetv107xevm/config.mk b/board/ti/tnetv107xevm/config.mk index d24d49a15..79b8304cf 100644 --- a/board/ti/tnetv107xevm/config.mk +++ b/board/ti/tnetv107xevm/config.mk @@ -17,4 +17,4 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -TEXT_BASE = 0x83FC0000 +CONFIG_SYS_TEXT_BASE = 0x83FC0000 diff --git a/board/timll/devkit8000/config.mk b/board/timll/devkit8000/config.mk index 6bfcef71e..cb2cf8f78 100644 --- a/board/timll/devkit8000/config.mk +++ b/board/timll/devkit8000/config.mk @@ -32,4 +32,4 @@ # (mem base + reserved) # For use with external or internal boots. -TEXT_BASE = 0x80e80000 +CONFIG_SYS_TEXT_BASE = 0x80e80000 diff --git a/board/total5200/config.mk b/board/total5200/config.mk index e7ac93d24..2863a4472 100644 --- a/board/total5200/config.mk +++ b/board/total5200/config.mk @@ -24,7 +24,7 @@ # # Total5200 board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFFF00000 boot high (standard configuration) # 0xFE000000 boot low @@ -33,11 +33,12 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot high -TEXT_BASE = 0xFFF00000 +CONFIG_SYS_TEXT_BASE = 0xFFF00000 ## For testing: boot from RAM -# TEXT_BASE = 0x00100000 +# CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/tqc/tqm5200/config.mk b/board/tqc/tqm5200/config.mk index d72dfe748..d9522ad82 100644 --- a/board/tqc/tqm5200/config.mk +++ b/board/tqc/tqm5200/config.mk @@ -24,7 +24,7 @@ # # TQM5200 board: # -# Valid values for TEXT_BASE are: +# Valid values for CONFIG_SYS_TEXT_BASE are: # # 0xFC000000 boot low (standard configuration with room for max 64 MByte # Flash ROM) @@ -34,13 +34,14 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE +ifndef CONFIG_SYS_TEXT_BASE ## Standard: boot low -TEXT_BASE = 0xFC000000 +CONFIG_SYS_TEXT_BASE = 0xFC000000 ## For a backup copy of U-Boot at the end of flash: boot high -# TEXT_BASE = 0xFFF00000 +# CONFIG_SYS_TEXT_BASE = 0xFFF00000 ## For testing: boot from RAM -# TEXT_BASE = 0x00100000 +# CONFIG_SYS_TEXT_BASE = 0x00100000 endif -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/tqc/tqm8260/config.mk b/board/tqc/tqm8260/config.mk index 3ecfc4876..b8de2f1ee 100644 --- a/board/tqc/tqm8260/config.mk +++ b/board/tqc/tqm8260/config.mk @@ -29,6 +29,7 @@ # for the "final" configuration, with U-Boot in flash, or the address # in RAM where U-Boot is loaded at for debugging. # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/tqc/tqm8272/config.mk b/board/tqc/tqm8272/config.mk index 05c5f0cb8..0ea134294 100644 --- a/board/tqc/tqm8272/config.mk +++ b/board/tqc/tqm8272/config.mk @@ -29,6 +29,7 @@ # for the "final" configuration, with U-Boot in flash, or the address # in RAM where U-Boot is loaded at for debugging. # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR) diff --git a/board/tqc/tqm834x/config.mk b/board/tqc/tqm834x/config.mk index f172c4ede..868fc86fd 100644 --- a/board/tqc/tqm834x/config.mk +++ b/board/tqc/tqm834x/config.mk @@ -20,4 +20,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0x80000000 +CONFIG_SYS_TEXT_BASE = 0x80000000 diff --git a/board/tqc/tqm85xx/config.mk b/board/tqc/tqm85xx/config.mk index 37b7b234a..7d6254491 100644 --- a/board/tqc/tqm85xx/config.mk +++ b/board/tqc/tqm85xx/config.mk @@ -25,7 +25,7 @@ # tqm85xx board # ifeq ($(CONFIG_TQM8548_BE),y) -TEXT_BASE = 0xfff80000 +CONFIG_SYS_TEXT_BASE = 0xfff80000 else -TEXT_BASE = 0xfffc0000 +CONFIG_SYS_TEXT_BASE = 0xfffc0000 endif diff --git a/board/tqc/tqm8xx/config.mk b/board/tqc/tqm8xx/config.mk index 9d6080b84..017dc83a2 100644 --- a/board/tqc/tqm8xx/config.mk +++ b/board/tqc/tqm8xx/config.mk @@ -25,4 +25,4 @@ # TQM8xxL boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/trab/config.mk b/board/trab/config.mk index 88f3beb5a..a349b8c1d 100644 --- a/board/trab/config.mk +++ b/board/trab/config.mk @@ -21,8 +21,8 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef TEXT_BASE -TEXT_BASE = 0x0DF40000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0x0DF40000 endif LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/trab/lowlevel_init.S b/board/trab/lowlevel_init.S index 9a009449f..3cef41473 100644 --- a/board/trab/lowlevel_init.S +++ b/board/trab/lowlevel_init.S @@ -138,7 +138,7 @@ _TEXT_BASE: - .word TEXT_BASE + .word CONFIG_SYS_TEXT_BASE .globl lowlevel_init lowlevel_init: diff --git a/board/trizepsiv/config.mk b/board/trizepsiv/config.mk index 4486f6b96..f04eb74ef 100644 --- a/board/trizepsiv/config.mk +++ b/board/trizepsiv/config.mk @@ -1,3 +1,3 @@ -TEXT_BASE =0xa1f00000 +CONFIG_SYS_TEXT_BASE =0xa1f00000 # 0xa1700000 -#TEXT_BASE = 0 +#CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/utx8245/config.mk b/board/utx8245/config.mk index a33faa742..a3d30a79d 100644 --- a/board/utx8245/config.mk +++ b/board/utx8245/config.mk @@ -29,5 +29,5 @@ # # UTX8245 boards # -TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +CONFIG_SYS_TEXT_BASE = 0xFFF00000 +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) diff --git a/board/v37/config.mk b/board/v37/config.mk index 50cac972e..06801a6df 100644 --- a/board/v37/config.mk +++ b/board/v37/config.mk @@ -24,4 +24,4 @@ # # Marel V37 boards # -TEXT_BASE = 0x40000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 diff --git a/board/v38b/config.mk b/board/v38b/config.mk index bc55fc7b2..985c6ba59 100644 --- a/board/v38b/config.mk +++ b/board/v38b/config.mk @@ -27,6 +27,7 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -TEXT_BASE = 0xFF000000 +CONFIG_SYS_TEXT_BASE = 0xFF000000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -I$(TOPDIR)/board diff --git a/board/ve8313/config.mk b/board/ve8313/config.mk index 02dd33e90..33686aa9b 100644 --- a/board/ve8313/config.mk +++ b/board/ve8313/config.mk @@ -2,6 +2,6 @@ ifndef NAND_SPL sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp endif -ifndef TEXT_BASE -TEXT_BASE = 0xfe000000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xfe000000 endif diff --git a/board/voiceblue/config.mk b/board/voiceblue/config.mk index 2cfc56ada..412b57d27 100644 --- a/board/voiceblue/config.mk +++ b/board/voiceblue/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x13FD0000 +CONFIG_SYS_TEXT_BASE = 0x13FD0000 diff --git a/board/voiceblue/setup.S b/board/voiceblue/setup.S index cc50e8c39..6dddd6bdc 100644 --- a/board/voiceblue/setup.S +++ b/board/voiceblue/setup.S @@ -26,7 +26,7 @@ #include <version.h> _TEXT_BASE: - .word TEXT_BASE /* SDRAM load addr from config.mk */ + .word CONFIG_SYS_TEXT_BASE /* SDRAM load addr from config.mk */ OMAP5910_LPG1_BASE: .word 0xfffbd000 OMAP5910_TIPB_SWITCHES_BASE: .word 0xfffbc800 diff --git a/board/vpac270/config.mk b/board/vpac270/config.mk index 1d650acd9..0f10662ce 100644 --- a/board/vpac270/config.mk +++ b/board/vpac270/config.mk @@ -1 +1 @@ -TEXT_BASE = 0xa1000000 +CONFIG_SYS_TEXT_BASE = 0xa1000000 diff --git a/board/w7o/config.mk b/board/w7o/config.mk index bc341ca75..d9a53dd1c 100644 --- a/board/w7o/config.mk +++ b/board/w7o/config.mk @@ -25,7 +25,7 @@ # Wave 7 Optics boards # -#TEXT_BASE = 0xFFF80000 -TEXT_BASE = 0xFFFC0000 +#CONFIG_SYS_TEXT_BASE = 0xFFF80000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 #PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARD) diff --git a/board/wepep250/config.mk b/board/wepep250/config.mk index 8701581d2..60cbc2429 100644 --- a/board/wepep250/config.mk +++ b/board/wepep250/config.mk @@ -1,11 +1,11 @@ # # This is config used for compilation of WEP EP250 sources # -# You might change location of U-Boot in memory by setting right TEXT_BASE. +# You might change location of U-Boot in memory by setting right CONFIG_SYS_TEXT_BASE. # This allows for example having one copy located at the end of ram and stored # in flash device and later on while developing use other location to test # the code in RAM device only. # -TEXT_BASE = 0xa1fe0000 -#TEXT_BASE = 0xa1001000 +CONFIG_SYS_TEXT_BASE = 0xa1fe0000 +#CONFIG_SYS_TEXT_BASE = 0xa1001000 diff --git a/board/westel/amx860/config.mk b/board/westel/amx860/config.mk index d0ee4a286..49574336e 100644 --- a/board/westel/amx860/config.mk +++ b/board/westel/amx860/config.mk @@ -21,6 +21,6 @@ # MA 02111-1307 USA # -#TEXT_BASE = 0xFE000000 -TEXT_BASE = 0x40000000 +#CONFIG_SYS_TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0x40000000 OBJCFLAGS = --set-section-flags=.ppcenv=contents,alloc,load,data diff --git a/board/xaeniax/config.mk b/board/xaeniax/config.mk index 45079a079..c63975279 100644 --- a/board/xaeniax/config.mk +++ b/board/xaeniax/config.mk @@ -1,2 +1,2 @@ -TEXT_BASE = 0xa3FB0000 -#TEXT_BASE = 0 +CONFIG_SYS_TEXT_BASE = 0xa3FB0000 +#CONFIG_SYS_TEXT_BASE = 0 diff --git a/board/xes/xpedite1000/config.mk b/board/xes/xpedite1000/config.mk index 33dfbf1c0..5da8707fe 100644 --- a/board/xes/xpedite1000/config.mk +++ b/board/xes/xpedite1000/config.mk @@ -26,9 +26,9 @@ # ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 +CONFIG_SYS_TEXT_BASE = 0x07FD0000 else -TEXT_BASE = 0xFFF80000 +CONFIG_SYS_TEXT_BASE = 0xFFF80000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/xes/xpedite5170/config.mk b/board/xes/xpedite5170/config.mk index 1abae973f..5b99220a8 100644 --- a/board/xes/xpedite5170/config.mk +++ b/board/xes/xpedite5170/config.mk @@ -24,4 +24,4 @@ # # XPedite5170 # -TEXT_BASE = 0xfff00000 +CONFIG_SYS_TEXT_BASE = 0xfff00000 diff --git a/board/xes/xpedite5200/config.mk b/board/xes/xpedite5200/config.mk index 0761579d9..a6bd6d28e 100644 --- a/board/xes/xpedite5200/config.mk +++ b/board/xes/xpedite5200/config.mk @@ -24,6 +24,6 @@ # # xpedite5200 board # -ifndef TEXT_BASE -TEXT_BASE = 0xfff80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xfff80000 endif diff --git a/board/xes/xpedite5370/config.mk b/board/xes/xpedite5370/config.mk index 995def875..aa8c5e0f8 100644 --- a/board/xes/xpedite5370/config.mk +++ b/board/xes/xpedite5370/config.mk @@ -24,6 +24,6 @@ # # xpedite5370 board # -ifndef TEXT_BASE -TEXT_BASE = 0xfff80000 +ifndef CONFIG_SYS_TEXT_BASE +CONFIG_SYS_TEXT_BASE = 0xfff80000 endif diff --git a/board/xilinx/microblaze-generic/config.mk b/board/xilinx/microblaze-generic/config.mk index c75daaf0b..f8d7e2622 100644 --- a/board/xilinx/microblaze-generic/config.mk +++ b/board/xilinx/microblaze-generic/config.mk @@ -25,7 +25,7 @@ # Version: Xilinx EDK 6.3 EDK_Gmm.12.3 # -TEXT_BASE = 0x29000000 +CONFIG_SYS_TEXT_BASE = 0x29000000 PLATFORM_CPPFLAGS += -mno-xl-soft-mul PLATFORM_CPPFLAGS += -mno-xl-soft-div diff --git a/board/xilinx/ppc405-generic/u-boot-ram.lds b/board/xilinx/ppc405-generic/u-boot-ram.lds index 2543c9b06..a7539fde4 100644 --- a/board/xilinx/ppc405-generic/u-boot-ram.lds +++ b/board/xilinx/ppc405-generic/u-boot-ram.lds @@ -124,7 +124,7 @@ SECTIONS *(COMMON) } - ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your configuration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified."); + ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your configuration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and CONFIG_SYS_TEXT_BASE may need to be modified."); _end = . ; PROVIDE (end = .); diff --git a/board/xilinx/ppc405-generic/u-boot-rom.lds b/board/xilinx/ppc405-generic/u-boot-rom.lds index 65d0e4dfd..074f3c24a 100644 --- a/board/xilinx/ppc405-generic/u-boot-rom.lds +++ b/board/xilinx/ppc405-generic/u-boot-rom.lds @@ -134,7 +134,7 @@ SECTIONS *(COMMON) } - ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your configuration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified."); + ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your configuration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and CONFIG_SYS_TEXT_BASE may need to be modified."); _end = . ; PROVIDE (end = .); diff --git a/board/xilinx/ppc440-generic/u-boot-ram.lds b/board/xilinx/ppc440-generic/u-boot-ram.lds index 94f6fafa1..203f0623b 100644 --- a/board/xilinx/ppc440-generic/u-boot-ram.lds +++ b/board/xilinx/ppc440-generic/u-boot-ram.lds @@ -125,7 +125,7 @@ SECTIONS . = ALIGN(4); } - ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified."); + ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and CONFIG_SYS_TEXT_BASE may need to be modified."); _end = . ; PROVIDE (end = .); diff --git a/board/xilinx/ppc440-generic/u-boot-rom.lds b/board/xilinx/ppc440-generic/u-boot-rom.lds index b8f8bedb8..b67617dca 100644 --- a/board/xilinx/ppc440-generic/u-boot-rom.lds +++ b/board/xilinx/ppc440-generic/u-boot-rom.lds @@ -135,7 +135,7 @@ SECTIONS . = ALIGN(4); } - ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified."); + ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and CONFIG_SYS_TEXT_BASE may need to be modified."); _end = . ; PROVIDE (end = .); diff --git a/board/xm250/config.mk b/board/xm250/config.mk index 8ce0c4841..a3fa0e5b9 100644 --- a/board/xm250/config.mk +++ b/board/xm250/config.mk @@ -27,9 +27,9 @@ # This is the address where U-Boot lives in flash: -#TEXT_BASE = 0 +#CONFIG_SYS_TEXT_BASE = 0 # FIXME: armboot does only work correctly when being compiled # for the addresses _after_ relocation to RAM!! Otherwhise the # .bss segment is assumed in flash... -TEXT_BASE = 0xA3F80000 +CONFIG_SYS_TEXT_BASE = 0xA3F80000 diff --git a/board/xsengine/config.mk b/board/xsengine/config.mk index 148c5199d..821bb3b09 100644 --- a/board/xsengine/config.mk +++ b/board/xsengine/config.mk @@ -1 +1 @@ -TEXT_BASE = 0xA3F80000 +CONFIG_SYS_TEXT_BASE = 0xA3F80000 diff --git a/board/zeus/config.mk b/board/zeus/config.mk index 1bdf5e4fc..1646d3423 100644 --- a/board/zeus/config.mk +++ b/board/zeus/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC0000 +CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/zipitz2/config.mk b/board/zipitz2/config.mk index 1d650acd9..0f10662ce 100644 --- a/board/zipitz2/config.mk +++ b/board/zipitz2/config.mk @@ -1 +1 @@ -TEXT_BASE = 0xa1000000 +CONFIG_SYS_TEXT_BASE = 0xa1000000 diff --git a/board/zpc1900/config.mk b/board/zpc1900/config.mk index 3e53b2be0..1bb0806d7 100644 --- a/board/zpc1900/config.mk +++ b/board/zpc1900/config.mk @@ -27,4 +27,4 @@ # ZPC.1900 board # -TEXT_BASE = 0xFE000000 +CONFIG_SYS_TEXT_BASE = 0xFE000000 diff --git a/board/zylonite/config.mk b/board/zylonite/config.mk index 09b0f7155..954f46e38 100644 --- a/board/zylonite/config.mk +++ b/board/zylonite/config.mk @@ -1,4 +1,4 @@ -#TEXT_BASE = 0x0 -#TEXT_BASE = 0xa1700000 -#TEXT_BASE = 0xa3080000 -TEXT_BASE = 0xa3008000 +#CONFIG_SYS_TEXT_BASE = 0x0 +#CONFIG_SYS_TEXT_BASE = 0xa1700000 +#CONFIG_SYS_TEXT_BASE = 0xa3080000 +CONFIG_SYS_TEXT_BASE = 0xa3008000 |