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_sh/gen4/mmcfix' of https://source.denx.de/u-boot/custodians...
[platform/kernel/u-boot.git]
/
include
/
configs
/
theadorable-x86-common.h
diff --git
a/include/configs/theadorable-x86-common.h
b/include/configs/theadorable-x86-common.h
index
af0a095
..
b23b878
100644
(file)
--- a/
include/configs/theadorable-x86-common.h
+++ b/
include/configs/theadorable-x86-common.h
@@
-11,18
+11,17
@@
#ifndef __THEADORABLE_X86_COMMON_H
#define __THEADORABLE_X86_COMMON_H
#ifndef __THEADORABLE_X86_COMMON_H
#define __THEADORABLE_X86_COMMON_H
-#define C
ONFI
G_STD_DEVICES_SETTINGS "stdin=serial\0" \
+#define C
F
G_STD_DEVICES_SETTINGS "stdin=serial\0" \
"stdout=serial\0" \
"stderr=serial\0"
#define VIDEO_IO_OFFSET 0
"stdout=serial\0" \
"stderr=serial\0"
#define VIDEO_IO_OFFSET 0
-#define CONFIG_X86EMU_RAW_IO
/* Environment settings */
/* Environment settings */
-#undef C
ONFI
G_EXTRA_ENV_SETTINGS
+#undef C
F
G_EXTRA_ENV_SETTINGS
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#define C
FG_EXTRA_ENV_SETTINGS
\
"tftpdir=" DEF_ENV_TFTPDIR "\0" \
"eth_init=" DEF_ENV_ETH_INIT "\0" \
"ubuntu_part=" __stringify(DEF_ENV_UBUNTU_PART) "\0" \
"tftpdir=" DEF_ENV_TFTPDIR "\0" \
"eth_init=" DEF_ENV_ETH_INIT "\0" \
"ubuntu_part=" __stringify(DEF_ENV_UBUNTU_PART) "\0" \