diff options
| author | Justin Waters <justin@justin-linux.(none)> | 2008-01-21 15:11:54 -0500 |
|---|---|---|
| committer | Justin Waters <justin@justin-linux.(none)> | 2008-01-21 16:34:01 -0500 |
| commit | 584432a4e4bfea64e689e241d5be36f23fa2b781 (patch) | |
| tree | 3ebb97422c830bc4f348902aea41329ee07fe02e /lib_arm/board.c | |
| parent | 9a337ddc154a10a26f117fd147b009abcdeba75a (diff) | |
| parent | 2a43bc1f85618a6fb291dc26b0461857898515f7 (diff) | |
Merge branch 'u-boot-1.1.5-at91' into u-boot-1.3.0-at91
Conflicts:
MAKEALL
board/at91rm9200dk/at45.c
common/cmd_flash.c
drivers/Makefile
drivers/at45.c
drivers/dataflash.c
drivers/dm9000x.c
drivers/nand/nand.c
drivers/nand/nand_base.c
drivers/nand/nand_ids.c
drivers/nand/nand_util.c
examples/Makefile
include/asm-arm/mach-types.h
Diffstat (limited to 'lib_arm/board.c')
| -rw-r--r-- | lib_arm/board.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index 7e97f13476..07def66b1e 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -307,6 +307,9 @@ void start_armboot (void) # ifndef PAGE_SIZE # define PAGE_SIZE 4096 # endif + +#if !defined (CONFIG_AT91SAM9261EK) && !defined (CONFIG_AT91SAM9263EK) && \ + !defined (CONFIG_AT91SAM9RLEK) /* * reserve memory for LCD display (always full pages) */ @@ -314,6 +317,7 @@ void start_armboot (void) addr = (_bss_end + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1); size = lcd_setmem (addr); gd->fb_base = addr; +#endif #endif /* CONFIG_LCD */ /* armboot_start is defined in the board-specific linker script */ |