projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
bf537-minotaur.h
diff --git
a/include/configs/bf537-minotaur.h
b/include/configs/bf537-minotaur.h
index
463b7d0
..
feb9d73
100644
(file)
--- a/
include/configs/bf537-minotaur.h
+++ b/
include/configs/bf537-minotaur.h
@@
-75,7
+75,6
@@
#ifndef __ADSPBF534__
#define CONFIG_BFIN_MAC
#define CONFIG_NETCONSOLE 1
#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
#endif
#ifdef CONFIG_BFIN_MAC
#define CONFIG_IPADDR 192.168.0.15
@@
-86,7
+85,7
@@
#endif
#define CONFIG_SYS_AUTOLOAD "no"
#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 */
/* Uncomment next line to use fixed MAC address */
/* #define CONFIG_ETHADDR 02:80:ad:20:31:42 */
@@
-115,7
+114,7
@@
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_SECT_SIZE 0x10000
#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
/*
/*
@@
-156,6
+155,7
@@
# define CONFIG_CMD_PING
#else
# undef CONFIG_CMD_NET
# define CONFIG_CMD_PING
#else
# undef CONFIG_CMD_NET
+# undef CONFIG_CMD_NFS
#endif
#define CONFIG_CMD_BOOTLDR
#endif
#define CONFIG_CMD_BOOTLDR
@@
-173,7
+173,7
@@
#define BOOT_ENV_SETTINGS \
"update=tftpboot $(loadaddr) u-boot.ldr;" \
#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;" \
"sf erase 0 0x30000;" \
"sf write $(loadaddr) 0 $(filesize)" \
"flashboot=sf read 0x1000000 0x30000 0x320000;" \