aboutsummaryrefslogtreecommitdiffstats
path: root/lib_ppc
diff options
context:
space:
mode:
authorroy zang <tie-fei.zang@freescale.com>2007-01-04 11:10:05 +0800
committerZang Tiefei <roy@bus.ap.freescale.net>2007-01-04 11:10:05 +0800
commita41969e09b9d886091a804c2ba5f1ab84b084dd3 (patch)
tree96d4b03713537e6c0a696e4770c23f9d39792666 /lib_ppc
parentd3bb5ec198edad4869ac5276a5899881b7bf5433 (diff)
parent92eb729bad876725aeea908d2addba0800620840 (diff)
downloadu-boot-midas-a41969e09b9d886091a804c2ba5f1ab84b084dd3.tar.gz
u-boot-midas-a41969e09b9d886091a804c2ba5f1ab84b084dd3.tar.bz2
u-boot-midas-a41969e09b9d886091a804c2ba5f1ab84b084dd3.zip
Merge branch 'master' into hpc2
Diffstat (limited to 'lib_ppc')
-rw-r--r--lib_ppc/board.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index a11d3c0fd2..f424121962 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -72,6 +72,10 @@
#include <keyboard.h>
#endif
+#ifdef CFG_UPDATE_FLASH_SIZE
+extern int update_flash_size (int flash_size);
+#endif
+
#if (CONFIG_COMMANDS & CFG_CMD_DOC)
void doc_init (void);
#endif
@@ -730,6 +734,13 @@ void board_init_r (gd_t *id, ulong dest_addr)
bd->bi_flashstart = CFG_FLASH_BASE; /* update start of FLASH memory */
bd->bi_flashsize = flash_size; /* size of FLASH memory (final value) */
+
+#if defined(CFG_UPDATE_FLASH_SIZE)
+ /* Make a update of the Memctrl. */
+ update_flash_size (flash_size);
+#endif
+
+
# if defined(CONFIG_PCU_E) || defined(CONFIG_OXC) || defined(CONFIG_RMU)
/* flash mapped at end of memory map */
bd->bi_flashoffset = TEXT_BASE + flash_size;
@@ -876,6 +887,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif
#if defined(CONFIG_TQM8xxL) || defined(CONFIG_TQM8260) || \
+ defined(CONFIG_TQM8272) || \
defined(CONFIG_CCM) || defined(CONFIG_KUP4K) || defined(CONFIG_KUP4X)
load_sernum_ethaddr ();
#endif