diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-23 10:22:41 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-23 10:22:41 +0100 |
| commit | 8206bfae3ab7f99965136384360ba2de0c6f4c3b (patch) | |
| tree | e11bf0fad2e418e6771e8db7dbcb6630a6053f0c /board/earthlcd | |
| parent | ee1702d75a30d076139d1841383a1fa7220a0e11 (diff) | |
| parent | 58a518c3d8a2c7de11d414e8b903495daee7dc7e (diff) | |
| download | u-boot-imx-8206bfae3ab7f99965136384360ba2de0c6f4c3b.zip u-boot-imx-8206bfae3ab7f99965136384360ba2de0c6f4c3b.tar.gz u-boot-imx-8206bfae3ab7f99965136384360ba2de0c6f4c3b.tar.bz2 | |
Merge branch 'mimc200'
Diffstat (limited to 'board/earthlcd')
| -rw-r--r-- | board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 13 | ||||
| -rw-r--r-- | board/earthlcd/favr-32-ezkit/flash.c | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/board/earthlcd/favr-32-ezkit/favr-32-ezkit.c b/board/earthlcd/favr-32-ezkit/favr-32-ezkit.c index da05589..8af680f 100644 --- a/board/earthlcd/favr-32-ezkit/favr-32-ezkit.c +++ b/board/earthlcd/favr-32-ezkit/favr-32-ezkit.c @@ -23,8 +23,8 @@ #include <asm/io.h> #include <asm/sdram.h> #include <asm/arch/clk.h> -#include <asm/arch/gpio.h> #include <asm/arch/hmatrix.h> +#include <asm/arch/portmux.h> DECLARE_GLOBAL_DATA_PTR; @@ -50,13 +50,13 @@ int board_early_init_f(void) /* Enable SDRAM in the EBI mux */ hmatrix_slave_write(EBI, SFR, HMATRIX_BIT(EBI_SDRAM_ENABLE)); - gpio_enable_ebi(); - gpio_enable_usart3(); + portmux_enable_ebi(32, 23, 0, PORTMUX_DRIVE_HIGH); + portmux_enable_usart3(PORTMUX_DRIVE_MIN); #if defined(CONFIG_MACB) - gpio_enable_macb0(); + portmux_enable_macb0(PORTMUX_MACB_MII, PORTMUX_DRIVE_HIGH); #endif #if defined(CONFIG_MMC) - gpio_enable_mmci(); + portmux_enable_mmci(0, PORTMUX_MMCI_4BIT, PORTMUX_DRIVE_LOW); #endif return 0; @@ -82,9 +82,10 @@ phys_size_t initdram(int board_type) return actual_size; } -void board_init_info(void) +int board_early_init_r(void) { gd->bd->bi_phy_id[0] = 0x01; + return 0; } #if defined(CONFIG_MACB) && defined(CONFIG_CMD_NET) diff --git a/board/earthlcd/favr-32-ezkit/flash.c b/board/earthlcd/favr-32-ezkit/flash.c index 5f73ff0..0a26146 100644 --- a/board/earthlcd/favr-32-ezkit/flash.c +++ b/board/earthlcd/favr-32-ezkit/flash.c @@ -20,7 +20,7 @@ #include <common.h> #ifdef CONFIG_FAVR32_EZKIT_EXT_FLASH -#include <asm/cacheflush.h> +#include <asm/arch/cacheflush.h> #include <asm/io.h> #include <asm/sections.h> |