summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-22 02:44:13 (GMT)
committerSimon Glass <sjg@chromium.org>2016-01-22 03:42:36 (GMT)
commit27a1961d0b527b24e7f76230d94df617004b1534 (patch)
treeaa565344419fc5f81dbe78988db9628deafeaaeb /include
parent90a28470fc11c86c64b8f413d23a5c8fcff45a04 (diff)
downloadu-boot-27a1961d0b527b24e7f76230d94df617004b1534.tar.xz
rockchip: jerry: Enable the Chrome OS EC
Turn on the EC and enable the keyboard. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/configs/chromebook_jerry.h7
-rw-r--r--include/configs/firefly-rk3288.h2
-rw-r--r--include/configs/rk3288_common.h7
3 files changed, 16 insertions, 0 deletions
diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h
index 78c06af..6e32f2c 100644
--- a/include/configs/chromebook_jerry.h
+++ b/include/configs/chromebook_jerry.h
@@ -7,6 +7,11 @@
#ifndef __CONFIG_H
#define __CONFIG_H
+#define ROCKCHIP_DEVICE_SETTINGS \
+ "stdin=serial,cros-ec-keyb\0" \
+ "stdout=serial\0" \
+ "stderr=serial\0"
+
#include <configs/rk3288_common.h>
#define CONFIG_ENV_IS_NOWHERE
@@ -17,4 +22,6 @@
#undef CONFIG_SPL_GPIO_SUPPORT
+#define CONFIG_KEYBOARD
+
#endif
diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h
index 4c5c4dd..8ac6521 100644
--- a/include/configs/firefly-rk3288.h
+++ b/include/configs/firefly-rk3288.h
@@ -7,6 +7,8 @@
#ifndef __CONFIG_H
#define __CONFIG_H
+#define ROCKCHIP_DEVICE_SETTINGS
+
#include <configs/rk3288_common.h>
#define CONFIG_SPL_MMC_SUPPORT
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index f47573b..ebddfb0 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -42,6 +42,12 @@
#define CONFIG_ROCKCHIP_COMMON
#define CONFIG_SPL_ROCKCHIP_COMMON
+#define CONFIG_SILENT_CONSOLE
+#ifndef CONFIG_SPL_BUILD
+# define CONFIG_SYS_CONSOLE_IS_IN_ENV
+# define CONFIG_CONSOLE_MUX
+#endif
+
/* MMC/SD IP block */
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
@@ -110,6 +116,7 @@
"fdt_high=0x1fffffff\0" \
"initrd_high=0x1fffffff\0" \
ENV_MEM_LAYOUT_SETTINGS \
+ ROCKCHIP_DEVICE_SETTINGS \
BOOTENV
#endif