From 4ba494ae6ec0515c9e076624bb0ec7fa7f97655d Mon Sep 17 00:00:00 2001 From: 5kft <5kft@users.noreply.github.com> Date: Sat, 19 Sep 2020 10:09:05 -0700 Subject: [PATCH] [ sunxi-dev ] move u-boot to v2020.07 --- .../families/include/sunxi64_common.inc | 1 + .../sources/families/include/sunxi_common.inc | 1 + ...isable-de2-to-improve-edid-detection.patch | 41 ++++++++++--------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 5417f9be7e..acda4fd001 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -29,6 +29,7 @@ case $BRANCH in KERNELSOURCE="https://github.com/megous/linux" KERNELBRANCH="branch:orange-pi-5.9" KERNELPATCHDIR='sunxi-'$BRANCH + BOOTBRANCH='tag:v2020.07' ;; esac diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index 622e7e2a91..e16fd305fd 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -31,6 +31,7 @@ case $BRANCH in KERNELSOURCE="https://github.com/megous/linux" KERNELBRANCH="branch:orange-pi-5.9" KERNELPATCHDIR='sunxi-'$BRANCH + BOOTBRANCH='tag:v2020.07' ;; esac diff --git a/patch/u-boot/u-boot-sunxi/xxx-disable-de2-to-improve-edid-detection.patch b/patch/u-boot/u-boot-sunxi/xxx-disable-de2-to-improve-edid-detection.patch index 70e7a1ac09..f8028e7426 100644 --- a/patch/u-boot/u-boot-sunxi/xxx-disable-de2-to-improve-edid-detection.patch +++ b/patch/u-boot/u-boot-sunxi/xxx-disable-de2-to-improve-edid-detection.patch @@ -11,28 +11,28 @@ index e3d67670..2f9874ee 100644 CONFIG_USB_OHCI_HCD=y +CONFIG_VIDEO_DE2=n diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig -index 656a0e1d..0fc91ff4 100644 +index 7300e132..871c99ec 100644 --- a/configs/Bananapi_defconfig +++ b/configs/Bananapi_defconfig -@@ -19,3 +19,4 @@ CONFIG_SUN7I_GMAC=y +@@ -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/configs/Bananapi_m2m_defconfig b/configs/Bananapi_m2m_defconfig -index 2649c7e8..331a7573 100644 +index 8806fe66..fe9ecff6 100644 --- a/configs/Bananapi_m2m_defconfig +++ b/configs/Bananapi_m2m_defconfig -@@ -16,3 +16,4 @@ CONFIG_USB_EHCI_HCD=y +@@ -15,3 +15,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_FUNCTION_MASS_STORAGE=y +CONFIG_VIDEO_DE2=n diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig -index cc6906a6..5ddcdf93 100644 +index 292ce818..4d537bc2 100644 --- a/configs/Cubieboard2_defconfig +++ b/configs/Cubieboard2_defconfig -@@ -17,3 +17,4 @@ CONFIG_SCSI=y +@@ -18,3 +18,4 @@ CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y CONFIG_MMC_SUNXI_SLOT_EXTRA=2 @@ -47,7 +47,7 @@ index 17b0a758..eb6d29c9 100644 CONFIG_USB_OHCI_HCD=y +CONFIG_VIDEO_DE2=n diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig -index b7287d43..dba75bc0 100644 +index 88b3322e..5cfcc06a 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -29,3 +29,4 @@ CONFIG_USB_EHCI_HCD=y @@ -65,20 +65,20 @@ index 20906ff5..aaebbdc9 100644 CONFIG_USB_OHCI_HCD=y +CONFIG_VIDEO_DE2=n diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig -index 6c3c9cbc..498493f4 100644 +index f7a3c351..ecd76a3b 100644 --- a/configs/Orangepi_mini_defconfig +++ b/configs/Orangepi_mini_defconfig -@@ -23,3 +23,4 @@ CONFIG_SUN7I_GMAC=y +@@ -24,3 +24,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/configs/a64-olinuxino-emmc_defconfig b/configs/a64-olinuxino-emmc_defconfig -index 08687cb6..c0f619fa 100644 +index b6205829..20311403 100644 --- a/configs/a64-olinuxino-emmc_defconfig +++ b/configs/a64-olinuxino-emmc_defconfig -@@ -10,3 +10,4 @@ CONFIG_SUN8I_EMAC=y - CONFIG_SUPPORT_EMMC_BOOT=y +@@ -10,3 +10,4 @@ CONFIG_SUPPORT_EMMC_BOOT=y + CONFIG_SUN8I_EMAC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y +CONFIG_VIDEO_DE2=n @@ -92,10 +92,10 @@ index cb270cd7..546a4e34 100644 CONFIG_USB_OHCI_HCD=y +CONFIG_VIDEO_DE2=n diff --git a/configs/bananapi_m1_plus_defconfig b/configs/bananapi_m1_plus_defconfig -index 3813b6e8..32adeb8f 100644 +index e533555c..8a611710 100644 --- a/configs/bananapi_m1_plus_defconfig +++ b/configs/bananapi_m1_plus_defconfig -@@ -19,3 +19,4 @@ CONFIG_SUN7I_GMAC=y +@@ -20,3 +20,4 @@ CONFIG_SUN7I_GMAC=y CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y @@ -335,14 +335,17 @@ index a0375770..5aafc17b 100644 CONFIG_USB_OHCI_HCD=y +CONFIG_VIDEO_DE2=n diff --git a/configs/pine_h64_defconfig b/configs/pine_h64_defconfig -index cb5e624a..94891f75 100644 +index 87871fd1..c95654a8 100644 --- a/configs/pine_h64_defconfig +++ b/configs/pine_h64_defconfig -@@ -12,3 +12,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-pine-h64" - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_OHCI_HCD=y - CONFIG_SPL_SPI_SUNXI=y +@@ -1,6 +1,7 @@ + CONFIG_ARM=y + CONFIG_ARCH_SUNXI=y + CONFIG_SPL=y +CONFIG_VIDEO_DE2=n + CONFIG_MACH_SUN50I_H6=y + CONFIG_SUNXI_DRAM_H6_LPDDR3=y + CONFIG_MMC0_CD_PIN="PF6" diff --git a/configs/sunvell_r69_defconfig b/configs/sunvell_r69_defconfig index d03dcec8..f1fc8f12 100644 --- a/configs/sunvell_r69_defconfig