MCC200: set default configuration to low_boot DDR,
authorWolfgang Denk <wd@pollux.denx.de>
Sun, 23 Jul 2006 20:40:51 +0000 (22:40 +0200)
committerWolfgang Denk <wd@pollux.denx.de>
Sun, 23 Jul 2006 20:40:51 +0000 (22:40 +0200)
and support for configurable options high_boot and/or SDRAM.

CHANGELOG
Makefile
board/mcc200/config.mk
board/mcc200/mcc200.c

index c4568a862b8c8df0dde6767ce4536705ff1d7c0a..a5ff095735daf7356837ff0e179de10e65193e21 100644 (file)
--- 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
 
index 5879079ba1b789981df1851598a37a3babbcb8df..128ae59a066b7526c4e7823cfc09598c3c2c1fbd 100644 (file)
--- 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
index fa55673adfd0afecada7676c4315e09967a69417..a8225598cc1d6b6f1b14b21bdcfd99604fe65160 100644 (file)
 #
 #      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
index 6e2d564c5bc228af47dffa9d1b8f3358855586d2..167dc0f84645be6d6664f45dff1471855f227ea3 100644 (file)
 /* #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;