diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-28 23:30:47 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-28 23:30:47 +0200 | 
| commit | 2e6e1772c0e34871769be4aef79748fe3e47d953 (patch) | |
| tree | 00e4e19d7bccd2a1cd5753854ff4c2b8a26bebb0 /arch/i386/lib/board.c | |
| parent | 1e4e5ef0469050f014aee1204dae8a9ab6053e49 (diff) | |
| parent | 3df61957938586c512c17e72d83551d190400981 (diff) | |
| download | olio-uboot-2014.01-2e6e1772c0e34871769be4aef79748fe3e47d953.tar.xz olio-uboot-2014.01-2e6e1772c0e34871769be4aef79748fe3e47d953.zip | |
Merge branch 'next' of /home/wd/git/u-boot/next
Conflicts:
	include/ppc4xx.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/i386/lib/board.c')
| -rw-r--r-- | arch/i386/lib/board.c | 7 | 
1 files changed, 0 insertions, 7 deletions
| diff --git a/arch/i386/lib/board.c b/arch/i386/lib/board.c index 93f910b49..5002203ec 100644 --- a/arch/i386/lib/board.c +++ b/arch/i386/lib/board.c @@ -335,13 +335,6 @@ void board_init_r(gd_t *id, ulong dest_addr)  	enable_interrupts();  	show_boot_progress(0x28); -	/* Must happen after interrupts are initialized since -	 * an irq handler gets installed -	 */ -#ifdef CONFIG_SERIAL_SOFTWARE_FIFO -	serial_buffered_init(); -#endif -  #ifdef CONFIG_STATUS_LED  	status_led_set (STATUS_LED_BOOT, STATUS_LED_BLINKING);  #endif |