Merge branch 'master' into next

[u-boot] / include / configs / bf533-stamp.h

diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index c03561cef14a8edc84ed6f932c3832ec35799974..0006b029e24daba0e5b1b176b7bb381617c9e7cc 100644 (file)
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -36,7 +36,7 @@
 #define CONFIG_CCLK_DIV                        1
 /* SCLK_DIV controls the system clock divider                          */
 /* Values can range from 1-15                                          */
-#define CONFIG_SCLK_DIV                        5
+#define CONFIG_SCLK_DIV                        6 /* note: 1.2 boards can go faster */
 
 
 /*
@@ -60,12 +60,14 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_DRIVER_SMC91111 1
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC91111        1
 #define CONFIG_SMC91111_BASE   0x20300300
 #define SMC91111_EEPROM_INIT() \
        do { \
-               *pFIO_DIR |= PF1; \
-               *pFIO_FLAG_S = PF1; \
+               bfin_write_FIO_DIR(bfin_read_FIO_DIR() | PF1 | PF0); \
+               bfin_write_FIO_FLAG_C(PF1); \
+               bfin_write_FIO_FLAG_S(PF0); \
                SSYNC(); \
        } while (0)
 #define CONFIG_HOSTNAME                bf533-stamp