February 2021 - U-Boot

[PATCH 1/1] efi_loader: console size of vidconsole
by Heinrich Schuchardt 28 Feb '21

28 Feb '21

If stdout is 'vidconsole' we correctly set the console size. If stdout is 'vidconsole,serial' the video console is ignored. We should always evaluate the size of vidconsole if it is the primary console. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index edcfce7bec..c4003554c2 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -311,7 +311,7 @@ static void query_console_size(void) const char *stdout_name = env_get("stdout"); int rows = 25, cols = 80; - if (stdout_name && !strcmp(stdout_name, "vidconsole") && + if (stdout_name && !strncmp(stdout_name, "vidconsole", 10) && IS_ENABLED(CONFIG_DM_VIDEO)) { struct stdio_dev *stdout_dev = stdio_get_by_name("vidconsole"); -- 2.30.1

1 0

[PATCH 1/1] usb: USB keyboard requires DM_KEYBOARD
by Heinrich Schuchardt 28 Feb '21

28 Feb '21

If CONFIG_DM_USB=y, the USB keyboard only works if CONFIG_DM_KEYBOARD=y. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/usb/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 6e291198ab..f6975730bf 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -95,6 +95,7 @@ config USB_STORAGE config USB_KEYBOARD bool "USB Keyboard support" + select DM_KEYBOARD if DM_USB select SYS_STDIO_DEREGISTER ---help--- Say Y here if you want to use a USB keyboard for U-Boot command line -- 2.30.1

2 1

[PATCH] RFC: spl: fit: Use libfdt functions to read stringlist
by Simon Glass 28 Feb '21

28 Feb '21

At present the code here reimplements a few libfdt functions and does not always respect the property length. The !str check is unlikely to fire since 1 is added to the string address. If strchr() returns NULL then the code produces (void*)1 instead. Also it might extend beyond the property value since strchr() does not have a maximum length. In any case it does not seem worthwhile to implement the libfdt functions again, despite small code-size advantages. There is no function to return the count after a failed get, but we can call two functions. We could add one if code size is considered critical here. Update the code to use libfdt directly. For lion-rk3368 (aarch64) this adds 68 bytes of code. For am57xx_hs_evm (arm) it adds 134 bytes. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- common/spl/spl_fit.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 75c8ff065bb..3b5307e4b2d 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -83,33 +83,24 @@ static int spl_fit_get_image_name(const struct spl_fit_info *ctx, const char **outname) { struct udevice *sysinfo; - const char *name, *str; - __maybe_unused int node; - int len, i; - bool found = true; - - name = fdt_getprop(ctx->fit, ctx->conf_node, type, &len); - if (!name) { - debug("cannot find property '%s': %d\n", type, len); - return -EINVAL; - } + const char *str; + int count; + bool found; - str = name; - for (i = 0; i < index; i++) { - str = strchr(str, '\0') + 1; - if (!str || (str - name >= len)) { - found = false; - break; - } - } + count = fdt_stringlist_count(ctx->fit, ctx->conf_node, type); + str = fdt_stringlist_get(ctx->fit, ctx->conf_node, type, index, NULL); + found = str; if (!found && CONFIG_IS_ENABLED(SYSINFO) && !sysinfo_get(&sysinfo)) { int rc; /* * no string in the property for this index. Check if the - * sysinfo-level code can supply one. + * sysinfo-level code can supply one. Subtract the number of + * strings found in the devicetre node, so that @index numbers + * the options in order from 0, starting with the devicetree + * property and ending with sysinfo. */ - rc = sysinfo_get_fit_loadable(sysinfo, index - i - 1, type, + rc = sysinfo_get_fit_loadable(sysinfo, index - count, type, &str); if (rc && rc != -ENOENT) return rc; -- 2.30.1.766.gb4fecdf3b7-goog

3 2

[PATCH] arm64: rk3399: Add support NanoPi R4s
by xiaobo 27 Feb '21

27 Feb '21

From: Xiaobo Tian <peterwillcn(a)gmail.com> NanoPi R4s is SBC base on Rockchip RK3399 hexa-core processor with dual-Core Cortex-A72 and Mali-T864 GPU with 4GiB(LPDDR4) of RAM, SD card support, including 2 gigabit ethernet(RTL8211E 1Gbps - RTL8111H 1Gbps) and 2 USB 3.0 port. port.It also has two GPIO headers which allows further peripherals to be used. The devicetree file is taken of the rk3399 nanopi4 Linux kernel [1]. [1] https://github.com/torvalds/linux/commit/e7a095908227fb3ccc86d001d9e13c9ae2… Signed-off-by: xiaobo <peterwillcn(a)gmail.com> --- arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 16 +++ arch/arm/dts/rk3399-nanopi-r4s.dts | 138 +++++++++++++++++++++ board/rockchip/evb_rk3399/MAINTAINERS | 6 + configs/nanopi-r4s-rk3399_defconfig | 62 +++++++++ 5 files changed, 223 insertions(+) create mode 100644 arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopi-r4s.dts create mode 100644 configs/nanopi-r4s-rk3399_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 33e483f4fb..008dfc0de0 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -132,6 +132,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ rk3399-nanopi-m4.dtb \ rk3399-nanopi-m4-2gb.dtb \ rk3399-nanopi-neo4.dtb \ + rk3399-nanopi-r4s.dtb \ rk3399-orangepi.dtb \ rk3399-pinebook-pro.dtb \ rk3399-puma-haikou.dtb \ diff --git a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi new file mode 100644 index 0000000000..cd1642527b --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * RK3399-based FriendlyElec boards device tree source + * + * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd + * + * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com) + * + * Copyright (c) 2018 Collabora Ltd. + * Copyright (c) 2019 Arm Ltd. + * Copyright (C) 2020 Xiaobo <peterwillcn(a)gmail.com> + */ + +#include "rk3399-nanopi4-u-boot.dtsi" +#include "rk3399-sdram-lpddr4-100.dtsi" diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts new file mode 100644 index 0000000000..6f2cf17bf1 --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -0,0 +1,138 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd + * + * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com) + * + * Copyright (c) 2018 Collabora Ltd. + * Copyright (c) 2019 Arm Ltd. + * Copyright (C) 2020 Xiaobo <peterwillcn(a)gmail.com> + */ + +/dts-v1/; +#include "rk3399-nanopi4.dtsi" + +/ { + model = "FriendlyElec NanoPi R4S"; + compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; + + aliases { + ethernet1 = &r8169; + }; + + vdd_5v: vdd-5v { + compatible = "regulator-fixed"; + regulator-name = "vdd_5v"; + regulator-always-on; + regulator-boot-on; + }; + + fan: pwm-fan { + compatible = "pwm-fan"; + cooling-levels = <0 12 18 255>; + #cooling-cells = <2>; + fan-supply = <&vdd_5v>; + pwms = <&pwm1 0 50000 0>; + }; +}; + +&cpu_thermal { + trips { + cpu_warm: cpu_warm { + temperature = <55000>; + hysteresis = <2000>; + type = "active"; + }; + + cpu_hot: cpu_hot { + temperature = <65000>; + hysteresis = <2000>; + type = "active"; + }; + }; + + cooling-maps { + map2 { + trip = <&cpu_warm>; + cooling-device = <&fan THERMAL_NO_LIMIT 1>; + }; + + map3 { + trip = <&cpu_hot>; + cooling-device = <&fan 2 THERMAL_NO_LIMIT>; + }; + }; +}; + +&emmc_phy { + status = "disabled"; +}; + +&fusb0 { + status = "disabled"; +}; + +&leds { + lan_led: led-1 { + gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; + label = "nanopi-r4s:green:lan"; + }; + + wan_led: led-2 { + gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; + label = "nanopi-r4s:green:wan"; + }; +}; + +&leds_gpio { + rockchip,pins = + <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, + <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, + <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; +}; + +&pcie0 { + max-link-speed = <1>; + num-lanes = <1>; + vpcie3v3-supply = <&vcc3v3_sys>; + + pcie@0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + + r8169: pcie@0,0 { + reg = <0x000000 0 0 0 0>; + local-mac-address = [ 00 00 00 00 00 00 ]; + }; + }; +}; + +&sdhci { + status = "disabled"; +}; + +&sdio0 { + status = "disabled"; +}; + +&sdmmc { + host-index-min = <1>; +}; + +&u2phy0_host { + phy-supply = <&vdd_5v>; +}; + +&u2phy1_host { + status = "disabled"; +}; + +&usbdrd_dwc3_0 { + dr_mode = "host"; +}; + +&vcc3v3_sys { + vin-supply = <&vcc5v0_sys>; +}; diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS index 4c889e06a6..3b9d60eccd 100644 --- a/board/rockchip/evb_rk3399/MAINTAINERS +++ b/board/rockchip/evb_rk3399/MAINTAINERS @@ -55,6 +55,12 @@ S: Maintained F: configs/nanopi-neo4-rk3399_defconfig F: arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi +NANOPI-R4S +M: Xiaobo Tian <peterwillcn(a)gmail.com> +S: Maintained +F: configs/nanopi-r4s-rk3399_defconfig +F: arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi + ORANGEPI-RK3399 M: Jagan Teki <jagan(a)amarulasolutions.com> S: Maintained diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig new file mode 100644 index 0000000000..0a3c28b012 --- /dev/null +++ b/configs/nanopi-r4s-rk3399_defconfig @@ -0,0 +1,62 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_ROCKCHIP_RK3399=y +CONFIG_TARGET_EVB_RK3399=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEBUG_UART_BASE=0xFF1A0000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEBUG_UART=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4s.dtb" +CONFIG_DISPLAY_BOARDINFO_LATE=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 +CONFIG_TPL=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TIME=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-r4s" +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_DM_ETH=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_PWM=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM_RK3399_LPDDR4=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYSRESET=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_ASIX88179=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_RTL8152=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_DM_VIDEO=y +CONFIG_DISPLAY=y +CONFIG_VIDEO_ROCKCHIP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y +CONFIG_SPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y -- 2.30.1

1 0

[PATCH 0/6] efi_loader: Unicode output in UEFI applications
by Heinrich Schuchardt 27 Feb '21

27 Feb '21

UEFI programs use Unicode for console output, e.g. GRUB uses characters from the 0x2500 code block to draw a box around the menu. The video console does not understand the UTF-8 codes and renders each byte individually. The series adds the necessary conversions both for the TrueType as well as for the normal and rotated consoles which only support code page 437. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Heinrich Schuchardt (6): efi_loader: move codepage 437 table efi_loader: carve out utf_to_cp() lib/charset: utf8_get() should return error lib/charset: UTF-8 stream conversion video: use int for character in putc_xy() video: support Unicode in video console drivers/video/console_normal.c | 2 +- drivers/video/console_rotate.c | 6 +- drivers/video/console_truetype.c | 2 +- drivers/video/vidconsole-uclass.c | 29 ++++++- include/charset.h | 34 ++++++++ include/video_console.h | 4 +- lib/charset.c | 96 +++++++++++++++++++-- lib/efi_loader/efi_unicode_collation.c | 21 +---- test/unicode_ut.c | 114 +++++++++++++++++++++++++ 9 files changed, 271 insertions(+), 37 deletions(-) -- 2.30.0

1 6

[PATCH 1/1] video: add DejaVu Mono font
by Heinrich Schuchardt 27 Feb '21

27 Feb '21

A TrueType font for U-Boot should fulfill the following requirements: * mono spaced * support full code page 437 * easily readable Unfortunately none of the fonts provided with U-Boot fulfills all of these requirements. Let's add the DejaVu Mono font. To reduce the code size the characters are limited to code page 437. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- Licenses/dejavu_font_license.txt | 187 ++++++++++++++++++++++++++++ drivers/video/console_truetype.c | 4 + drivers/video/fonts/Kconfig | 10 +- drivers/video/fonts/Makefile | 1 + drivers/video/fonts/dejavu_mono.ttf | Bin 0 -> 41056 bytes 5 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 Licenses/dejavu_font_license.txt create mode 100644 drivers/video/fonts/dejavu_mono.ttf diff --git a/Licenses/dejavu_font_license.txt b/Licenses/dejavu_font_license.txt new file mode 100644 index 0000000000..df52c1709b --- /dev/null +++ b/Licenses/dejavu_font_license.txt @@ -0,0 +1,187 @@ +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) + + +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING +ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE +FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. + +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. + +TeX Gyre DJV Math +----------------- +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. + +Math extensions done by B. Jackowski, P. Strzelczyk and P. Pianowski +(on behalf of TeX users groups) are in public domain. + +Letters imported from Euler Fraktur from AMSfonts are (c) American +Mathematical Society (see below). +Bitstream Vera Fonts Copyright +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera +is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license (“Fonts”) and associated +documentation +files (the “Font Software”), to reproduce and distribute the Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, +and/or sell copies of the Font Software, and to permit persons to whom +the Font Software is furnished to do so, subject to the following +conditions: + +The above copyright and trademark notices and this permission notice +shall be +included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional +glyphs or characters may be added to the Fonts, only if the fonts are +renamed +to names not containing either the words “Bitstream” or the word “Vera”. + +This License becomes null and void to the extent applicable to Fonts or +Font Software +that has been modified and is distributed under the “Bitstream Vera” +names. + +The Font Software may be sold as part of a larger software package but +no copy +of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, +SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN +ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR +INABILITY TO USE +THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. +Except as contained in this notice, the names of GNOME, the GNOME +Foundation, +and Bitstream Inc., shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Font Software without prior written +authorization from the GNOME Foundation or Bitstream Inc., respectively. +For further information, contact: fonts at gnome dot org. + +AMSFonts (v. 2.2) copyright + +The PostScript Type 1 implementation of the AMSFonts produced by and +previously distributed by Blue Sky Research and Y&Y, Inc. are now freely +available for general use. This has been accomplished through the +cooperation +of a consortium of scientific publishers with Blue Sky Research and Y&Y. +Members of this consortium include: + +Elsevier Science IBM Corporation Society for Industrial and Applied +Mathematics (SIAM) Springer-Verlag American Mathematical Society (AMS) + +In order to assure the authenticity of these fonts, copyright will be +held by +the American Mathematical Society. This is not meant to restrict in any way +the legitimate use of the fonts, such as (but not limited to) electronic +distribution of documents containing these fonts, inclusion of these fonts +into other public domain or commercial font collections or computer +applications, use of the outline data to create derivative fonts and/or +faces, etc. However, the AMS does require that the AMS copyright notice be +removed from any derivative versions of the fonts which have been altered in +any way. In addition, to ensure the fidelity of TeX documents using Computer +Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces, +has requested that any alterations which yield different font metrics be +given a different name. + +$Id$ diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c index 293b3a5ef4..b9caf2dd0c 100644 --- a/drivers/video/console_truetype.c +++ b/drivers/video/console_truetype.c @@ -490,6 +490,7 @@ FONT_DECL(nimbus_sans_l_regular); FONT_DECL(ankacoder_c75_r); FONT_DECL(rufscript010); FONT_DECL(cantoraone_regular); +FONT_DECL(dejavu_mono); static struct font_info font_table[] = { #ifdef CONFIG_CONSOLE_TRUETYPE_NIMBUS @@ -503,6 +504,9 @@ static struct font_info font_table[] = { #endif #ifdef CONFIG_CONSOLE_TRUETYPE_CANTORAONE FONT_ENTRY(cantoraone_regular), +#endif +#ifdef CONFIG_CONSOLE_TRUETYPE_DEJAVU + FONT_ENTRY(dejavu_mono), #endif {} /* sentinel */ }; diff --git a/drivers/video/fonts/Kconfig b/drivers/video/fonts/Kconfig index c692fa9602..f0cc963fb6 100644 --- a/drivers/video/fonts/Kconfig +++ b/drivers/video/fonts/Kconfig @@ -7,7 +7,6 @@ menu "TrueType Fonts" config CONSOLE_TRUETYPE_NIMBUS bool "Nimbus Sans Regular" depends on CONSOLE_TRUETYPE - default y help Nimbus Sans L is a version of Nimbus Sans using Adobe font sources. It was designed in 1987. A subset of Nimbus Sans L were released @@ -49,4 +48,13 @@ config CONSOLE_TRUETYPE_CANTORAONE License: SIL Open Font Licence http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL +config CONSOLE_TRUETYPE_DEJAVU + bool "DejaVu Sans Mono Regular" + depends on CONSOLE_TRUETYPE + default y + help + This mono spaced font contains all code page 437 characters. + From https://sourceforge.net/projects/dejavu/ + License: DejaVu Font License + endmenu diff --git a/drivers/video/fonts/Makefile b/drivers/video/fonts/Makefile index 4fca120b73..1111f92a2c 100644 --- a/drivers/video/fonts/Makefile +++ b/drivers/video/fonts/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_CONSOLE_TRUETYPE_NIMBUS) += nimbus_sans_l_regular.o obj-$(CONFIG_CONSOLE_TRUETYPE_ANKACODER) += ankacoder_c75_r.o obj-$(CONFIG_CONSOLE_TRUETYPE_RUFSCRIPT) += rufscript010.o obj-$(CONFIG_CONSOLE_TRUETYPE_CANTORAONE) += cantoraone_regular.o +obj-$(CONFIG_CONSOLE_TRUETYPE_DEJAVU) += dejavu_mono.o diff --git a/drivers/video/fonts/dejavu_mono.ttf b/drivers/video/fonts/dejavu_mono.ttf new file mode 100644 index 0000000000000000000000000000000000000000..43f8c5e0054acf5fa6852ea9583fee3eb3ce0cc5 GIT binary patch literal 41056 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 literal 0 HcmV?d00001 -- 2.30.0

1 0

[PATCH 0/5] board: imx8mm: Add Engicam i.Core MX8M Mini SoM
by Jagan Teki 27 Feb '21

27 Feb '21

Patch series for Engicam i.Core MX8M Mini SOM and it's associated carrier board dts(i) support. dts(i) patches are part of Linux mainling-list. patch 1-2: exiting imx8mm dts, header improvement code patch 3: Engicam i.Core MX8M Mini SoM dts patch 4-5: EDIMM2.2, C.TOUCH 2.0 Carrier boards Any inputs? Jagan. Jagan Teki (5): arm64: dts: imx8mm: Add common -u-boot.dtsi configs: Add imx8mm-common header arm64: dts: imx8mm: Add Engicam i.Core MX8M Mini SoM board: imx8mm: Add Engicam i.Core MX8M Mini EDIMM2.2 Starter Kit board: imx8mm: Add Engicam i.Core MX8M Mini C.TOUCH 2.0 arch/arm/dts/Makefile | 2 + arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi | 37 +- arch/arm/dts/imx8mm-evk-u-boot.dtsi | 37 +- .../imx8mm-icore-mx8mm-ctouch2-u-boot.dtsi | 31 + arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts | 97 + .../imx8mm-icore-mx8mm-edimm2.2-u-boot.dtsi | 31 + arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts | 97 + arch/arm/dts/imx8mm-icore-mx8mm-u-boot.dtsi | 27 + arch/arm/dts/imx8mm-icore-mx8mm.dtsi | 232 +++ arch/arm/dts/imx8mm-u-boot.dtsi | 39 + arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 38 +- arch/arm/dts/phycore-imx8mm-u-boot.dtsi | 37 +- arch/arm/mach-imx/imx8m/Kconfig | 19 + board/engicam/imx8mm/Kconfig | 14 + board/engicam/imx8mm/MAINTAINERS | 13 + board/engicam/imx8mm/Makefile | 12 + board/engicam/imx8mm/icore_mx8mm.c | 21 + board/engicam/imx8mm/lpddr4_timing.c | 1847 +++++++++++++++++ board/engicam/imx8mm/spl.c | 101 + configs/imx8mm-icore-mx8mm-ctouch2_defconfig | 84 + configs/imx8mm-icore-mx8mm-edimm2.2_defconfig | 84 + include/configs/imx8mm-common.h | 48 + include/configs/imx8mm_beacon.h | 48 +- include/configs/imx8mm_evk.h | 45 +- include/configs/imx8mm_icore_mx8mm.h | 58 + include/configs/phycore_imx8mm.h | 43 +- include/configs/verdin-imx8mm.h | 42 +- 27 files changed, 2881 insertions(+), 303 deletions(-) create mode 100644 arch/arm/dts/imx8mm-icore-mx8mm-ctouch2-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts create mode 100644 arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts create mode 100644 arch/arm/dts/imx8mm-icore-mx8mm-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mm-icore-mx8mm.dtsi create mode 100644 arch/arm/dts/imx8mm-u-boot.dtsi create mode 100644 board/engicam/imx8mm/Kconfig create mode 100644 board/engicam/imx8mm/MAINTAINERS create mode 100644 board/engicam/imx8mm/Makefile create mode 100644 board/engicam/imx8mm/icore_mx8mm.c create mode 100644 board/engicam/imx8mm/lpddr4_timing.c create mode 100644 board/engicam/imx8mm/spl.c create mode 100644 configs/imx8mm-icore-mx8mm-ctouch2_defconfig create mode 100644 configs/imx8mm-icore-mx8mm-edimm2.2_defconfig create mode 100644 include/configs/imx8mm-common.h create mode 100644 include/configs/imx8mm_icore_mx8mm.h -- 2.25.1

1 5

[PATCH 1/1] cmd/efidebug: add firmware management protocol GUID
by Heinrich Schuchardt 27 Feb '21

27 Feb '21

Add missing GUID short text used in the efidebug tables and efidebug dh sub-commands. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/efidebug.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/efidebug.c b/cmd/efidebug.c index bbbcb0a546..e4030f514a 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -507,6 +507,10 @@ static const struct { "System Partition", PARTITION_SYSTEM_GUID }, + { + "Firmware Management", + EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GUID + }, /* Configuration table GUIDs */ { "ACPI table", -- 2.30.0

1 0

[PULL] u-boot-usb/master
by Marek Vasut 26 Feb '21

26 Feb '21

The following changes since commit c28d5d704d3347fcbe5e49ab561973c00bf9337f: Merge branch '2021-02-25-remove-platforms' (2021-02-25 13:18:27 -0500) are available in the Git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 0a7e5e5f103867789328067f87e34b25b26fc3b0: usb: gadget: dwc2_udc_otg: Fix dwc2_gadget_start() and usb_gadget_register_driver() (2021-02-26 15:30:55 +0100) ---------------------------------------------------------------- Heiko Schocher (1): fastboot: add UUU command UCmd and ACmd support Patrice Chotard (1): usb: gadget: dwc2_udc_otg: Fix dwc2_gadget_start() and usb_gadget_register_driver() Sean Anderson (10): mmc: sandbox: Add support for writing test: dm: Add test for fastboot mmc partition naming part: Give several functions more useful return values part: Support getting whole disk from part_get_info_by_dev_and_name_or_num part: Support string block devices in part_get_info_by_dev_and_name fastboot: Remove mmcpart argument from raw_part_get_info_by_name fastboot: Move part_get_info_by_name_or_alias after raw_part_get_info_by_name fastboot: Allow u-boot-style partitions doc: Rename k210 partitions anchor doc: Document partition specifications Stefan Brüns (1): usb: kbd: Also accept keyboards with Interrupt OUT endpoint cmd/ab_select.c | 3 +- common/usb_kbd.c | 23 ++++++----- configs/sandbox64_defconfig | 2 + configs/sandbox_defconfig | 2 + disk/part.c | 90 ++++++++++++++++++++++++------------------- doc/android/fastboot-protocol.rst | 5 +++ doc/android/fastboot.rst | 6 +++ doc/board/sipeed/maix.rst | 4 +- doc/usage/index.rst | 1 + doc/usage/partitions.rst | 80 ++++++++++++++++++++++++++++++++++++++ drivers/fastboot/Kconfig | 9 +++++ drivers/fastboot/fb_command.c | 68 ++++++++++++++++++++++++++++++++ drivers/fastboot/fb_mmc.c | 210 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------ drivers/mmc/sandbox_mmc.c | 43 ++++++++++++++++++--- drivers/usb/gadget/dwc2_udc_otg.c | 8 +--- drivers/usb/gadget/f_fastboot.c | 17 ++++++++ include/fastboot.h | 7 ++++ include/part.h | 6 ++- test/dm/Makefile | 3 ++ test/dm/fastboot.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ test/dm/mmc.c | 19 ++++++--- 21 files changed, 543 insertions(+), 158 deletions(-) create mode 100644 doc/usage/partitions.rst create mode 100644 test/dm/fastboot.c

2 1

[PATCH] arm64: rk3399: Add support NanoPi R4s
by xiaobo 26 Feb '21

26 Feb '21

From: Xiaobo Tian <peterwillcn(a)gmail.com> NanoPi R4s is SBC base on Rockchip RK3399 hexa-core processor with dual-Core Cortex-A72 and Mali-T864 GPU with 4GiB(LPDDR4) of RAM, SD card support, including 2 gigabit ethernet(RTL8211E 1Gbps - RTL8111H 1Gbps) and 2 USB 3.0 port. port.It also has two GPIO headers which allows further peripherals to be used. The devicetree file is taken of the rk3399 nanopi4 Linux kernel [1]. [1] https://github.com/torvalds/linux/commit/e7a095908227fb3ccc86d001d9e13c9ae2… Signed-off-by: xiaobo <peterwillcn(a)gmail.com> --- arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 17 +++ arch/arm/dts/rk3399-nanopi-r4s.dts | 138 +++++++++++++++++++++ board/rockchip/evb_rk3399/MAINTAINERS | 6 + configs/nanopi-r4s-rk3399_defconfig | 62 +++++++++ 5 files changed, 224 insertions(+) create mode 100644 arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopi-r4s.dts create mode 100644 configs/nanopi-r4s-rk3399_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 858b79ac97..528dfe069e 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -92,6 +92,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \ rk3288-evb.dtb \ rk3288-firefly.dtb \ rk3288-miqi.dtb \ + rk3399-nanopi-r4s.dtb \ rk3288-phycore-rdk.dtb \ rk3288-popmetal.dtb \ rk3288-rock2-square.dtb \ diff --git a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi new file mode 100644 index 0000000000..3f97867cc5 --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * RK3399-based FriendlyElec boards device tree source + * + * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd + * + * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com) + * + * Copyright (c) 2018 Collabora Ltd. + * Copyright (c) 2019 Arm Ltd. + * Copyright (C) 2020 Xiaobo <peterwillcn(a)gmail.com> + */ + +#include "rk3399-nanopi4-u-boot.dtsi" +#include "rk3399-sdram-lpddr4-100.dtsi" +#include "rk3399-sdram-ddr3-1866.dtsi" diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts new file mode 100644 index 0000000000..6f2cf17bf1 --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -0,0 +1,138 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd + * + * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com) + * + * Copyright (c) 2018 Collabora Ltd. + * Copyright (c) 2019 Arm Ltd. + * Copyright (C) 2020 Xiaobo <peterwillcn(a)gmail.com> + */ + +/dts-v1/; +#include "rk3399-nanopi4.dtsi" + +/ { + model = "FriendlyElec NanoPi R4S"; + compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; + + aliases { + ethernet1 = &r8169; + }; + + vdd_5v: vdd-5v { + compatible = "regulator-fixed"; + regulator-name = "vdd_5v"; + regulator-always-on; + regulator-boot-on; + }; + + fan: pwm-fan { + compatible = "pwm-fan"; + cooling-levels = <0 12 18 255>; + #cooling-cells = <2>; + fan-supply = <&vdd_5v>; + pwms = <&pwm1 0 50000 0>; + }; +}; + +&cpu_thermal { + trips { + cpu_warm: cpu_warm { + temperature = <55000>; + hysteresis = <2000>; + type = "active"; + }; + + cpu_hot: cpu_hot { + temperature = <65000>; + hysteresis = <2000>; + type = "active"; + }; + }; + + cooling-maps { + map2 { + trip = <&cpu_warm>; + cooling-device = <&fan THERMAL_NO_LIMIT 1>; + }; + + map3 { + trip = <&cpu_hot>; + cooling-device = <&fan 2 THERMAL_NO_LIMIT>; + }; + }; +}; + +&emmc_phy { + status = "disabled"; +}; + +&fusb0 { + status = "disabled"; +}; + +&leds { + lan_led: led-1 { + gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; + label = "nanopi-r4s:green:lan"; + }; + + wan_led: led-2 { + gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; + label = "nanopi-r4s:green:wan"; + }; +}; + +&leds_gpio { + rockchip,pins = + <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, + <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, + <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; +}; + +&pcie0 { + max-link-speed = <1>; + num-lanes = <1>; + vpcie3v3-supply = <&vcc3v3_sys>; + + pcie@0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + + r8169: pcie@0,0 { + reg = <0x000000 0 0 0 0>; + local-mac-address = [ 00 00 00 00 00 00 ]; + }; + }; +}; + +&sdhci { + status = "disabled"; +}; + +&sdio0 { + status = "disabled"; +}; + +&sdmmc { + host-index-min = <1>; +}; + +&u2phy0_host { + phy-supply = <&vdd_5v>; +}; + +&u2phy1_host { + status = "disabled"; +}; + +&usbdrd_dwc3_0 { + dr_mode = "host"; +}; + +&vcc3v3_sys { + vin-supply = <&vcc5v0_sys>; +}; diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS index 4c889e06a6..3b9d60eccd 100644 --- a/board/rockchip/evb_rk3399/MAINTAINERS +++ b/board/rockchip/evb_rk3399/MAINTAINERS @@ -55,6 +55,12 @@ S: Maintained F: configs/nanopi-neo4-rk3399_defconfig F: arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi +NANOPI-R4S +M: Xiaobo Tian <peterwillcn(a)gmail.com> +S: Maintained +F: configs/nanopi-r4s-rk3399_defconfig +F: arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi + ORANGEPI-RK3399 M: Jagan Teki <jagan(a)amarulasolutions.com> S: Maintained diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig new file mode 100644 index 0000000000..0a3c28b012 --- /dev/null +++ b/configs/nanopi-r4s-rk3399_defconfig @@ -0,0 +1,62 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_ROCKCHIP_RK3399=y +CONFIG_TARGET_EVB_RK3399=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEBUG_UART_BASE=0xFF1A0000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEBUG_UART=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4s.dtb" +CONFIG_DISPLAY_BOARDINFO_LATE=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 +CONFIG_TPL=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TIME=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-r4s" +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_DM_ETH=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_PWM=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM_RK3399_LPDDR4=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYSRESET=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_ASIX88179=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_RTL8152=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_DM_VIDEO=y +CONFIG_DISPLAY=y +CONFIG_VIDEO_ROCKCHIP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y +CONFIG_SPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y -- 2.30.0

2 2