X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fbf537-minotaur.h;h=c6ae4f15060c6ee3566d2288cb9cc886147272c9;hb=10d1a160f5e28b05f891c050ca2f23855b226f5f;hp=351aebb33996c2a88add735d5592b42b89ffd583;hpb=d7fdc1410b5fa5ef623b35a283733b6bcee3753b;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 351aebb..c6ae4f1 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -18,7 +18,7 @@
 #ifndef __CONFIG_BF537_MINOTAUR_H__
 #define __CONFIG_BF537_MINOTAUR_H__
 
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.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
@@ -87,9 +86,8 @@
 
 #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
+/* Uncomment next line to use fixed MAC address */
+/* #define CONFIG_ETHADDR	02:80:ad:20:31:42 */
 
 
 /*
@@ -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,7 +114,7 @@
 #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
 
 
 /*
@@ -157,6 +155,7 @@
 # define CONFIG_CMD_PING
 #else
 # undef CONFIG_CMD_NET
+# undef CONFIG_CMD_NFS
 #endif
 
 #define CONFIG_CMD_BOOTLDR
@@ -198,7 +197,4 @@
 	"ramargs=setenv bootargs " CONFIG_BOOTARGS "\0" \
 	BOOT_ENV_SETTINGS
 
-
-#include <asm/blackfin-config-post.h>
-
 #endif