Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 23cb61761b137f088ef8625a1c4e7d9af2cbd296

Authored by Peter Robinson
Committed by Kever Yang
1 parent 9cec336708
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

rockchip: Change keyboard input from CrOS EC keyboard to a USB keyboard 

These boards aren't ChromeOS devices so won't have a cros-ec-keyb
input as it's the keyboard available via the ChromeOS Embedded
Controller. Update them to use a USB keyboard which would actually
be available. Also enable the usb keyboard option for those devices
that don't have it enabled already.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Showing 10 changed files with 10 additions and 5 deletions Side-by-side Diff

configs/miqi-rk3288_defconfig
Diff comments   View file @ 23cb617
... ... @@ -75,6 +75,7 @@
75 75 CONFIG_USB_HOST_ETHER=y
76 76 CONFIG_USB_ETHER_ASIX=y
77 77 CONFIG_USB_ETHER_SMSC95XX=y
  78 +CONFIG_USB_KEYBOARD=y
78 79 CONFIG_DM_VIDEO=y
79 80 # CONFIG_VIDEO_BPP8 is not set
80 81 CONFIG_DISPLAY=y
configs/roc-pc-rk3399_defconfig
Diff comments   View file @ 23cb617
... ... @@ -56,6 +56,7 @@
56 56 CONFIG_USB_ETHER_MCS7830=y
57 57 CONFIG_USB_ETHER_RTL8152=y
58 58 CONFIG_USB_ETHER_SMSC95XX=y
  59 +CONFIG_USB_KEYBOARD=y
59 60 CONFIG_SPL_TINY_MEMSET=y
60 61 CONFIG_ERRNO_STR=y
configs/rock2_defconfig
Diff comments   View file @ 23cb617
... ... @@ -74,6 +74,7 @@
74 74 CONFIG_ROCKCHIP_USB2_PHY=y
75 75 CONFIG_USB_GADGET=y
76 76 CONFIG_USB_GADGET_DWC2_OTG=y
  77 +CONFIG_USB_KEYBOARD=y
77 78 CONFIG_DM_VIDEO=y
78 79 # CONFIG_VIDEO_BPP8 is not set
79 80 CONFIG_DISPLAY=y
configs/tinker-rk3288_defconfig
Diff comments   View file @ 23cb617
... ... @@ -80,6 +80,7 @@
80 80 CONFIG_USB_HOST_ETHER=y
81 81 CONFIG_USB_ETHER_ASIX=y
82 82 CONFIG_USB_ETHER_SMSC95XX=y
  83 +CONFIG_USB_KEYBOARD=y
83 84 CONFIG_DM_VIDEO=y
84 85 CONFIG_DISPLAY=y
85 86 CONFIG_VIDEO_ROCKCHIP=y
configs/tinker-s-rk3288_defconfig
Diff comments   View file @ 23cb617
... ... @@ -80,6 +80,7 @@
80 80 CONFIG_USB_HOST_ETHER=y
81 81 CONFIG_USB_ETHER_ASIX=y
82 82 CONFIG_USB_ETHER_SMSC95XX=y
  83 +CONFIG_USB_KEYBOARD=y
83 84 CONFIG_DM_VIDEO=y
84 85 # CONFIG_VIDEO_BPP8 is not set
85 86 CONFIG_DISPLAY=y
include/configs/miqi_rk3288.h
Diff comments   View file @ 23cb617
... ... @@ -7,7 +7,7 @@
7 7 #define __CONFIG_H
8 8  
9 9 #define ROCKCHIP_DEVICE_SETTINGS \
10   - "stdin=serial,cros-ec-keyb\0" \" \
  10 + "stdin=serial,usbkbd\0" \" \
11 11 "stdout=serial,vidconsole\0" \
12 12 "stderr=serial,vidconsole\0"
13 13  
include/configs/roc-pc-rk3399.h
Diff comments   View file @ 23cb617
... ... @@ -7,7 +7,7 @@
7 7 #define __ROC_PC_RK3399_H
8 8  
9 9 #define ROCKCHIP_DEVICE_SETTINGS \
10   - "stdin=serial,cros-ec-keyb\0" \" \
  10 + "stdin=serial,usbkbd\0" \" \
11 11 "stdout=serial,vidconsole\0" \
12 12 "stderr=serial,vidconsole\0"
13 13  
include/configs/rock2.h
Diff comments   View file @ 23cb617
... ... @@ -7,7 +7,7 @@
7 7 #define __CONFIG_H
8 8  
9 9 #define ROCKCHIP_DEVICE_SETTINGS \
10   - "stdin=serial,cros-ec-keyb\0" \" \
  10 + "stdin=serial,usbkbd\0" \" \
11 11 "stdout=serial,vidconsole\0" \
12 12 "stderr=serial,vidconsole\0"
13 13  
include/configs/tinker_rk3288.h
Diff comments   View file @ 23cb617
... ... @@ -7,7 +7,7 @@
7 7 #define __CONFIG_H
8 8  
9 9 #define ROCKCHIP_DEVICE_SETTINGS \
10   - "stdin=serial,cros-ec-keyb\0" \" \
  10 + "stdin=serial,usbkbd\0" \" \
11 11 "stdout=serial,vidconsole\0" \
12 12 "stderr=serial,vidconsole\0"
13 13  
include/configs/vyasa-rk3288.h
Diff comments   View file @ 23cb617
... ... @@ -9,7 +9,7 @@
9 9 #define __CONFIG_H
10 10  
11 11 #define ROCKCHIP_DEVICE_SETTINGS \
12   - "stdin=serial,cros-ec-keyb\0" \" \
  12 + "stdin=serial,usbkbd\0" \" \
13 13 "stdout=serial,vidconsole\0" \
14 14 "stderr=serial,vidconsole\0"
15 15