diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-08 00:06:47 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-08 00:06:47 +0200 |
| commit | 34e6cb8d1d9dc8194b2d8cad1cc39273ac58f8d8 (patch) | |
| tree | b771597b2864542865bfad1e56ecaf4f5641acf9 /board/bf537-stamp/bf537-stamp.c | |
| parent | 62479b181460f5bf99517b68059d5ba87908edd3 (diff) | |
| parent | d5bffeb868d6b4d462f558dac43011027b6644b7 (diff) | |
| download | u-boot-imx-34e6cb8d1d9dc8194b2d8cad1cc39273ac58f8d8.zip u-boot-imx-34e6cb8d1d9dc8194b2d8cad1cc39273ac58f8d8.tar.gz u-boot-imx-34e6cb8d1d9dc8194b2d8cad1cc39273ac58f8d8.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-blackfin
Diffstat (limited to 'board/bf537-stamp/bf537-stamp.c')
| -rw-r--r-- | board/bf537-stamp/bf537-stamp.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/board/bf537-stamp/bf537-stamp.c b/board/bf537-stamp/bf537-stamp.c index 6ca8e21..e714177 100644 --- a/board/bf537-stamp/bf537-stamp.c +++ b/board/bf537-stamp/bf537-stamp.c @@ -120,12 +120,10 @@ long int initdram(int board_type) /* miscellaneous platform dependent initialisations */ int misc_init_r(void) { -#if (BFIN_BOOT_MODE == BF537_BYPASS_BOOT) +#if defined(CONFIG_CMD_NET) char nid[32]; unsigned char *pMACaddr = (unsigned char *)0x203F0000; - u8 SrcAddr[6] = { 0x02, 0x80, 0xAD, 0x20, 0x31, 0xB8 }; -#if defined(CONFIG_CMD_NET) /* The 0xFF check here is to make sure we don't use the address * in flash if it's simply been erased (aka all 0xFF values) */ if (getenv("ethaddr") == NULL && is_valid_ether_addr(pMACaddr)) { @@ -135,7 +133,6 @@ int misc_init_r(void) setenv("ethaddr", nid); } #endif -#endif /* BFIN_BOOT_MODE == BF537_BYPASS_BOOT */ #if defined(CONFIG_BFIN_IDE) #if defined(CONFIG_BFIN_TRUE_IDE) @@ -158,13 +155,6 @@ int misc_init_r(void) #endif /* CONFIG_MISC_INIT_R */ #ifdef CONFIG_POST -#if (BFIN_BOOT_MODE != BF537_BYPASS_BOOT) -/* Using sw10-PF5 as the hotkey */ -int post_hotkeys_pressed(void) -{ - return 0; -} -#else /* Using sw10-PF5 as the hotkey */ int post_hotkeys_pressed(void) { @@ -197,7 +187,6 @@ int post_hotkeys_pressed(void) } } #endif -#endif #if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER) void post_word_store(ulong a) |