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 remote-tracking branch 'u-boot/master' into u-boot-arm-merged
[platform/kernel/u-boot.git]
/
include
/
configs
/
seaboard.h
diff --git
a/include/configs/seaboard.h
b/include/configs/seaboard.h
index
c2d1c66
..
de0c777
100644
(file)
--- a/
include/configs/seaboard.h
+++ b/
include/configs/seaboard.h
@@
-103,10
+103,8
@@
#define CONFIG_TEGRA_KEYBOARD
#define CONFIG_KEYBOARD
#define CONFIG_TEGRA_KEYBOARD
#define CONFIG_KEYBOARD
-#undef TEGRA_DEVICE_SETTINGS
-#define TEGRA_DEVICE_SETTINGS "stdin=serial,tegra-kbc\0" \
- "stdout=serial,lcd\0" \
- "stderr=serial,lcd\0"
+/* USB keyboard */
+#define CONFIG_USB_KEYBOARD
/* LCD support */
#define CONFIG_LCD
/* LCD support */
#define CONFIG_LCD