diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2008-03-30 15:46:13 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-03-30 15:50:19 -0400 |
| commit | 9171fc81722c20fdb5a829a58b17c9eaadd5fb44 (patch) | |
| tree | d5b8741232955f2c01b0c36c46c867d15e8245a7 /board/bf537-stamp/bf537-stamp.c | |
| parent | 9ce7e53abd039decea1af67aec81bbd5df7a2593 (diff) | |
| download | blackbird-obmc-uboot-9171fc81722c20fdb5a829a58b17c9eaadd5fb44.tar.gz blackbird-obmc-uboot-9171fc81722c20fdb5a829a58b17c9eaadd5fb44.zip | |
Blackfin: unify cpu and boot modes
All of the duplicated code for Blackfin processors and boot modes have been
unified. After all, the core is the same for all processors, just the
peripheral set differs (which gets handled in the drivers).
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
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 6ca8e21f3a..e714177d7c 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) |
