summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Fuchs <matthias.fuchs@esd-electronics.com>2008-09-05 15:34:02 +0200
committerStefan Roese <sr@denx.de>2008-09-08 10:28:29 +0200
commit767f9159c5c94cd0cb3135b5b82814ad12816ddf (patch)
tree674c7cebb8c0e62065f322730a8c2fa9fbf762b7
parentf071f01fd09e9bf1cf09de37a7416aacce71bae1 (diff)
ppc4xx: Update CPCI405 variants handling
This patch replaces the BOARD_REVISION variable in include/config.mk by a using a temporary include file in the platform directory. The former way does not work anymore and the latter is also used by some other boards. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--Makefile8
-rw-r--r--board/esd/cpci405/config.mk16
2 files changed, 7 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 3869e79281..ae3db0a644 100644
--- a/Makefile
+++ b/Makefile
@@ -1242,12 +1242,14 @@ CMS700_config: unconfig
CPCI2DP_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci2dp esd
-CPCI405_config \
-CPCI4052_config \
+CPCI405_config: unconfig
+ @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
+
+CPCI4052_config \
CPCI405DT_config \
CPCI405AB_config: unconfig
+ @echo "TEXT_BASE = 0xFFFC0000" > $(obj)board/esd/cpci405/config.tmp
@$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
- @echo "BOARD_REVISION = $(@:_config=)" >> $(obj)include/config.mk
CPCIISER4_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc ppc4xx cpciiser4 esd
diff --git a/board/esd/cpci405/config.mk b/board/esd/cpci405/config.mk
index 0be45c70d7..6cfb8912dd 100644
--- a/board/esd/cpci405/config.mk
+++ b/board/esd/cpci405/config.mk
@@ -21,20 +21,8 @@
# MA 02111-1307 USA
#
-#
-# esd CPCI405 boards
-#
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
-ifeq ($(BOARD_REVISION),CPCI4052)
-TEXT_BASE = 0xFFFC0000
-else
-ifeq ($(BOARD_REVISION),CPCI405DT)
-TEXT_BASE = 0xFFFC0000
-else
-ifeq ($(BOARD_REVISION),CPCI405AB)
-TEXT_BASE = 0xFFFC0000
-else
+ifndef TEXT_BASE
TEXT_BASE = 0xFFFD0000
endif
-endif
-endif