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/tqc/tqm5200/config.mk | 24 ++---------------------- board/tqc/tqm8260/config.mk | 10 +--------- board/tqc/tqm8272/config.mk | 10 +--------- board/tqc/tqm834x/config.mk | 23 ----------------------- board/tqc/tqm85xx/config.mk | 31 ------------------------------- board/tqc/tqm8xx/config.mk | 28 ---------------------------- 6 files changed, 4 insertions(+), 122 deletions(-) delete mode 100644 board/tqc/tqm834x/config.mk delete mode 100644 board/tqc/tqm85xx/config.mk delete mode 100644 board/tqc/tqm8xx/config.mk (limited to 'board/tqc') diff --git a/board/tqc/tqm5200/config.mk b/board/tqc/tqm5200/config.mk index d9522ad..6add283 100644 --- a/board/tqc/tqm5200/config.mk +++ b/board/tqc/tqm5200/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2004 +# (C) Copyright 2004-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -24,24 +24,4 @@ # # TQM5200 board: # -# Valid values for CONFIG_SYS_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 CONFIG_SYS_TEXT_BASE -## Standard: boot low -CONFIG_SYS_TEXT_BASE = 0xFC000000 -## For a backup copy of U-Boot at the end of flash: boot high -# CONFIG_SYS_TEXT_BASE = 0xFFF00000 -## For testing: boot from RAM -# CONFIG_SYS_TEXT_BASE = 0x00100000 -endif - -PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ - -I$(TOPDIR)/board +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board diff --git a/board/tqc/tqm8260/config.mk b/board/tqc/tqm8260/config.mk index b8de2f1..f266321 100644 --- a/board/tqc/tqm8260/config.mk +++ b/board/tqc/tqm8260/config.mk @@ -24,12 +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. -# -CONFIG_SYS_TEXT_BASE = 0x40000000 - -PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ - -I$(TOPDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR) diff --git a/board/tqc/tqm8272/config.mk b/board/tqc/tqm8272/config.mk index 0ea1342..60a048f 100644 --- a/board/tqc/tqm8272/config.mk +++ b/board/tqc/tqm8272/config.mk @@ -24,12 +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. -# -CONFIG_SYS_TEXT_BASE = 0x40000000 - -PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_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 868fc86..0000000 --- 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 -# - -CONFIG_SYS_TEXT_BASE = 0x80000000 diff --git a/board/tqc/tqm85xx/config.mk b/board/tqc/tqm85xx/config.mk deleted file mode 100644 index 7d62544..0000000 --- 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) -CONFIG_SYS_TEXT_BASE = 0xfff80000 -else -CONFIG_SYS_TEXT_BASE = 0xfffc0000 -endif diff --git a/board/tqc/tqm8xx/config.mk b/board/tqc/tqm8xx/config.mk deleted file mode 100644 index 017dc83..0000000 --- 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 -# - -CONFIG_SYS_TEXT_BASE = 0x40000000 -- cgit v1.1