summaryrefslogtreecommitdiffstats
path: root/board/manroland
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-06 09:05:45 +0200
committerWolfgang Denk <wd@denx.de>2010-10-18 22:12:04 +0200
commit2ae1824196884ba2bafffb7c0d3e8297350591e9 (patch)
tree5af805bde716ea0438e9f39898e6cb4f7677f97a /board/manroland
parent2bad5df7274dd2802ba9526ea7218e9c09d3f89c (diff)
downloadblackbird-obmc-uboot-2ae1824196884ba2bafffb7c0d3e8297350591e9.tar.gz
blackbird-obmc-uboot-2ae1824196884ba2bafffb7c0d3e8297350591e9.zip
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 <wd@denx.de>
Diffstat (limited to 'board/manroland')
-rw-r--r--board/manroland/hmi1001/config.mk20
-rw-r--r--board/manroland/mucmc52/config.mk20
-rw-r--r--board/manroland/uc100/config.mk29
-rw-r--r--board/manroland/uc101/config.mk20
4 files changed, 3 insertions, 86 deletions
diff --git a/board/manroland/hmi1001/config.mk b/board/manroland/hmi1001/config.mk
index b5a7125cfd..06d57faec6 100644
--- a/board/manroland/hmi1001/config.mk
+++ b/board/manroland/hmi1001/config.mk
@@ -21,23 +21,5 @@
# MA 02111-1307 USA
#
-#
-# INKA 4X0 board:
-#
-# Valid values for CONFIG_SYS_TEXT_BASE are:
-#
-# 0xFFE00000 boot high
-#
-# 0x00100000 boot from RAM (for testing only)
-#
-
-ifndef CONFIG_SYS_TEXT_BASE
-## Standard: 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
LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
diff --git a/board/manroland/mucmc52/config.mk b/board/manroland/mucmc52/config.mk
index cb2218fcee..b2960a38e8 100644
--- a/board/manroland/mucmc52/config.mk
+++ b/board/manroland/mucmc52/config.mk
@@ -24,23 +24,5 @@
# MA 02111-1307 USA
#
-#
-# MUCMC52 board:
-#
-# Valid values for CONFIG_SYS_TEXT_BASE are:
-#
-# 0xFFE00000 boot high
-#
-# 0x00100000 boot from RAM (for testing only)
-#
-
-ifndef CONFIG_SYS_TEXT_BASE
-## Standard: 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
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 4308eedc5e..0000000000
--- 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
-#
-
-#CONFIG_SYS_TEXT_BASE = 0x40000000
-CONFIG_SYS_TEXT_BASE = 0x40700000
diff --git a/board/manroland/uc101/config.mk b/board/manroland/uc101/config.mk
index b5a7125cfd..06d57faec6 100644
--- a/board/manroland/uc101/config.mk
+++ b/board/manroland/uc101/config.mk
@@ -21,23 +21,5 @@
# MA 02111-1307 USA
#
-#
-# INKA 4X0 board:
-#
-# Valid values for CONFIG_SYS_TEXT_BASE are:
-#
-# 0xFFE00000 boot high
-#
-# 0x00100000 boot from RAM (for testing only)
-#
-
-ifndef CONFIG_SYS_TEXT_BASE
-## Standard: 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
LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
OpenPOWER on IntegriCloud