X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=include%2Fconfigs%2Fbf537-srv1.h;h=15d912e89ad26b7a235dff5ad143a515990f6b29;hb=f029fa8f4eaf0c29d4e96ffe46cb91a4892b9fe0;hp=e8024d7a2c03be391ef9097b4f68a1571225723f;hpb=17e967b3dfcc0616a135700a2c39287943ffb958;p=karo-tx-uboot.git

diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index e8024d7a2c..15d912e89a 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -75,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
@@ -86,10 +85,7 @@
 #endif
 
 #define CONFIG_SYS_AUTOLOAD	"no"
-#define CONFIG_ROOTPATH		/romfs
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR	02:80:ad:20:31:42 */
-
+#define CONFIG_ROOTPATH		"/romfs"
 
 /*
  * Flash Settings
@@ -104,7 +100,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 
@@ -121,8 +116,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
 
@@ -133,10 +128,10 @@
 #define CONFIG_SYS_LONGHELP		1
 #define CONFIG_CMDLINE_EDITING	1
 #define CONFIG_ENV_OVERWRITE	1
-#define CONFIG_MISC_INIT_R
 
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_UART_CONSOLE	0
+#define CONFIG_BFIN_SERIAL
 
 #define CONFIG_PANIC_HANG	1
 #define CONFIG_RTC_BFIN		1
@@ -149,32 +144,24 @@
 # define CONFIG_BOOTDELAY	5
 #endif
 
-#include <config_cmd_default.h>
-
 #ifdef CONFIG_BFIN_MAC
 # define CONFIG_CMD_DHCP
 # define CONFIG_CMD_PING
-#else
-# undef CONFIG_CMD_NET
-# undef CONFIG_CMD_NFS
 #endif
 
 #define CONFIG_CMD_BOOTLDR
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
-#undef CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_SF
 
 #define CONFIG_BOOTCOMMAND	"run flashboot"
 #define CONFIG_BOOTARGS	"root=/dev/mtdblock0 rw"
-#define CONFIG_SYS_PROMPT	"srv1> "
 
 #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;" \