Rockchip: u-boot: fix boot for RK3999-ROC-PC

packages/tools/u-boot/patches/rockchip/u-boot-0009-configs-sync-rk3288-rk3328-and-rk3399-defconfig.patch

@@ -105,3 +105,84 @@ index a6f8c0cb51..9c4a9f47cf 100644
  CONFIG_MISC=y
  CONFIG_ROCKCHIP_EFUSE=y
  CONFIG_I2C_EEPROM=y
+ diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
+index f0931266aa..af0ad7d5aa 100644
+--- a/configs/firefly-rk3399_defconfig
++++ b/configs/firefly-rk3399_defconfig
+@@ -5,16 +5,15 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
+ CONFIG_SYS_MALLOC_F_LEN=0x4000
+ CONFIG_ROCKCHIP_RK3399=y
+ CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
+-CONFIG_RKIMG_BOOTLOADER=y
+ CONFIG_SPL_STACK_R_ADDR=0x80000
+ CONFIG_DEFAULT_DEVICE_TREE="rk3399-firefly"
+ CONFIG_DEBUG_UART=y
+-CONFIG_ANDROID_BOOTLOADER=y
++# CONFIG_ANDROID_BOOT_IMAGE is not set
+ CONFIG_FIT=y
++CONFIG_FIT_VERBOSE=y
+ CONFIG_SPL_LOAD_FIT=y
+ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
+ # CONFIG_DISPLAY_CPUINFO is not set
+-CONFIG_ANDROID_BOOTLOADER=y
+ CONFIG_SPL_STACK_R=y
+ CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
+ CONFIG_SPL_ATF=y
+@@ -25,20 +24,19 @@ CONFIG_FASTBOOT_FLASH=y
+ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+ CONFIG_CMD_BOOTZ=y
+ # CONFIG_CMD_IMLS is not set
++CONFIG_CMD_GPIO=y
+ CONFIG_CMD_GPT=y
+-CONFIG_CMD_LOAD_ANDROID=y
+-CONFIG_CMD_BOOT_ANDROID=y
+-CONFIG_CMD_BOOT_ROCKCHIP=y
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_SF=y
+ CONFIG_CMD_USB=y
+ CONFIG_CMD_USB_MASS_STORAGE=y
+ # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TIME=y
+-CONFIG_RKPARM_PARTITION=y
++CONFIG_CMD_PMIC=y
++CONFIG_CMD_REGULATOR=y
+ CONFIG_SPL_OF_CONTROL=y
+ 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_NET_RANDOM_ETHADDR=y
+ CONFIG_REGMAP=y
+ CONFIG_SPL_REGMAP=y
+ CONFIG_SYSCON=y
+@@ -47,6 +45,7 @@ CONFIG_CLK=y
+ CONFIG_SPL_CLK=y
+ CONFIG_ROCKCHIP_GPIO=y
+ CONFIG_SYS_I2C_ROCKCHIP=y
++CONFIG_DM_KEY=y
+ CONFIG_MISC=y
+ CONFIG_ROCKCHIP_EFUSE=y
+ CONFIG_MMC_DW=y
+@@ -77,14 +76,16 @@ CONFIG_USB_XHCI_HCD=y
+ CONFIG_USB_XHCI_DWC3=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_EHCI_GENERIC=y
++CONFIG_USB_OHCI_HCD=y
++CONFIG_USB_OHCI_GENERIC=y
+ CONFIG_USB_DWC3=y
+ CONFIG_USB_DWC3_GADGET=y
+ CONFIG_USB_STORAGE=y
+ CONFIG_USB_GADGET=y
+ CONFIG_USB_GADGET_DOWNLOAD=y
+ CONFIG_G_DNL_MANUFACTURER="Rockchip"
+-CONFIG_G_DNL_VENDOR_NUM=0x18d1
+-CONFIG_G_DNL_PRODUCT_NUM=0xd00d
++CONFIG_G_DNL_VENDOR_NUM=0x2207
++CONFIG_G_DNL_PRODUCT_NUM=0x330a
+ CONFIG_USB_HOST_ETHER=y
+ CONFIG_USB_ETHER_ASIX=y
+ CONFIG_USB_ETHER_ASIX88179=y
+@@ -93,3 +94,5 @@ CONFIG_USB_ETHER_RTL8152=y
+ CONFIG_USB_ETHER_SMSC95XX=y
+ CONFIG_USE_TINY_PRINTF=y
+ CONFIG_ERRNO_STR=y
++CONFIG_BOOTDELAY=1
++# CONFIG_EFI_LOADER is not set

scripts/uboot_helper

@@ -302,7 +302,7 @@ devices = \
       },
       'roc-pc': {
         'dtb': 'rk3399-roc-pc-mezzanine.dtb',
-        'config': 'evb-rk3399_defconfig'
+        'config': 'firefly-rk3399_defconfig'
       },
       'sapphire': {
         'dtb': 'rk3399-sapphire.dtb',