diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-07 22:47:17 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-07 22:47:17 +0100 |
| commit | 206c00f26f56af02686cb69bfe5c75e979063171 (patch) | |
| tree | 4e637df34f87762a2e70649e88f52ac973df1f00 /board | |
| parent | 39ff7d5f4cc547a2034a8bfc2a5b5f4b62fd5c20 (diff) | |
| parent | f8450829f921cf10667af98a8d08edfa3d998f04 (diff) | |
| download | u-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.zip u-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.tar.gz u-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.tar.bz2 | |
Merge branch 'master' into next
Conflicts:
lib_generic/zlib.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
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 2f6b599..7ead2b8 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 bac49be..b4ed735 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 4030b9d..1485c02 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) */ |