diff options
| author | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 | 
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 | 
| commit | 3e4d27b06d7484040355e22eec2cbce7335d6dab (patch) | |
| tree | 9672a2bb2e4ce0edc0ab776ddf0e2ca8e39a5f62 /arch/nds32/lib/board.c | |
| parent | bad05afe083eec0467220de21683443292c5012e (diff) | |
| parent | 59852d03867108217fe88e3bfc3e1e9cedfe63c5 (diff) | |
| download | olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.tar.xz olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.zip | |
Merge git://git.denx.de/u-boot
Diffstat (limited to 'arch/nds32/lib/board.c')
| -rw-r--r-- | arch/nds32/lib/board.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/arch/nds32/lib/board.c b/arch/nds32/lib/board.c index 89900fea4..91395cabf 100644 --- a/arch/nds32/lib/board.c +++ b/arch/nds32/lib/board.c @@ -320,8 +320,8 @@ void board_init_r(gd_t *id, ulong dest_addr)  	/*  	 * We have to relocate the command table manually  	 */ -	fixup_cmdtable(&__u_boot_cmd_start, -		(ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start)); +	fixup_cmdtable(ll_entry_start(cmd_tbl_t, cmd), +			ll_entry_count(cmd_tbl_t, cmd));  #endif /* defined(CONFIG_NEEDS_MANUAL_RELOC) */  	serial_initialize(); @@ -396,7 +396,7 @@ void board_init_r(gd_t *id, ulong dest_addr)  	/* Initialize from environment */  	load_addr = getenv_ulong("loadaddr", 16, load_addr); -#ifdef BOARD_LATE_INIT +#ifdef CONFIG_BOARD_LATE_INIT  	board_late_init();  #endif |