Merge with /home/wd/git/u-boot/master
diff --git a/CHANGELOG b/CHANGELOG
index ef3b807..ad5f7a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Fix lowboot support on MCC200 board
+
* Merged MPC8349ADS and MPC8349EMDS ports into MPC8349EMDS port:
- Removed MPC8349ADS port
- Added PCI support to MPC8349ADS
diff --git a/Makefile b/Makefile
index 74e9474..6e24341 100644
--- a/Makefile
+++ b/Makefile
@@ -326,7 +326,7 @@
mcc200_lowboot_config: unconfig
@ >include/config.h
@[ -z "$(findstring lowboot_,$@)" ] || \
- { echo "TEXT_BASE = 0xFE000000" >board/mcc200/config.tmp ; \
+ { echo "TEXT_BASE = 0xFC000000" >board/mcc200/config.tmp ; \
echo "... with lowboot configuration" ; \
}
@./mkconfig mcc200 ppc mpc5xxx mcc200
diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index 2b1c0d0..d8d63a1 100644
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -172,6 +172,10 @@
#define CONFIG_ENV_OVERWRITE 1 /* allow modification of vendor params */
+#if TEXT_BASE == CFG_FLASH_BASE
+#define CFG_LOWBOOT 1
+#endif
+
/*
* Memory map
*/