From 19fbdb6fe5f786149500affa0e3648ad81afc9a6 Mon Sep 17 00:00:00 2001 From: Gunjan Gupta Date: Wed, 13 Dec 2023 03:17:16 +0530 Subject: [PATCH] Allwinner: u-boot: Move some defconfig changes from patches to board config files --- config/boards/bananapi.csc | 8 + config/boards/bananapipro.csc | 5 + config/boards/cubieboard.csc | 8 + config/boards/cubieboard2.csc | 11 + config/boards/lamobo-r1.eos | 5 + config/boards/lime-a64.csc | 6 + config/boards/lime2.csc | 4 + config/boards/nanopim1plus.eos | 5 + config/boards/nanopineoplus2.csc | 5 + config/boards/orangepi.eos | 5 + config/boards/orangepilite.csc | 7 + config/boards/orangepimini.eos | 5 + config/boards/orangepione.conf | 7 + config/boards/orangepipc2.csc | 6 + config/boards/orangepiplus.csc | 7 + config/boards/orangepiplus2e.csc | 7 + config/boards/orangepiprime.conf | 6 + config/boards/orangepizeroplus2-h5.csc | 5 + config/boards/pcduino3.csc | 5 + ...nner-adjust-default-dram-clockspeeds.patch | 194 ------------------ .../adjust-default-dram-clockspeeds.patch | 13 -- ...isable-de2-to-improve-edid-detection.patch | 12 -- .../adjust-default-dram-clockspeeds.patch | 13 -- .../adjust-default-dram-clockspeeds.patch | 13 -- ...isable-de2-to-improve-edid-detection.patch | 12 -- .../add-a20-optional-eMMC.patch | 18 -- .../adjust-default-dram-clockspeeds.patch | 13 -- ...isable-de2-to-improve-edid-detection.patch | 12 -- .../GMAC_TX_DELAY_autocorrection.patch | 13 -- 29 files changed, 117 insertions(+), 313 deletions(-) delete mode 100644 patch/u-boot/u-boot-sunxi/allwinner-adjust-default-dram-clockspeeds.patch delete mode 100644 patch/u-boot/u-boot-sunxi/board_bananapi/adjust-default-dram-clockspeeds.patch delete mode 100644 patch/u-boot/u-boot-sunxi/board_bananapi/allwinner-disable-de2-to-improve-edid-detection.patch delete mode 100644 patch/u-boot/u-boot-sunxi/board_bananapipro/adjust-default-dram-clockspeeds.patch delete mode 100644 patch/u-boot/u-boot-sunxi/board_cubieboard/adjust-default-dram-clockspeeds.patch delete mode 100644 patch/u-boot/u-boot-sunxi/board_cubieboard/allwinner-disable-de2-to-improve-edid-detection.patch delete mode 100644 patch/u-boot/u-boot-sunxi/board_cubieboard2/add-a20-optional-eMMC.patch delete mode 100644 patch/u-boot/u-boot-sunxi/board_cubieboard2/adjust-default-dram-clockspeeds.patch delete mode 100644 patch/u-boot/u-boot-sunxi/board_cubieboard2/allwinner-disable-de2-to-improve-edid-detection.patch diff --git a/config/boards/bananapi.csc b/config/boards/bananapi.csc index 6da2b69081..a6dc606d25 100644 --- a/config/boards/bananapi.csc +++ b/config/boards/bananapi.csc @@ -4,3 +4,11 @@ BOARDFAMILY="sun7i" BOARD_MAINTAINER="DylanHP" BOOTCONFIG="Bananapi_defconfig" KERNEL_TARGET="legacy,current,edge" + +function post_config_uboot_target__extra_configs_for_bananapi() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "384" + + display_alert "$BOARD" "disable de2 to improve edid detection" "info" + run_host_command_logged scripts/config --disable CONFIG_VIDEO_DE2 +} diff --git a/config/boards/bananapipro.csc b/config/boards/bananapipro.csc index 6cab7e3da0..8e2533347a 100644 --- a/config/boards/bananapipro.csc +++ b/config/boards/bananapipro.csc @@ -5,3 +5,8 @@ BOARD_MAINTAINER="" BOOTCONFIG="Bananapro_defconfig" KERNEL_TARGET="legacy,current,edge" KERNEL_TEST_TARGET="current,edge" + +function post_config_uboot_target__extra_configs_for_bananapipro() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "384" +} diff --git a/config/boards/cubieboard.csc b/config/boards/cubieboard.csc index 53635535fe..65a260c298 100644 --- a/config/boards/cubieboard.csc +++ b/config/boards/cubieboard.csc @@ -7,3 +7,11 @@ HAS_VIDEO_OUTPUT="no" KERNEL_TARGET="legacy,current,edge" KERNEL_TEST_TARGET="edge" MODULES_BLACKLIST="ir_lirc_codec lirc_dev sunxi-cir" + +function post_config_uboot_target__extra_configs_for_cubieboard() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "432" + + display_alert "$BOARD" "disable de2 to improve edid detection" "info" + run_host_command_logged scripts/config --disable CONFIG_VIDEO_DE2 +} diff --git a/config/boards/cubieboard2.csc b/config/boards/cubieboard2.csc index db9d92fa62..0ab6fe2495 100644 --- a/config/boards/cubieboard2.csc +++ b/config/boards/cubieboard2.csc @@ -4,3 +4,14 @@ BOARDFAMILY="sun7i" BOARD_MAINTAINER="" BOOTCONFIG="Cubieboard2_config" KERNEL_TARGET="legacy,current,edge" + +function post_config_uboot_target__extra_configs_for_cubieboard2() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "432" + + display_alert "$BOARD" "disable de2 to improve edid detection" "info" + run_host_command_logged scripts/config --disable CONFIG_VIDEO_DE2 + + display_alert "$BOARD" "add optional emmc" "info" + run_host_command_logged scripts/config --set-val CONFIG_MMC_SUNXI_SLOT_EXTRA "2" +} diff --git a/config/boards/lamobo-r1.eos b/config/boards/lamobo-r1.eos index 8d91b1a8e4..59cbad16eb 100644 --- a/config/boards/lamobo-r1.eos +++ b/config/boards/lamobo-r1.eos @@ -4,3 +4,8 @@ BOARDFAMILY="sun7i" BOARD_MAINTAINER="" BOOTCONFIG="Lamobo_R1_defconfig" KERNEL_TARGET="current,edge" + +function post_config_uboot_target__extra_configs_for_lamobo_r1() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "384" +} diff --git a/config/boards/lime-a64.csc b/config/boards/lime-a64.csc index 65ec4af41d..cc043bb1fd 100644 --- a/config/boards/lime-a64.csc +++ b/config/boards/lime-a64.csc @@ -7,3 +7,9 @@ BOOTCONFIG="a64-olinuxino_defconfig" KERNEL_TARGET="legacy,current,edge" FULL_DESKTOP="yes" CRUSTCONFIG="a64_defconfig" + +function post_config_uboot_target__extra_configs_for_orangepi_mini() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "624" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_ZQ "3881949" +} diff --git a/config/boards/lime2.csc b/config/boards/lime2.csc index ffb8c5ff1a..4ec5a1d5e7 100644 --- a/config/boards/lime2.csc +++ b/config/boards/lime2.csc @@ -5,3 +5,7 @@ BOARD_MAINTAINER="" BOOTCONFIG="A20-OLinuXino-Lime2-eMMC_defconfig" KERNEL_TARGET="legacy,current,edge" +function post_config_uboot_target__extra_configs_for_lime2() { + run_host_command_logged scripts/config --enable CONFIG_PHY_MICREL + run_host_command_logged scripts/config --enable CONFIG_PHY_MICREL_KSZ90X1 +} diff --git a/config/boards/nanopim1plus.eos b/config/boards/nanopim1plus.eos index 054c820170..0dee577203 100644 --- a/config/boards/nanopim1plus.eos +++ b/config/boards/nanopim1plus.eos @@ -7,3 +7,8 @@ MODULES_LEGACY="g_serial" MODULES_CURRENT="g_serial" SERIALCON="ttyS0,ttyGS0" KERNEL_TARGET="legacy,current,edge" + +function post_config_uboot_target__extra_configs_for_nanopi_m1_plus() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "576" +} diff --git a/config/boards/nanopineoplus2.csc b/config/boards/nanopineoplus2.csc index b79bfc0060..f66c4a4caa 100644 --- a/config/boards/nanopineoplus2.csc +++ b/config/boards/nanopineoplus2.csc @@ -11,3 +11,8 @@ SERIALCON="ttyS0,ttyGS0" HAS_VIDEO_OUTPUT="no" KERNEL_TARGET="legacy,current,edge" CRUSTCONFIG="h5_defconfig" + +function post_config_uboot_target__extra_configs_for_nanopi_neo_plus2() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "504" +} diff --git a/config/boards/orangepi.eos b/config/boards/orangepi.eos index 2940e1e50e..645c5ee845 100644 --- a/config/boards/orangepi.eos +++ b/config/boards/orangepi.eos @@ -4,3 +4,8 @@ BOARDFAMILY="sun7i" BOARD_MAINTAINER="" BOOTCONFIG="Orangepi_defconfig" KERNEL_TARGET="legacy,current,edge" + +function post_config_uboot_target__extra_configs_for_orangepi() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "384" +} diff --git a/config/boards/orangepilite.csc b/config/boards/orangepilite.csc index fc85c0de6e..a07192879d 100644 --- a/config/boards/orangepilite.csc +++ b/config/boards/orangepilite.csc @@ -6,3 +6,10 @@ BOOTCONFIG="orangepi_lite_defconfig" MODULES_LEGACY="g_serial" MODULES_CURRENT="g_serial" KERNEL_TARGET="legacy,current,edge" + +function post_config_uboot_target__extra_configs_for_orangepi_lite() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "624" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_ZQ "3881979" + run_host_command_logged scripts/config --enable CONFIG_DRAM_ODT_EN +} diff --git a/config/boards/orangepimini.eos b/config/boards/orangepimini.eos index 5ec41bc47c..902b3f6653 100644 --- a/config/boards/orangepimini.eos +++ b/config/boards/orangepimini.eos @@ -4,3 +4,8 @@ BOARDFAMILY="sun7i" BOARD_MAINTAINER="" BOOTCONFIG="Orangepi_mini_defconfig" KERNEL_TARGET="legacy,current,edge" + +function post_config_uboot_target__extra_configs_for_orangepi_mini() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "384" +} diff --git a/config/boards/orangepione.conf b/config/boards/orangepione.conf index c8c0261c7f..d88f24adf6 100644 --- a/config/boards/orangepione.conf +++ b/config/boards/orangepione.conf @@ -4,3 +4,10 @@ BOARDFAMILY="sun8i" BOARD_MAINTAINER="StephenGraf" BOOTCONFIG="orangepi_one_defconfig" KERNEL_TARGET="legacy,current,edge" + +function post_config_uboot_target__extra_configs_for_orangepi_one() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "624" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_ZQ "3881979" + run_host_command_logged scripts/config --enable CONFIG_DRAM_ODT_EN +} diff --git a/config/boards/orangepipc2.csc b/config/boards/orangepipc2.csc index 32ff510ed9..9d869d09a8 100644 --- a/config/boards/orangepipc2.csc +++ b/config/boards/orangepipc2.csc @@ -6,3 +6,9 @@ BOOTCONFIG="orangepi_pc2_defconfig" KERNEL_TARGET="legacy,current,edge" FULL_DESKTOP="yes" CRUSTCONFIG="h5_defconfig" + +function post_config_uboot_target__extra_configs_for_orangepi_pc2() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "504" + run_host_command_logged scripts/config --enable CONFIG_DRAM_ODT_EN +} diff --git a/config/boards/orangepiplus.csc b/config/boards/orangepiplus.csc index 5d16929b97..810dce4d16 100644 --- a/config/boards/orangepiplus.csc +++ b/config/boards/orangepiplus.csc @@ -4,3 +4,10 @@ BOARDFAMILY="sun8i" BOARD_MAINTAINER="" BOOTCONFIG="orangepi_plus_defconfig" KERNEL_TARGET="legacy,current,edge" + +function post_config_uboot_target__extra_configs_for_orangepi_plus() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "624" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_ZQ "3881979" + run_host_command_logged scripts/config --enable CONFIG_DRAM_ODT_EN +} diff --git a/config/boards/orangepiplus2e.csc b/config/boards/orangepiplus2e.csc index ecafd1c67d..b390f89455 100644 --- a/config/boards/orangepiplus2e.csc +++ b/config/boards/orangepiplus2e.csc @@ -6,3 +6,10 @@ BOOTCONFIG="orangepi_plus2e_defconfig" KERNEL_TARGET="legacy,current,edge" KERNEL_TEST_TARGET="legacy" FULL_DESKTOP="yes" + +function post_config_uboot_target__extra_configs_for_orangepi_plus2e() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "624" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_ZQ "3881979" + run_host_command_logged scripts/config --enable CONFIG_DRAM_ODT_EN +} diff --git a/config/boards/orangepiprime.conf b/config/boards/orangepiprime.conf index 171eedf548..cdffa024f6 100644 --- a/config/boards/orangepiprime.conf +++ b/config/boards/orangepiprime.conf @@ -8,3 +8,9 @@ KERNEL_TARGET="legacy,current,edge" KERNEL_TEST_TARGET="current" FULL_DESKTOP="yes" CRUSTCONFIG="orangepi_pc2_defconfig" + +function post_config_uboot_target__extra_configs_for_orangepi_prime() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "504" + run_host_command_logged scripts/config --enable CONFIG_DRAM_ODT_EN +} diff --git a/config/boards/orangepizeroplus2-h5.csc b/config/boards/orangepizeroplus2-h5.csc index bf0c04537e..b45bbe3294 100644 --- a/config/boards/orangepizeroplus2-h5.csc +++ b/config/boards/orangepizeroplus2-h5.csc @@ -10,3 +10,8 @@ HAS_VIDEO_OUTPUT="no" SERIALCON="ttyS0,ttyGS0" KERNEL_TARGET="legacy,current,edge" CRUSTCONFIG="h5_defconfig" + +function post_config_uboot_target__extra_configs_for_orangepi_zero_plus2() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "504" +} diff --git a/config/boards/pcduino3.csc b/config/boards/pcduino3.csc index 0388d38844..cc7a35bf64 100644 --- a/config/boards/pcduino3.csc +++ b/config/boards/pcduino3.csc @@ -4,3 +4,8 @@ BOARDFAMILY="sun7i" BOARD_MAINTAINER="" BOOTCONFIG="Linksprite_pcDuino3_defconfig" KERNEL_TARGET="legacy,current,edge" + +function post_config_uboot_target__extra_configs_for_pcDuino3() { + display_alert "$BOARD" "set dram clock" "info" + run_host_command_logged scripts/config --set-val CONFIG_DRAM_CLK "408" +} diff --git a/patch/u-boot/u-boot-sunxi/allwinner-adjust-default-dram-clockspeeds.patch b/patch/u-boot/u-boot-sunxi/allwinner-adjust-default-dram-clockspeeds.patch deleted file mode 100644 index 908de85a9a..0000000000 --- a/patch/u-boot/u-boot-sunxi/allwinner-adjust-default-dram-clockspeeds.patch +++ /dev/null @@ -1,194 +0,0 @@ -diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig -index f97dc131f2..bbb1034170 100644 ---- a/configs/Lamobo_R1_defconfig -+++ b/configs/Lamobo_R1_defconfig -@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1" - CONFIG_SPL=y - CONFIG_MACH_SUN7I=y --CONFIG_DRAM_CLK=432 -+CONFIG_DRAM_CLK=384 - CONFIG_MACPWR="PH23" - CONFIG_MMC0_CD_PIN="PH10" - CONFIG_SATAPWR="PB3" -diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig -index 1fda0db4c9..e38d986ccd 100644 ---- a/configs/Linksprite_pcDuino3_defconfig -+++ b/configs/Linksprite_pcDuino3_defconfig -@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3" - CONFIG_SPL=y - CONFIG_MACH_SUN7I=y --CONFIG_DRAM_CLK=480 -+CONFIG_DRAM_CLK=408 - CONFIG_DRAM_ZQ=122 - CONFIG_SATAPWR="PH2" - CONFIG_AHCI=y -diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig -index c89a9a1f9d..3405f3d70d 100644 ---- a/configs/Orangepi_defconfig -+++ b/configs/Orangepi_defconfig -@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi" - CONFIG_SPL=y - CONFIG_MACH_SUN7I=y --CONFIG_DRAM_CLK=432 -+CONFIG_DRAM_CLK=384 - CONFIG_MACPWR="PH23" - CONFIG_USB1_VBUS_PIN="PH26" - CONFIG_USB2_VBUS_PIN="PH22" -diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig -index 8757dcb461..2d0315b655 100644 ---- a/configs/Orangepi_mini_defconfig -+++ b/configs/Orangepi_mini_defconfig -@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini" - CONFIG_SPL=y - CONFIG_MACH_SUN7I=y --CONFIG_DRAM_CLK=432 -+CONFIG_DRAM_CLK=384 - CONFIG_MACPWR="PH23" - CONFIG_MMC0_CD_PIN="PH10" - CONFIG_MMC3_CD_PIN="PH11" -diff --git a/configs/a64-olinuxino_defconfig b/configs/a64-olinuxino_defconfig -index 16cef18bee..99fa24ae23 100644 ---- a/configs/a64-olinuxino_defconfig -+++ b/configs/a64-olinuxino_defconfig -@@ -6,6 +6,8 @@ CONFIG_MACH_SUN50I=y - CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y - CONFIG_MMC_SUNXI_SLOT_EXTRA=2 - # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -+CONFIG_DRAM_CLK=624 -+CONFIG_DRAM_ZQ=3881949 - CONFIG_SUN8I_EMAC=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_OHCI_HCD=y -diff --git a/configs/nanopi_m1_plus_defconfig b/configs/nanopi_m1_plus_defconfig -index 37b7817d86..4953e09c18 100644 ---- a/configs/nanopi_m1_plus_defconfig -+++ b/configs/nanopi_m1_plus_defconfig -@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-m1-plus" - CONFIG_SPL=y - CONFIG_MACH_SUN8I_H3=y --CONFIG_DRAM_CLK=408 -+CONFIG_DRAM_CLK=576 - CONFIG_MACPWR="PD6" - CONFIG_MMC0_CD_PIN="PH13" - CONFIG_MMC_SUNXI_SLOT_EXTRA=2 -diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig -index 924ff38f17..5171cb4800 100644 ---- a/configs/nanopi_neo_plus2_defconfig -+++ b/configs/nanopi_neo_plus2_defconfig -@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-plus2" - CONFIG_SPL=y - CONFIG_MACH_SUN50I_H5=y --CONFIG_DRAM_CLK=408 -+CONFIG_DRAM_CLK=504 - CONFIG_DRAM_ZQ=3881977 - # CONFIG_DRAM_ODT_EN is not set - CONFIG_MACPWR="PD6" -diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig -index 96bbd1bab6..ab64319875 100644 ---- a/configs/orangepi_lite_defconfig -+++ b/configs/orangepi_lite_defconfig -@@ -3,7 +3,9 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-lite" - CONFIG_SPL=y - CONFIG_MACH_SUN8I_H3=y --CONFIG_DRAM_CLK=672 -+CONFIG_DRAM_CLK=624 -+CONFIG_DRAM_ZQ=3881979 -+CONFIG_DRAM_ODT_EN=y - # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_OHCI_HCD=y -diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig -index 1064b4a39d..cbe2c97f2b 100644 ---- a/configs/orangepi_one_defconfig -+++ b/configs/orangepi_one_defconfig -@@ -3,7 +3,9 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-one" - CONFIG_SPL=y - CONFIG_MACH_SUN8I_H3=y --CONFIG_DRAM_CLK=672 -+CONFIG_DRAM_CLK=624 -+CONFIG_DRAM_ZQ=3881979 -+CONFIG_DRAM_ODT_EN=y - # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set - CONFIG_SUN8I_EMAC=y - CONFIG_USB_EHCI_HCD=y -diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig -index 777af8c60e..5a7dbd45e8 100644 ---- a/configs/orangepi_pc2_defconfig -+++ b/configs/orangepi_pc2_defconfig -@@ -3,8 +3,9 @@ CONFIG_ARCH_SUNXI=y - 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_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 138a6a72b8..879f01dcd8 100644 ---- a/configs/orangepi_plus2e_defconfig -+++ b/configs/orangepi_plus2e_defconfig -@@ -3,7 +3,9 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus2e" - CONFIG_SPL=y - CONFIG_MACH_SUN8I_H3=y --CONFIG_DRAM_CLK=672 -+CONFIG_DRAM_CLK=624 -+CONFIG_DRAM_ZQ=3881979 -+CONFIG_DRAM_ODT_EN=y - CONFIG_MACPWR="PD6" - CONFIG_MMC_SUNXI_SLOT_EXTRA=2 - # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig -index 76de72aa22..aa3f51e97b 100644 ---- a/configs/orangepi_plus_defconfig -+++ b/configs/orangepi_plus_defconfig -@@ -3,7 +3,9 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus" - CONFIG_SPL=y - CONFIG_MACH_SUN8I_H3=y --CONFIG_DRAM_CLK=672 -+CONFIG_DRAM_CLK=624 -+CONFIG_DRAM_ZQ=3881979 -+CONFIG_DRAM_ODT_EN=y - CONFIG_MACPWR="PD6" - CONFIG_MMC_SUNXI_SLOT_EXTRA=2 - CONFIG_USB1_VBUS_PIN="PG13" -diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig -index 95a82e20f3..551348f8c6 100644 ---- a/configs/orangepi_prime_defconfig -+++ b/configs/orangepi_prime_defconfig -@@ -3,8 +3,9 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-prime" - 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_SYS_MALLOC_CLEAR_ON_INIT is not set - CONFIG_SUN8I_EMAC=y -diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig -index 9583d24c8d..77a3ad5b83 100644 ---- a/configs/orangepi_zero_plus2_defconfig -+++ b/configs/orangepi_zero_plus2_defconfig -@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-zero-plus2" - CONFIG_SPL=y - CONFIG_MACH_SUN50I_H5=y --CONFIG_DRAM_CLK=672 -+CONFIG_DRAM_CLK=504 - CONFIG_DRAM_ZQ=3881977 - # CONFIG_DRAM_ODT_EN is not set - CONFIG_MMC0_CD_PIN="PH13" diff --git a/patch/u-boot/u-boot-sunxi/board_bananapi/adjust-default-dram-clockspeeds.patch b/patch/u-boot/u-boot-sunxi/board_bananapi/adjust-default-dram-clockspeeds.patch deleted file mode 100644 index 8a57602a19..0000000000 --- a/patch/u-boot/u-boot-sunxi/board_bananapi/adjust-default-dram-clockspeeds.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig -index fe75eef513..74bcfc64af 100644 ---- a/configs/Bananapi_defconfig -+++ b/configs/Bananapi_defconfig -@@ -1,7 +1,7 @@ - CONFIG_ARM=y - CONFIG_ARCH_SUNXI=y - CONFIG_MACH_SUN7I=y --CONFIG_DRAM_CLK=432 -+CONFIG_DRAM_CLK=384 - CONFIG_MACPWR="PH23" - CONFIG_VIDEO_COMPOSITE=y - CONFIG_GMAC_TX_DELAY=3 diff --git a/patch/u-boot/u-boot-sunxi/board_bananapi/allwinner-disable-de2-to-improve-edid-detection.patch b/patch/u-boot/u-boot-sunxi/board_bananapi/allwinner-disable-de2-to-improve-edid-detection.patch deleted file mode 100644 index bf114369f2..0000000000 --- a/patch/u-boot/u-boot-sunxi/board_bananapi/allwinner-disable-de2-to-improve-edid-detection.patch +++ /dev/null @@ -1,12 +0,0 @@ -This patch disables display driver in u-boot which improves EDID detection -https://forum.armbian.com/topic/13651-pine-a64-no-hdmi-signal/?do=findComment&comment=99169 - -diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig -index 7300e132..871c99ec 100644 ---- a/configs/Bananapi_defconfig -+++ b/configs/Bananapi_defconfig -@@ -20,3 +20,4 @@ CONFIG_SUN7I_GMAC=y - CONFIG_SCSI=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_OHCI_HCD=y -+CONFIG_VIDEO_DE2=n diff --git a/patch/u-boot/u-boot-sunxi/board_bananapipro/adjust-default-dram-clockspeeds.patch b/patch/u-boot/u-boot-sunxi/board_bananapipro/adjust-default-dram-clockspeeds.patch deleted file mode 100644 index 94352fe71f..0000000000 --- a/patch/u-boot/u-boot-sunxi/board_bananapipro/adjust-default-dram-clockspeeds.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig -index df65922e83..80a45fde6f 100644 ---- a/configs/Bananapro_defconfig -+++ b/configs/Bananapro_defconfig -@@ -1,7 +1,7 @@ - CONFIG_ARM=y - CONFIG_ARCH_SUNXI=y - CONFIG_MACH_SUN7I=y --CONFIG_DRAM_CLK=432 -+CONFIG_DRAM_CLK=384 - CONFIG_MACPWR="PH23" - CONFIG_USB1_VBUS_PIN="PH0" - CONFIG_USB2_VBUS_PIN="PH1" diff --git a/patch/u-boot/u-boot-sunxi/board_cubieboard/adjust-default-dram-clockspeeds.patch b/patch/u-boot/u-boot-sunxi/board_cubieboard/adjust-default-dram-clockspeeds.patch deleted file mode 100644 index f23cae95b9..0000000000 --- a/patch/u-boot/u-boot-sunxi/board_cubieboard/adjust-default-dram-clockspeeds.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig -index 71743f7b8a..29e695d4a7 100644 ---- a/configs/Cubieboard_defconfig -+++ b/configs/Cubieboard_defconfig -@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard" - CONFIG_SPL=y - CONFIG_MACH_SUN4I=y --CONFIG_DRAM_CLK=480 -+CONFIG_DRAM_CLK=432 - CONFIG_SATAPWR="PB8" - CONFIG_AHCI=y - # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git a/patch/u-boot/u-boot-sunxi/board_cubieboard/allwinner-disable-de2-to-improve-edid-detection.patch b/patch/u-boot/u-boot-sunxi/board_cubieboard/allwinner-disable-de2-to-improve-edid-detection.patch deleted file mode 100644 index ad78b7e60f..0000000000 --- a/patch/u-boot/u-boot-sunxi/board_cubieboard/allwinner-disable-de2-to-improve-edid-detection.patch +++ /dev/null @@ -1,12 +0,0 @@ -This patch disables display driver in u-boot which improves EDID detection -https://forum.armbian.com/topic/13651-pine-a64-no-hdmi-signal/?do=findComment&comment=99169 - -diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig -index 17b0a758..eb6d29c9 100644 ---- a/configs/Cubieboard_defconfig -+++ b/configs/Cubieboard_defconfig -@@ -15,3 +15,4 @@ CONFIG_SUN4I_EMAC=y - CONFIG_SCSI=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_OHCI_HCD=y -+CONFIG_VIDEO_DE2=n diff --git a/patch/u-boot/u-boot-sunxi/board_cubieboard2/add-a20-optional-eMMC.patch b/patch/u-boot/u-boot-sunxi/board_cubieboard2/add-a20-optional-eMMC.patch deleted file mode 100644 index 6e628272f0..0000000000 --- a/patch/u-boot/u-boot-sunxi/board_cubieboard2/add-a20-optional-eMMC.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig -index ef95ac6a5e..7565786648 100644 ---- a/configs/Cubieboard2_defconfig -+++ b/configs/Cubieboard2_defconfig -@@ -19,3 +19,4 @@ CONFIG_SUN7I_GMAC=y - CONFIG_SCSI=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_OHCI_HCD=y -+CONFIG_MMC_SUNXI_SLOT_EXTRA=2 -diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig -index f9f73fdb23..ecb4f2f24e 100644 ---- a/configs/Cubietruck_defconfig -+++ b/configs/Cubietruck_defconfig -@@ -30,3 +30,4 @@ CONFIG_SCSI=y - CONFIG_SCSI=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_MUSB_GADGET=y -+CONFIG_MMC_SUNXI_SLOT_EXTRA=2 diff --git a/patch/u-boot/u-boot-sunxi/board_cubieboard2/adjust-default-dram-clockspeeds.patch b/patch/u-boot/u-boot-sunxi/board_cubieboard2/adjust-default-dram-clockspeeds.patch deleted file mode 100644 index 9039f3b506..0000000000 --- a/patch/u-boot/u-boot-sunxi/board_cubieboard2/adjust-default-dram-clockspeeds.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig -index 10314ab991..a1d8866d78 100644 ---- a/configs/Cubieboard2_defconfig -+++ b/configs/Cubieboard2_defconfig -@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2" - CONFIG_SPL=y - CONFIG_MACH_SUN7I=y --CONFIG_DRAM_CLK=480 -+CONFIG_DRAM_CLK=432 - CONFIG_SATAPWR="PB8" - CONFIG_AHCI=y - # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git a/patch/u-boot/u-boot-sunxi/board_cubieboard2/allwinner-disable-de2-to-improve-edid-detection.patch b/patch/u-boot/u-boot-sunxi/board_cubieboard2/allwinner-disable-de2-to-improve-edid-detection.patch deleted file mode 100644 index a1efff6191..0000000000 --- a/patch/u-boot/u-boot-sunxi/board_cubieboard2/allwinner-disable-de2-to-improve-edid-detection.patch +++ /dev/null @@ -1,12 +0,0 @@ -This patch disables display driver in u-boot which improves EDID detection -https://forum.armbian.com/topic/13651-pine-a64-no-hdmi-signal/?do=findComment&comment=99169 - -diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig -index 292ce818..4d537bc2 100644 ---- a/configs/Cubieboard2_defconfig -+++ b/configs/Cubieboard2_defconfig -@@ -18,3 +18,4 @@ CONFIG_SCSI=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_OHCI_HCD=y - CONFIG_MMC_SUNXI_SLOT_EXTRA=2 -+CONFIG_VIDEO_DE2=n diff --git a/patch/u-boot/u-boot-sunxi/board_lime2/GMAC_TX_DELAY_autocorrection.patch b/patch/u-boot/u-boot-sunxi/board_lime2/GMAC_TX_DELAY_autocorrection.patch index 5a73658df7..ec7c0fed37 100644 --- a/patch/u-boot/u-boot-sunxi/board_lime2/GMAC_TX_DELAY_autocorrection.patch +++ b/patch/u-boot/u-boot-sunxi/board_lime2/GMAC_TX_DELAY_autocorrection.patch @@ -1,16 +1,3 @@ -diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig -index cd1fa64..f817b8c 100644 ---- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig -+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig -@@ -7,6 +7,8 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2 - CONFIG_USB0_VBUS_PIN="PC17" - CONFIG_USB0_VBUS_DET="PH5" - CONFIG_I2C1_ENABLE=y -+CONFIG_PHY_MICREL=y -+CONFIG_PHY_MICREL_KSZ90X1=y - CONFIG_SATAPWR="PC3" - CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2-emmc" - CONFIG_AHCI=y diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c index b350a61..701a3d1 100644 --- a/drivers/net/phy/micrel_ksz90x1.c