diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-08 15:10:33 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-08 15:10:33 +0100 |
| commit | 9b223555aa390e9a33ee8d4bbd2865fd1fbae9f7 (patch) | |
| tree | c9ef5f250ec76cda491b1dd6704d317448df3958 /board | |
| parent | ecde8243a8351725ff598f42c88ded154f8a0f1e (diff) | |
| parent | 0fc52948bda0734431cb528ee4fd82f1dec8c7b5 (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'board')
| -rw-r--r-- | board/atmel/at91sam9261ek/at91sam9261ek.c | 9 | ||||
| -rw-r--r-- | board/mucmc52/mucmc52.c | 2 | ||||
| -rw-r--r-- | board/uc101/uc101.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c index 2f6b599a6..7ead2b897 100644 --- a/board/atmel/at91sam9261ek/at91sam9261ek.c +++ b/board/atmel/at91sam9261ek/at91sam9261ek.c @@ -265,11 +265,12 @@ int board_init(void) } #ifdef CONFIG_DRIVER_DM9000 - int board_eth_init(bd_t *bis) - { +int board_eth_init(bd_t *bis) +{ return dm9000_initialize(bis); - } - #endif +} +#endif + int dram_init(void) { gd->bd->bi_dram[0].start = PHYS_SDRAM; diff --git a/board/mucmc52/mucmc52.c b/board/mucmc52/mucmc52.c index bac49beff..b4ed7357e 100644 --- a/board/mucmc52/mucmc52.c +++ b/board/mucmc52/mucmc52.c @@ -31,6 +31,7 @@ */ #include <common.h> +#include <fdt_support.h> #include <mpc5xxx.h> #include <pci.h> #include <malloc.h> @@ -403,5 +404,6 @@ void pci_init_board (void) void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); + fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); } #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */ diff --git a/board/uc101/uc101.c b/board/uc101/uc101.c index 4030b9d0d..1485c0249 100644 --- a/board/uc101/uc101.c +++ b/board/uc101/uc101.c @@ -31,6 +31,7 @@ */ #include <common.h> +#include <fdt_support.h> #include <mpc5xxx.h> #include <pci.h> #include <malloc.h> @@ -376,5 +377,6 @@ void hw_watchdog_reset(void) void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); + fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); } #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */ |