From f99b356ff47757f59bee370a6c2b0329b0a028e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Fri, 14 Oct 2022 09:19:50 +0200 Subject: [PATCH] Bump Rockchip64 u-boot to 2022.07 (#4246) --- config/sources/families/include/rockchip64_common.inc | 2 +- .../add-board-orangepi-r1-plus-lts.patch | 6 +++--- .../board-rock-pi-4-enable-spi-flash.patch | 8 ++++---- .../board-rockpro64-disable-preboot.patch | 2 +- .../u-boot-rockchip64/u-boot-rk-rk3399-usb-start.patch | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index 6566eb1d85..2b9c2ada5b 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -10,7 +10,7 @@ OVERLAY_PREFIX='rockchip' SERIALCON=${SERIALCON:=$([ $BRANCH == "legacy" ] && echo "ttyFIQ0:1500000" || echo "ttyS2:1500000")} GOVERNOR="ondemand" ATFPATCHDIR='atf-rockchip64' -BOOTBRANCH="tag:v2022.04" +BOOTBRANCH="tag:v2022.07" BOOTPATCHDIR="u-boot-rockchip64" PACKAGE_LIST_FAMILY="ethtool" diff --git a/patch/u-boot/u-boot-rockchip64/add-board-orangepi-r1-plus-lts.patch b/patch/u-boot/u-boot-rockchip64/add-board-orangepi-r1-plus-lts.patch index e2e8360f52..fc89013e96 100644 --- a/patch/u-boot/u-boot-rockchip64/add-board-orangepi-r1-plus-lts.patch +++ b/patch/u-boot/u-boot-rockchip64/add-board-orangepi-r1-plus-lts.patch @@ -748,15 +748,15 @@ diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index ed197fa4..6a14eada 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -639,6 +642,8 @@ static struct phy_driver *generic_for_interface(phy_interface_t interface) +@@ -648,6 +648,8 @@ static struct phy_driver *generic_for_phy(struct phy_device *phydev) return &genphy_driver; } +#define YT_8531C_PHY_ID 0x4f51e91b + - static struct phy_driver *get_phy_driver(struct phy_device *phydev, - phy_interface_t interface) + static struct phy_driver *get_phy_driver(struct phy_device *phydev) { + struct list_head *entry; @@ -646,6 +651,10 @@ static struct phy_driver *get_phy_driver(struct phy_device *phydev, int phy_id = phydev->phy_id; struct phy_driver *drv = NULL; diff --git a/patch/u-boot/u-boot-rockchip64/board-rock-pi-4-enable-spi-flash.patch b/patch/u-boot/u-boot-rockchip64/board-rock-pi-4-enable-spi-flash.patch index 66fc2191ce..e1754310df 100644 --- a/patch/u-boot/u-boot-rockchip64/board-rock-pi-4-enable-spi-flash.patch +++ b/patch/u-boot/u-boot-rockchip64/board-rock-pi-4-enable-spi-flash.patch @@ -49,9 +49,9 @@ index 764e2b56..11b57434 100644 CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI=y + CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y - # CONFIG_ANDROID_BOOT_IMAGE is not set - CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb" + CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y @@ -16,6 +20,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y @@ -108,9 +108,9 @@ index 671c0c10..874f4061 100644 CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI=y + CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y - # CONFIG_ANDROID_BOOT_IMAGE is not set - CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4c.dtb" + CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y @@ -16,6 +20,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y diff --git a/patch/u-boot/u-boot-rockchip64/board-rockpro64-disable-preboot.patch b/patch/u-boot/u-boot-rockchip64/board-rockpro64-disable-preboot.patch index d32d4b16ed..5f93d7a67e 100644 --- a/patch/u-boot/u-boot-rockchip64/board-rockpro64-disable-preboot.patch +++ b/patch/u-boot/u-boot-rockchip64/board-rockpro64-disable-preboot.patch @@ -12,8 +12,8 @@ index ce1adc53..9fa371c4 100644 +++ b/configs/rockpro64-rk3399_defconfig @@ -14,7 +14,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y - CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x800800 + CONFIG_DEBUG_UART=y -CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/patch/u-boot/u-boot-rockchip64/u-boot-rk-rk3399-usb-start.patch b/patch/u-boot/u-boot-rockchip64/u-boot-rk-rk3399-usb-start.patch index c3e4212708..a8ee724c09 100644 --- a/patch/u-boot/u-boot-rockchip64/u-boot-rk-rk3399-usb-start.patch +++ b/patch/u-boot/u-boot-rockchip64/u-boot-rk-rk3399-usb-start.patch @@ -1,14 +1,14 @@ --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h -@@ -55,9 +55,9 @@ +@@ -61,10 +61,10 @@ #ifdef CONFIG_ROCKCHIP_RK3399 #define BOOT_TARGET_DEVICES(func) \ + BOOT_TARGET_USB(func) \ BOOT_TARGET_MMC(func) \ BOOT_TARGET_NVME(func) \ + BOOT_TARGET_SCSI(func) \ - BOOT_TARGET_USB(func) \ BOOT_TARGET_PXE(func) \ BOOT_TARGET_DHCP(func) \ BOOT_TARGET_SF(func) -