From patchwork Wed Mar 18 22:27:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1257828 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=HaQCnTAE; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48jPnx2vTdz9sPF for ; Thu, 19 Mar 2020 09:28:37 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oB92deSBcN2Zjn6sySyJRZzU4CCP5F6qb0bpHjSBh/s=; b=HaQCnTAEbsCSt+ YcIcWZCIdHNV2Okcks9ZtNUG/nDZQXbCtja50AjlCFjFCmFwA3vJxCJ6+zhOns6OUXNK2LhuVF1mu 5zwkeVQ3jy9ktluGkUW7RQeZ8WVijdRjkIu9Bl2Cz0U/0QDKmxBwiIsrpa21R0hURtSg3ow7VmMPD MbjDdClEsfGrJ46vUn1B3rbnMVwItqS2miR+ouFOIGealX0MqWINuBCSQW2TbUOAtcqjDim11M45A D0K3eCThjn7jI1UM0rvpaVwIaetmrmOfGhnuaKohPdKRJT3wiopKLVRL/D1RLhw+JGr+/STz0D07K 9jHYZB4tqi9GxFl4rgJA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEhAv-000838-GQ; Wed, 18 Mar 2020 22:28:33 +0000 Received: from smtp-out.xnet.cz ([178.217.244.18]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEhA4-0006uX-O0 for openwrt-devel@lists.openwrt.org; Wed, 18 Mar 2020 22:27:44 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 109544C16; Wed, 18 Mar 2020 23:27:37 +0100 (CET) Received: by meh.true.cz (OpenSMTPD) with ESMTP id 1ac6c8ab; Wed, 18 Mar 2020 23:27:23 +0100 (CET) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Wed, 18 Mar 2020 23:27:05 +0100 Message-Id: <20200318222713.1495-2-ynezz@true.cz> In-Reply-To: <20200318222713.1495-1-ynezz@true.cz> References: <20200318222713.1495-1-ynezz@true.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200318_152741_082876_05E262CE X-CRM114-Status: GOOD ( 17.28 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [178.217.244.18 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH 1/9] uboot-sunxi: bump to 2020.01 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Petr_=C5=A0tetiar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Refreshed patches, removed following, probably obsolete patches: 221-compatible-old-dtc.patch 240-sun50i-h5-Orange-Pi-Zero-Plus-Fix-SdCard-detection.patch Signed-off-by: Petr Štetiar --- package/boot/uboot-sunxi/Makefile | 4 +- .../003-add-theobroma-a31-pangolin.patch | 4 +- .../patches/062-A20-improve-gmac-upload.patch | 2 +- .../063-fix-lime2-revK-add-micrel-PHY.patch | 12 ++--- ...1-sun6i-sync-PLL1-multdiv-with-Boot1.patch | 2 +- .../100-sun6i-alternate-on-UART2.patch | 2 +- .../101-sun6i-support-console-on-UART2.patch | 4 +- ...2-sunxi-make_CONS_INDEX-configurable.patch | 2 +- ...-environment-for-dtc-binary-location.patch | 2 +- .../patches/210-sunxi-deactivate-binman.patch | 4 +- .../patches/221-compatible-old-dtc.patch | 52 ------------------- .../230-disable-axp209-on-a13-olinuxino.diff | 8 +-- ...ge-Pi-Zero-Plus-Fix-SdCard-detection.patch | 28 ---------- 13 files changed, 23 insertions(+), 103 deletions(-) delete mode 100644 package/boot/uboot-sunxi/patches/221-compatible-old-dtc.patch delete mode 100644 package/boot/uboot-sunxi/patches/240-sun50i-h5-Orange-Pi-Zero-Plus-Fix-SdCard-detection.patch diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index eef4c56f5321..69d5d9269b2d 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -PKG_VERSION:=2019.01 +PKG_VERSION:=2020.01 -PKG_HASH:=50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22 +PKG_HASH:=aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1 PKG_MAINTAINER:=Zoltan HERPAI diff --git a/package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch b/package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch index 899bcb12994c..518f882d2095 100644 --- a/package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch +++ b/package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch @@ -1,6 +1,6 @@ --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -313,6 +313,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ +@@ -446,6 +446,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ sun6i-a31-m9.dtb \ sun6i-a31-mele-a1000g-quad.dtb \ sun6i-a31-mixtile-loftq.dtb \ @@ -358,7 +358,7 @@ +CONFIG_SUNXI_SPI=y --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig -@@ -875,6 +875,14 @@ config VIDEO_LCD_PANEL_I2C_SCL +@@ -895,6 +895,14 @@ config VIDEO_LCD_PANEL_I2C_SCL Set the SCL pin for the LCD i2c interface. This takes a string in the format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H. diff --git a/package/boot/uboot-sunxi/patches/062-A20-improve-gmac-upload.patch b/package/boot/uboot-sunxi/patches/062-A20-improve-gmac-upload.patch index a1caf18a184a..13a703f307d2 100644 --- a/package/boot/uboot-sunxi/patches/062-A20-improve-gmac-upload.patch +++ b/package/boot/uboot-sunxi/patches/062-A20-improve-gmac-upload.patch @@ -2,7 +2,7 @@ --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig -@@ -25,6 +25,7 @@ CONFIG_ETH_DESIGNWARE=y +@@ -26,6 +26,7 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_MII=y CONFIG_SUN7I_GMAC=y diff --git a/package/boot/uboot-sunxi/patches/063-fix-lime2-revK-add-micrel-PHY.patch b/package/boot/uboot-sunxi/patches/063-fix-lime2-revK-add-micrel-PHY.patch index 9ea0642537b7..d5536345564f 100644 --- a/package/boot/uboot-sunxi/patches/063-fix-lime2-revK-add-micrel-PHY.patch +++ b/package/boot/uboot-sunxi/patches/063-fix-lime2-revK-add-micrel-PHY.patch @@ -1,17 +1,17 @@ --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig -@@ -8,6 +8,8 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +@@ -9,6 +9,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_SPL_SPI_SUNXI=y CONFIG_AHCI=y - CONFIG_NR_DRAM_BANKS=1 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig -@@ -7,6 +7,8 @@ CONFIG_MMC0_CD_PIN="PH1" +@@ -8,6 +8,8 @@ CONFIG_MMC0_CD_PIN="PH1" CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5" CONFIG_I2C1_ENABLE=y @@ -19,10 +19,10 @@ +CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_SATAPWR="PC3" CONFIG_AHCI=y - CONFIG_NR_DRAM_BANKS=1 + # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set --- a/drivers/net/phy/micrel_ksz90x1.c +++ b/drivers/net/phy/micrel_ksz90x1.c -@@ -13,6 +13,8 @@ +@@ -14,6 +14,8 @@ #include #include #include @@ -31,7 +31,7 @@ /* * KSZ9021 - KSZ9031 common -@@ -329,6 +331,10 @@ static int ksz9031_phy_extwrite(struct p +@@ -344,6 +346,10 @@ static int ksz9031_phy_extwrite(struct p static int ksz9031_config(struct phy_device *phydev) { int ret; diff --git a/package/boot/uboot-sunxi/patches/091-sun6i-sync-PLL1-multdiv-with-Boot1.patch b/package/boot/uboot-sunxi/patches/091-sun6i-sync-PLL1-multdiv-with-Boot1.patch index bcf2faa186dd..f2a2b5e48fc9 100644 --- a/package/boot/uboot-sunxi/patches/091-sun6i-sync-PLL1-multdiv-with-Boot1.patch +++ b/package/boot/uboot-sunxi/patches/091-sun6i-sync-PLL1-multdiv-with-Boot1.patch @@ -28,5 +28,5 @@ More specifically, the following settings are now used: + k = 4; + m = 2; } else if (clk > 768000000) { - k = 3; + k = 4; m = 2; diff --git a/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch b/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch index 8bab22051885..a7afa5130419 100644 --- a/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch +++ b/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch @@ -6,7 +6,7 @@ Subject: sun6i: define alternate-function for UART2 on GPG --- a/arch/arm/include/asm/arch-sunxi/gpio.h +++ b/arch/arm/include/asm/arch-sunxi/gpio.h -@@ -186,6 +186,7 @@ enum sunxi_gpio_number { +@@ -190,6 +190,7 @@ enum sunxi_gpio_number { #define SUN6I_GPG_SDC1 2 #define SUN8I_GPG_SDC1 2 #define SUN6I_GPG_TWI3 2 diff --git a/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch b/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch index b92269084549..823c1568090b 100644 --- a/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch +++ b/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch @@ -6,7 +6,7 @@ Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7) --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c -@@ -127,6 +127,10 @@ static int gpio_init(void) +@@ -129,6 +129,10 @@ static int gpio_init(void) sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG_UART1); sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG_UART1); sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP); @@ -19,7 +19,7 @@ Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7) sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_GPB_UART2); --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h -@@ -258,6 +258,8 @@ extern int soft_i2c_gpio_scl; +@@ -244,6 +244,8 @@ extern int soft_i2c_gpio_scl; #endif #elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I) #define OF_STDOUT_PATH "/soc@01c00000/serial@01c28400:115200" diff --git a/package/boot/uboot-sunxi/patches/102-sunxi-make_CONS_INDEX-configurable.patch b/package/boot/uboot-sunxi/patches/102-sunxi-make_CONS_INDEX-configurable.patch index 4e35d582fafd..b8c1253dcd70 100644 --- a/package/boot/uboot-sunxi/patches/102-sunxi-make_CONS_INDEX-configurable.patch +++ b/package/boot/uboot-sunxi/patches/102-sunxi-make_CONS_INDEX-configurable.patch @@ -6,7 +6,7 @@ Subject: ARM: sunxi: Make CONS_INDEX configurable --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig -@@ -538,6 +538,14 @@ config SYS_BOARD +@@ -558,6 +558,14 @@ config SYS_BOARD config SYS_SOC default "sunxi" diff --git a/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch b/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch index 12f47259c323..fe8eac78488d 100644 --- a/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch +++ b/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch @@ -17,7 +17,7 @@ Cc: Simon Glass --- a/tools/fit_image.c +++ b/tools/fit_image.c -@@ -656,9 +656,14 @@ static int fit_handle_file(struct image_ +@@ -662,9 +662,14 @@ static int fit_handle_file(struct image_ } *cmd = '\0'; } else if (params->datafile) { diff --git a/package/boot/uboot-sunxi/patches/210-sunxi-deactivate-binman.patch b/package/boot/uboot-sunxi/patches/210-sunxi-deactivate-binman.patch index d86097858aa8..c6be8369154a 100644 --- a/package/boot/uboot-sunxi/patches/210-sunxi-deactivate-binman.patch +++ b/package/boot/uboot-sunxi/patches/210-sunxi-deactivate-binman.patch @@ -12,7 +12,7 @@ old way of generating images. --- a/Makefile +++ b/Makefile -@@ -1344,8 +1344,10 @@ endif +@@ -1525,8 +1525,10 @@ endif ifneq ($(CONFIG_ARCH_SUNXI),) ifeq ($(CONFIG_ARM64),) @@ -27,7 +27,7 @@ old way of generating images. $(call if_changed,cat) --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -842,7 +842,6 @@ config ARCH_SOCFPGA +@@ -945,7 +945,6 @@ config ARCH_SOCFPGA config ARCH_SUNXI bool "Support sunxi (Allwinner) SoCs" diff --git a/package/boot/uboot-sunxi/patches/221-compatible-old-dtc.patch b/package/boot/uboot-sunxi/patches/221-compatible-old-dtc.patch deleted file mode 100644 index 4056d9800894..000000000000 --- a/package/boot/uboot-sunxi/patches/221-compatible-old-dtc.patch +++ /dev/null @@ -1,52 +0,0 @@ -Revert the commit c0e032e0090d65 ("scripts/dtc: Update to upstream -version v1.4.3") -OpenWrt uses the dtc from the kernel also in u-boot, but when we compile -against kernel 4.9 we run into some errors because it is too old now. -Add the options only when they are supported to make it compatible with -dtc from kernel 4.9. - ---- a/scripts/Kbuild.include -+++ b/scripts/Kbuild.include -@@ -173,6 +173,11 @@ ld-version = $(shell $(LD) --version | $ - # Usage: $(call ld-ifversion, -ge, 22252, y) - ld-ifversion = $(shell [ $(ld-version) $(1) $(2) ] && echo $(3) || echo $(4)) - -+# dtc-option -+# Usage: DTC_FLAGS += $(call dtc-option,-Wno-unit_address_vs_reg) -+dtc-option = $(call try-run,\ -+ echo '/dts-v1/; / {};' | $(DTC) $(1),$(1),$(2)) -+ - ###### - - ### ---- a/scripts/Makefile.extrawarn -+++ b/scripts/Makefile.extrawarn -@@ -56,8 +56,8 @@ endif - - KBUILD_CFLAGS += $(warning) - --dtc-warning-2 += -Wnode_name_chars_strict --dtc-warning-2 += -Wproperty_name_chars_strict -+dtc-warning-2 += $(call dtc-option,-Wnode_name_chars_strict) -+dtc-warning-2 += $(call dtc-option,-Wproperty_name_chars_strict) - - dtc-warning := $(dtc-warning-$(findstring 1, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS))) - dtc-warning += $(dtc-warning-$(findstring 2, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS))) -@@ -68,11 +68,11 @@ DTC_FLAGS += $(dtc-warning) - else - - # Disable noisy checks by default --DTC_FLAGS += -Wno-unit_address_vs_reg --DTC_FLAGS += -Wno-simple_bus_reg --DTC_FLAGS += -Wno-unit_address_format --DTC_FLAGS += -Wno-pci_bridge --DTC_FLAGS += -Wno-pci_device_bus_num --DTC_FLAGS += -Wno-pci_device_reg -+DTC_FLAGS += $(call dtc-option,-Wno-unit_address_vs_reg) -+DTC_FLAGS += $(call dtc-option,-Wno-simple_bus_reg) -+DTC_FLAGS += $(call dtc-option,-Wno-unit_address_format) -+DTC_FLAGS += $(call dtc-option,-Wno-pci_bridge) -+DTC_FLAGS += $(call dtc-option,-Wno-pci_device_bus_num) -+DTC_FLAGS += $(call dtc-option,-Wno-pci_device_reg) - - endif diff --git a/package/boot/uboot-sunxi/patches/230-disable-axp209-on-a13-olinuxino.diff b/package/boot/uboot-sunxi/patches/230-disable-axp209-on-a13-olinuxino.diff index 9ce6adeb352d..ce5ea8f01c0b 100644 --- a/package/boot/uboot-sunxi/patches/230-disable-axp209-on-a13-olinuxino.diff +++ b/package/boot/uboot-sunxi/patches/230-disable-axp209-on-a13-olinuxino.diff @@ -1,6 +1,6 @@ --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig -@@ -7,7 +7,6 @@ CONFIG_DRAM_EMR1=0 +@@ -8,7 +8,6 @@ CONFIG_DRAM_EMR1=0 CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB0_VBUS_DET="PG1" CONFIG_USB1_VBUS_PIN="PG11" @@ -8,12 +8,12 @@ # CONFIG_VIDEO_HDMI is not set CONFIG_VIDEO_VGA_VIA_LCD=y CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y -@@ -24,7 +23,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y - CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino" +@@ -25,7 +24,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ol + CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DFU_RAM=y CONFIG_FASTBOOT_CMD_OEM_FORMAT=y -CONFIG_AXP_ALDO3_VOLT=3300 +CONFIG_SUNXI_NO_PMIC=y CONFIG_CONS_INDEX=2 CONFIG_USB_EHCI_HCD=y - CONFIG_USB_MUSB_GADGET=y + CONFIG_USB_OHCI_HCD=y diff --git a/package/boot/uboot-sunxi/patches/240-sun50i-h5-Orange-Pi-Zero-Plus-Fix-SdCard-detection.patch b/package/boot/uboot-sunxi/patches/240-sun50i-h5-Orange-Pi-Zero-Plus-Fix-SdCard-detection.patch deleted file mode 100644 index 2feab76754eb..000000000000 --- a/package/boot/uboot-sunxi/patches/240-sun50i-h5-Orange-Pi-Zero-Plus-Fix-SdCard-detection.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ad320d4d6ad03af5ff730546113d53a47ef6a22e Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sun, 13 Jan 2019 17:05:09 +0100 -Subject: [PATCH] sun50i: h5: Orange Pi Zero Plus: Fix SdCard detection - -The Detection pin is at PF6 and not at PH13 like defined before. I -checked the schematics and now I am am not seeing this error message any -more: -Loading Environment from FAT... Card did not respond to voltage select! - -Fixes: 76d69eb01de ("sun50i: h5: Add initial Orange Pi Zero Plus support") -Signed-off-by: Hauke Mehrtens ---- - configs/orangepi_zero_plus_defconfig | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/configs/orangepi_zero_plus_defconfig -+++ b/configs/orangepi_zero_plus_defconfig -@@ -4,8 +4,7 @@ CONFIG_SPL=y - CONFIG_MACH_SUN50I_H5=y - CONFIG_DRAM_CLK=624 - CONFIG_DRAM_ZQ=3881977 --CONFIG_MMC0_CD_PIN="PH13" --CONFIG_MMC_SUNXI_SLOT_EXTRA=2 -+CONFIG_MMC0_CD_PIN="PF6" - CONFIG_NR_DRAM_BANKS=1 - # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set - # CONFIG_CMD_FLASH is not set