Merge branch 'karo-tx-uboot' into kc-merge

[karo-tx-uboot.git] / include / configs / bf537-srv1.h

diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index 559428f4845fe85a2473ccb5f6c9042b1cad04b0..d01d88f3b47cc673af67f5dd079fe8cad2ff76e1 100644 (file)
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -24,6 +24,7 @@
 /*
  * Processor Settings
  */
+#define CONFIG_BFIN_CPU             bf537-0.2
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_SPI_MASTER
 
 
@@ -74,7 +75,6 @@
 #ifndef __ADSPBF534__
 #define CONFIG_BFIN_MAC
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #ifdef CONFIG_BFIN_MAC
 #define CONFIG_IPADDR          192.168.0.15
@@ -85,10 +85,10 @@
 #endif
 
 #define CONFIG_SYS_AUTOLOAD    "no"
-#define CONFIG_ROOTPATH                /romfs
+#define CONFIG_ROOTPATH                "/romfs"
 /* Uncomment next line to use fixed MAC address */
 /* #define CONFIG_ETHADDR      02:80:ad:20:31:42 */
-
+#define CONFIG_LIB_RAND
 
 /*
  * Flash Settings
@@ -120,8 +120,8 @@
 /*
  * I2C settings
  */
-#define CONFIG_BFIN_TWI_I2C    1
-#define CONFIG_HARD_I2C                1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_SYS_I2C_SPEED           50000
 #define CONFIG_SYS_I2C_SLAVE           0
 
@@ -136,6 +136,7 @@
 
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_UART_CONSOLE    0
+#define CONFIG_BFIN_SERIAL
 
 #define CONFIG_PANIC_HANG      1
 #define CONFIG_RTC_BFIN                1
@@ -155,6 +156,7 @@
 # define CONFIG_CMD_PING
 #else
 # undef CONFIG_CMD_NET
+# undef CONFIG_CMD_NFS
 #endif
 
 #define CONFIG_CMD_BOOTLDR
@@ -172,7 +174,7 @@
 
 #define BOOT_ENV_SETTINGS \
        "update=tftpboot $(loadaddr) u-boot.ldr;" \
-               "sf probe " MK_STR(BFIN_BOOT_SPI_SSEL) ";" \
+               "sf probe " __stringify(BFIN_BOOT_SPI_SSEL) ";" \
                "sf erase 0 0x30000;" \
                "sf write $(loadaddr) 0 $(filesize)" \
        "flashboot=sf read 0x1000000 0x30000 0x320000;" \