summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-07-23 22:40:51 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-07-23 22:40:51 +0200
commit4819fad905138095bf8502f80fc65124f2d4e2ac (patch)
tree75c245169d9f47c94fab69512d3293f6376aa21e
parentfd27996dacd308849e30f67da49ba068a7f68aaa (diff)
downloadu-boot-imx-4819fad905138095bf8502f80fc65124f2d4e2ac.zip
u-boot-imx-4819fad905138095bf8502f80fc65124f2d4e2ac.tar.gz
u-boot-imx-4819fad905138095bf8502f80fc65124f2d4e2ac.tar.bz2
MCC200: set default configuration to low_boot DDR,
and support for configurable options high_boot and/or SDRAM.
-rw-r--r--CHANGELOG3
-rw-r--r--Makefile22
-rw-r--r--board/mcc200/config.mk10
-rw-r--r--board/mcc200/mcc200.c7
4 files changed, 32 insertions, 10 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c4568a8..a5ff095 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* MCC200: set default configuration to low_boot DDR,
+ and support for configurable options high_boot and/or SDRAM.
+
* Add support for 256 MB SDRAM on CPU87
Patch by Josef Wagner, 25 Nov 2005
diff --git a/Makefile b/Makefile
index 5879079..128ae59 100644
--- a/Makefile
+++ b/Makefile
@@ -323,13 +323,25 @@ lite5200b_LOWBOOT_config: unconfig
@./mkconfig -a IceCube ppc mpc5xxx icecube
mcc200_config \
-mcc200_lowboot_config: unconfig
+mcc200_SDRAM \
+mcc200_highboot \
+mcc200_highboot_SDRAM: unconfig
@ >include/config.h
- @[ -z "$(findstring lowboot_,$@)" ] || \
- { echo "TEXT_BASE = 0xFC000000" >board/mcc200/config.tmp ; \
- echo "... with lowboot configuration" ; \
+ @[ -n "$(findstring highboot,$@)" ] || \
+ { echo "... with lowboot configuration" ; \
+ }
+ @[ -z "$(findstring highboot,$@)" ] || \
+ { echo "TEXT_BASE = 0xFFF00000" >board/mcc200/config.tmp ; \
+ echo "... with highboot configuration" ; \
+ }
+ @[ -n "$(findstring _SDRAM,$@)" ] || \
+ { echo "... with DDR" ; \
+ }
+ @[ -z "$(findstring _SDRAM,$@)" ] || \
+ { echo "#define CONFIG_MCC200_SDRAM" >>include/config.h ; \
+ echo "... with SDRAM" ; \
}
- @./mkconfig mcc200 ppc mpc5xxx mcc200
+ @./mkconfig -a mcc200 ppc mpc5xxx mcc200
o2dnt_config:
@./mkconfig o2dnt ppc mpc5xxx o2dnt
diff --git a/board/mcc200/config.mk b/board/mcc200/config.mk
index fa55673..a822559 100644
--- a/board/mcc200/config.mk
+++ b/board/mcc200/config.mk
@@ -26,16 +26,18 @@
#
# Valid values for TEXT_BASE are:
#
-# 0xFFF00000 boot high (standard configuration)
-# 0xFE000000 boot low
+# 0xFC000000 boot low (standard configuration)
+# 0xFFF00000 boot high
# 0x00100000 boot from RAM (for testing only)
#
sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
ifndef TEXT_BASE
-## Standard: boot high
-TEXT_BASE = 0xFFF00000
+## Standard: boot low
+TEXT_BASE = 0xFC000000
+## Boot high
+# TEXT_BASE = 0xFFF00000
## For testing: boot from RAM
# TEXT_BASE = 0x00100000
endif
diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index 6e2d564..167dc0f 100644
--- a/board/mcc200/mcc200.c
+++ b/board/mcc200/mcc200.c
@@ -32,7 +32,12 @@
/* #include "mt48lc8m32b2-6-7.h" */
/* One MT48LC16M32S2 for 64 MB */
-#include "mt48lc16m32s2-75.h"
+/* #include "mt48lc16m32s2-75.h" */
+#if defined (CONFIG_MCC200_SDRAM)
+#include "mt48lc16m16a2-75.h"
+#else
+#include "mt46v16m16-75.h"
+#endif
DECLARE_GLOBAL_DATA_PTR;