diff options
author | Wolfgang Denk <wd@denx.de> | 2009-05-28 19:27:51 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-05-28 19:27:51 (GMT) |
commit | 5520ab1f7685721314dcfb7cdcc7c15e6571473f (patch) | |
tree | dbbfc887d778f581343e2f2ef2f42cbe91c91103 | |
parent | 76b5883da2cf049cd410901c04ea450e5f5c27c3 (diff) | |
parent | ab687907980fa28940a1a992d3f1c5d17cdbbf5d (diff) | |
download | u-boot-5520ab1f7685721314dcfb7cdcc7c15e6571473f.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
-rw-r--r-- | board/bf518f-ezbrd/bf518f-ezbrd.c | 16 | ||||
-rw-r--r-- | include/configs/bf518f-ezbrd.h | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/board/bf518f-ezbrd/bf518f-ezbrd.c b/board/bf518f-ezbrd/bf518f-ezbrd.c index ec5a7ed..63be7cf 100644 --- a/board/bf518f-ezbrd/bf518f-ezbrd.c +++ b/board/bf518f-ezbrd/bf518f-ezbrd.c @@ -146,3 +146,19 @@ int misc_init_r(void) return 0; } + +int board_early_init_f(void) +{ +#if !defined(CONFIG_SYS_NO_FLASH) + /* setup BF518-EZBRD GPIO pin PG11 to AMS2. */ + bfin_write_PORTG_MUX((bfin_read_PORTG_MUX() & ~PORT_x_MUX_6_MASK) | PORT_x_MUX_6_FUNC_2); + bfin_write_PORTG_FER(bfin_read_PORTG_FER() | PG11); + +# if !defined(CONFIG_BFIN_SPI) + /* setup BF518-EZBRD GPIO pin PG15 to AMS3. */ + bfin_write_PORTG_MUX((bfin_read_PORTG_MUX() & ~PORT_x_MUX_7_MASK) | PORT_x_MUX_7_FUNC_3); + bfin_write_PORTG_FER(bfin_read_PORTG_FER() | PG15); +# endif +#endif + return 0; +} diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h index 77b94a8..06f2765 100644 --- a/include/configs/bf518f-ezbrd.h +++ b/include/configs/bf518f-ezbrd.h @@ -132,6 +132,7 @@ /* * Misc Settings */ +#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE 0 |