From bd54236f9f1c4ed055e174a9a81d631f61ae9e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sat, 9 Oct 2021 17:57:56 +0200 Subject: [PATCH] Update u-boot to 2021.10 (#3182) --- config/sources/arm64.conf | 2 +- config/sources/armhf.conf | 2 +- .../u-boot/u-boot-sunxi/adjust-default-dram-clockspeeds.patch | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/sources/arm64.conf b/config/sources/arm64.conf index 48974756e..6915aa5eb 100644 --- a/config/sources/arm64.conf +++ b/config/sources/arm64.conf @@ -41,7 +41,7 @@ fi [[ -z $UBOOT_USE_GCC ]] && UBOOT_USE_GCC='> 8.0' [[ -z $BOOTSOURCE ]] && BOOTSOURCE=$MAINLINE_UBOOT_SOURCE [[ -z $BOOTDIR ]] && BOOTDIR=$MAINLINE_UBOOT_DIR -[[ -z $BOOTBRANCH ]] && BOOTBRANCH='tag:v2021.07' +[[ -z $BOOTBRANCH ]] && BOOTBRANCH='tag:v2021.10' [[ -z $KERNELDIR ]] && KERNELDIR=$MAINLINE_KERNEL_DIR [[ -z $KERNELSOURCE ]] && KERNELSOURCE=$MAINLINE_KERNEL_SOURCE diff --git a/config/sources/armhf.conf b/config/sources/armhf.conf index 750e2aceb..e953e2d2d 100644 --- a/config/sources/armhf.conf +++ b/config/sources/armhf.conf @@ -27,7 +27,7 @@ fi [[ -z $UBOOT_USE_GCC ]] && UBOOT_USE_GCC='> 8.0' [[ -z $BOOTSOURCE ]] && BOOTSOURCE=$MAINLINE_UBOOT_SOURCE [[ -z $BOOTDIR ]] && BOOTDIR=$MAINLINE_UBOOT_DIR -[[ -z $BOOTBRANCH ]] && BOOTBRANCH='tag:v2020.04' +[[ -z $BOOTBRANCH ]] && BOOTBRANCH='tag:v2021.10' if [ "$(uname -m)" = "aarch64" ]; then [[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="arm-linux-gnueabihf-" diff --git a/patch/u-boot/u-boot-sunxi/adjust-default-dram-clockspeeds.patch b/patch/u-boot/u-boot-sunxi/adjust-default-dram-clockspeeds.patch index 3939bde2a..bf4cc2332 100644 --- a/patch/u-boot/u-boot-sunxi/adjust-default-dram-clockspeeds.patch +++ b/patch/u-boot/u-boot-sunxi/adjust-default-dram-clockspeeds.patch @@ -202,16 +202,16 @@ index ba0f2d5..93641c3 100644 --- a/configs/orangepi_pc2_defconfig +++ b/configs/orangepi_pc2_defconfig @@ -3,8 +3,9 @@ CONFIG_ARCH_SUNXI=y - CONFIG_NR_DRAM_BANKS=1 + CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-pc2" CONFIG_SPL=y CONFIG_MACH_SUN50I_H5=y -CONFIG_DRAM_CLK=672 +CONFIG_DRAM_CLK=504 CONFIG_DRAM_ZQ=3881977 +CONFIG_DRAM_ODT_EN=y - # CONFIG_DRAM_ODT_EN is not set CONFIG_MACPWR="PD6" CONFIG_SPL_SPI_SUNXI=y + # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git a/configs/orangepi_plus2e_defconfig b/configs/orangepi_plus2e_defconfig index 79da5ce..b93284b 100644 --- a/configs/orangepi_plus2e_defconfig