summaryrefslogtreecommitdiff
path: root/lib_arm
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-02-19 00:46:32 +0100
committerWolfgang Denk <wd@denx.de>2009-02-19 00:46:32 +0100
commit9eb468da3fd8753de55ab271d6ff5ed7f36d7ea2 (patch)
treeaae7e65957170327d2ecb38779d63ca0e77be940 /lib_arm
parent1bba30efe1717bea13026e15c7c7d906419fac69 (diff)
parentb4e85d0f37b5b924fbf834867ad6d0b31b86f667 (diff)
downloadu-boot-imx-9eb468da3fd8753de55ab271d6ff5ed7f36d7ea2.zip
u-boot-imx-9eb468da3fd8753de55ab271d6ff5ed7f36d7ea2.tar.gz
u-boot-imx-9eb468da3fd8753de55ab271d6ff5ed7f36d7ea2.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'lib_arm')
-rw-r--r--lib_arm/board.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c
index fe68df0..f125d38 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -287,9 +287,6 @@ void start_armboot (void)
{
init_fnc_t **init_fnc_ptr;
char *s;
-#if !defined(CONFIG_SYS_NO_FLASH) || defined (CONFIG_VFD) || defined(CONFIG_LCD)
- ulong size;
-#endif
#if defined(CONFIG_VFD) || defined(CONFIG_LCD)
unsigned long addr;
#endif
@@ -315,8 +312,7 @@ void start_armboot (void)
#ifndef CONFIG_SYS_NO_FLASH
/* configure available FLASH banks */
- size = flash_init ();
- display_flash_config (size);
+ display_flash_config (flash_init ());
#endif /* CONFIG_SYS_NO_FLASH */
#ifdef CONFIG_VFD
@@ -328,7 +324,7 @@ void start_armboot (void)
*/
/* bss_end is defined in the board-specific linker script */
addr = (_bss_end + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
- size = vfd_setmem (addr);
+ vfd_setmem (addr);
gd->fb_base = addr;
#endif /* CONFIG_VFD */
@@ -343,7 +339,7 @@ void start_armboot (void)
*/
/* bss_end is defined in the board-specific linker script */
addr = (_bss_end + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
- size = lcd_setmem (addr);
+ lcd_setmem (addr);
gd->fb_base = addr;
}
#endif /* CONFIG_LCD */