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 'master' of git://git.denx.de/u-boot
[platform/kernel/u-boot.git]
/
include
/
configs
/
x86-common.h
diff --git
a/include/configs/x86-common.h
b/include/configs/x86-common.h
index
3f153f2
..
faadab8
100644
(file)
--- a/
include/configs/x86-common.h
+++ b/
include/configs/x86-common.h
@@
-115,7
+115,6
@@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_ZBOOT
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_ZBOOT
-#define CONFIG_CMD_ELF
#define CONFIG_BOOTARGS \
"root=/dev/sdb3 init=/sbin/init rootwait ro"
#define CONFIG_BOOTARGS \
"root=/dev/sdb3 init=/sbin/init rootwait ro"
@@
-217,7
+216,7
@@
/* Default environment */
#define CONFIG_ROOTPATH "/opt/nfsroot"
/* Default environment */
#define CONFIG_ROOTPATH "/opt/nfsroot"
-#define CONFIG_HOSTNAME
"x86"
+#define CONFIG_HOSTNAME
x86
#define CONFIG_BOOTFILE "bzImage"
#define CONFIG_LOADADDR 0x1000000
#define CONFIG_BOOTFILE "bzImage"
#define CONFIG_LOADADDR 0x1000000