adjust default settings

uboot/make_uboot.sh

@@ -19,11 +19,10 @@ fi
 if ! git -C u-boot branch | grep -q uboot-2022.04; then
     git -C u-boot checkout -b uboot-2022.04 v2022.04
     git -C u-boot am ../patches/0001-.gitignore-ignore-tools-boot-build-artifact.patch
-    git -C u-boot am ../patches/0002-arm64-rk3399-remove-video-support.patch
+    git -C u-boot am ../patches/0002-arm64-rk3399-enable-usb-disable-video.patch
     git -C u-boot am ../patches/0003-arm64-rk3399-set-ethaddr-and-eth1addr-from-eeprom.patch
-    git -C u-boot am ../patches/0004-arm64-rk3399-enable-usb-host.patch
     # optional boot from usb
-#    git -C u-boot am ../patches/0005-optional-skip-mmc-boot-usb-boot.patch
+#    git -C u-boot am ../patches/0004-optional-skip-mmc-boot-usb-boot.patch
 elif [ 'uboot-2022.04' != "$(git -C u-boot branch | sed -n -e 's/^\* \(.*\)/\1/p')" ]; then
     git -C u-boot checkout uboot-2022.04
 fi

uboot/patches/0002-arm64-rk3399-enable-usb-disable-video.patch

@@ -0,0 +1,73 @@
+From efe5b8f7967281d4374848327d0aec8f06492b1c Mon Sep 17 00:00:00 2001
+From: John Clark <[email protected]>
+Date: Fri, 8 Jul 2022 21:22:30 -0400
+Subject: [PATCH] arm64: rk3399: enable usb, disable video
+
+Signed-off-by: John Clark <[email protected]>
+---
+ configs/nanopi-r4s-rk3399_defconfig | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig
+index 7d176ce28e..89097964ae 100644
+--- a/configs/nanopi-r4s-rk3399_defconfig
++++ b/configs/nanopi-r4s-rk3399_defconfig
+@@ -11,7 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
+ CONFIG_DEBUG_UART_CLOCK=24000000
+ CONFIG_DEBUG_UART=y
+ CONFIG_SYS_LOAD_ADDR=0x800800
+-CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4s.dtb"
++CONFIG_DEFAULT_FDT_FILE="rk3399-nanopi-r4s.dtb"
+ CONFIG_DISPLAY_BOARDINFO_LATE=y
+ # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+ CONFIG_SPL_STACK_R=y
+@@ -29,18 +29,27 @@ CONFIG_ENV_IS_IN_MMC=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_ROCKCHIP_GPIO=y
+ CONFIG_SYS_I2C_ROCKCHIP=y
++CONFIG_MISC=y
++CONFIG_MMC_HS400_SUPPORT=y
+ CONFIG_MMC_DW=y
+ CONFIG_MMC_DW_ROCKCHIP=y
+ CONFIG_MMC_SDHCI=y
++CONFIG_MMC_SDHCI_SDMA=y
+ CONFIG_MMC_SDHCI_ROCKCHIP=y
++CONFIG_SF_DEFAULT_SPEED=20000000
+ CONFIG_DM_ETH=y
+ CONFIG_ETH_DESIGNWARE=y
+ CONFIG_GMAC_ROCKCHIP=y
++CONFIG_PHY_ROCKCHIP_INNO_USB2=y
++CONFIG_PHY_ROCKCHIP_TYPEC=y
+ CONFIG_PMIC_RK8XX=y
+ CONFIG_REGULATOR_PWM=y
+ CONFIG_REGULATOR_RK8XX=y
+ CONFIG_PWM_ROCKCHIP=y
+ CONFIG_RAM_RK3399_LPDDR4=y
++CONFIG_DM_RESET=y
++CONFIG_DM_RNG=y
++CONFIG_RNG_ROCKCHIP=y
+ CONFIG_BAUDRATE=1500000
+ CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYSRESET=y
+@@ -49,16 +58,13 @@ 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_DWC3=y
++CONFIG_USB_DWC3_GENERIC=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.2
+

uboot/patches/0003-arm64-rk3399-set-ethaddr-and-eth1addr-from-eeprom.patch

@@ -77,17 +77,16 @@ index 87eebd9872..a65c786e5b 100644
  	return 0;
  }
 diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig
-index d769d9c79e..7369ea3de3 100644
+index 89097964ae..823dafcdac 100644
 --- a/configs/nanopi-r4s-rk3399_defconfig
 +++ b/configs/nanopi-r4s-rk3399_defconfig
-@@ -14,6 +14,7 @@ CONFIG_SYS_LOAD_ADDR=0x800800
- CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4s.dtb"
- CONFIG_CONSOLE_MUX=y
+@@ -13,6 +13,7 @@ CONFIG_DEBUG_UART=y
+ CONFIG_SYS_LOAD_ADDR=0x800800
+ CONFIG_DEFAULT_FDT_FILE="rk3399-nanopi-r4s.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
 +CONFIG_MISC_INIT_R=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
--- 
+--
 2.30.2
-