summaryrefslogtreecommitdiffstats
path: root/lib_ppc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2006-12-24 01:30:04 +0100
committerWolfgang Denk <wd@denx.de>2006-12-24 01:30:04 +0100
commitbc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea (patch)
treebcb2fa6abc6e2b2ed36a06cd77bb7f869abbe92f /lib_ppc
parent1b3c360c235dc684ec06c2d5f183f0a282ce45e2 (diff)
parentfa23044564091f05d9695beb7b5b9a931e7f41a4 (diff)
downloadblackbird-obmc-uboot-bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea.tar.gz
blackbird-obmc-uboot-bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea.zip
Merge with /home/hs/TQ/u-boot-dev
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
OpenPOWER on IntegriCloud