diff options
Diffstat (limited to 'board')
532 files changed, 435 insertions, 7933 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 deleted file mode 100644 index defc36080..000000000 --- a/board/LEOX/elpt860/config.mk +++ /dev/null @@ -1,36 +0,0 @@ -####################################################################### -# -# Copyright (C) 2000, 2001, 2002, 2003 -# The LEOX team <team@leox.org>, http://www.leox.org -# -# LEOX.org is about the development of free hardware and software resources -# for system on chip. -# -# Description: U-Boot port on the LEOX's ELPT860 CPU board -# ~~~~~~~~~~~ -# -####################################################################### -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -####################################################################### - -# -# ELPT860 board -# - -TEXT_BASE = 0x02000000 -#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 deleted file mode 100644 index 0e42b48e1..000000000 --- a/board/Marvell/db64360/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2001 -# Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# EVB64360 boards -# - -TEXT_BASE = 0xfff00000 diff --git a/board/Marvell/db64460/config.mk b/board/Marvell/db64460/config.mk deleted file mode 100644 index 5a434d9bc..000000000 --- a/board/Marvell/db64460/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2001 -# Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# EVB64460 boards -# - -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 deleted file mode 100644 index ae455e120..000000000 --- a/board/RPXClassic/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2001 -# Stäubli Faverges - <www.staubli.com> -# Pierre AUBERT p.aubert@staubli.com -# U-Boot port on RPXClassic LF (CLLF_BW31) board -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xff000000 diff --git a/board/RPXlite/config.mk b/board/RPXlite/config.mk deleted file mode 100644 index 6536b7761..000000000 --- a/board/RPXlite/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# RPXlite boards -# - -TEXT_BASE = 0xfff00000 diff --git a/board/RPXlite_dw/config.mk b/board/RPXlite_dw/config.mk deleted file mode 100644 index 797091095..000000000 --- a/board/RPXlite_dw/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# Sam Song, IEMC. SHU, samsongshu@yahoo.com.cn -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# RPXlite dw boards : lite_dw -# - -TEXT_BASE = 0xff000000 diff --git a/board/RRvision/config.mk b/board/RRvision/config.mk deleted file mode 100644 index ab1c8d6cc..000000000 --- a/board/RRvision/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# RedRock vision boards -# - -TEXT_BASE = 0x40000000 diff --git a/board/a3000/config.mk b/board/a3000/config.mk deleted file mode 100644 index 798e0321d..000000000 --- a/board/a3000/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Artis A-3000 boards -# - -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index 4691a69ef..000000000 --- a/board/adder/config.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (C) 2004 Arabella Software Ltd. -# Yuli Barcohen <yuli@arabellasw.com> -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Analogue&Micro Adder boards family -# -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 deleted file mode 100644 index 99d28a54f..000000000 --- a/board/alaska/config.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# (C) Copyright 2003-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# alaska board -# - -TEXT_BASE = 0xfff00000 -# TEXT_BASE = 0x00100000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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..2f2787f11 100644 --- a/board/amcc/acadia/config.mk +++ b/board/amcc/acadia/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2007 +# (C) Copyright 2007-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -25,16 +25,13 @@ # AMCC 405EZ Reference Platform (Acadia) board # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFFF80000 -endif - ifeq ($(debug),1) PLATFORM_CPPFLAGS += -DDEBUG endif -ifdef CONFIG_NAND_U_BOOT +ifdef CONFIG_SYS_LDSCRIPT +# need to strip off double quotes +LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) +else ifdef CONFIG_NAND_U_BOOT LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds endif diff --git a/board/amcc/bamboo/config.mk b/board/amcc/bamboo/config.mk index 72b6bc0c0..7ca16a066 100644 --- a/board/amcc/bamboo/config.mk +++ b/board/amcc/bamboo/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2002-2007 +# (C) Copyright 2002-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -21,12 +21,6 @@ # MA 02111-1307 USA # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) @@ -37,6 +31,9 @@ ifeq ($(dbcr),1) PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8cff0000 endif -ifdef CONFIG_NAND_U_BOOT +ifdef CONFIG_SYS_LDSCRIPT +# need to strip off double quotes +LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) +else ifdef CONFIG_NAND_U_BOOT LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds endif diff --git a/board/amcc/bluestone/config.mk b/board/amcc/bluestone/config.mk index e2194e4e0..d5d66eb9e 100644 --- a/board/amcc/bluestone/config.mk +++ b/board/amcc/bluestone/config.mk @@ -23,12 +23,6 @@ # Applied Micro APM821XX Evaluation board. # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/amcc/bubinga/config.mk b/board/amcc/bubinga/config.mk deleted file mode 100644 index 1bdf5e4fc..000000000 --- a/board/amcc/bubinga/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFFC0000 diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk index 3d6a6085c..abf2a2680 100644 --- a/board/amcc/canyonlands/config.mk +++ b/board/amcc/canyonlands/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2008 +# (C) Copyright 2008-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -24,12 +24,6 @@ # AMCC 460EX/460GT Evaluation Board (Canyonlands) board # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFFF80000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) @@ -40,6 +34,9 @@ ifeq ($(dbcr),1) PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8cff0000 endif -ifdef CONFIG_NAND_U_BOOT +ifdef CONFIG_SYS_LDSCRIPT +# need to strip off double quotes +LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) +else ifdef CONFIG_NAND_U_BOOT LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds endif diff --git a/board/amcc/ebony/config.mk b/board/amcc/ebony/config.mk index 60d3bf4d2..9eac8b963 100644 --- a/board/amcc/ebony/config.mk +++ b/board/amcc/ebony/config.mk @@ -21,18 +21,6 @@ # MA 02111-1307 USA # -# -# esd ADCIOP boards -# - -#TEXT_BASE = 0xFFFE0000 - -ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 -else -TEXT_BASE = 0xFFFC0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/amcc/katmai/config.mk b/board/amcc/katmai/config.mk index ef0cf9672..f5dfbaf6d 100644 --- a/board/amcc/katmai/config.mk +++ b/board/amcc/katmai/config.mk @@ -25,8 +25,6 @@ # AMCC 440SPe Evaluation (Katmai) board # -TEXT_BASE = 0xFFFA0000 - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/amcc/kilauea/config.mk b/board/amcc/kilauea/config.mk index b3d3f227f..4ae3ea926 100644 --- a/board/amcc/kilauea/config.mk +++ b/board/amcc/kilauea/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2007 +# (C) Copyright 2007-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -21,16 +21,13 @@ # MA 02111-1307 USA # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 -endif - ifeq ($(debug),1) PLATFORM_CPPFLAGS += -DDEBUG endif -ifdef CONFIG_NAND_U_BOOT +ifdef CONFIG_SYS_LDSCRIPT +# need to strip off double quotes +LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) +else ifdef CONFIG_NAND_U_BOOT LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds endif diff --git a/board/amcc/luan/config.mk b/board/amcc/luan/config.mk index 5e4182d5b..9eac8b963 100644 --- a/board/amcc/luan/config.mk +++ b/board/amcc/luan/config.mk @@ -21,18 +21,6 @@ # MA 02111-1307 USA # -# -# esd ADCIOP boards -# - -#TEXT_BASE = 0x00001000 - -ifeq ($(ramsym),1) -TEXT_BASE = 0xFBD00000 -else -TEXT_BASE = 0xFFFB0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/amcc/makalu/config.mk b/board/amcc/makalu/config.mk deleted file mode 100644 index a46b19724..000000000 --- a/board/amcc/makalu/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFFA0000 diff --git a/board/amcc/ocotea/config.mk b/board/amcc/ocotea/config.mk index b62e776d3..75634ad5d 100644 --- a/board/amcc/ocotea/config.mk +++ b/board/amcc/ocotea/config.mk @@ -25,14 +25,6 @@ # AMCC 440GX Reference Platform (Ocotea) board # -#TEXT_BASE = 0xFFFE0000 - -ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 -else -TEXT_BASE = 0xFFFC0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/amcc/redwood/config.mk b/board/amcc/redwood/config.mk index 381f2b23d..f10d81283 100644 --- a/board/amcc/redwood/config.mk +++ b/board/amcc/redwood/config.mk @@ -25,12 +25,6 @@ # AMCC 460SX Reference Platform (redwood) board # -ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 -else -TEXT_BASE = 0xfffb0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/amcc/sequoia/config.mk b/board/amcc/sequoia/config.mk index c8e2dff21..73efe727d 100644 --- a/board/amcc/sequoia/config.mk +++ b/board/amcc/sequoia/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2002 +# (C) Copyright 2002-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -24,12 +24,6 @@ # AMCC 440EPx Reference Platform (Sequoia) board # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFFF80000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) @@ -40,6 +34,9 @@ ifeq ($(dbcr),1) PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8cff0000 endif -ifdef CONFIG_NAND_U_BOOT +ifdef CONFIG_SYS_LDSCRIPT +# need to strip off double quotes +LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) +else ifdef CONFIG_NAND_U_BOOT LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds endif diff --git a/board/amcc/taihu/config.mk b/board/amcc/taihu/config.mk deleted file mode 100644 index 1bdf5e4fc..000000000 --- a/board/amcc/taihu/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFFC0000 diff --git a/board/amcc/taishan/config.mk b/board/amcc/taishan/config.mk index ee5eb1ba6..3d18a3854 100644 --- a/board/amcc/taishan/config.mk +++ b/board/amcc/taishan/config.mk @@ -25,14 +25,6 @@ # AMCC 440GX Reference Platform (Taishan) board # -#TEXT_BASE = 0xFFFE0000 - -ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 -else -TEXT_BASE = 0xFFFC0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/amcc/walnut/config.mk b/board/amcc/walnut/config.mk deleted file mode 100644 index 1bdf5e4fc..000000000 --- a/board/amcc/walnut/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFFC0000 diff --git a/board/amcc/yosemite/config.mk b/board/amcc/yosemite/config.mk index df5466e2c..9eac8b963 100644 --- a/board/amcc/yosemite/config.mk +++ b/board/amcc/yosemite/config.mk @@ -21,18 +21,6 @@ # MA 02111-1307 USA # -# -# esd ADCIOP boards -# - -#TEXT_BASE = 0x00001000 - -ifeq ($(ramsym),1) -TEXT_BASE = 0xFBD00000 -else -TEXT_BASE = 0xFFF80000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),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..2d075b6db 100644 --- a/board/amirix/ap1000/config.mk +++ b/board/amirix/ap1000/config.mk @@ -21,10 +21,5 @@ # MA 02111-1307 USA # -# 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 - # 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..ebd758cbe 100644 --- a/board/atc/config.mk +++ b/board/atc/config.mk @@ -25,14 +25,4 @@ # ATC boards # -# This should be equal to the CONFIG_SYS_FLASH_BASE define in config_atc.h -# for the "final" configuration, with U-Boot in flash, or the address -# in RAM where U-Boot is loaded at for debugging. -# - -TEXT_BASE := 0xFF000000 - -# RAM version -#TEXT_BASE := 0x100000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -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 deleted file mode 100644 index a13f52d38..000000000 --- a/board/atum8548/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright 2004, 2007 Freescale Semiconductor. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# atum8548 board -# TEXT_BASE = 0xfff80000 -# TEXT_BASE = 0xfffff000 -ifndef TEXT_BASE -TEXT_BASE = 0xfff80000 -endif diff --git a/board/avnet/fx12mm/config.mk b/board/avnet/fx12mm/config.mk index f5a603950..78dde622d 100644 --- a/board/avnet/fx12mm/config.mk +++ b/board/avnet/fx12mm/config.mk @@ -23,4 +23,7 @@ # # -sinclude $(SRCTREE)/board/xilinx/ppc405-generic/config.mk +ifdef CONFIG_SYS_LDSCRIPT +# need to strip off double quotes +LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) +endif diff --git a/board/avnet/v5fx30teval/config.mk b/board/avnet/v5fx30teval/config.mk index 51448ce7f..78dde622d 100644 --- a/board/avnet/v5fx30teval/config.mk +++ b/board/avnet/v5fx30teval/config.mk @@ -23,4 +23,7 @@ # # -sinclude $(SRCTREE)/board/xilinx/ppc440-generic/config.mk +ifdef CONFIG_SYS_LDSCRIPT +# need to strip off double quotes +LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) +endif diff --git a/board/barco/config.mk b/board/barco/config.mk deleted file mode 100644 index f950c07b0..000000000 --- a/board/barco/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Barco Hydra/SCN boards -# - -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/bc3450/config.mk b/board/bc3450/config.mk deleted file mode 100644 index 47e995578..000000000 --- a/board/bc3450/config.mk +++ /dev/null @@ -1,41 +0,0 @@ -# -# (C) Copyright 2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# BC3450 board: -# -# Valid values for 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 -## Standard: boot low -TEXT_BASE = 0xFC000000 -## For testing: boot from RAM -# TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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-ezkit/video.c b/board/bf527-ezkit/video.c index 87e7658b4..ca5e9b045 100644 --- a/board/bf527-ezkit/video.c +++ b/board/bf527-ezkit/video.c @@ -24,7 +24,7 @@ #define LCD_Y_RES 240 /* Vertical Resolution */ #define DMA_BUS_SIZE 16 -#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 /* lq035q1 */ +#ifdef CONFIG_BF527_EZKIT_REV_2_1 /* lq035q1 */ #if !defined(CONFIG_LQ035Q1_USE_RGB888_8_BIT_PPI) && \ !defined(CONFIG_LQ035Q1_USE_RGB565_8_BIT_PPI) @@ -125,7 +125,7 @@ #define PPI_PACK_EN 0x80 #define PPI_POLS_1 0x8000 -#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 +#ifdef CONFIG_BF527_EZKIT_REV_2_1 static struct spi_slave *slave; static int lq035q1_control(unsigned char reg, unsigned short value) { @@ -305,7 +305,7 @@ void EnableTIMER12(void) int video_init(void *dst) { -#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 +#ifdef CONFIG_BF527_EZKIT_REV_2_1 lq035q1_control(LQ035_SHUT_CTL, LQ035_ON); lq035q1_control(LQ035_DRIVER_OUTPUT_CTL, (CONFIG_LQ035Q1_LCD_MODE & LQ035_DRIVER_OUTPUT_MASK) | LQ035_DRIVER_OUTPUT_DEFAULT); @@ -318,7 +318,7 @@ int video_init(void *dst) Init_PPI(); EnablePPI(); -#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 +#ifdef CONFIG_BF527_EZKIT_REV_2_1 EnableTIMER12(); #else /* Frame sync 2 (VS) needs to start at least one PPI clk earlier */ @@ -388,7 +388,7 @@ void video_stop(void) DisableDMA(); DisableTIMER0(); DisableTIMER1(); -#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 +#ifdef CONFIG_BF527_EZKIT_REV_2_1 lq035q1_control(LQ035_SHUT_CTL, LQ035_SHUT); #endif } 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..a1a44e581 100644 --- a/board/bmw/config.mk +++ b/board/bmw/config.mk @@ -22,11 +22,9 @@ # # -# CU824 board +# BMW board # -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) + -DDBG=0 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256 diff --git a/board/c2mon/config.mk b/board/c2mon/config.mk deleted file mode 100644 index c2d21e2e4..000000000 --- a/board/c2mon/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# TTTech C2MON boards -# - -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 deleted file mode 100644 index a163b34d6..000000000 --- a/board/canmb/config.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -# (C) Copyright 2005 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# (C) Copyright 2003 -# Reinhard Meyer, EMK Elektronik GmbH, r.meyer@emk-elektronik.de -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# CANMB board -# -# allowed and functional TEXT_BASE values: -# -# 0xfe000000 low boot at 0x00000100 (default board setting) -# 0x00100000 RAM load and test -# - -TEXT_BASE = 0xFE000000 -#TEXT_BASE = 0x00100000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index 7f061391a..000000000 --- a/board/cm5200/config.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# (C) Copyright 2007 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xfc000000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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..2685d4f7e 100644 --- a/board/cmi/config.mk +++ b/board/cmi/config.mk @@ -22,10 +22,7 @@ # # -# EPQ Board Configuration +# CMI Board Configuration # -# Boot from flash at location 0x00000000 -TEXT_BASE = 0x02000000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -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..78730db49 100644 --- a/board/cogent/config.mk +++ b/board/cogent/config.mk @@ -25,9 +25,6 @@ # Cogent Modular Architecture # -# Boot EPROM location -TEXT_BASE = 0xfff00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -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..0f8d66560 100644 --- a/board/cpc45/config.mk +++ b/board/cpc45/config.mk @@ -25,12 +25,4 @@ # CPC45 board # - -ifeq ($(CONFIG_BOOT_ROM),y) - TEXT_BASE := 0xFFF00000 - PLATFORM_CPPFLAGS += -DCONFIG_BOOT_ROM -else - TEXT_BASE := 0xFFF00000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR) diff --git a/board/cpu86/config.mk b/board/cpu86/config.mk index 5fe0ca088..379017e7e 100644 --- a/board/cpu86/config.mk +++ b/board/cpu86/config.mk @@ -25,16 +25,4 @@ # CPU86 boards # -# This should be equal to the CONFIG_SYS_FLASH_BASE define in config_CPU86.h -# for the "final" configuration, with U-Boot in flash, or the address -# in RAM where U-Boot is loaded at for debugging. -# - -ifeq ($(CONFIG_BOOT_ROM),y) - TEXT_BASE := 0xFF800000 - PLATFORM_CPPFLAGS += -DCONFIG_BOOT_ROM -else - TEXT_BASE := 0xFF000000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR) diff --git a/board/cpu87/config.mk b/board/cpu87/config.mk index 6a694a405..42f7f958d 100644 --- a/board/cpu87/config.mk +++ b/board/cpu87/config.mk @@ -25,16 +25,4 @@ # CPU87 board # -# This should be equal to the CONFIG_SYS_FLASH_BASE define in configs/cpu87.h -# for the "final" configuration, with U-Boot in flash, or the address -# in RAM where U-Boot is loaded at for debugging. -# - -ifeq ($(CONFIG_BOOT_ROM),y) - TEXT_BASE := 0xFF800000 - PLATFORM_CPPFLAGS += -DCONFIG_BOOT_ROM -else - TEXT_BASE := 0xFF000000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -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 deleted file mode 100644 index b69fe8ee0..000000000 --- a/board/cray/L1/config.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# 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 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..a3cd0400e 100644 --- a/board/csb272/config.mk +++ b/board/csb272/config.mk @@ -29,8 +29,3 @@ # LDFLAGS += $(LINKER_UNDEFS) - -TEXT_BASE := 0xFFFC0000 -#TEXT_BASE := 0x00100000 - -PLATFORM_RELFLAGS := $(PLATFORM_RELFLAGS) diff --git a/board/csb472/config.mk b/board/csb472/config.mk index 04aefd1f8..90a9cba2b 100644 --- a/board/csb472/config.mk +++ b/board/csb472/config.mk @@ -29,8 +29,3 @@ # LDFLAGS += $(LINKER_UNDEFS) - -TEXT_BASE := 0xFFFC0000 -#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 deleted file mode 100644 index 18673e16d..000000000 --- a/board/cu824/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# CU824 board -# - -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index 9083aacfa..000000000 --- a/board/dave/PPChameleonEVB/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000, 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# Reserve 256 kB for Monitor -#TEXT_BASE = 0xFFFC0000 - -# Reserve 320 kB for Monitor -TEXT_BASE = 0xFFFB0000 diff --git a/board/davedenx/aria/config.mk b/board/davedenx/aria/config.mk deleted file mode 100644 index 838a01849..000000000 --- a/board/davedenx/aria/config.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# (C) Copyright 2009 Wolfgang Denk <wd@denx.de> -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -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/schmoogie/schmoogie.c b/board/davinci/schmoogie/schmoogie.c index 19c95809a..80a0f9fcc 100644 --- a/board/davinci/schmoogie/schmoogie.c +++ b/board/davinci/schmoogie/schmoogie.c @@ -107,12 +107,12 @@ int misc_init_r(void) /* Set serial number from UID chip */ if (i2c_read(CONFIG_SYS_UID_ADDR, 0, 1, buf, 8)) { printf("\nUID @ 0x%02x read FAILED!!!\n", CONFIG_SYS_UID_ADDR); - forceenv("serial#", "FAILED"); + setenv("serial#", "FAILED"); } else { if (buf[0] != 0x70) { /* Device Family Code */ printf("\nUID @ 0x%02x read FAILED!!!\n", CONFIG_SYS_UID_ADDR); - forceenv("serial#", "FAILED"); + setenv("serial#", "FAILED"); } } /* Now check CRC */ @@ -122,12 +122,12 @@ int misc_init_r(void) if (tmp[0] != 0) { printf("\nUID @ 0x%02x - BAD CRC!!!\n", CONFIG_SYS_UID_ADDR); - forceenv("serial#", "FAILED"); + setenv("serial#", "FAILED"); } else { /* CRC OK, set "serial" env variable */ sprintf((char *)&tmp[0], "%02x%02x%02x%02x%02x%02x", buf[6], buf[5], buf[4], buf[3], buf[2], buf[1]); - forceenv("serial#", (char *)&tmp[0]); + setenv("serial#", (char *)&tmp[0]); } return(0); 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 deleted file mode 100644 index e2f14b0ce..000000000 --- a/board/digsy_mtc/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# Author: Grzegorz Bernacki, Semihalf, gjb@semihalf.com -# - -# -# digsyMTC board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFF00000 boot high (standard configuration) -# 0xFE000000 boot low -# 0x00100000 boot from RAM (for testing only) -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -# TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index b3f65ebe5..000000000 --- a/board/eXalion/config.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Sandpoint boards -# - -#TEXT_BASE = 0x00090000 -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index aa463c5dc..000000000 --- a/board/eltec/bab7xx/config.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/eltec/elppc/config.mk b/board/eltec/elppc/config.mk deleted file mode 100644 index aa463c5dc..000000000 --- a/board/eltec/elppc/config.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/eltec/mhpc/config.mk b/board/eltec/mhpc/config.mk deleted file mode 100644 index 03934de3f..000000000 --- a/board/eltec/mhpc/config.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# (C) Copyright 2000 -# Sysgo Real-Time Solutions, GmbH <www.elinos.com> -# Marius Groeger <mgroeger@sysgo.de> -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MHPC boards -# - -TEXT_BASE = 0xfe000000 -/*TEXT_BASE = 0x00200000 */ diff --git a/board/emk/top5200/config.mk b/board/emk/top5200/config.mk deleted file mode 100644 index 84131fef1..000000000 --- a/board/emk/top5200/config.mk +++ /dev/null @@ -1,41 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# (C) Copyright 2003 -# Reinhard Meyer, EMK Elektronik GmbH, r.meyer@emk-elektronik.de -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# TOP5200 board, on optional MINI5200 and EVAL5200 boards -# -# allowed and functional 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 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/emk/top860/config.mk b/board/emk/top860/config.mk deleted file mode 100644 index 7b940cb81..000000000 --- a/board/emk/top860/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# TOP860 board -# - -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 deleted file mode 100644 index eda523be2..000000000 --- a/board/ep8248/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# Modified by, Yuli Barcohen, Arabella Software Ltd. <yuli@arabellasw.com> -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# EP82xx series boards by Embedded Planet -# - -TEXT_BASE = 0xFFF00000 diff --git a/board/ep8260/config.mk b/board/ep8260/config.mk index 1225830be..ee4b5eabc 100644 --- a/board/ep8260/config.mk +++ b/board/ep8260/config.mk @@ -25,12 +25,4 @@ # EP8260 boards # -# This should be equal to the CONFIG_SYS_FLASH_BASE define in config_ep8260.h -# 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 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR) diff --git a/board/ep82xxm/config.mk b/board/ep82xxm/config.mk deleted file mode 100644 index da039e21b..000000000 --- a/board/ep82xxm/config.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# (C) Copyright 2001-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# EP82xxM series boards by Embedded Planet - -TEXT_BASE = 0xFFF00000 diff --git a/board/ep88x/config.mk b/board/ep88x/config.mk deleted file mode 100644 index 72b326c32..000000000 --- a/board/ep88x/config.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (C) 2005 Arabella Software Ltd. -# Yuli Barcohen <yuli@arabellasw.com> -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Embedded Planet EP88x boards -# -TEXT_BASE = 0xFC000000 diff --git a/board/eric/config.mk b/board/eric/config.mk deleted file mode 100644 index dd0b41209..000000000 --- a/board/eric/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd ADCIOP boards -# - -#TEXT_BASE = 0xFFF80000 -TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/adciop/config.mk b/board/esd/adciop/config.mk deleted file mode 100644 index 747f29f77..000000000 --- a/board/esd/adciop/config.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd ADCIOP boards -# - -# FLASH: -#TEXT_BASE = 0xFFFE0000 -TEXT_BASE = 0xFFFD0000 - -# SDRAM: -#TEXT_BASE = 0x00FE0000 diff --git a/board/esd/apc405/config.mk b/board/esd/apc405/config.mk deleted file mode 100644 index 11faad2e0..000000000 --- a/board/esd/apc405/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd ABG405 boards -# - -TEXT_BASE = 0xFFF80000 diff --git a/board/esd/ar405/config.mk b/board/esd/ar405/config.mk deleted file mode 100644 index da7c10728..000000000 --- a/board/esd/ar405/config.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -TEXT_BASE = 0xFFFA0000 diff --git a/board/esd/ash405/config.mk b/board/esd/ash405/config.mk deleted file mode 100644 index 1d743a9f8..000000000 --- a/board/esd/ash405/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd ASH405 boards -# - -TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/canbt/config.mk b/board/esd/canbt/config.mk deleted file mode 100644 index ae855dc05..000000000 --- a/board/esd/canbt/config.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/cms700/config.mk b/board/esd/cms700/config.mk deleted file mode 100644 index 8e48bcd6c..000000000 --- a/board/esd/cms700/config.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -TEXT_BASE = 0xFFFC8000 diff --git a/board/esd/cpci2dp/config.mk b/board/esd/cpci2dp/config.mk deleted file mode 100644 index 2da4c9f76..000000000 --- a/board/esd/cpci2dp/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd CPCI2DP board -# - -TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/cpci405/config.mk b/board/esd/cpci405/config.mk deleted file mode 100644 index 1bdf5e4fc..000000000 --- a/board/esd/cpci405/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/cpci5200/config.mk b/board/esd/cpci5200/config.mk deleted file mode 100644 index 170779d6c..000000000 --- a/board/esd/cpci5200/config.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# IceCube board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFF00000 boot high (standard configuration) -# 0xFF000000 boot low for 16 MiB boards -# 0xFF800000 boot low for 8 MiB boards -# 0x00100000 boot from RAM (for testing only) -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -# TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/esd/cpci750/config.mk b/board/esd/cpci750/config.mk deleted file mode 100644 index 7795dfa81..000000000 --- a/board/esd/cpci750/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2004 -# Reinhard Arlt <reinhard.arlt@esd-electronics.com> -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# cpci750 board -# - -TEXT_BASE = 0xfff00000 diff --git a/board/esd/cpciiser4/config.mk b/board/esd/cpciiser4/config.mk deleted file mode 100644 index 58574cb04..000000000 --- a/board/esd/cpciiser4/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd CPCIISER4 boards -# - -#TEXT_BASE = 0xFFFE0000 -#TEXT_BASE = 0xFFFD0000 -TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/dasa_sim/config.mk b/board/esd/dasa_sim/config.mk index 4fe3774ff..a92d9a920 100644 --- a/board/esd/dasa_sim/config.mk +++ b/board/esd/dasa_sim/config.mk @@ -20,7 +20,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # -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 deleted file mode 100644 index 9b1a8bebb..000000000 --- a/board/esd/dp405/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFFD0000 diff --git a/board/esd/du405/config.mk b/board/esd/du405/config.mk deleted file mode 100644 index d091d96ec..000000000 --- a/board/esd/du405/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd CPCIISER4 boards -# - -#TEXT_BASE = 0xFFFE0000 -TEXT_BASE = 0xFFFD0000 -#TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/du440/config.mk b/board/esd/du440/config.mk index 91e65ec8a..24f74e121 100644 --- a/board/esd/du440/config.mk +++ b/board/esd/du440/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2002 +# (C) Copyright 2002-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -20,11 +20,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 -endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/esd/hh405/config.mk b/board/esd/hh405/config.mk deleted file mode 100644 index 7129ad568..000000000 --- a/board/esd/hh405/config.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd VOH405 boards -# - -#TEXT_BASE = 0xFFF00000 -TEXT_BASE = 0xFFF80000 -#TEXT_BASE = 0xFFFC0000 -#TEXT_BASE = 0x00FC0000 diff --git a/board/esd/hub405/config.mk b/board/esd/hub405/config.mk deleted file mode 100644 index a6d31aad2..000000000 --- a/board/esd/hub405/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd HUB405 boards -# - -TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/mecp5123/config.mk b/board/esd/mecp5123/config.mk deleted file mode 100644 index 838a01849..000000000 --- a/board/esd/mecp5123/config.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# (C) Copyright 2009 Wolfgang Denk <wd@denx.de> -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFF00000 diff --git a/board/esd/mecp5200/config.mk b/board/esd/mecp5200/config.mk deleted file mode 100644 index 170779d6c..000000000 --- a/board/esd/mecp5200/config.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# IceCube board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFF00000 boot high (standard configuration) -# 0xFF000000 boot low for 16 MiB boards -# 0xFF800000 boot low for 8 MiB boards -# 0x00100000 boot from RAM (for testing only) -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -# TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index f12331994..000000000 --- a/board/esd/ocrtc/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd ADCIOP boards -# - -#TEXT_BASE = 0xFFFE0000 -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 deleted file mode 100644 index 83f07fe79..000000000 --- a/board/esd/pci405/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd ADCIOP boards -# - -#TEXT_BASE = 0xFFFE0000 -TEXT_BASE = 0xFFFD0000 diff --git a/board/esd/pf5200/config.mk b/board/esd/pf5200/config.mk deleted file mode 100644 index 170779d6c..000000000 --- a/board/esd/pf5200/config.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# IceCube board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFF00000 boot high (standard configuration) -# 0xFF000000 boot low for 16 MiB boards -# 0xFF800000 boot low for 8 MiB boards -# 0x00100000 boot from RAM (for testing only) -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -# TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/esd/plu405/config.mk b/board/esd/plu405/config.mk deleted file mode 100644 index 0a4dbaa54..000000000 --- a/board/esd/plu405/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd PLU405 boards -# - -TEXT_BASE = 0xFFF80000 diff --git a/board/esd/pmc405/config.mk b/board/esd/pmc405/config.mk deleted file mode 100644 index 5a3fc4be7..000000000 --- a/board/esd/pmc405/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFF80000 diff --git a/board/esd/pmc405de/config.mk b/board/esd/pmc405de/config.mk deleted file mode 100644 index ae855dc05..000000000 --- a/board/esd/pmc405de/config.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/pmc440/config.mk b/board/esd/pmc440/config.mk index 6e9f735f4..24f74e121 100644 --- a/board/esd/pmc440/config.mk +++ b/board/esd/pmc440/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2002 +# (C) Copyright 2002-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -20,11 +20,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -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 deleted file mode 100644 index 1ae26caad..000000000 --- a/board/esd/vme8349/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# VME8349E -# - -TEXT_BASE = 0xFFF00000 diff --git a/board/esd/voh405/config.mk b/board/esd/voh405/config.mk deleted file mode 100644 index 219a4eba1..000000000 --- a/board/esd/voh405/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd VOH405 boards -# - -TEXT_BASE = 0xFFF80000 diff --git a/board/esd/vom405/config.mk b/board/esd/vom405/config.mk deleted file mode 100644 index 8e48bcd6c..000000000 --- a/board/esd/vom405/config.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -TEXT_BASE = 0xFFFC8000 diff --git a/board/esd/wuh405/config.mk b/board/esd/wuh405/config.mk deleted file mode 100644 index 1d743a9f8..000000000 --- a/board/esd/wuh405/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd ASH405 boards -# - -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 deleted file mode 100644 index 9d6080b84..000000000 --- a/board/esteem192e/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# TQM8xxL boards -# - -TEXT_BASE = 0x40000000 diff --git a/board/etin/debris/config.mk b/board/etin/debris/config.mk deleted file mode 100644 index 64debf5ef..000000000 --- a/board/etin/debris/config.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Sangmoon, Etin Systems, dogoil@etinsys.com. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Debris boards -# - -#TEXT_BASE = 0x00090000 -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/etin/kvme080/config.mk b/board/etin/kvme080/config.mk deleted file mode 100644 index 45abdc0e8..000000000 --- a/board/etin/kvme080/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2005 -# Sangmoon, Etin Systems, dogoil@etinsys.com. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# KVME080 board -# - -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/etx094/config.mk b/board/etx094/config.mk deleted file mode 100644 index 655c2db45..000000000 --- a/board/etx094/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# ETX_094 Boards -# - -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 deleted file mode 100644 index 0646a3eb5..000000000 --- a/board/evb64260/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2001 -# Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# EVB64260 boards -# - -TEXT_BASE = 0xfff00000 diff --git a/board/fads/config.mk b/board/fads/config.mk deleted file mode 100644 index 61060907e..000000000 --- a/board/fads/config.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# Modified by, Yuli Barcohen, Arabella Software Ltd., yuli@arabellasw.com -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Motorola old MPC821/860ADS, MPC8xxFADS, new MPC866ADS, and -# MPC885ADS boards -# - -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..38abc70d4 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 @@ -351,14 +351,6 @@ #define CONFIG_SYS_OR1_PRELIM 0xFFFF8110 /* 64Kbyte address space */ #define CONFIG_SYS_BR1_PRELIM ((BCSR_ADDR) | BR_V) -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - /* values according to the manual */ #define BCSR0 ((uint) (BCSR_ADDR + 0x00)) 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 deleted file mode 100644 index 9c72c79d3..000000000 --- a/board/flagadm/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# TQM8xxL boards -# - -TEXT_BASE = 0x40000000 diff --git a/board/freescale/corenet_ds/config.mk b/board/freescale/corenet_ds/config.mk index 72db24ebd..15bbf20d3 100644 --- a/board/freescale/corenet_ds/config.mk +++ b/board/freescale/corenet_ds/config.mk @@ -23,8 +23,5 @@ # # P4080DS board # -ifndef TEXT_BASE -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 deleted file mode 100644 index 14998f475..000000000 --- a/board/freescale/mpc5121ads/config.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# (C) Copyright 2007 DENX Software Engineering -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFF00000 diff --git a/board/freescale/mpc5121ads/mpc5121ads.c b/board/freescale/mpc5121ads/mpc5121ads.c index 8cc68530e..b356a478b 100644 --- a/board/freescale/mpc5121ads/mpc5121ads.c +++ b/board/freescale/mpc5121ads/mpc5121ads.c @@ -53,7 +53,9 @@ DECLARE_GLOBAL_DATA_PTR; #define SCCR2_CLOCKS_EN (CLOCK_SCCR2_DIU_EN | \ CLOCK_SCCR2_I2C_EN | \ CLOCK_SCCR2_MEM_EN | \ - CLOCK_SCCR2_SPDIF_EN) + CLOCK_SCCR2_SPDIF_EN | \ + CLOCK_SCCR2_USB1_EN | \ + CLOCK_SCCR2_USB2_EN) void __mpc5121_nfc_select_chip(struct mtd_info *mtd, int chip); diff --git a/board/freescale/mpc7448hpc2/config.mk b/board/freescale/mpc7448hpc2/config.mk index 2e58858c4..84a46e35e 100644 --- a/board/freescale/mpc7448hpc2/config.mk +++ b/board/freescale/mpc7448hpc2/config.mk @@ -20,9 +20,4 @@ # MA 02111-1307 USA # -# Flash address -TEXT_BASE = 0xFF000000 -# RAM address -#TEXT_BASE = 0x00400000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -maltivec -mabi=altivec -msoft-float +PLATFORM_CPPFLAGS += -maltivec -mabi=altivec -msoft-float diff --git a/board/freescale/mpc8260ads/config.mk b/board/freescale/mpc8260ads/config.mk deleted file mode 100644 index e99e181dd..000000000 --- a/board/freescale/mpc8260ads/config.mk +++ /dev/null @@ -1,37 +0,0 @@ -# -# (C) Copyright 2001-2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# Modified by, Stuart Hughes, Lineo Inc, stuarth@lineo.com -# -# Modified by, Yuli Barcohen, Arabella Software Ltd., yuli@arabellasw.com -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MPC8260ADS, MPC8266ADS, and PQ2FADS-ZU/VR boards -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -endif diff --git a/board/freescale/mpc8266ads/config.mk b/board/freescale/mpc8266ads/config.mk deleted file mode 100644 index ecc2a7db6..000000000 --- a/board/freescale/mpc8266ads/config.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# Modified by, Stuart Hughes, Lineo Inc, stuarth@lineo.com -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# mpc8260ads board -# - -TEXT_BASE = 0xfe000000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/freescale/mpc8308rdb/config.mk b/board/freescale/mpc8308rdb/config.mk deleted file mode 100644 index f76826495..000000000 --- a/board/freescale/mpc8308rdb/config.mk +++ /dev/null @@ -1 +0,0 @@ -TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc8313erdb/config.mk b/board/freescale/mpc8313erdb/config.mk deleted file mode 100644 index fd72a1402..000000000 --- a/board/freescale/mpc8313erdb/config.mk +++ /dev/null @@ -1,7 +0,0 @@ -ifndef NAND_SPL -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -endif - -ifndef TEXT_BASE -TEXT_BASE = 0xFE000000 -endif diff --git a/board/freescale/mpc8315erdb/config.mk b/board/freescale/mpc8315erdb/config.mk deleted file mode 100644 index bf972fbe5..000000000 --- a/board/freescale/mpc8315erdb/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -ifndef NAND_SPL -ifeq ($(CONFIG_MK_NAND), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) -endif -endif - -ifndef TEXT_BASE -TEXT_BASE = 0xFE000000 -endif diff --git a/board/freescale/mpc8323erdb/config.mk b/board/freescale/mpc8323erdb/config.mk deleted file mode 100644 index fe0d37d42..000000000 --- a/board/freescale/mpc8323erdb/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MPC8323ERDB -# - -TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc832xemds/config.mk b/board/freescale/mpc832xemds/config.mk deleted file mode 100644 index 6c3eca753..000000000 --- a/board/freescale/mpc832xemds/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MPC832XEMDS -# - -TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc832xemds/pci.c b/board/freescale/mpc832xemds/pci.c index 5c7901d39..8cab771a0 100644 --- a/board/freescale/mpc832xemds/pci.c +++ b/board/freescale/mpc832xemds/pci.c @@ -68,9 +68,6 @@ static struct pci_region pci2_regions[] = { }; #endif -DECLARE_GLOBAL_DATA_PTR; - - void pci_init_board(void) #ifdef CONFIG_PCISLAVE { @@ -124,10 +121,10 @@ void pci_init_board(void) /* initialize the PCA9555PW IO expander on the PIB board */ pib_init(); -#if defined(PCI_66M) +#if defined(CONFIG_PCI_66M) clk->occr = OCCR_PCICOE0 | OCCR_PCICOE1 | OCCR_PCICOE2; printf("PCI clock is 66MHz\n"); -#elif defined(PCI_33M) +#elif defined(CONFIG_PCI_33M) clk->occr = OCCR_PCICOE0 | OCCR_PCICOE1 | OCCR_PCICOE2 | OCCR_PCICD0 | OCCR_PCICD1 | OCCR_PCICD2 | OCCR_PCICR; printf("PCI clock is 33MHz\n"); diff --git a/board/freescale/mpc8349emds/config.mk b/board/freescale/mpc8349emds/config.mk deleted file mode 100644 index edf64d150..000000000 --- a/board/freescale/mpc8349emds/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MPC8349EMDS -# - -TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc8349itx/config.mk b/board/freescale/mpc8349itx/config.mk deleted file mode 100644 index 61b6a9015..000000000 --- a/board/freescale/mpc8349itx/config.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (C) Freescale Semiconductor, Inc. 2006. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MPC8349E-mITX and MPC8349E-mITX-GP -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFEF00000 -endif diff --git a/board/freescale/mpc8360emds/config.mk b/board/freescale/mpc8360emds/config.mk deleted file mode 100644 index 9ace8860c..000000000 --- a/board/freescale/mpc8360emds/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MPC8360EMDS -# - -TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc8360emds/pci.c b/board/freescale/mpc8360emds/pci.c index c3a866351..5466a089f 100644 --- a/board/freescale/mpc8360emds/pci.c +++ b/board/freescale/mpc8360emds/pci.c @@ -122,10 +122,10 @@ void pci_init_board(void) /* initialize the PCA9555PW IO expander on the PIB board */ pib_init(); -#if defined(PCI_66M) +#if defined(CONFIG_PCI_66M) clk->occr = OCCR_PCICOE0 | OCCR_PCICOE1 | OCCR_PCICOE2; printf("PCI clock is 66MHz\n"); -#elif defined(PCI_33M) +#elif defined(CONFIG_PCI_33M) clk->occr = OCCR_PCICOE0 | OCCR_PCICOE1 | OCCR_PCICOE2 | OCCR_PCICD0 | OCCR_PCICD1 | OCCR_PCICD2 | OCCR_PCICR; printf("PCI clock is 33MHz\n"); diff --git a/board/freescale/mpc8360erdk/config.mk b/board/freescale/mpc8360erdk/config.mk deleted file mode 100644 index 87dd746a6..000000000 --- a/board/freescale/mpc8360erdk/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MPC8360ERDK -# - -TEXT_BASE = 0xFF800000 diff --git a/board/freescale/mpc8360erdk/mpc8360erdk.c b/board/freescale/mpc8360erdk/mpc8360erdk.c index a6530d16c..2baa11ab6 100644 --- a/board/freescale/mpc8360erdk/mpc8360erdk.c +++ b/board/freescale/mpc8360erdk/mpc8360erdk.c @@ -326,7 +326,7 @@ void pci_init_board(void) volatile law83xx_t *pci_law = immr->sysconf.pcilaw; struct pci_region *reg[] = { pci_regions, }; -#if defined(PCI_33M) +#if defined(CONFIG_PCI_33M) clk->occr = OCCR_PCICOE0 | OCCR_PCICOE1 | OCCR_PCICOE2 | OCCR_PCICD0 | OCCR_PCICD1 | OCCR_PCICD2 | OCCR_PCICR; printf("PCI clock is 33MHz\n"); diff --git a/board/freescale/mpc837xemds/config.mk b/board/freescale/mpc837xemds/config.mk deleted file mode 100644 index 63c5fc3c3..000000000 --- a/board/freescale/mpc837xemds/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MPC837xEMDS -# - -TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c index 77c5bda6a..edb3ff03b 100644 --- a/board/freescale/mpc837xemds/pci.c +++ b/board/freescale/mpc837xemds/pci.c @@ -138,7 +138,7 @@ skip_pci: out_be32(&pcie_law[1].bar, CONFIG_SYS_PCIE2_BASE & LAWBAR_BAR); out_be32(&pcie_law[1].ar, LBLAWAR_EN | LBLAWAR_512MB); - mpc83xx_pcie_init(pex2 ? 1 : 2, pcie_reg, 0); + mpc83xx_pcie_init(pex2 ? 1 : 2, pcie_reg); } void ft_pcie_fixup(void *blob, bd_t *bd) diff --git a/board/freescale/mpc837xerdb/config.mk b/board/freescale/mpc837xerdb/config.mk deleted file mode 100644 index 5675f81e1..000000000 --- a/board/freescale/mpc837xerdb/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MPC837xERDB -# - -TEXT_BASE = 0xFE000000 diff --git a/board/freescale/mpc8536ds/config.mk b/board/freescale/mpc8536ds/config.mk index 3f5447a43..b7deb4a5d 100644 --- a/board/freescale/mpc8536ds/config.mk +++ b/board/freescale/mpc8536ds/config.mk @@ -24,26 +24,19 @@ # mpc8536ds board # ifndef NAND_SPL -ifeq ($(CONFIG_MK_NAND), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +ifeq ($(CONFIG_NAND), y) LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds endif endif -ifeq ($(CONFIG_MK_SDCARD), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +ifeq ($(CONFIG_SDCARD), y) RESET_VECTOR_ADDRESS = 0xf8fffffc endif -ifeq ($(CONFIG_MK_SPIFLASH), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +ifeq ($(CONFIG_SPIFLASH), y) RESET_VECTOR_ADDRESS = 0xf8fffffc endif -ifndef TEXT_BASE -TEXT_BASE = 0xeff80000 -endif - ifndef RESET_VECTOR_ADDRESS RESET_VECTOR_ADDRESS = 0xeffffffc endif diff --git a/board/freescale/mpc8540ads/config.mk b/board/freescale/mpc8540ads/config.mk deleted file mode 100644 index 7ae5e61d9..000000000 --- a/board/freescale/mpc8540ads/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2004 Freescale Semiconductor. -# Modified by Xianghua Xiao, X.Xiao@motorola.com -# (C) Copyright 2002,Motorola Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# mpc8540ads board -# default CCARBAR is at 0xff700000 -# assume U-Boot is less than 0.5MB -# -TEXT_BASE = 0xfff80000 diff --git a/board/freescale/mpc8541cds/config.mk b/board/freescale/mpc8541cds/config.mk deleted file mode 100644 index e7a0b347b..000000000 --- a/board/freescale/mpc8541cds/config.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright 2004 Freescale Semiconductor. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# mpc8541cds board -# -TEXT_BASE = 0xfff80000 diff --git a/board/freescale/mpc8544ds/config.mk b/board/freescale/mpc8544ds/config.mk deleted file mode 100644 index a09dac189..000000000 --- a/board/freescale/mpc8544ds/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright 2007 Freescale Semiconductor, Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# mpc8544ds board -# -ifndef TEXT_BASE -TEXT_BASE = 0xfff80000 -endif diff --git a/board/freescale/mpc8548cds/config.mk b/board/freescale/mpc8548cds/config.mk deleted file mode 100644 index 81c8737a9..000000000 --- a/board/freescale/mpc8548cds/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright 2004, 2007 Freescale Semiconductor. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# mpc8548cds board -# -ifndef TEXT_BASE -TEXT_BASE = 0xfff80000 -endif diff --git a/board/freescale/mpc8555cds/config.mk b/board/freescale/mpc8555cds/config.mk deleted file mode 100644 index 798be3975..000000000 --- a/board/freescale/mpc8555cds/config.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright 2004 Freescale Semiconductor. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# mpc8555cds board -# -TEXT_BASE = 0xfff80000 diff --git a/board/freescale/mpc8560ads/config.mk b/board/freescale/mpc8560ads/config.mk deleted file mode 100644 index 37dc7a165..000000000 --- a/board/freescale/mpc8560ads/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2004 Freescale Semiconductor. -# Modified by Xianghua Xiao, X.Xiao@motorola.com -# (C) Copyright 2002,2003 Motorola Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# mpc8560ads board -# default CCARBAR is at 0xff700000 -# assume U-Boot is less than 0.5MB -# -TEXT_BASE = 0xfff80000 diff --git a/board/freescale/mpc8568mds/config.mk b/board/freescale/mpc8568mds/config.mk deleted file mode 100644 index ed4b10167..000000000 --- a/board/freescale/mpc8568mds/config.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright 2007 Freescale Semiconductor. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# mpc8568mds board -# -TEXT_BASE = 0xfff80000 diff --git a/board/freescale/mpc8569mds/config.mk b/board/freescale/mpc8569mds/config.mk index 86f138c19..54b2eb1ba 100644 --- a/board/freescale/mpc8569mds/config.mk +++ b/board/freescale/mpc8569mds/config.mk @@ -24,12 +24,7 @@ # mpc8569mds board # ifndef NAND_SPL -ifeq ($(CONFIG_MK_NAND), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +ifeq ($(CONFIG_NAND), y) LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds endif endif - -ifndef TEXT_BASE -TEXT_BASE = 0xfff80000 -endif diff --git a/board/freescale/mpc8572ds/config.mk b/board/freescale/mpc8572ds/config.mk index 67394c9b7..5413921a2 100644 --- a/board/freescale/mpc8572ds/config.mk +++ b/board/freescale/mpc8572ds/config.mk @@ -23,8 +23,4 @@ # # mpc8572ds board # -ifndef TEXT_BASE -TEXT_BASE = 0xeff80000 -endif - RESET_VECTOR_ADDRESS = 0xeffffffc diff --git a/board/freescale/mpc8610hpcd/config.mk b/board/freescale/mpc8610hpcd/config.mk deleted file mode 100644 index 798f60a96..000000000 --- a/board/freescale/mpc8610hpcd/config.mk +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2007 Freescale Semiconductor. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xfff00000 diff --git a/board/freescale/mpc8641hpcn/config.mk b/board/freescale/mpc8641hpcn/config.mk deleted file mode 100644 index 3315d25e9..000000000 --- a/board/freescale/mpc8641hpcn/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2004 Freescale Semiconductor. -# Modified by Jeff Brown -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# mpc8641hpcn board -# default CCSRBAR is at 0xff700000 -# assume U-Boot is less than 0.5MB -# -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..a953fdde8 100644 --- a/board/freescale/p1022ds/config.mk +++ b/board/freescale/p1022ds/config.mk @@ -7,8 +7,4 @@ # any later version. # -ifndef TEXT_BASE -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 1f9f7b68a..eececaa6b 100644 --- a/board/freescale/p1_p2_rdb/config.mk +++ b/board/freescale/p1_p2_rdb/config.mk @@ -25,26 +25,19 @@ # ifndef NAND_SPL -ifeq ($(CONFIG_MK_NAND), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +ifeq ($(CONFIG_NAND), y) LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds endif endif -ifeq ($(CONFIG_MK_SDCARD), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +ifeq ($(CONFIG_SDCARD), y) RESET_VECTOR_ADDRESS = 0xf8fffffc endif -ifeq ($(CONFIG_MK_SPIFLASH), y) -TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) +ifeq ($(CONFIG_SPIFLASH), y) RESET_VECTOR_ADDRESS = 0xf8fffffc endif -ifndef TEXT_BASE -TEXT_BASE = 0xeff80000 -endif - ifndef RESET_VECTOR_ADDRESS RESET_VECTOR_ADDRESS = 0xeffffffc endif diff --git a/board/freescale/p2020ds/config.mk b/board/freescale/p2020ds/config.mk index 4fcd69c5d..f5c07e569 100644 --- a/board/freescale/p2020ds/config.mk +++ b/board/freescale/p2020ds/config.mk @@ -23,8 +23,4 @@ # # p2020ds board # -ifndef TEXT_BASE -TEXT_BASE = 0xeff80000 -endif - RESET_VECTOR_ADDRESS = 0xeffffffc diff --git a/board/funkwerk/vovpn-gw/config.mk b/board/funkwerk/vovpn-gw/config.mk deleted file mode 100644 index e59b4831d..000000000 --- a/board/funkwerk/vovpn-gw/config.mk +++ /dev/null @@ -1,21 +0,0 @@ -# (C) Copyright 2004 -# Elmeg Communications Systems GmbH, Juergen Selent (j.selent@elmeg.de) -# -# Support for the Elmeg VoVPN Gateway Module -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA - -TEXT_BASE = 0xfff00000 diff --git a/board/g2000/config.mk b/board/g2000/config.mk deleted file mode 100644 index 25b210579..000000000 --- a/board/g2000/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd PLU405 boards -# - -TEXT_BASE = 0xFFFC0000 -#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 deleted file mode 100644 index c6398b26e..000000000 --- a/board/galaxy5200/config.mk +++ /dev/null @@ -1,45 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# galaxy5200 board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFF00000 boot high (standard configuration) -# 0xFE000000 boot low -# 0x00100000 boot from RAM (for testing only) does not work -# - -sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp - -ifdef CONFIG_galaxy5200_LOWBOOT -TEXT_BASE = 0xFE000000 -endif - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index 1bdf5e4fc..000000000 --- a/board/gdsys/dlvision/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFFC0000 diff --git a/board/gdsys/gdppc440etx/config.mk b/board/gdsys/gdppc440etx/config.mk index 045f3e98b..5b9543c02 100644 --- a/board/gdsys/gdppc440etx/config.mk +++ b/board/gdsys/gdppc440etx/config.mk @@ -25,14 +25,6 @@ # G&D 440EP/GR ETX-Module # -#TEXT_BASE = 0x00001000 - -ifeq ($(ramsym),1) -TEXT_BASE = 0xFBD00000 -else -TEXT_BASE = 0xFFF80000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/gdsys/intip/config.mk b/board/gdsys/intip/config.mk index 56e397d77..3923e011f 100644 --- a/board/gdsys/intip/config.mk +++ b/board/gdsys/intip/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2008 +# (C) Copyright 2008-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -24,12 +24,6 @@ # G&D CompactCenter # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/gdsys/neo/config.mk b/board/gdsys/neo/config.mk deleted file mode 100644 index 1bdf5e4fc..000000000 --- a/board/gdsys/neo/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFFC0000 diff --git a/board/gen860t/config.mk b/board/gen860t/config.mk deleted file mode 100644 index 7acd90493..000000000 --- a/board/gen860t/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# FLASH base address for GEN860T board -# - -TEXT_BASE = 0x40000000 diff --git a/board/genietv/config.mk b/board/genietv/config.mk index 69ab21fcf..7e24fcc02 100644 --- a/board/genietv/config.mk +++ b/board/genietv/config.mk @@ -21,5 +21,4 @@ # MA 02111-1307 USA # -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 deleted file mode 100644 index ca0540d70..000000000 --- a/board/gw8260/config.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -# (C) Copyright 2000 -# Sysgo Real-Time Solutions, GmbH <www.elinos.com> -# Marius Groeger <mgroeger@sysgo.de> -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MBX8xx boards -# - -TEXT_BASE = 0x40000000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/hermes/config.mk b/board/hermes/config.mk deleted file mode 100644 index 008165fa6..000000000 --- a/board/hermes/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Multidata HERMES-PRO ISDN Routers -# - -TEXT_BASE = 0xFE000000 diff --git a/board/hidden_dragon/config.mk b/board/hidden_dragon/config.mk deleted file mode 100644 index 5c36d05fe..000000000 --- a/board/hidden_dragon/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2000-2005 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Hidden Dragon boards -# - -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/hymod/config.mk b/board/hymod/config.mk index 2df321fdd..ae766bc85 100644 --- a/board/hymod/config.mk +++ b/board/hymod/config.mk @@ -25,8 +25,6 @@ # HYMOD boards # -TEXT_BASE = 0x40000000 - PLATFORM_CPPFLAGS += -I$(TOPDIR) OBJCFLAGS = --remove-section=.ppcenv 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 deleted file mode 100644 index 170779d6c..000000000 --- a/board/icecube/config.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# IceCube board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFF00000 boot high (standard configuration) -# 0xFF000000 boot low for 16 MiB boards -# 0xFF800000 boot low for 8 MiB boards -# 0x00100000 boot from RAM (for testing only) -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -# TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/icu862/config.mk b/board/icu862/config.mk index 315e70d76..9bfbc85ba 100644 --- a/board/icu862/config.mk +++ b/board/icu862/config.mk @@ -25,5 +25,4 @@ # ICU862 boards # -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..c39beb8c8 100644 --- a/board/ids8247/config.mk +++ b/board/ids8247/config.mk @@ -24,11 +24,4 @@ # # IDS 8247 Board # - -# This should be equal to the CONFIG_SYS_FLASH_BASE define in config_IDS8247.h -# 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 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -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..a42d1244d 100644 --- a/board/inka4x0/config.mk +++ b/board/inka4x0/config.mk @@ -24,19 +24,4 @@ # # INKA 4X0 board: # -# Valid values for TEXT_BASE are: -# -# 0xFFE00000 boot low -# -# 0x00100000 boot from RAM (for testing only) -# - -ifndef TEXT_BASE -## Standard: boot low -TEXT_BASE = 0xFFE00000 -## For testing: boot from RAM -#TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index ea3b8735e..000000000 --- a/board/ip860/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MicroSys IP860 VMEBus Systems -# - -TEXT_BASE = 0x10000000 diff --git a/board/ipek01/config.mk b/board/ipek01/config.mk deleted file mode 100644 index c8ecb2944..000000000 --- a/board/ipek01/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2003-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# IPEK01 board -# - -TEXT_BASE = 0xfc000000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/iphase4539/config.mk b/board/iphase4539/config.mk deleted file mode 100644 index 632c1d2ac..000000000 --- a/board/iphase4539/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2002 Wolfgang Grandegger <wg@denx.de> -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# iphase4539 board -# - -TEXT_BASE = 0xffb00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/ispan/config.mk b/board/ispan/config.mk deleted file mode 100644 index 4600dbb06..000000000 --- a/board/ispan/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (C) 2004 Arabella Software Ltd. -# Yuli Barcohen <yuli@arabellasw.com> -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Interphase iSPAN Communications Controllers -# -#TEXT_BASE = 0xFF800000 -#TEXT_BASE = 0xFFBA0000 -TEXT_BASE = 0xFE7A0000 diff --git a/board/ivm/config.mk b/board/ivm/config.mk deleted file mode 100644 index 37e718573..000000000 --- a/board/ivm/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# Ulrich Lutz, Speech Design GmbH, ulutz@datalab.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# IVM boards -# - -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 deleted file mode 100644 index 03ec08501..000000000 --- a/board/jse/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2003 Picture Elements, Inc. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Picture Elements, Inc. JSE boards -# - -TEXT_BASE = 0xFFF80000 diff --git a/board/jupiter/config.mk b/board/jupiter/config.mk deleted file mode 100644 index 5f4da96da..000000000 --- a/board/jupiter/config.mk +++ /dev/null @@ -1,41 +0,0 @@ -# -# (C) Copyright 2007 -# Heiko Schocher, DENX Software Engineering, hs@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Jupiter board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFF00000 boot high (standard configuration) -# 0x00100000 boot from RAM (for testing only) -# - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -# TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board -#PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index 8625cea56..000000000 --- a/board/keymile/km8xx/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2007 -# Heiko Schocher, DENX Software Engineering, hs@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# mgsvud boards -# - -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 deleted file mode 100644 index 20f298bdb..000000000 --- a/board/keymile/kmeter1/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2008 -# Heiko Schocher, DENX Software Engineering, hs@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xF0000000 diff --git a/board/keymile/mgcoge/config.mk b/board/keymile/mgcoge/config.mk deleted file mode 100644 index 143bc9f76..000000000 --- a/board/keymile/mgcoge/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2007 -# Heiko Schocher, DENX Software Engineering, hs@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFE000000 diff --git a/board/korat/config.mk b/board/korat/config.mk index 73180dbd8..63e84dc74 100644 --- a/board/korat/config.mk +++ b/board/korat/config.mk @@ -38,10 +38,6 @@ ifeq ($(dbcr),1) PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8CFF0000 endif -ifeq ($(perm),1) -PLATFORM_CPPFLAGS += -DCONFIG_KORAT_PERMANENT -TEXT_BASE = 0xFFFA0000 -else -TEXT_BASE = 0xF7F60000 +ifndef CONFIG_KORAT_PERMANENT LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-F7FC.lds endif diff --git a/board/kup/kup4k/config.mk b/board/kup/kup4k/config.mk deleted file mode 100644 index 22e30b2ca..000000000 --- a/board/kup/kup4k/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# KUP4K board -# - -TEXT_BASE = 0x40000000 diff --git a/board/kup/kup4x/config.mk b/board/kup/kup4x/config.mk deleted file mode 100644 index 61d4e09f6..000000000 --- a/board/kup/kup4x/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# KUP4X board -# - -TEXT_BASE = 0x40000000 diff --git a/board/lantec/config.mk b/board/lantec/config.mk deleted file mode 100644 index 05ea3b914..000000000 --- a/board/lantec/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Lantec board (based on TQM8xxL config). -# - -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 deleted file mode 100644 index d04829014..000000000 --- a/board/linkstation/config.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -# (C) Copyright 2001-2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# LinkStation/LinkStation-HG: -# -# Valid values for TEXT_BASE are: -# -# Standard configuration - all models -# 0xFFF00000 boot from flash -# -# Test configuration (boot from RAM using uloader.o) -# LinkStation HD-HLAN and KuroBox Standard -# 0x03F00000 boot from RAM -# LinkStation HD-HGLAN and KuroBox HG -# 0x07F00000 boot from RAM -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -# For flash image - all models -TEXT_BASE = 0xFFF00000 -# For RAM image -# HLAN and LAN -#TEXT_BASE = 0x03F00000 -# HGLAN and HGTL -#TEXT_BASE = 0x07F00000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 a12c1824b..a7887ba44 100644 --- a/board/logicpd/imx31_litekit/config.mk +++ b/board/logicpd/imx31_litekit/config.mk @@ -1 +1 @@ -TEXT_BASE = 0xa0000000 +CONFIG_SYS_TEXT_BASE = 0xa0000000 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/logodl/Makefile b/board/logodl/Makefile deleted file mode 100644 index 0795b6b2a..000000000 --- a/board/logodl/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -include $(TOPDIR)/config.mk - -LIB = $(obj)lib$(BOARD).a - -COBJS := logodl.o flash.o -SOBJS := lowlevel_init.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -$(LIB): $(obj).depend $(OBJS) $(SOBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) - -clean: - rm -f $(SOBJS) $(OBJS) - -distclean: clean - rm -f $(LIB) core *.bak $(obj).depend - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### diff --git a/board/logodl/config.mk b/board/logodl/config.mk deleted file mode 100644 index 76c382d57..000000000 --- a/board/logodl/config.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -# Linux-Kernel is expected to be at c000'8000, entry c000'8000 -# -# we load ourself to c170'0000, the upper 1 MB of second bank -# -# download areas is c800'0000 -# - -#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 = 0x083E0000 diff --git a/board/logodl/flash.c b/board/logodl/flash.c deleted file mode 100644 index 593943ffd..000000000 --- a/board/logodl/flash.c +++ /dev/null @@ -1,829 +0,0 @@ -/* - * (C) 2000 Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * (C) 2003 August Hoeraendl, Logotronic GmbH - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#undef CONFIG_FLASH_16BIT - -#include <common.h> - -#define FLASH_BANK_SIZE 0x1000000 -#define MAIN_SECT_SIZE 0x20000 /* 2x64k = 128k per sector */ - -flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */ - -/* NOTE - CONFIG_FLASH_16BIT means the CPU interface is 16-bit, it - * has nothing to do with the flash chip being 8-bit or 16-bit. - */ -#ifdef CONFIG_FLASH_16BIT -typedef unsigned short FLASH_PORT_WIDTH; -typedef volatile unsigned short FLASH_PORT_WIDTHV; - -#define FLASH_ID_MASK 0xFFFF -#else -typedef unsigned long FLASH_PORT_WIDTH; -typedef volatile unsigned long FLASH_PORT_WIDTHV; - -#define FLASH_ID_MASK 0xFFFFFFFF -#endif - -#define FPW FLASH_PORT_WIDTH -#define FPWV FLASH_PORT_WIDTHV - -#define ORMASK(size) ((-size) & OR_AM_MSK) - -/*----------------------------------------------------------------------- - * Functions - */ -static ulong flash_get_size(FPWV *addr, flash_info_t *info); -static void flash_reset(flash_info_t *info); -static int write_word_intel(flash_info_t *info, FPWV *dest, FPW data); -static int write_word_amd(flash_info_t *info, FPWV *dest, FPW data); -#define write_word(in, de, da) write_word_amd(in, de, da) -static void flash_get_offsets(ulong base, flash_info_t *info); -#ifdef CONFIG_SYS_FLASH_PROTECTION -static void flash_sync_real_protect(flash_info_t *info); -#endif - -/*----------------------------------------------------------------------- - * flash_init() - * - * sets up flash_info and returns size of FLASH (bytes) - */ -ulong flash_init(void) -{ - int i, j; - ulong size = 0; - - for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) - { - ulong flashbase = 0; - flash_info[i].flash_id = - (FLASH_MAN_AMD & FLASH_VENDMASK) | - (FLASH_AM640U & FLASH_TYPEMASK); - flash_info[i].size = FLASH_BANK_SIZE; - flash_info[i].sector_count = CONFIG_SYS_MAX_FLASH_SECT; - memset(flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT); - switch (i) - { - case 0: - flashbase = PHYS_FLASH_1; - break; - case 1: - flashbase = PHYS_FLASH_2; - break; - default: - panic("configured too many flash banks!\n"); - break; - } - for (j = 0; j < flash_info[i].sector_count; j++) - { - flash_info[i].start[j] = flashbase + j*MAIN_SECT_SIZE; - } - size += flash_info[i].size; - } - - /* Protect monitor and environment sectors - */ - flash_protect(FLAG_PROTECT_SET, - CONFIG_SYS_FLASH_BASE, - CONFIG_SYS_FLASH_BASE + _bss_start - _armboot_start, - &flash_info[0]); - - flash_protect(FLAG_PROTECT_SET, - CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, - &flash_info[0]); - - return size; -} - -/*----------------------------------------------------------------------- - */ -static void flash_reset(flash_info_t *info) -{ - FPWV *base = (FPWV *)(info->start[0]); - - /* Put FLASH back in read mode */ - if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) - *base = (FPW)0x00FF00FF; /* Intel Read Mode */ - else if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_AMD) - *base = (FPW)0x00F000F0; /* AMD Read Mode */ -} - -/*----------------------------------------------------------------------- - */ -static void flash_get_offsets (ulong base, flash_info_t *info) -{ - int i; - - /* set up sector start address table */ - if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL - && (info->flash_id & FLASH_BTYPE)) { - int bootsect_size; /* number of bytes/boot sector */ - int sect_size; /* number of bytes/regular sector */ - - bootsect_size = 0x00002000 * (sizeof(FPW)/2); - sect_size = 0x00010000 * (sizeof(FPW)/2); - - /* set sector offsets for bottom boot block type */ - for (i = 0; i < 8; ++i) { - info->start[i] = base + (i * bootsect_size); - } - for (i = 8; i < info->sector_count; i++) { - info->start[i] = base + ((i - 7) * sect_size); - } - } - else if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_AMD - && (info->flash_id & FLASH_TYPEMASK) == FLASH_AM640U) { - - int sect_size; /* number of bytes/sector */ - - sect_size = 0x00010000 * (sizeof(FPW)/2); - - /* set up sector start address table (uniform sector type) */ - for( i = 0; i < info->sector_count; i++ ) - info->start[i] = base + (i * sect_size); - } -} - -/*----------------------------------------------------------------------- - */ - -void flash_print_info (flash_info_t *info) -{ - int i; - uchar *boottype; - uchar *bootletter; - uchar *fmt; - uchar botbootletter[] = "B"; - uchar topbootletter[] = "T"; - uchar botboottype[] = "bottom boot sector"; - uchar topboottype[] = "top boot sector"; - - if (info->flash_id == FLASH_UNKNOWN) { - printf ("missing or unknown FLASH type\n"); - return; - } - - switch (info->flash_id & FLASH_VENDMASK) { - case FLASH_MAN_AMD: printf ("AMD "); break; - case FLASH_MAN_BM: printf ("BRIGHT MICRO "); break; - case FLASH_MAN_FUJ: printf ("FUJITSU "); break; - case FLASH_MAN_SST: printf ("SST "); break; - case FLASH_MAN_STM: printf ("STM "); break; - case FLASH_MAN_INTEL: printf ("INTEL "); break; - default: printf ("Unknown Vendor "); break; - } - - /* check for top or bottom boot, if it applies */ - if (info->flash_id & FLASH_BTYPE) { - boottype = botboottype; - bootletter = botbootletter; - } - else { - boottype = topboottype; - bootletter = topbootletter; - } - - switch (info->flash_id & FLASH_TYPEMASK) { - case FLASH_AM640U: - fmt = "29LV641D (64 Mbit, uniform sectors)\n"; - break; - case FLASH_28F800C3B: - case FLASH_28F800C3T: - fmt = "28F800C3%s (8 Mbit, %s)\n"; - break; - case FLASH_INTEL800B: - case FLASH_INTEL800T: - fmt = "28F800B3%s (8 Mbit, %s)\n"; - break; - case FLASH_28F160C3B: - case FLASH_28F160C3T: - fmt = "28F160C3%s (16 Mbit, %s)\n"; - break; - case FLASH_INTEL160B: - case FLASH_INTEL160T: - fmt = "28F160B3%s (16 Mbit, %s)\n"; - break; - case FLASH_28F320C3B: - case FLASH_28F320C3T: - fmt = "28F320C3%s (32 Mbit, %s)\n"; - break; - case FLASH_INTEL320B: - case FLASH_INTEL320T: - fmt = "28F320B3%s (32 Mbit, %s)\n"; - break; - case FLASH_28F640C3B: - case FLASH_28F640C3T: - fmt = "28F640C3%s (64 Mbit, %s)\n"; - break; - case FLASH_INTEL640B: - case FLASH_INTEL640T: - fmt = "28F640B3%s (64 Mbit, %s)\n"; - break; - default: - fmt = "Unknown Chip Type\n"; - break; - } - - printf (fmt, bootletter, boottype); - - printf (" Size: %ld MB in %d Sectors\n", - info->size >> 20, - info->sector_count); - - printf (" Sector Start Addresses:"); - - for (i=0; i<info->sector_count; ++i) { - if ((i % 5) == 0) { - printf ("\n "); - } - - printf (" %08lX%s", info->start[i], - info->protect[i] ? " (RO)" : " "); - } - - printf ("\n"); -} - -/*----------------------------------------------------------------------- - */ - -/* - * The following code cannot be run from FLASH! - */ - -ulong flash_get_size (FPWV *addr, flash_info_t *info) -{ - /* Write auto select command: read Manufacturer ID */ - - /* Write auto select command sequence and test FLASH answer */ - addr[0x0555] = (FPW)0x00AA00AA; /* for AMD, Intel ignores this */ - addr[0x02AA] = (FPW)0x00550055; /* for AMD, Intel ignores this */ - addr[0x0555] = (FPW)0x00900090; /* selects Intel or AMD */ - - /* The manufacturer codes are only 1 byte, so just use 1 byte. - * This works for any bus width and any FLASH device width. - */ - switch (addr[0] & 0xff) { - - case (uchar)AMD_MANUFACT: - info->flash_id = FLASH_MAN_AMD; - break; - - case (uchar)INTEL_MANUFACT: - info->flash_id = FLASH_MAN_INTEL; - break; - - default: - info->flash_id = FLASH_UNKNOWN; - info->sector_count = 0; - info->size = 0; - break; - } - - /* Check 16 bits or 32 bits of ID so work on 32 or 16 bit bus. */ - if (info->flash_id != FLASH_UNKNOWN) switch (addr[1]) { - - case (FPW)AMD_ID_LV640U: /* 29LV640 and 29LV641 have same ID */ - info->flash_id += FLASH_AM640U; - info->sector_count = 128; - info->size = 0x00800000 * (sizeof(FPW)/2); - break; /* => 8 or 16 MB */ - - case (FPW)INTEL_ID_28F800C3B: - info->flash_id += FLASH_28F800C3B; - info->sector_count = 23; - info->size = 0x00100000 * (sizeof(FPW)/2); - break; /* => 1 or 2 MB */ - - case (FPW)INTEL_ID_28F800B3B: - info->flash_id += FLASH_INTEL800B; - info->sector_count = 23; - info->size = 0x00100000 * (sizeof(FPW)/2); - break; /* => 1 or 2 MB */ - - case (FPW)INTEL_ID_28F160C3B: - info->flash_id += FLASH_28F160C3B; - info->sector_count = 39; - info->size = 0x00200000 * (sizeof(FPW)/2); - break; /* => 2 or 4 MB */ - - case (FPW)INTEL_ID_28F160B3B: - info->flash_id += FLASH_INTEL160B; - info->sector_count = 39; - info->size = 0x00200000 * (sizeof(FPW)/2); - break; /* => 2 or 4 MB */ - - case (FPW)INTEL_ID_28F320C3B: - info->flash_id += FLASH_28F320C3B; - info->sector_count = 71; - info->size = 0x00400000 * (sizeof(FPW)/2); - break; /* => 4 or 8 MB */ - - case (FPW)INTEL_ID_28F320B3B: - info->flash_id += FLASH_INTEL320B; - info->sector_count = 71; - info->size = 0x00400000 * (sizeof(FPW)/2); - break; /* => 4 or 8 MB */ - - case (FPW)INTEL_ID_28F640C3B: - info->flash_id += FLASH_28F640C3B; - info->sector_count = 135; - info->size = 0x00800000 * (sizeof(FPW)/2); - break; /* => 8 or 16 MB */ - - case (FPW)INTEL_ID_28F640B3B: - info->flash_id += FLASH_INTEL640B; - info->sector_count = 135; - info->size = 0x00800000 * (sizeof(FPW)/2); - break; /* => 8 or 16 MB */ - - default: - info->flash_id = FLASH_UNKNOWN; - info->sector_count = 0; - info->size = 0; - return (0); /* => no or unknown flash */ - } - - flash_get_offsets((ulong)addr, info); - - /* Put FLASH back in read mode */ - flash_reset(info); - - return (info->size); -} - -#ifdef CONFIG_SYS_FLASH_PROTECTION -/*----------------------------------------------------------------------- - */ - -static void flash_sync_real_protect(flash_info_t *info) -{ - FPWV *addr = (FPWV *)(info->start[0]); - FPWV *sect; - int i; - - switch (info->flash_id & FLASH_TYPEMASK) { - case FLASH_28F800C3B: - case FLASH_28F800C3T: - case FLASH_28F160C3B: - case FLASH_28F160C3T: - case FLASH_28F320C3B: - case FLASH_28F320C3T: - case FLASH_28F640C3B: - case FLASH_28F640C3T: - /* check for protected sectors */ - *addr = (FPW)0x00900090; - for (i = 0; i < info->sector_count; i++) { - /* read sector protection at sector address, (A7 .. A0) = 0x02. - * D0 = 1 for each device if protected. - * If at least one device is protected the sector is marked - * protected, but mixed protected and unprotected devices - * within a sector should never happen. - */ - sect = (FPWV *)(info->start[i]); - info->protect[i] = (sect[2] & (FPW)(0x00010001)) ? 1 : 0; - } - - /* Put FLASH back in read mode */ - flash_reset(info); - break; - - case FLASH_AM640U: - default: - /* no hardware protect that we support */ - break; - } -} -#endif - -/*----------------------------------------------------------------------- - */ - -int flash_erase (flash_info_t *info, int s_first, int s_last) -{ - FPWV *addr; - int flag, prot, sect; - int intel = (info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL; - ulong start, now, last; - int rcode = 0; - - if ((s_first < 0) || (s_first > s_last)) { - if (info->flash_id == FLASH_UNKNOWN) { - printf ("- missing\n"); - } else { - printf ("- no sectors to erase\n"); - } - return 1; - } - - switch (info->flash_id & FLASH_TYPEMASK) { - case FLASH_INTEL800B: - case FLASH_INTEL160B: - case FLASH_INTEL320B: - case FLASH_INTEL640B: - case FLASH_28F800C3B: - case FLASH_28F160C3B: - case FLASH_28F320C3B: - case FLASH_28F640C3B: - case FLASH_AM640U: - break; - case FLASH_UNKNOWN: - default: - printf ("Can't erase unknown flash type %08lx - aborted\n", - info->flash_id); - return 1; - } - - prot = 0; - for (sect=s_first; sect<=s_last; ++sect) { - if (info->protect[sect]) { - prot++; - } - } - - if (prot) { - printf ("- Warning: %d protected sectors will not be erased!\n", - prot); - } else { - printf ("\n"); - } - - start = get_timer(0); - last = start; - - /* Start erase on unprotected sectors */ - for (sect = s_first; sect<=s_last && rcode == 0; sect++) { - - if (info->protect[sect] != 0) /* protected, skip it */ - continue; - - /* Disable interrupts which might cause a timeout here */ - flag = disable_interrupts(); - - addr = (FPWV *)(info->start[sect]); - if (intel) { - *addr = (FPW)0x00500050; /* clear status register */ - *addr = (FPW)0x00200020; /* erase setup */ - *addr = (FPW)0x00D000D0; /* erase confirm */ - } - else { - /* must be AMD style if not Intel */ - FPWV *base; /* first address in bank */ - - base = (FPWV *)(info->start[0]); - base[0x0555] = (FPW)0x00AA00AA; /* unlock */ - base[0x02AA] = (FPW)0x00550055; /* unlock */ - base[0x0555] = (FPW)0x00800080; /* erase mode */ - base[0x0555] = (FPW)0x00AA00AA; /* unlock */ - base[0x02AA] = (FPW)0x00550055; /* unlock */ - *addr = (FPW)0x00300030; /* erase sector */ - } - - /* re-enable interrupts if necessary */ - if (flag) - enable_interrupts(); - - /* wait at least 50us for AMD, 80us for Intel. - * Let's wait 1 ms. - */ - udelay (1000); - - while ((*addr & (FPW)0x00800080) != (FPW)0x00800080) { - if ((now = get_timer(start)) > CONFIG_SYS_FLASH_ERASE_TOUT) { - printf ("Timeout\n"); - - if (intel) { - /* suspend erase */ - *addr = (FPW)0x00B000B0; - } - - flash_reset(info); /* reset to read mode */ - rcode = 1; /* failed */ - break; - } - - /* show that we're waiting */ - if ((now - last) > 1000) { /* every second */ - putc ('.'); - last = now; - } - } - - flash_reset(info); /* reset to read mode */ - } - - printf (" done\n"); - return rcode; -} - -/*----------------------------------------------------------------------- - * Copy memory to flash, returns: - * 0 - OK - * 1 - write timeout - * 2 - Flash not erased - */ -int bad_write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) -{ - FPW data = 0; /* 16 or 32 bit word, matches flash bus width on MPC8XX */ - int bytes; /* number of bytes to program in current word */ - int left; /* number of bytes left to program */ - int i, res; - - for (left = cnt, res = 0; - left > 0 && res == 0; - addr += sizeof(data), left -= sizeof(data) - bytes) { - - bytes = addr & (sizeof(data) - 1); - addr &= ~(sizeof(data) - 1); - - /* combine source and destination data so can program - * an entire word of 16 or 32 bits - */ - for (i = 0; i < sizeof(data); i++) { - data <<= 8; - if (i < bytes || i - bytes >= left ) - data += *((uchar *)addr + i); - else - data += *src++; - } - - /* write one word to the flash */ - switch (info->flash_id & FLASH_VENDMASK) { - case FLASH_MAN_AMD: - res = write_word_amd(info, (FPWV *)addr, data); - break; - case FLASH_MAN_INTEL: - res = write_word_intel(info, (FPWV *)addr, data); - break; - default: - /* unknown flash type, error! */ - printf ("missing or unknown FLASH type\n"); - res = 1; /* not really a timeout, but gives error */ - break; - } - } - - return (res); -} - -/** - * write_buf: - Copy memory to flash. - * - * @param info: - * @param src: source of copy transaction - * @param addr: where to copy to - * @param cnt: number of bytes to copy - * - * @return error code - */ - -int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) -{ - ulong cp, wp; - FPW data; - int l; - int i, rc; - - wp = (addr & ~1); /* get lower word aligned address */ - - /* - * handle unaligned start bytes - */ - if ((l = addr - wp) != 0) { - data = 0; - for (i=0, cp=wp; i<l; ++i, ++cp) { - data = (data >> 8) | (*(uchar *)cp << 8); - } - for (; i<2 && cnt>0; ++i) { - data = (data >> 8) | (*src++ << 8); - --cnt; - ++cp; - } - for (; cnt==0 && i<2; ++i, ++cp) { - data = (data >> 8) | (*(uchar *)cp << 8); - } - - if ((rc = write_word(info, wp, data)) != 0) { - return (rc); - } - wp += 2; - } - - /* - * handle word aligned part - */ - while (cnt >= 2) { - /* data = *((vushort*)src); */ - data = *((FPW*)src); - if ((rc = write_word(info, wp, data)) != 0) { - return (rc); - } - src += sizeof(FPW); - wp += sizeof(FPW); - cnt -= sizeof(FPW); - } - - if (cnt == 0) return ERR_OK; - - /* - * handle unaligned tail bytes - */ - data = 0; - for (i=0, cp=wp; i<2 && cnt>0; ++i, ++cp) { - data = (data >> 8) | (*src++ << 8); - --cnt; - } - for (; i<2; ++i, ++cp) { - data = (data >> 8) | (*(uchar *)cp << 8); - } - - return write_word(info, wp, data); -} - - -/*----------------------------------------------------------------------- - * Write a word to Flash for AMD FLASH - * A word is 16 or 32 bits, whichever the bus width of the flash bank - * (not an individual chip) is. - * - * returns: - * 0 - OK - * 1 - write timeout - * 2 - Flash not erased - */ -static int write_word_amd (flash_info_t *info, FPWV *dest, FPW data) -{ - ulong start; - int flag; - int res = 0; /* result, assume success */ - FPWV *base; /* first address in flash bank */ - - /* Check if Flash is (sufficiently) erased */ - if ((*dest & data) != data) { - return (2); - } - - - base = (FPWV *)(info->start[0]); - /* Disable interrupts which might cause a timeout here */ - flag = disable_interrupts(); - - base[0x0555] = (FPW)0x00AA00AA; /* unlock */ - base[0x02AA] = (FPW)0x00550055; /* unlock */ - base[0x0555] = (FPW)0x00A000A0; /* selects program mode */ - - *dest = data; /* start programming the data */ - - /* re-enable interrupts if necessary */ - if (flag) - enable_interrupts(); - - start = get_timer (0); - - /* data polling for D7 */ - while (res == 0 && (*dest & (FPW)0x00800080) != (data & (FPW)0x00800080)) { - if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) { - *dest = (FPW)0x00F000F0; /* reset bank */ - res = 1; - } - } - - return (res); -} - -/*----------------------------------------------------------------------- - * Write a word to Flash for Intel FLASH - * A word is 16 or 32 bits, whichever the bus width of the flash bank - * (not an individual chip) is. - * - * returns: - * 0 - OK - * 1 - write timeout - * 2 - Flash not erased - */ -static int write_word_intel (flash_info_t *info, FPWV *dest, FPW data) -{ - ulong start; - int flag; - int res = 0; /* result, assume success */ - - /* Check if Flash is (sufficiently) erased */ - if ((*dest & data) != data) { - return (2); - } - - /* Disable interrupts which might cause a timeout here */ - flag = disable_interrupts(); - - *dest = (FPW)0x00500050; /* clear status register */ - *dest = (FPW)0x00FF00FF; /* make sure in read mode */ - *dest = (FPW)0x00400040; /* program setup */ - - *dest = data; /* start programming the data */ - - /* re-enable interrupts if necessary */ - if (flag) - enable_interrupts(); - - start = get_timer (0); - - while (res == 0 && (*dest & (FPW)0x00800080) != (FPW)0x00800080) { - if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) { - *dest = (FPW)0x00B000B0; /* Suspend program */ - res = 1; - } - } - - if (res == 0 && (*dest & (FPW)0x00100010)) - res = 1; /* write failed, time out error is close enough */ - - *dest = (FPW)0x00500050; /* clear status register */ - *dest = (FPW)0x00FF00FF; /* make sure in read mode */ - - return (res); -} - -#ifdef CONFIG_SYS_FLASH_PROTECTION -/*----------------------------------------------------------------------- - */ -int flash_real_protect (flash_info_t * info, long sector, int prot) -{ - int rcode = 0; /* assume success */ - FPWV *addr; /* address of sector */ - FPW value; - - addr = (FPWV *) (info->start[sector]); - - switch (info->flash_id & FLASH_TYPEMASK) { - case FLASH_28F800C3B: - case FLASH_28F800C3T: - case FLASH_28F160C3B: - case FLASH_28F160C3T: - case FLASH_28F320C3B: - case FLASH_28F320C3T: - case FLASH_28F640C3B: - case FLASH_28F640C3T: - flash_reset (info); /* make sure in read mode */ - *addr = (FPW) 0x00600060L; /* lock command setup */ - if (prot) - *addr = (FPW) 0x00010001L; /* lock sector */ - else - *addr = (FPW) 0x00D000D0L; /* unlock sector */ - flash_reset (info); /* reset to read mode */ - - /* now see if it really is locked/unlocked as requested */ - *addr = (FPW) 0x00900090; - /* read sector protection at sector address, (A7 .. A0) = 0x02. - * D0 = 1 for each device if protected. - * If at least one device is protected the sector is marked - * protected, but return failure. Mixed protected and - * unprotected devices within a sector should never happen. - */ - value = addr[2] & (FPW) 0x00010001; - if (value == 0) - info->protect[sector] = 0; - else if (value == (FPW) 0x00010001) - info->protect[sector] = 1; - else { - /* error, mixed protected and unprotected */ - rcode = 1; - info->protect[sector] = 1; - } - if (info->protect[sector] != prot) - rcode = 1; /* failed to protect/unprotect as requested */ - - /* reload all protection bits from hardware for now */ - flash_sync_real_protect (info); - break; - - case FLASH_AM640U: - default: - /* no hardware protect that we support */ - info->protect[sector] = prot; - break; - } - - return rcode; -} -#endif diff --git a/board/logodl/logodl.c b/board/logodl/logodl.c deleted file mode 100644 index 2562ecca3..000000000 --- a/board/logodl/logodl.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * (C) 2002 Kyle Harris <kharris@nexus-tech.net>, Nexus Technologies, Inc. - * (C) 2002 Marius Groeger <mgroeger@sysgo.de>, Sysgo GmbH - * (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de>, Pengutronix - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include <common.h> -#include <netdev.h> -#include <asm/arch/pxa-regs.h> - -DECLARE_GLOBAL_DATA_PTR; - -/** - * board_init: - setup some data structures - * - * @return: 0 in case of success - */ - -int board_init (void) -{ - /* memory and cpu-speed are setup before relocation */ - /* so we do _nothing_ here */ - - gd->bd->bi_arch_number = MACH_TYPE_LOGODL; - gd->bd->bi_boot_params = 0x08000100; - gd->bd->bi_baudrate = CONFIG_BAUDRATE; - - (*((volatile short*)0x14800000)) = 0xff; /* power on eth0 */ - (*((volatile short*)0x14000000)) = 0xff; /* power on uart */ - - return 0; -} - - -/** - * dram_init: - setup dynamic RAM - * - * @return: 0 in case of success - */ - -int dram_init (void) -{ - gd->bd->bi_dram[0].start = PHYS_SDRAM_1; - gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; - - return 0; -} - - -/** - * logodl_set_led: - switch LEDs on or off - * - * @param led: LED to switch (0,1) - * @param state: switch on (1) or off (0) - */ - -void logodl_set_led(int led, int state) -{ - switch(led) { - - case 0: - if (state==1) { - CONFIG_SYS_LED_A_CR = CONFIG_SYS_LED_A_BIT; - } else if (state==0) { - CONFIG_SYS_LED_A_SR = CONFIG_SYS_LED_A_BIT; - } - break; - - case 1: - if (state==1) { - CONFIG_SYS_LED_B_CR = CONFIG_SYS_LED_B_BIT; - } else if (state==0) { - CONFIG_SYS_LED_B_SR = CONFIG_SYS_LED_B_BIT; - } - break; - } - - return; -} - - -/** - * show_boot_progress: - indicate state of the boot process - * - * @param status: Status number - see README for details. - * - * The LOGOTRONIC does only have 2 LEDs, so we switch them on at the most - * important states (1, 5, 15). - */ - -void show_boot_progress (int status) -{ - if (status < -32) status = -1; /* let things compatible */ - /* - switch(status) { - case 1: logodl_set_led(0,1); break; - case 5: logodl_set_led(1,1); break; - case 15: logodl_set_led(2,1); break; - } - */ - logodl_set_led(0, (status & 1)==1); - logodl_set_led(1, (status & 2)==2); - - return; -} - -#ifdef CONFIG_CMD_NET -int board_eth_init(bd_t *bis) -{ - int rc = 0; -#ifdef CONFIG_SMC91111 - rc = smc91111_initialize(0, CONFIG_SMC91111_BASE); -#endif - return rc; -} -#endif diff --git a/board/logodl/lowlevel_init.S b/board/logodl/lowlevel_init.S deleted file mode 100644 index 9892430a1..000000000 --- a/board/logodl/lowlevel_init.S +++ /dev/null @@ -1,437 +0,0 @@ -/* - * Most of this taken from Redboot hal_platform_setup.h with cleanup - * - * NOTE: I haven't clean this up considerably, just enough to get it - * running. See hal_platform_setup.h for the source. See - * board/cradle/lowlevel_init.S for another PXA250 setup that is - * much cleaner. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include <config.h> -#include <version.h> -#include <asm/arch/pxa-regs.h> - -DRAM_SIZE: .long CONFIG_SYS_DRAM_SIZE - -/* wait for coprocessor write complete */ - .macro CPWAIT reg - mrc p15,0,\reg,c2,c0,0 - mov \reg,\reg - sub pc,pc,#4 - .endm - -_TEXT_BASE: - .word TEXT_BASE - - -/* - * Memory setup - */ - -.globl lowlevel_init -lowlevel_init: - - mov r10, lr - - /* Set up GPIO pins first ----------------------------------------- */ - - ldr r0, =GPSR0 - ldr r1, =CONFIG_SYS_GPSR0_VAL - str r1, [r0] - - ldr r0, =GPSR1 - ldr r1, =CONFIG_SYS_GPSR1_VAL - str r1, [r0] - - ldr r0, =GPSR2 - ldr r1, =CONFIG_SYS_GPSR2_VAL - str r1, [r0] - - ldr r0, =GPCR0 - ldr r1, =CONFIG_SYS_GPCR0_VAL - str r1, [r0] - - ldr r0, =GPCR1 - ldr r1, =CONFIG_SYS_GPCR1_VAL - str r1, [r0] - - ldr r0, =GPCR2 - ldr r1, =CONFIG_SYS_GPCR2_VAL - str r1, [r0] - - ldr r0, =GPDR0 - ldr r1, =CONFIG_SYS_GPDR0_VAL - str r1, [r0] - - ldr r0, =GPDR1 - ldr r1, =CONFIG_SYS_GPDR1_VAL - str r1, [r0] - - ldr r0, =GPDR2 - ldr r1, =CONFIG_SYS_GPDR2_VAL - str r1, [r0] - - ldr r0, =GAFR0_L - ldr r1, =CONFIG_SYS_GAFR0_L_VAL - str r1, [r0] - - ldr r0, =GAFR0_U - ldr r1, =CONFIG_SYS_GAFR0_U_VAL - str r1, [r0] - - ldr r0, =GAFR1_L - ldr r1, =CONFIG_SYS_GAFR1_L_VAL - str r1, [r0] - - ldr r0, =GAFR1_U - ldr r1, =CONFIG_SYS_GAFR1_U_VAL - str r1, [r0] - - ldr r0, =GAFR2_L - ldr r1, =CONFIG_SYS_GAFR2_L_VAL - str r1, [r0] - - ldr r0, =GAFR2_U - ldr r1, =CONFIG_SYS_GAFR2_U_VAL - str r1, [r0] - - ldr r0, =PSSR /* enable GPIO pins */ - ldr r1, =CONFIG_SYS_PSSR_VAL - str r1, [r0] - -/* ldr r3, =MSC1 / low - bank 2 Lubbock Registers / SRAM */ -/* ldr r2, =CONFIG_SYS_MSC1_VAL / high - bank 3 Ethernet Controller */ -/* str r2, [r3] / need to set MSC1 before trying to write to the HEX LEDs */ -/* ldr r2, [r3] / need to read it back to make sure the value latches (see MSC section of manual) */ -/* */ -/* ldr r1, =LED_BLANK */ -/* mov r0, #0xFF */ -/* str r0, [r1] / turn on hex leds */ -/* */ -/*loop: */ -/* */ -/* ldr r0, =0xB0070001 */ -/* ldr r1, =_LED */ -/* str r0, [r1] / hex display */ - - - /* ---------------------------------------------------------------- */ - /* Enable memory interface */ - /* */ - /* The sequence below is based on the recommended init steps */ - /* detailed in the Intel PXA250 Operating Systems Developers Guide, */ - /* Chapter 10. */ - /* ---------------------------------------------------------------- */ - - /* ---------------------------------------------------------------- */ - /* Step 1: Wait for at least 200 microsedonds to allow internal */ - /* clocks to settle. Only necessary after hard reset... */ - /* FIXME: can be optimized later */ - /* ---------------------------------------------------------------- */ - - ldr r3, =OSCR /* reset the OS Timer Count to zero */ - mov r2, #0 - str r2, [r3] - ldr r4, =0x300 /* really 0x2E1 is about 200usec, */ - /* so 0x300 should be plenty */ -1: - ldr r2, [r3] - cmp r4, r2 - bgt 1b - -mem_init: - - ldr r1, =MEMC_BASE /* get memory controller base addr. */ - - /* ---------------------------------------------------------------- */ - /* Step 2a: Initialize Asynchronous static memory controller */ - /* ---------------------------------------------------------------- */ - - /* MSC registers: timing, bus width, mem type */ - - /* MSC0: nCS(0,1) */ - ldr r2, =CONFIG_SYS_MSC0_VAL - str r2, [r1, #MSC0_OFFSET] - ldr r2, [r1, #MSC0_OFFSET] /* read back to ensure */ - /* that data latches */ - /* MSC1: nCS(2,3) */ - ldr r2, =CONFIG_SYS_MSC1_VAL - str r2, [r1, #MSC1_OFFSET] - ldr r2, [r1, #MSC1_OFFSET] - - /* MSC2: nCS(4,5) */ - ldr r2, =CONFIG_SYS_MSC2_VAL - str r2, [r1, #MSC2_OFFSET] - ldr r2, [r1, #MSC2_OFFSET] - - /* ---------------------------------------------------------------- */ - /* Step 2b: Initialize Card Interface */ - /* ---------------------------------------------------------------- */ - - /* MECR: Memory Expansion Card Register */ - ldr r2, =CONFIG_SYS_MECR_VAL - str r2, [r1, #MECR_OFFSET] - ldr r2, [r1, #MECR_OFFSET] - - /* MCMEM0: Card Interface slot 0 timing */ - ldr r2, =CONFIG_SYS_MCMEM0_VAL - str r2, [r1, #MCMEM0_OFFSET] - ldr r2, [r1, #MCMEM0_OFFSET] - - /* MCMEM1: Card Interface slot 1 timing */ - ldr r2, =CONFIG_SYS_MCMEM1_VAL - str r2, [r1, #MCMEM1_OFFSET] - ldr r2, [r1, #MCMEM1_OFFSET] - - /* MCATT0: Card Interface Attribute Space Timing, slot 0 */ - ldr r2, =CONFIG_SYS_MCATT0_VAL - str r2, [r1, #MCATT0_OFFSET] - ldr r2, [r1, #MCATT0_OFFSET] - - /* MCATT1: Card Interface Attribute Space Timing, slot 1 */ - ldr r2, =CONFIG_SYS_MCATT1_VAL - str r2, [r1, #MCATT1_OFFSET] - ldr r2, [r1, #MCATT1_OFFSET] - - /* MCIO0: Card Interface I/O Space Timing, slot 0 */ - ldr r2, =CONFIG_SYS_MCIO0_VAL - str r2, [r1, #MCIO0_OFFSET] - ldr r2, [r1, #MCIO0_OFFSET] - - /* MCIO1: Card Interface I/O Space Timing, slot 1 */ - ldr r2, =CONFIG_SYS_MCIO1_VAL - str r2, [r1, #MCIO1_OFFSET] - ldr r2, [r1, #MCIO1_OFFSET] - - /* ---------------------------------------------------------------- */ - /* Step 2c: Write FLYCNFG FIXME: what's that??? */ - /* ---------------------------------------------------------------- */ - - /* test if we run from flash or RAM - RAM/BDI: don't setup RAM */ - adr r3, mem_init /* r0 <- current position of code */ - ldr r2, =mem_init - cmp r3, r2 /* skip init if in place */ - beq initirqs - - - /* ---------------------------------------------------------------- */ - /* Step 2d: Initialize Timing for Sync Memory (SDCLK0) */ - /* ---------------------------------------------------------------- */ - - /* Before accessing MDREFR we need a valid DRI field, so we set */ - /* this to power on defaults + DRI field. */ - - ldr r3, =CONFIG_SYS_MDREFR_VAL - ldr r2, =0xFFF - and r3, r3, r2 - ldr r4, =0x03ca4000 - orr r4, r4, r3 - - str r4, [r1, #MDREFR_OFFSET] /* write back MDREFR */ - ldr r4, [r1, #MDREFR_OFFSET] - - - /* ---------------------------------------------------------------- */ - /* Step 3: Initialize Synchronous Static Memory (Flash/Peripherals) */ - /* ---------------------------------------------------------------- */ - - /* Initialize SXCNFG register. Assert the enable bits */ - - /* Write SXMRS to cause an MRS command to all enabled banks of */ - /* synchronous static memory. Note that SXLCR need not be written */ - /* at this time. */ - - /* FIXME: we use async mode for now */ - - - /* ---------------------------------------------------------------- */ - /* Step 4: Initialize SDRAM */ - /* ---------------------------------------------------------------- */ - - /* Step 4a: assert MDREFR:K?RUN and configure */ - /* MDREFR:K1DB2 and MDREFR:K2DB2 as desired. */ - - ldr r4, =CONFIG_SYS_MDREFR_VAL - str r4, [r1, #MDREFR_OFFSET] /* write back MDREFR */ - ldr r4, [r1, #MDREFR_OFFSET] - - /* Step 4b: de-assert MDREFR:SLFRSH. */ - - bic r4, r4, #(MDREFR_SLFRSH) - - str r4, [r1, #MDREFR_OFFSET] /* write back MDREFR */ - ldr r4, [r1, #MDREFR_OFFSET] - - - /* Step 4c: assert MDREFR:E1PIN and E0PIO */ - - orr r4, r4, #(MDREFR_E1PIN|MDREFR_E0PIN) - - str r4, [r1, #MDREFR_OFFSET] /* write back MDREFR */ - ldr r4, [r1, #MDREFR_OFFSET] - - - /* Step 4d: write MDCNFG with MDCNFG:DEx deasserted (set to 0), to */ - /* configure but not enable each SDRAM partition pair. */ - - ldr r4, =CONFIG_SYS_MDCNFG_VAL - bic r4, r4, #(MDCNFG_DE0|MDCNFG_DE1) - - str r4, [r1, #MDCNFG_OFFSET] /* write back MDCNFG */ - ldr r4, [r1, #MDCNFG_OFFSET] - - - /* Step 4e: Wait for the clock to the SDRAMs to stabilize, */ - /* 100..200 µsec. */ - - ldr r3, =OSCR /* reset the OS Timer Count to zero */ - mov r2, #0 - str r2, [r3] - ldr r4, =0x300 /* really 0x2E1 is about 200usec, */ - /* so 0x300 should be plenty */ -1: - ldr r2, [r3] - cmp r4, r2 - bgt 1b - - - /* Step 4f: Trigger a number (usually 8) refresh cycles by */ - /* attempting non-burst read or write accesses to disabled */ - /* SDRAM, as commonly specified in the power up sequence */ - /* documented in SDRAM data sheets. The address(es) used */ - /* for this purpose must not be cacheable. */ - - /* There should 9 writes, since the first write doesn't */ - /* trigger a refresh cycle on PXA250. See Intel PXA250 and */ - /* PXA210 Processors Specification Update, */ - /* Jan 2003, Errata #116, page 30. */ - - - ldr r3, =CONFIG_SYS_DRAM_BASE - str r2, [r3] - str r2, [r3] - str r2, [r3] - str r2, [r3] - str r2, [r3] - str r2, [r3] - str r2, [r3] - str r2, [r3] - str r2, [r3] - - /* Step 4g: Write MDCNFG with enable bits asserted */ - /* (MDCNFG:DEx set to 1). */ - - ldr r3, [r1, #MDCNFG_OFFSET] - orr r3, r3, #(MDCNFG_DE0|MDCNFG_DE1) - str r3, [r1, #MDCNFG_OFFSET] - - /* Step 4h: Write MDMRS. */ - - ldr r2, =CONFIG_SYS_MDMRS_VAL - str r2, [r1, #MDMRS_OFFSET] - - - /* We are finished with Intel's memory controller initialisation */ - - /* ---------------------------------------------------------------- */ - /* Disable (mask) all interrupts at interrupt controller */ - /* ---------------------------------------------------------------- */ - -initirqs: - - mov r1, #0 /* clear int. level register (IRQ, not FIQ) */ - ldr r2, =ICLR - str r1, [r2] - - ldr r2, =ICMR /* mask all interrupts at the controller */ - str r1, [r2] - - - /* ---------------------------------------------------------------- */ - /* Clock initialisation */ - /* ---------------------------------------------------------------- */ - -initclks: - - /* Disable the peripheral clocks, and set the core clock frequency */ - /* (hard-coding at 398.12MHz for now). */ - - /* Turn Off ALL on-chip peripheral clocks for re-configuration */ - /* Note: See label 'ENABLECLKS' for the re-enabling */ - ldr r1, =CKEN - mov r2, #0 - str r2, [r1] - - - /* default value in case no valid rotary switch setting is found */ - ldr r2, =(CCCR_L27|CCCR_M2|CCCR_N10) /* DEFAULT: {200/200/100} */ - - /* ... and write the core clock config register */ - ldr r1, =CCCR - str r2, [r1] - - /* enable the 32Khz oscillator for RTC and PowerManager */ -/* - ldr r1, =OSCC - mov r2, #OSCC_OON - str r2, [r1] -*/ - /* NOTE: spin here until OSCC.OOK get set, meaning the PLL */ - /* has settled. */ -60: - ldr r2, [r1] - ands r2, r2, #1 - beq 60b - - /* ---------------------------------------------------------------- */ - /* */ - /* ---------------------------------------------------------------- */ - - /* Save SDRAM size */ - ldr r1, =DRAM_SIZE - str r8, [r1] - - /* Interrupt init: Mask all interrupts */ - ldr r0, =ICMR /* enable no sources */ - mov r1, #0 - str r1, [r0] - - /* FIXME */ - -#ifndef DEBUG - /*Disable software and data breakpoints */ - mov r0,#0 - mcr p15,0,r0,c14,c8,0 /* ibcr0 */ - mcr p15,0,r0,c14,c9,0 /* ibcr1 */ - mcr p15,0,r0,c14,c4,0 /* dbcon */ - - /*Enable all debug functionality */ - mov r0,#0x80000000 - mcr p14,0,r0,c10,c0,0 /* dcsr */ -#endif - - /* ---------------------------------------------------------------- */ - /* End lowlevel_init */ - /* ---------------------------------------------------------------- */ - -endlowlevel_init: - - mov pc, lr 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 deleted file mode 100644 index dfa952add..000000000 --- a/board/lwmon/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# Ulrich Lutz, Speech Design GmbH, ulutz@datalab.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# LWE Monitorcontroller Litronic LCD IV boards -# - -TEXT_BASE = 0x40000000 -#TEXT_BASE = 0x41000000 diff --git a/board/lwmon5/config.mk b/board/lwmon5/config.mk index 3c6d04172..648fa3d46 100644 --- a/board/lwmon5/config.mk +++ b/board/lwmon5/config.mk @@ -24,10 +24,6 @@ # lwmon5 (440EPx) # -ifndef TEXT_BASE -TEXT_BASE = 0xFFF80000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),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..54dc1c479 100644 --- a/board/manroland/hmi1001/config.mk +++ b/board/manroland/hmi1001/config.mk @@ -21,22 +21,4 @@ # MA 02111-1307 USA # -# -# INKA 4X0 board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFE00000 boot high -# -# 0x00100000 boot from RAM (for testing only) -# - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -#TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index 685072833..000000000 --- a/board/manroland/mucmc52/config.mk +++ /dev/null @@ -1,45 +0,0 @@ -# -# (C) Copyright 2008 -# Heiko Schocher, DENX Software Engineering, hs@denx.de. -# -# (C) Copyright 2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MUCMC52 board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFE00000 boot high -# -# 0x00100000 boot from RAM (for testing only) -# - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -#TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index a65a8ba2c..000000000 --- a/board/manroland/uc100/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# UC100 boards -# - -#TEXT_BASE = 0x40000000 -TEXT_BASE = 0x40700000 diff --git a/board/manroland/uc101/config.mk b/board/manroland/uc101/config.mk index 8ccf33e15..54dc1c479 100644 --- a/board/manroland/uc101/config.mk +++ b/board/manroland/uc101/config.mk @@ -21,22 +21,4 @@ # MA 02111-1307 USA # -# -# INKA 4X0 board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFE00000 boot high -# -# 0x00100000 boot from RAM (for testing only) -# - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -#TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index c2c09f4fd..000000000 --- a/board/matrix_vision/mvbc_p/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFF800000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/matrix_vision/mvblm7/config.mk b/board/matrix_vision/mvblm7/config.mk deleted file mode 100644 index d48fc3105..000000000 --- a/board/matrix_vision/mvblm7/config.mk +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (C) Freescale Semiconductor, Inc. 2006. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -TEXT_BASE = 0xFFF00000 diff --git a/board/matrix_vision/mvsmr/config.mk b/board/matrix_vision/mvsmr/config.mk index b1da812c4..d5308d90e 100644 --- a/board/matrix_vision/mvsmr/config.mk +++ b/board/matrix_vision/mvsmr/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2003 +# (C) Copyright 2003-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -21,11 +21,4 @@ # MA 02111-1307 USA # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFF800000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index d5e8ed264..000000000 --- a/board/mbx8xx/config.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# (C) Copyright 2000 -# Sysgo Real-Time Solutions, GmbH <www.elinos.com> -# Marius Groeger <mgroeger@sysgo.de> -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MBX8xx boards -# - -TEXT_BASE = 0xfe000000 -/*TEXT_BASE = 0x00200000 */ diff --git a/board/mcc200/config.mk b/board/mcc200/config.mk deleted file mode 100644 index d0f9289fe..000000000 --- a/board/mcc200/config.mk +++ /dev/null @@ -1,45 +0,0 @@ -# -# (C) Copyright 2003-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MCC200, PRS200 boards: -# -# Valid values for TEXT_BASE are: -# -# 0xFC000000 boot low (standard configuration) -# 0xFFF00000 boot high -# 0x00100000 boot from RAM (for testing only) -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot low -TEXT_BASE = 0xFC000000 -## Boot high -# TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -# TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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..06ba43fca 100644 --- a/board/ml2/config.mk +++ b/board/ml2/config.mk @@ -21,12 +21,5 @@ # MA 02111-1307 USA # -# -# esd ADCIOP boards -# - -#TEXT_BASE = 0xFFFE0000 -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..bce35147a 100644 --- a/board/mosaixtech/icon/config.mk +++ b/board/mosaixtech/icon/config.mk @@ -21,8 +21,6 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFA0000 - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/motionpro/config.mk b/board/motionpro/config.mk deleted file mode 100644 index e7934d29c..000000000 --- a/board/motionpro/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2006-2007 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Promess Motion-PRO -# - -TEXT_BASE = 0xfff00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/mousse/config.mk b/board/mousse/config.mk index 933e6b32a..a69215b3b 100644 --- a/board/mousse/config.mk +++ b/board/mousse/config.mk @@ -24,7 +24,4 @@ # # MOUSSE boards # -TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index 183d3e869..000000000 --- a/board/mpc8308_p1m/config.mk +++ /dev/null @@ -1,3 +0,0 @@ -ifndef TEXT_BASE -TEXT_BASE = 0xFC000000 -endif diff --git a/board/mpc8540eval/config.mk b/board/mpc8540eval/config.mk deleted file mode 100644 index 20b868175..000000000 --- a/board/mpc8540eval/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Modified by Xianghua Xiao, X.Xiao@motorola.com -# (C) Copyright 2002,Motorola Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# gda8540 board -# default CCARBAR is at 0xff700000 -# assume U-Boot is less than 0.5MB -# -#TEXT_BASE = 0x1000000 -TEXT_BASE = 0xfff80000 diff --git a/board/mpl/mip405/config.mk b/board/mpl/mip405/config.mk deleted file mode 100644 index 0f8d153d8..000000000 --- a/board/mpl/mip405/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd ADCIOP boards -# - -#TEXT_BASE = 0xFFFE0000 -TEXT_BASE = 0xFFF80000 diff --git a/board/mpl/pati/config.mk b/board/mpl/pati/config.mk index b8a098591..ce56195a9 100644 --- a/board/mpl/pati/config.mk +++ b/board/mpl/pati/config.mk @@ -21,11 +21,4 @@ # MA 02111-1307 USA # -# -# EPQ Board Configuration -# - -# Boot from flash at location 0x00000000 -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR) diff --git a/board/mpl/pip405/config.mk b/board/mpl/pip405/config.mk deleted file mode 100644 index 0f8d153d8..000000000 --- a/board/mpl/pip405/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd ADCIOP boards -# - -#TEXT_BASE = 0xFFFE0000 -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 deleted file mode 100644 index cdd0ec9a9..000000000 --- a/board/muas3001/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2008 -# Heiko Schocher, DENX Software Engineering, hs@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFF000000 diff --git a/board/munices/config.mk b/board/munices/config.mk deleted file mode 100644 index 1b573bc88..000000000 --- a/board/munices/config.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -# (C) Copyright 2007 -# Heiko Schocher, DENX Software Engineering, hs@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MUNICes board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFF00000 boot high (standard configuration) -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFFF00000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/musenki/config.mk b/board/musenki/config.mk deleted file mode 100644 index 18673e16d..000000000 --- a/board/musenki/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# CU824 board -# - -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/mvblue/config.mk b/board/mvblue/config.mk deleted file mode 100644 index 6e0ce4efb..000000000 --- a/board/mvblue/config.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# (C) Copyright 2001-2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index 9d9b89260..000000000 --- a/board/nc650/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2006, 2007 Detlev Zundel, dzu@denx.de -# (C) Copyright 2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# NC650 board -# - -TEXT_BASE = 0x40700000 diff --git a/board/netphone/config.mk b/board/netphone/config.mk deleted file mode 100644 index 8497ebc81..000000000 --- a/board/netphone/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# netVia Boards -# - -TEXT_BASE = 0x40000000 diff --git a/board/netstal/hcu4/config.mk b/board/netstal/hcu4/config.mk index 580f18cb2..fd3e88964 100644 --- a/board/netstal/hcu4/config.mk +++ b/board/netstal/hcu4/config.mk @@ -20,9 +20,6 @@ # # Netstal Maschinen AG: HCU4 boards # - -TEXT_BASE = 0xFFFB0000 - ifeq ($(debug),1) PLATFORM_CPPFLAGS += -DDEBUG -g endif diff --git a/board/netstal/hcu5/config.mk b/board/netstal/hcu5/config.mk index 51ddb76cd..f641d5445 100644 --- a/board/netstal/hcu5/config.mk +++ b/board/netstal/hcu5/config.mk @@ -20,9 +20,6 @@ # # Netstal Maschinen AG: HCU5 boards # - -TEXT_BASE = 0xFFFB0000 - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/netstal/mcu25/config.mk b/board/netstal/mcu25/config.mk index f0f2ea176..61dc09124 100644 --- a/board/netstal/mcu25/config.mk +++ b/board/netstal/mcu25/config.mk @@ -20,8 +20,6 @@ # # Netstal Maschinen AG: MCU25 board # -TEXT_BASE = 0xFFFB0000 - ifeq ($(debug),1) PLATFORM_CPPFLAGS += -DDEBUG -g endif 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 deleted file mode 100644 index 8497ebc81..000000000 --- a/board/netta/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# netVia Boards -# - -TEXT_BASE = 0x40000000 diff --git a/board/netta2/config.mk b/board/netta2/config.mk deleted file mode 100644 index 8497ebc81..000000000 --- a/board/netta2/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# netVia Boards -# - -TEXT_BASE = 0x40000000 diff --git a/board/netvia/config.mk b/board/netvia/config.mk deleted file mode 100644 index 9dddaad54..000000000 --- a/board/netvia/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# netVia Boards -# - -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 deleted file mode 100644 index 3b3ea1e23..000000000 --- a/board/nx823/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Nexus boards -# - -TEXT_BASE = 0x40000000 diff --git a/board/o2dnt/config.mk b/board/o2dnt/config.mk deleted file mode 100644 index b87337680..000000000 --- a/board/o2dnt/config.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# (C) Copyright 2005 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# boot low for 16 MiB boards -TEXT_BASE = 0xFF000000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index 7a5bcfc19..000000000 --- a/board/oxc/config.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# OXC boards -# - -#TEXT_BASE = 0x00090000 -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index 92d37c936..000000000 --- a/board/pcippc2/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2002 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# PCIPPC-2 boards -# - -TEXT_BASE = 0xfff00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/pcs440ep/config.mk b/board/pcs440ep/config.mk index 0844e98e8..23631c510 100644 --- a/board/pcs440ep/config.mk +++ b/board/pcs440ep/config.mk @@ -28,14 +28,6 @@ # Check the U-Boot Image with a SHA1 checksum ALL += $(obj)u-boot.sha1 -#TEXT_BASE = 0x00001000 - -ifeq ($(ramsym),1) -TEXT_BASE = 0xFBD00000 -else -TEXT_BASE = 0xFFFA0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/pdm360ng/config.mk b/board/pdm360ng/config.mk deleted file mode 100644 index c3b07ddc1..000000000 --- a/board/pdm360ng/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2009 -# Michael Weiß, ifm ecomatic gmbh, michael.weiss@ifm.com -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xF0000000 diff --git a/board/phytec/pcm030/config.mk b/board/phytec/pcm030/config.mk deleted file mode 100644 index 92fecc63c..000000000 --- a/board/phytec/pcm030/config.mk +++ /dev/null @@ -1,41 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# phyCORE-MPC5200B tiny board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFF00000 boot high (standard configuration) -# 0xFF000000 boot low -# 0x00100000 boot from RAM (for testing only) -# - -sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index ad689f33b..000000000 --- a/board/pm520/config.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# (C) Copyright 2003-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# PM520 board -# - -TEXT_BASE = 0xfff00000 -# TEXT_BASE = 0x00100000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/pm826/config.mk b/board/pm826/config.mk index 48ac299fa..1da57e03c 100644 --- a/board/pm826/config.mk +++ b/board/pm826/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2001-2004 +# (C) Copyright 2001-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -24,14 +24,4 @@ # # MicroSys PM826 board: # - - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot 64-bit flash -TEXT_BASE = 0xFF000000 - -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR) diff --git a/board/pm828/config.mk b/board/pm828/config.mk index 6288431a5..625632fc4 100644 --- a/board/pm828/config.mk +++ b/board/pm828/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2003-2004 +# (C) Copyright 2003-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -24,14 +24,4 @@ # # MicroSys PM828 board: # - - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot 64-bit flash -TEXT_BASE = 0x40000000 - -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR) diff --git a/board/pm854/config.mk b/board/pm854/config.mk deleted file mode 100644 index 0b28f4efd..000000000 --- a/board/pm854/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2004 Freescale Semiconductor. -# Modified by Xianghua Xiao, X.Xiao@motorola.com -# (C) Copyright 2002,Motorola Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# pm854 board -# default CCARBAR is at 0xff700000 -# assume U-Boot is less than 0.5MB -# -TEXT_BASE = 0xfff80000 diff --git a/board/pm856/config.mk b/board/pm856/config.mk deleted file mode 100644 index 822930584..000000000 --- a/board/pm856/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2004 Freescale Semiconductor. -# Modified by Xianghua Xiao, X.Xiao@motorola.com -# (C) Copyright 2002,2003 Motorola Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# PM856 board -# default CCARBAR is at 0xff700000 -# assume U-Boot is less than 0.5MB -# -TEXT_BASE = 0xfff80000 diff --git a/board/pn62/config.mk b/board/pn62/config.mk deleted file mode 100644 index a2b6f059a..000000000 --- a/board/pn62/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# PN62 boards -# - -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/ppmc7xx/config.mk b/board/ppmc7xx/config.mk index b5b46dc56..ca574c460 100644 --- a/board/ppmc7xx/config.mk +++ b/board/ppmc7xx/config.mk @@ -23,6 +23,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA -TEXT_BASE = 0xFFF00000 TEXT_END = 0xFFF40000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/ppmc8260/config.mk b/board/ppmc8260/config.mk index d06fcead2..f0298fe67 100644 --- a/board/ppmc8260/config.mk +++ b/board/ppmc8260/config.mk @@ -29,6 +29,4 @@ # MBX8xx boards # -TEXT_BASE = 0xfe000000 TEXT_END = 0xfe080000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/prodrive/alpr/config.mk b/board/prodrive/alpr/config.mk index b62e776d3..7be81f385 100644 --- a/board/prodrive/alpr/config.mk +++ b/board/prodrive/alpr/config.mk @@ -21,18 +21,6 @@ # MA 02111-1307 USA # -# -# AMCC 440GX Reference Platform (Ocotea) board -# - -#TEXT_BASE = 0xFFFE0000 - -ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 -else -TEXT_BASE = 0xFFFC0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/prodrive/p3mx/config.mk b/board/prodrive/p3mx/config.mk deleted file mode 100644 index 35bf1c155..000000000 --- a/board/prodrive/p3mx/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2002-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# p3mx boards (P3M750 & P3M7448) -# - -TEXT_BASE = 0xfff00000 diff --git a/board/prodrive/p3p440/config.mk b/board/prodrive/p3p440/config.mk index 60d3bf4d2..9eac8b963 100644 --- a/board/prodrive/p3p440/config.mk +++ b/board/prodrive/p3p440/config.mk @@ -21,18 +21,6 @@ # MA 02111-1307 USA # -# -# esd ADCIOP boards -# - -#TEXT_BASE = 0xFFFE0000 - -ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 -else -TEXT_BASE = 0xFFFC0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),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 deleted file mode 100644 index 1bdf5e4fc..000000000 --- a/board/quad100hd/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0xFFFC0000 diff --git a/board/quantum/config.mk b/board/quantum/config.mk deleted file mode 100644 index 7cb374eb8..000000000 --- a/board/quantum/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# RMU boards -# - -TEXT_BASE = 0xfff00000 diff --git a/board/r360mpi/config.mk b/board/r360mpi/config.mk deleted file mode 100644 index 9d6080b84..000000000 --- a/board/r360mpi/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# TQM8xxL boards -# - -TEXT_BASE = 0x40000000 diff --git a/board/rattler/config.mk b/board/rattler/config.mk deleted file mode 100644 index 5fca8c7c6..000000000 --- a/board/rattler/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2001-2005 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# Modified by, Yuli Barcohen, Arabella Software Ltd. <yuli@arabellasw.com> -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Rattler series boards by Analogue & Micro -# - -TEXT_BASE = 0xFE000000 diff --git a/board/rbc823/config.mk b/board/rbc823/config.mk deleted file mode 100644 index 199ea3c1f..000000000 --- a/board/rbc823/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# RBC823 boards -# - -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 deleted file mode 100644 index 7cb374eb8..000000000 --- a/board/rmu/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# RMU boards -# - -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 deleted file mode 100644 index 4b8c5d31f..000000000 --- a/board/rpxsuper/config.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -# (C) Copyright 2000 -# Sysgo Real-Time Solutions, GmbH <www.elinos.com> -# Marius Groeger <mgroeger@sysgo.de> -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MBX8xx boards -# - -TEXT_BASE = 0x80F00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/rsdproto/config.mk b/board/rsdproto/config.mk index 35c3d8c76..9617f08e5 100644 --- a/board/rsdproto/config.mk +++ b/board/rsdproto/config.mk @@ -25,11 +25,4 @@ # MA 02111-1307 USA # -# -# MBX8xx boards -# - -TEXT_BASE = 0xff000000 -/*TEXT_BASE = 0x00200000 */ - LDSCRIPT := $(SRCTREE)/board/rsdproto/u-boot.lds diff --git a/board/sacsng/config.mk b/board/sacsng/config.mk deleted file mode 100644 index 220b218a7..000000000 --- a/board/sacsng/config.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -# (C) Copyright 2000 -# Sysgo Real-Time Solutions, GmbH <www.elinos.com> -# Marius Groeger <mgroeger@sysgo.de> -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# 82xx boards -# - -TEXT_BASE = 0x40000000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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..85fccd827 100644 --- a/board/sandburst/karef/config.mk +++ b/board/sandburst/karef/config.mk @@ -26,12 +26,6 @@ # Travis B. Sawyer # -ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 -else -TEXT_BASE = 0xFFF80000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/sandburst/metrobox/config.mk b/board/sandburst/metrobox/config.mk index 565e826b8..840738101 100644 --- a/board/sandburst/metrobox/config.mk +++ b/board/sandburst/metrobox/config.mk @@ -21,12 +21,6 @@ # MA 02111-1307 USA # -ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 -else -TEXT_BASE = 0xFFF80000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/sandpoint/config.mk b/board/sandpoint/config.mk deleted file mode 100644 index b3f65ebe5..000000000 --- a/board/sandpoint/config.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Sandpoint boards -# - -#TEXT_BASE = 0x00090000 -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(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 deleted file mode 100644 index bd5721781..000000000 --- a/board/sbc405/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000, 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Wind River sbc405 boards -# - -TEXT_BASE = 0xFFFC0000 diff --git a/board/sbc8240/config.mk b/board/sbc8240/config.mk deleted file mode 100644 index 1e9796052..000000000 --- a/board/sbc8240/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# sbc8240 board -# - -TEXT_BASE = 0xFFF00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/sbc8260/config.mk b/board/sbc8260/config.mk deleted file mode 100644 index 1f18260dd..000000000 --- a/board/sbc8260/config.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -# (C) Copyright 2000 -# Sysgo Real-Time Solutions, GmbH <www.elinos.com> -# Marius Groeger <mgroeger@sysgo.de> -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MBX8xx boards -# - -TEXT_BASE = 0x40000000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/sbc8349/config.mk b/board/sbc8349/config.mk deleted file mode 100644 index eacb27eec..000000000 --- a/board/sbc8349/config.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) 2006 Wind River Systems, Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# SBC8349E -# - -TEXT_BASE = 0xFF800000 diff --git a/board/sbc8548/config.mk b/board/sbc8548/config.mk deleted file mode 100644 index b2013d667..000000000 --- a/board/sbc8548/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright 2004, 2007 Freescale Semiconductor. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# sbc8548 board -# -ifndef TEXT_BASE -TEXT_BASE = 0xfffa0000 -endif diff --git a/board/sbc8560/config.mk b/board/sbc8560/config.mk deleted file mode 100644 index 995dadaff..000000000 --- a/board/sbc8560/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# Modified by Xianghua Xiao, X.Xiao@motorola.com -# (C) Copyright 2002,2003 Motorola Inc. -# -# (C) Copyright 2004 Wind River Systems Inc <www.windriver.com>. -# Added support for Wind River SBC8560 board -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -# -# based on mpc8560ads board -# default CCARBAR is at 0xff700000 -# assume U-Boot is less than 256K -# -TEXT_BASE = 0xfffc0000 diff --git a/board/sbc8641d/config.mk b/board/sbc8641d/config.mk deleted file mode 100644 index d1456b91d..000000000 --- a/board/sbc8641d/config.mk +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2004 Freescale Semiconductor. -# Modified by Jeff Brown -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# sbc8641 board -# default CCSRBAR is at 0xff700000 -# -TEXT_BASE = 0xfff00000 diff --git a/board/sc3/config.mk b/board/sc3/config.mk deleted file mode 100644 index a46b19724..000000000 --- a/board/sc3/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -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..d1b4e2eeb 100644 --- a/board/sheldon/simpc8313/config.mk +++ b/board/sheldon/simpc8313/config.mk @@ -1,11 +1,3 @@ -ifndef NAND_SPL -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -endif - -ifndef TEXT_BASE -TEXT_BASE = 0x00100000 -endif - ifdef CONFIG_NAND_LP PAD_TO = 0xFFF20000 else diff --git a/board/siemens/IAD210/config.mk b/board/siemens/IAD210/config.mk deleted file mode 100644 index c30abcb27..000000000 --- a/board/siemens/IAD210/config.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# (C) Copyright 2000 -# Sysgo Real-Time Solutions, GmbH <www.elinos.com> -# Marius Groeger <mgroeger@sysgo.de> -# -# (C) Copyright 2000, 2001, 2002 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# iad210 boards -# - -TEXT_BASE = 0x08000000 -/*TEXT_BASE = 0x00200000 */ diff --git a/board/siemens/SCM/config.mk b/board/siemens/SCM/config.mk index 5d0898be6..406584395 100644 --- a/board/siemens/SCM/config.mk +++ b/board/siemens/SCM/config.mk @@ -24,11 +24,4 @@ # # Siemens SCM boards # - -# This should be equal to the CONFIG_SYS_FLASH_BASE define in config_SCM.h -# 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 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -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 deleted file mode 100644 index 0cd8f4414..000000000 --- a/board/sixnet/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# SIXNET boards -# - -TEXT_BASE = 0xF8000000 diff --git a/board/snmc/qs850/config.mk b/board/snmc/qs850/config.mk deleted file mode 100644 index 905f69269..000000000 --- a/board/snmc/qs850/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2002-2003 -# Simple Network Magic Corporation, dnevil@snmc.com -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# QS850 -# Start address of Bootloader in Flash -# - -TEXT_BASE = 0xFFF00000 diff --git a/board/snmc/qs860t/config.mk b/board/snmc/qs860t/config.mk deleted file mode 100644 index f6ab2607b..000000000 --- a/board/snmc/qs860t/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2002 -# Simple Network Magic Corporation, dnevil@snmc.com -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# QS860T -# Start address of 512K Socketed Flash -# - -TEXT_BASE = 0xFFF00000 diff --git a/board/socrates/config.mk b/board/socrates/config.mk deleted file mode 100644 index 7ea37b5d5..000000000 --- a/board/socrates/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2004 Freescale Semiconductor. -# -# Modified by Sergei Poselenov -# (C) Copyright 2008, Emcraft Systems. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# socrates board -# default CCARBAR is at 0xff700000 -# -TEXT_BASE = 0xfff80000 diff --git a/board/sorcery/config.mk b/board/sorcery/config.mk deleted file mode 100644 index 25de0b5a3..000000000 --- a/board/sorcery/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2003-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# sorcery board -# - -TEXT_BASE = 0xfff00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/spc1920/config.mk b/board/spc1920/config.mk deleted file mode 100644 index 8dacc178f..000000000 --- a/board/spc1920/config.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# Modified by, Yuli Barcohen, Arabella Software Ltd., yuli@arabellasw.com -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Motorola old MPC821/860ADS, MPC8xxFADS, new MPC866ADS, and -# MPC885ADS boards -# - -#TEXT_BASE = 0xFE000000 -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 deleted file mode 100644 index e1e01929b..000000000 --- a/board/spd8xx/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# Ulrich Lutz, Speech Design GmbH, ulutz@datalab.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# SPD823TS boards -# - -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 deleted file mode 100644 index 47e44aa08..000000000 --- a/board/stx/stxgp3/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Modified by Xianghua Xiao, X.Xiao@motorola.com -# (C) Copyright 2002,2003 Motorola Inc. -# -# Copied from ADS85xx for STx GP3 - Dan Malek -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# default CCARBAR is at 0xff700000 -# assume U-Boot is less than 0.5MB -# -TEXT_BASE = 0xfff80000 diff --git a/board/stx/stxssa/config.mk b/board/stx/stxssa/config.mk deleted file mode 100644 index 57fe5d621..000000000 --- a/board/stx/stxssa/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# Modified by Xianghua Xiao, X.Xiao@motorola.com -# (C) Copyright 2002,2003 Motorola Inc. -# -# Copied from ADS85xx for STx GP3 - Dan Malek -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# default CCARBAR is at 0xff700000 -# assume U-Boot is less than 0.5MB -# U-Boot is less than 256K, so push -# it further up into the flash -# -TEXT_BASE = 0xFFFC0000 diff --git a/board/stx/stxxtc/config.mk b/board/stx/stxxtc/config.mk deleted file mode 100644 index f5dc03425..000000000 --- a/board/stx/stxxtc/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# STx XTc -# - -TEXT_BASE = 0x40F00000 diff --git a/board/svm_sc8xx/config.mk b/board/svm_sc8xx/config.mk deleted file mode 100644 index 4bec9cbe8..000000000 --- a/board/svm_sc8xx/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -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..e893fee27 100644 --- a/board/t3corp/config.mk +++ b/board/t3corp/config.mk @@ -22,12 +22,6 @@ # # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),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 deleted file mode 100644 index e7ac93d24..000000000 --- a/board/total5200/config.mk +++ /dev/null @@ -1,43 +0,0 @@ -# -# (C) Copyright 2003-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Total5200 board: -# -# Valid values for TEXT_BASE are: -# -# 0xFFF00000 boot high (standard configuration) -# 0xFE000000 boot low -# 0x00100000 boot from RAM (for testing only) -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot high -TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -# TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/tqc/tqm5200/config.mk b/board/tqc/tqm5200/config.mk deleted file mode 100644 index d72dfe748..000000000 --- a/board/tqc/tqm5200/config.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# (C) Copyright 2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# TQM5200 board: -# -# Valid values for TEXT_BASE are: -# -# 0xFC000000 boot low (standard configuration with room for max 64 MByte -# Flash ROM) -# 0xFFF00000 boot high (for a backup copy of U-Boot) -# 0x00100000 boot from RAM (for testing only) -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot low -TEXT_BASE = 0xFC000000 -## For a backup copy of U-Boot at the end of flash: boot high -# TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -# TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/tqc/tqm8260/config.mk b/board/tqc/tqm8260/config.mk index 3ecfc4876..f2663218f 100644 --- a/board/tqc/tqm8260/config.mk +++ b/board/tqc/tqm8260/config.mk @@ -24,11 +24,4 @@ # # TQM8260 boards # - -# This should be equal to the CONFIG_SYS_FLASH_BASE define in config_TQM8260.h -# 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 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR) diff --git a/board/tqc/tqm8272/config.mk b/board/tqc/tqm8272/config.mk index 05c5f0cb8..60a048f45 100644 --- a/board/tqc/tqm8272/config.mk +++ b/board/tqc/tqm8272/config.mk @@ -24,11 +24,4 @@ # # TQM8272 boards # - -# This should be equal to the CONFIG_SYS_FLASH_BASE define in config_TQM8260.h -# 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 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR) diff --git a/board/tqc/tqm834x/config.mk b/board/tqc/tqm834x/config.mk deleted file mode 100644 index f172c4ede..000000000 --- a/board/tqc/tqm834x/config.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright 2004 Freescale Semiconductor, Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -TEXT_BASE = 0x80000000 diff --git a/board/tqc/tqm85xx/config.mk b/board/tqc/tqm85xx/config.mk deleted file mode 100644 index 37b7b234a..000000000 --- a/board/tqc/tqm85xx/config.mk +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2004 Freescale Semiconductor. -# Modified by Xianghua Xiao, X.Xiao@motorola.com -# (C) Copyright 2002,Motorola Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# tqm85xx board -# -ifeq ($(CONFIG_TQM8548_BE),y) -TEXT_BASE = 0xfff80000 -else -TEXT_BASE = 0xfffc0000 -endif diff --git a/board/tqc/tqm8xx/config.mk b/board/tqc/tqm8xx/config.mk deleted file mode 100644 index 9d6080b84..000000000 --- a/board/tqc/tqm8xx/config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# TQM8xxL boards -# - -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 deleted file mode 100644 index a33faa742..000000000 --- a/board/utx8245/config.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# (C) Copyright 2002 -# Gregory E. Allen, gallen@arlut.utexas.edu -# Matthew E. Karger, karger@arlut.utexas.edu -# Applied Research Laboratories, The University of Texas at Austin -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# UTX8245 boards -# -TEXT_BASE = 0xFFF00000 -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/v37/config.mk b/board/v37/config.mk deleted file mode 100644 index 50cac972e..000000000 --- a/board/v37/config.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Marel V37 boards -# -TEXT_BASE = 0x40000000 diff --git a/board/v38b/config.mk b/board/v38b/config.mk deleted file mode 100644 index bc55fc7b2..000000000 --- a/board/v38b/config.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -# (C) Copyright 2003-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# MarelV38B board -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -TEXT_BASE = 0xFF000000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board diff --git a/board/ve8313/config.mk b/board/ve8313/config.mk deleted file mode 100644 index 02dd33e90..000000000 --- a/board/ve8313/config.mk +++ /dev/null @@ -1,7 +0,0 @@ -ifndef NAND_SPL -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -endif - -ifndef TEXT_BASE -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 deleted file mode 100644 index bc341ca75..000000000 --- a/board/w7o/config.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# (C) Copyright 2001 -# Erik Theisen, Wave 7 Optics, etheisen@mindspring.com. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# Wave 7 Optics boards -# - -#TEXT_BASE = 0xFFF80000 -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..b71db6adb 100644 --- a/board/westel/amx860/config.mk +++ b/board/westel/amx860/config.mk @@ -21,6 +21,4 @@ # MA 02111-1307 USA # -#TEXT_BASE = 0xFE000000 -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..b648bc6ac 100644 --- a/board/xes/xpedite1000/config.mk +++ b/board/xes/xpedite1000/config.mk @@ -25,12 +25,6 @@ # XES XPedite1000 PPC440GX # -ifeq ($(ramsym),1) -TEXT_BASE = 0x07FD0000 -else -TEXT_BASE = 0xFFF80000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/xes/xpedite5170/config.mk b/board/xes/xpedite5170/config.mk deleted file mode 100644 index 1abae973f..000000000 --- a/board/xes/xpedite5170/config.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2009 Extreme Engineering Solutions, Inc. -# Copyright 2007-2008 Freescale Semiconductor, Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# XPedite5170 -# -TEXT_BASE = 0xfff00000 diff --git a/board/xes/xpedite5200/config.mk b/board/xes/xpedite5200/config.mk deleted file mode 100644 index 0761579d9..000000000 --- a/board/xes/xpedite5200/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright 2008 Extreme Engineering Solutions, Inc. -# Copyright 2004, 2007 Freescale Semiconductor. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# xpedite5200 board -# -ifndef TEXT_BASE -TEXT_BASE = 0xfff80000 -endif diff --git a/board/xes/xpedite5370/config.mk b/board/xes/xpedite5370/config.mk deleted file mode 100644 index 995def875..000000000 --- a/board/xes/xpedite5370/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright 2008 Extreme Engineering Solutions, Inc. -# Copyright 2007-2008 Freescale Semiconductor, Inc. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# xpedite5370 board -# -ifndef TEXT_BASE -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/ml507/config.mk b/board/xilinx/ml507/config.mk index 51448ce7f..4df1d9c09 100644 --- a/board/xilinx/ml507/config.mk +++ b/board/xilinx/ml507/config.mk @@ -1,26 +1,4 @@ -# -# (C) Copyright 2008 -# Ricardo Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es -# Work supported by Qtechnology http://www.qtec.com -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -# - -sinclude $(SRCTREE)/board/xilinx/ppc440-generic/config.mk +# need to strip off double quotes +ifneq ($(CONFIG_SYS_LDSCRIPT),) +LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) +endif diff --git a/board/xilinx/ppc405-generic/config.mk b/board/xilinx/ppc405-generic/config.mk index 6d767552d..4df1d9c09 100644 --- a/board/xilinx/ppc405-generic/config.mk +++ b/board/xilinx/ppc405-generic/config.mk @@ -1,25 +1,4 @@ -# -# (C) Copyright 2008 -# Ricardo Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es -# Work supported by Qtechnology http://www.qtec.com -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp +# need to strip off double quotes +ifneq ($(CONFIG_SYS_LDSCRIPT),) +LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) +endif 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/config.mk b/board/xilinx/ppc440-generic/config.mk index 6d767552d..4df1d9c09 100644 --- a/board/xilinx/ppc440-generic/config.mk +++ b/board/xilinx/ppc440-generic/config.mk @@ -1,25 +1,4 @@ -# -# (C) Copyright 2008 -# Ricardo Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es -# Work supported by Qtechnology http://www.qtec.com -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp +# need to strip off double quotes +ifneq ($(CONFIG_SYS_LDSCRIPT),) +LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) +endif 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 deleted file mode 100644 index 1bdf5e4fc..000000000 --- a/board/zeus/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -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 deleted file mode 100644 index 3e53b2be0..000000000 --- a/board/zpc1900/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2001 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# Modified by, Yuli Barcohen, Arabella Software Ltd. <yuli@arabellasw.com> -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# ZPC.1900 board -# - -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 |