diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-11-13 00:19:55 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-11-13 00:19:55 +0100 |
| commit | 227b72515546fca535dbd3274f6d875d97f494fe (patch) | |
| tree | 3713c814a7453024eceb097c67532072950e2f2e /board/ti/evm | |
| parent | 34998cac2e6231e04d9c31357dc68047635a44ea (diff) | |
| parent | 0fc43a417c4ba5ab63dad6736a18f3bf7008f35f (diff) | |
| download | u-boot-imx-227b72515546fca535dbd3274f6d875d97f494fe.zip u-boot-imx-227b72515546fca535dbd3274f6d875d97f494fe.tar.gz u-boot-imx-227b72515546fca535dbd3274f6d875d97f494fe.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'board/ti/evm')
| -rw-r--r-- | board/ti/evm/config.mk | 2 | ||||
| -rw-r--r-- | board/ti/evm/evm.c | 24 | ||||
| -rw-r--r-- | board/ti/evm/evm.h | 2 |
3 files changed, 24 insertions, 4 deletions
diff --git a/board/ti/evm/config.mk b/board/ti/evm/config.mk index b92d3b0..d173eef 100644 --- a/board/ti/evm/config.mk +++ b/board/ti/evm/config.mk @@ -30,4 +30,4 @@ # (mem base + reserved) # For use with external or internal boots. -CONFIG_SYS_TEXT_BASE = 0x80e80000 +CONFIG_SYS_TEXT_BASE = 0x80008000 diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index 9948b9c..09d14f7 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -46,6 +46,11 @@ u8 get_omap3_evm_rev(void) static void omap3_evm_get_revision(void) { +#if defined(CONFIG_CMD_NET) + /* + * Board revision can be ascertained only by identifying + * the Ethernet chipset. + */ unsigned int smsc_id; /* Ethernet PHY ID is stored at ID_REV register */ @@ -62,8 +67,22 @@ static void omap3_evm_get_revision(void) default: omap3_evm_version = OMAP3EVM_BOARD_GEN_2; } +#else +#if defined(CONFIG_STATIC_BOARD_REV) + /* + * Look for static defintion of the board revision + */ + omap3_evm_version = CONFIG_STATIC_BOARD_REV; +#else + /* + * Fallback to the default above. + */ + omap3_evm_version = OMAP3EVM_BOARD_GEN_2; +#endif +#endif /* CONFIG_CMD_NET */ } +#ifdef CONFIG_USB_OMAP3 /* * MUSB port on OMAP3EVM Rev >= E requires extvbus programming. */ @@ -76,6 +95,7 @@ u8 omap3_evm_need_extvbus(void) return retval; } +#endif /* * Routine: board_init @@ -108,6 +128,7 @@ int misc_init_r(void) #if defined(CONFIG_CMD_NET) setup_net_chip(); #endif + omap3_evm_get_revision(); dieid_num_r(); @@ -161,9 +182,6 @@ static void setup_net_chip(void) writel(GPIO0, &gpio3_base->cleardataout); udelay(1); writel(GPIO0, &gpio3_base->setdataout); - - /* determine omap3evm revision */ - omap3_evm_get_revision(); } int board_eth_init(bd_t *bis) diff --git a/board/ti/evm/evm.h b/board/ti/evm/evm.h index e2581f6..a76deb8 100644 --- a/board/ti/evm/evm.h +++ b/board/ti/evm/evm.h @@ -47,7 +47,9 @@ enum { u8 get_omap3_evm_rev(void); +#if defined(CONFIG_CMD_NET) static void setup_net_chip(void); +#endif /* * IEN - Input Enable |