aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-03-26 21:39:59 -0400
committerTom Rini <trini@konsulko.com>2020-03-26 21:39:59 -0400
commitfa041198a803f5ee44362a32431ce7373f5f4ae5 (patch)
tree3194e75991e35b5fa8cbbc6f87946903065c01c5 /include
parentaf827140e5965e5bb2bcad1c53ca8419b428ff6d (diff)
parente5a405583f5ce9576c5084a178622e2fdd49cb23 (diff)
downloadu-boot-fa041198a803f5ee44362a32431ce7373f5f4ae5.zip
u-boot-fa041198a803f5ee44362a32431ce7373f5f4ae5.tar.gz
u-boot-fa041198a803f5ee44362a32431ce7373f5f4ae5.tar.bz2
Merge tag 'u-boot-rockchip-20200327' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Fixed for rv1108 and elgin-rv1108 board - Fix the keyboard from USB instead of CrOS EC
Diffstat (limited to 'include')
-rw-r--r--include/configs/miqi_rk3288.h2
-rw-r--r--include/configs/roc-pc-rk3399.h2
-rw-r--r--include/configs/rock2.h2
-rw-r--r--include/configs/tinker_rk3288.h2
-rw-r--r--include/configs/vyasa-rk3288.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/miqi_rk3288.h b/include/configs/miqi_rk3288.h
index c9691a0..e19fa90 100644
--- a/include/configs/miqi_rk3288.h
+++ b/include/configs/miqi_rk3288.h
@@ -7,7 +7,7 @@
#define __CONFIG_H
#define ROCKCHIP_DEVICE_SETTINGS \
- "stdin=serial,cros-ec-keyb\0" \
+ "stdin=serial,usbkbd\0" \
"stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0"
diff --git a/include/configs/roc-pc-rk3399.h b/include/configs/roc-pc-rk3399.h
index 3fd1062..d4cbc35 100644
--- a/include/configs/roc-pc-rk3399.h
+++ b/include/configs/roc-pc-rk3399.h
@@ -7,7 +7,7 @@
#define __ROC_PC_RK3399_H
#define ROCKCHIP_DEVICE_SETTINGS \
- "stdin=serial,cros-ec-keyb\0" \
+ "stdin=serial,usbkbd\0" \
"stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0"
diff --git a/include/configs/rock2.h b/include/configs/rock2.h
index 917caf4..9e4a669 100644
--- a/include/configs/rock2.h
+++ b/include/configs/rock2.h
@@ -7,7 +7,7 @@
#define __CONFIG_H
#define ROCKCHIP_DEVICE_SETTINGS \
- "stdin=serial,cros-ec-keyb\0" \
+ "stdin=serial,usbkbd\0" \
"stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0"
diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h
index f1095cc..d239e3b 100644
--- a/include/configs/tinker_rk3288.h
+++ b/include/configs/tinker_rk3288.h
@@ -7,7 +7,7 @@
#define __CONFIG_H
#define ROCKCHIP_DEVICE_SETTINGS \
- "stdin=serial,cros-ec-keyb\0" \
+ "stdin=serial,usbkbd\0" \
"stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0"
diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h
index e31dc77..c3521ca 100644
--- a/include/configs/vyasa-rk3288.h
+++ b/include/configs/vyasa-rk3288.h
@@ -9,7 +9,7 @@
#define __CONFIG_H
#define ROCKCHIP_DEVICE_SETTINGS \
- "stdin=serial,cros-ec-keyb\0" \
+ "stdin=serial,usbkbd\0" \
"stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0"