From 2ae1824196884ba2bafffb7c0d3e8297350591e9 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Wed, 6 Oct 2010 09:05:45 +0200 Subject: Makefile: move all Power Architecture boards into boards.cfg Clean up Makefile, and drop a lot of the config.mk files on the way. We now also automatically pick all boards that are listed in boards.cfg (and with all configurations), so we can drop the redundant entries from MAKEALL to avoid building these twice. Signed-off-by: Wolfgang Denk --- board/amcc/acadia/config.mk | 13 +++++-------- board/amcc/bamboo/config.mk | 13 +++++-------- board/amcc/bluestone/config.mk | 6 ------ board/amcc/bubinga/config.mk | 24 ------------------------ board/amcc/canyonlands/config.mk | 13 +++++-------- board/amcc/ebony/config.mk | 12 ------------ board/amcc/katmai/config.mk | 2 -- board/amcc/kilauea/config.mk | 13 +++++-------- board/amcc/luan/config.mk | 12 ------------ board/amcc/makalu/config.mk | 24 ------------------------ board/amcc/ocotea/config.mk | 8 -------- board/amcc/redwood/config.mk | 6 ------ board/amcc/sequoia/config.mk | 13 +++++-------- board/amcc/taihu/config.mk | 24 ------------------------ board/amcc/taishan/config.mk | 8 -------- board/amcc/walnut/config.mk | 24 ------------------------ board/amcc/yosemite/config.mk | 12 ------------ 17 files changed, 25 insertions(+), 202 deletions(-) delete mode 100644 board/amcc/bubinga/config.mk delete mode 100644 board/amcc/makalu/config.mk delete mode 100644 board/amcc/taihu/config.mk delete mode 100644 board/amcc/walnut/config.mk (limited to 'board/amcc') diff --git a/board/amcc/acadia/config.mk b/board/amcc/acadia/config.mk index d5c9ae772..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 CONFIG_SYS_TEXT_BASE -CONFIG_SYS_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 cdf8f11c7..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 CONFIG_SYS_TEXT_BASE -CONFIG_SYS_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 efb2de48a..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 CONFIG_SYS_TEXT_BASE -CONFIG_SYS_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 1646d3423..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 -# - -CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk index 9dd9c4bf8..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 CONFIG_SYS_TEXT_BASE -CONFIG_SYS_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 0b628cfac..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 -# - -#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 - -ifeq ($(ramsym),1) -CONFIG_SYS_TEXT_BASE = 0x07FD0000 -else -CONFIG_SYS_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 ca86dca49..f5dfbaf6d 100644 --- a/board/amcc/katmai/config.mk +++ b/board/amcc/katmai/config.mk @@ -25,8 +25,6 @@ # AMCC 440SPe Evaluation (Katmai) board # -CONFIG_SYS_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 17ef0d30c..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 CONFIG_SYS_TEXT_BASE -CONFIG_SYS_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 d8790ceb3..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 -# - -#CONFIG_SYS_TEXT_BASE = 0x00001000 - -ifeq ($(ramsym),1) -CONFIG_SYS_TEXT_BASE = 0xFBD00000 -else -CONFIG_SYS_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 e0ad62394..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 -# - -CONFIG_SYS_TEXT_BASE = 0xFFFA0000 diff --git a/board/amcc/ocotea/config.mk b/board/amcc/ocotea/config.mk index 06c519abd..75634ad5d 100644 --- a/board/amcc/ocotea/config.mk +++ b/board/amcc/ocotea/config.mk @@ -25,14 +25,6 @@ # AMCC 440GX Reference Platform (Ocotea) board # -#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 - -ifeq ($(ramsym),1) -CONFIG_SYS_TEXT_BASE = 0x07FD0000 -else -CONFIG_SYS_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 0d167b298..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) -CONFIG_SYS_TEXT_BASE = 0x07FD0000 -else -CONFIG_SYS_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 5bce05596..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 CONFIG_SYS_TEXT_BASE -CONFIG_SYS_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 1646d3423..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 -# - -CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/amcc/taishan/config.mk b/board/amcc/taishan/config.mk index 0b22b6ee0..3d18a3854 100644 --- a/board/amcc/taishan/config.mk +++ b/board/amcc/taishan/config.mk @@ -25,14 +25,6 @@ # AMCC 440GX Reference Platform (Taishan) board # -#CONFIG_SYS_TEXT_BASE = 0xFFFE0000 - -ifeq ($(ramsym),1) -CONFIG_SYS_TEXT_BASE = 0x07FD0000 -else -CONFIG_SYS_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 1646d3423..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 -# - -CONFIG_SYS_TEXT_BASE = 0xFFFC0000 diff --git a/board/amcc/yosemite/config.mk b/board/amcc/yosemite/config.mk index 0523aa3b4..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 -# - -#CONFIG_SYS_TEXT_BASE = 0x00001000 - -ifeq ($(ramsym),1) -CONFIG_SYS_TEXT_BASE = 0xFBD00000 -else -CONFIG_SYS_TEXT_BASE = 0xFFF80000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) -- cgit v1.2.3