Update u-boot to 2021.10 (#3182)

This commit is contained in:
Igor Pečovnik
2021-10-09 17:57:56 +02:00
committed by GitHub
parent c74b8ea582
commit bd54236f9f
3 changed files with 4 additions and 4 deletions

View File

@@ -41,7 +41,7 @@ fi
[[ -z $UBOOT_USE_GCC ]] && UBOOT_USE_GCC='> 8.0' [[ -z $UBOOT_USE_GCC ]] && UBOOT_USE_GCC='> 8.0'
[[ -z $BOOTSOURCE ]] && BOOTSOURCE=$MAINLINE_UBOOT_SOURCE [[ -z $BOOTSOURCE ]] && BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
[[ -z $BOOTDIR ]] && BOOTDIR=$MAINLINE_UBOOT_DIR [[ -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 $KERNELDIR ]] && KERNELDIR=$MAINLINE_KERNEL_DIR
[[ -z $KERNELSOURCE ]] && KERNELSOURCE=$MAINLINE_KERNEL_SOURCE [[ -z $KERNELSOURCE ]] && KERNELSOURCE=$MAINLINE_KERNEL_SOURCE

View File

@@ -27,7 +27,7 @@ fi
[[ -z $UBOOT_USE_GCC ]] && UBOOT_USE_GCC='> 8.0' [[ -z $UBOOT_USE_GCC ]] && UBOOT_USE_GCC='> 8.0'
[[ -z $BOOTSOURCE ]] && BOOTSOURCE=$MAINLINE_UBOOT_SOURCE [[ -z $BOOTSOURCE ]] && BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
[[ -z $BOOTDIR ]] && BOOTDIR=$MAINLINE_UBOOT_DIR [[ -z $BOOTDIR ]] && BOOTDIR=$MAINLINE_UBOOT_DIR
[[ -z $BOOTBRANCH ]] && BOOTBRANCH='tag:v2020.04' [[ -z $BOOTBRANCH ]] && BOOTBRANCH='tag:v2021.10'
if [ "$(uname -m)" = "aarch64" ]; then if [ "$(uname -m)" = "aarch64" ]; then
[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="arm-linux-gnueabihf-" [[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="arm-linux-gnueabihf-"

View File

@@ -202,16 +202,16 @@ index ba0f2d5..93641c3 100644
--- a/configs/orangepi_pc2_defconfig --- a/configs/orangepi_pc2_defconfig
+++ b/configs/orangepi_pc2_defconfig +++ b/configs/orangepi_pc2_defconfig
@@ -3,8 +3,9 @@ CONFIG_ARCH_SUNXI=y @@ -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_SPL=y
CONFIG_MACH_SUN50I_H5=y CONFIG_MACH_SUN50I_H5=y
-CONFIG_DRAM_CLK=672 -CONFIG_DRAM_CLK=672
+CONFIG_DRAM_CLK=504 +CONFIG_DRAM_CLK=504
CONFIG_DRAM_ZQ=3881977 CONFIG_DRAM_ZQ=3881977
+CONFIG_DRAM_ODT_EN=y +CONFIG_DRAM_ODT_EN=y
# CONFIG_DRAM_ODT_EN is not set
CONFIG_MACPWR="PD6" CONFIG_MACPWR="PD6"
CONFIG_SPL_SPI_SUNXI=y 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 diff --git a/configs/orangepi_plus2e_defconfig b/configs/orangepi_plus2e_defconfig
index 79da5ce..b93284b 100644 index 79da5ce..b93284b 100644
--- a/configs/orangepi_plus2e_defconfig --- a/configs/orangepi_plus2e_defconfig