diff options
| author | Gabe Black <gabeblack@google.com> | 2011-06-01 21:54:19 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:39:14 -0700 |
| commit | 309f8df51fc941523974b4b691686bba914583b5 (patch) | |
| tree | 9bd4fb8d2f8a2182bd7519d7f20d4e7e3adb061f /arch | |
| parent | 35ba532ce91865f1a272348a88a242599ed8e8bc (diff) | |
If there's no flash, don't call flash_init from the i386 board init code.
BUG=chrome-os-partner:3905
TEST=Built coreboot u-boot.
Signed-off-by: Gabe Black <gabeblack@google.com>
Change-Id: I25965a5ab0bedb4db81826fc7574fcaa02562965
Reviewed-on: http://gerrit.chromium.org/gerrit/2154
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/lib/board.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index df54222211..a8d1978375 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -120,11 +120,13 @@ static int display_dram_config (void) return (0); } +#ifndef CONFIG_SYS_NO_FLASH static void display_flash_config (ulong size) { puts ("Flash: "); print_size (size, "\n"); } +#endif /* * Breath some life into the board... @@ -303,8 +305,12 @@ void board_init_r(gd_t *id, ulong dest_addr) serial_initialize(); #endif /* configure available FLASH banks */ +#ifdef CONFIG_SYS_NO_FLASH + size = 0; +#else size = flash_init(); display_flash_config(size); +#endif show_boot_progress(0x24); show_boot_progress(0x25); |