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-coldfire
[platform/kernel/u-boot.git]
/
include
/
configs
/
slimbootloader.h
diff --git
a/include/configs/slimbootloader.h
b/include/configs/slimbootloader.h
index
ff0ed18
..
20b99a1
100644
(file)
--- a/
include/configs/slimbootloader.h
+++ b/
include/configs/slimbootloader.h
@@
-8,17
+8,17
@@
#include <configs/x86-common.h>
#include <configs/x86-common.h>
-#define C
ONFIG_STD_DEVICES_SETTINGS
\
+#define C
FG_STD_DEVICES_SETTINGS
\
"stdin=serial,i8042-kbd,usbkbd\0" \
"stdout=serial\0" \
"stderr=serial\0"
/*
"stdin=serial,i8042-kbd,usbkbd\0" \
"stdout=serial\0" \
"stderr=serial\0"
/*
- * Override C
ONFI
G_EXTRA_ENV_SETTINGS in x86-common.h
+ * Override C
F
G_EXTRA_ENV_SETTINGS in x86-common.h
*/
*/
-#undef C
ONFI
G_EXTRA_ENV_SETTINGS
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
- C
ONFIG_STD_DEVICES_SETTINGS
\
+#undef C
F
G_EXTRA_ENV_SETTINGS
+#define C
FG_EXTRA_ENV_SETTINGS
\
+ C
FG_STD_DEVICES_SETTINGS
\
"netdev=eth0\0" \
"consoledev=ttyS0\0" \
"ramdiskaddr=0x4000000\0" \
"netdev=eth0\0" \
"consoledev=ttyS0\0" \
"ramdiskaddr=0x4000000\0" \