X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fconfigs%2Fbf537-srv1.h;h=d01d88f3b47cc673af67f5dd079fe8cad2ff76e1;hb=1606b34aa50804227806971dbb6b82ea0bf81f55;hp=c1bff3ee2e95aeb97e1ab45825a1d7f16e1e6db8;hpb=f348ab85f741dc98b2d202c04b5f430eace94925;p=oweals%2Fu-boot.git

diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index c1bff3ee2e..d01d88f3b4 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,11 +85,10 @@
 #endif
 
 #define CONFIG_SYS_AUTOLOAD	"no"
-#define CONFIG_ROOTPATH		/romfs
-/* Use a fixed MAC address for booting up. Firstboot linux
- * must fetch a valid MAC from the production server. */
-#define CONFIG_ETHADDR	02:80:ad:20:31:42
-
+#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
@@ -104,7 +102,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
@@ -116,14 +114,14 @@
 #define CONFIG_ENV_OFFSET	0x10000
 #define CONFIG_ENV_SIZE		0x10000
 #define CONFIG_ENV_SECT_SIZE	0x10000
-#define ENV_IS_EMBEDDED_CUSTOM
+#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
 
 
 /*
  * 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
 
@@ -138,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
@@ -157,6 +156,7 @@
 # define CONFIG_CMD_PING
 #else
 # undef CONFIG_CMD_NET
+# undef CONFIG_CMD_NFS
 #endif
 
 #define CONFIG_CMD_BOOTLDR
@@ -174,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;" \