diff --git a/0001-sunxi-don-t-define-MACPWR-and-SATAPWR-to-empty-strin.patch b/0001-sunxi-don-t-define-MACPWR-and-SATAPWR-to-empty-strin.patch new file mode 100644 index 0000000..5c45308 --- /dev/null +++ b/0001-sunxi-don-t-define-MACPWR-and-SATAPWR-to-empty-strin.patch @@ -0,0 +1,40 @@ +From 03f91f2db03bf1382608798cd58251ff920d58ef Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Mon, 18 Jan 2021 00:02:53 +0000 +Subject: [PATCH] sunxi: don't define MACPWR and SATAPWR to empty strings + +There's checks in board/sunxi/board.c if either MACPWR or SATAPWR are +defined and they are defined by default to a empty string which means +on vast majority of AllWinner boards when they're not required the +code is still run and with SATAPWR we even get an unnecessary 500ms +delay booting. So let's not define a default for these options so the +code is only run for boards that need it. + +Signed-off-by: Peter Robinson +--- + arch/arm/mach-sunxi/Kconfig | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig +index 49ef217f08..a566e10315 100644 +--- a/arch/arm/mach-sunxi/Kconfig ++++ b/arch/arm/mach-sunxi/Kconfig +@@ -578,7 +578,6 @@ config OLD_SUNXI_KERNEL_COMPAT + + config MACPWR + string "MAC power pin" +- default "" + help + Set the pin used to power the MAC. This takes a string in the format + understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H. +@@ -969,7 +968,6 @@ endchoice + + config SATAPWR + string "SATA power pin" +- default "" + help + Set the pins used to power the SATA. This takes a string in the + format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of +-- +2.29.2 + diff --git a/rockchip-Fix-SPI-boot-on-Pinebook-Pro-Puma-and-RK3399-ROC-PC.patch b/rockchip-Fix-SPI-boot-on-Pinebook-Pro-Puma-and-RK3399-ROC-PC.patch index 39f9bb5..94e43b7 100644 --- a/rockchip-Fix-SPI-boot-on-Pinebook-Pro-Puma-and-RK3399-ROC-PC.patch +++ b/rockchip-Fix-SPI-boot-on-Pinebook-Pro-Puma-and-RK3399-ROC-PC.patch @@ -1,172 +1,3 @@ -From patchwork Sun Nov 22 13:03:44 2020 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Hugh Cole-Baker -X-Patchwork-Id: 1404474 -X-Patchwork-Delegate: ykai007@gmail.com -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.denx.de - (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; - envelope-from=u-boot-bounces@lists.denx.de; receiver=) -Authentication-Results: ozlabs.org; - dmarc=pass (p=none dis=none) header.from=gmail.com -Authentication-Results: ozlabs.org; - dkim=pass (2048-bit key; - unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 - header.s=20161025 header.b=P6CnMO7U; - dkim-atps=neutral -Received: from phobos.denx.de (phobos.denx.de - [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) - (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) - key-exchange X25519 server-signature RSA-PSS (4096 bits)) - (No client certificate requested) - by ozlabs.org (Postfix) with ESMTPS id 4Cf9VN30jjz9sT6 - for ; Mon, 23 Nov 2020 00:04:41 +1100 (AEDT) -Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) - by phobos.denx.de (Postfix) with ESMTP id CE775825A1; - Sun, 22 Nov 2020 14:04:18 +0100 (CET) -Authentication-Results: phobos.denx.de; - dmarc=pass (p=none dis=none) header.from=gmail.com -Authentication-Results: phobos.denx.de; - spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de -Authentication-Results: phobos.denx.de; - dkim=pass (2048-bit key; - unprotected) header.d=gmail.com header.i=@gmail.com header.b="P6CnMO7U"; - dkim-atps=neutral -Received: by phobos.denx.de (Postfix, from userid 109) - id 74E088257F; Sun, 22 Nov 2020 14:04:13 +0100 (CET) -X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de -X-Spam-Level: -X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, - DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED - autolearn=ham autolearn_force=no version=3.4.2 -Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com - [IPv6:2a00:1450:4864:20::441]) - (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) - (No client certificate requested) - by phobos.denx.de (Postfix) with ESMTPS id 898AE82564 - for ; Sun, 22 Nov 2020 14:04:09 +0100 (CET) -Authentication-Results: phobos.denx.de; - dmarc=pass (p=none dis=none) header.from=gmail.com -Authentication-Results: phobos.denx.de; - spf=pass smtp.mailfrom=sigmaris@gmail.com -Received: by mail-wr1-x441.google.com with SMTP id l1so15714256wrb.9 - for ; Sun, 22 Nov 2020 05:04:09 -0800 (PST) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; - h=from:to:cc:subject:date:message-id:in-reply-to:references - :mime-version:content-transfer-encoding; - bh=6SYQmHVr0D0O3wWmxMfhj7ZKtMAcYMPC+fsr+GotKTs=; - b=P6CnMO7Up+Z5K5CbVzKd4H/2QN8yjMOXmyDou0LODbNDm9Bk5yNIT7IPUTNgCi7OHU - MCkWj1sA/Y0Vy7be+3ft1nvEIh1fY6E44ffw6tGcvGUf7rDXyQvyAZ6zSd8IHyqI44Xq - dzs/KERwAULCzSHt9OQNGYDnv3bKJAfGhh5t+nfR8z8/9ssONR3q18wKQEJ1X5eFO/IK - butM9Dq2sfJ0e15aYShs2Ku0k641pHX6ur5zSujD46MVhPApRhbHN9pbTAdmBmFb5cpk - taUyiQmhmHxj8oclIibEwDHS/0ygI7OmaEfDZRoYa5K8U6dp7hqDb9iZHasNsyBYRHs+ - Iuyg== -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:mime-version:content-transfer-encoding; - bh=6SYQmHVr0D0O3wWmxMfhj7ZKtMAcYMPC+fsr+GotKTs=; - b=mQwI4z7mnmNifc4yfgZj/vpgd1vQW9IOxjw2r3+sk+pRuJ6SjrjPsFmnfU8d1CfA5X - /IgzqDbWRhYtjMPiXe0VbrS8HfI5Fqps/BFq2BjN+zrER/ZUKC0MSkv7XsYQmM3UoFgo - ysyImd1T8hkM2fcsg0idMJ1AAY2Mtol2oKwHm+F5kW054bkSUo2mWpGRJE/RUTGMJYzP - oGu6T7V/CLjZCuWNJkpzwzCY7BoyLnirZ+EH4mMGkxJgZ4NdZIl+DVP0kcbSgNLTDMhy - JTF57D+dog/31smuIZ38Xtiee9OlTyoaTQzEN8+1zfHSevwQyUD48xyKcLFA2DVAYtYP - X4wQ== -X-Gm-Message-State: AOAM533BH77QNc2JvGEEMb3O1vShAryk75TxbZD57eNvHYZ5XNi0l3Nd - Hi9Vz0PAFdp4uFVQjchxkUeQHvOpOpzcpA== -X-Google-Smtp-Source: - ABdhPJzsTBCcXrYUm/5t74Gtg0n/vpUspyjdh6Ua796/vUxpSvKtaPDvdYxfFz+jaI/Ujmpb8WJFOw== -X-Received: by 2002:a5d:5183:: with SMTP id k3mr5107660wrv.62.1606050248908; - Sun, 22 Nov 2020 05:04:08 -0800 (PST) -Received: from apple.sigmaris.info (ebrouter.sigmaris.info. [82.69.107.165]) - by smtp.gmail.com with ESMTPSA id i6sm10968566wma.42.2020.11.22.05.04.08 - (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); - Sun, 22 Nov 2020 05:04:08 -0800 (PST) -From: Hugh Cole-Baker -To: U-Boot Mailing List -Cc: Hugh Cole-Baker , Simon Glass , - Kever Yang , - Peter Robinson , - Philipp Tomsich -Subject: [PATCH v2 1/3] rockchip: pinebook-pro: default to SPI bus 1 for - SPI-flash -Date: Sun, 22 Nov 2020 13:03:44 +0000 -Message-Id: <20201122130346.11621-2-sigmaris@gmail.com> -X-Mailer: git-send-email 2.24.3 (Apple Git-128) -In-Reply-To: <20201122130346.11621-1-sigmaris@gmail.com> -References: <20201122130346.11621-1-sigmaris@gmail.com> -MIME-Version: 1.0 -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.34 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" -X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de -X-Virus-Status: Clean - -SPI flash on this machine is located on bus 1, default to using bus 1 -for SPI flash and stop aliasing it to bus 0. - -Signed-off-by: Hugh Cole-Baker -Suggested-by: Simon Glass -Fixes: c4cea2bb ("rockchip: Enable building a SPI ROM image on bob") ---- - -(no changes since v1) - - arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ---- - configs/pinebook-pro-rk3399_defconfig | 2 ++ - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi -index ded7db0aeff..ee3b98698e6 100644 ---- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi -+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi -@@ -7,10 +7,6 @@ - #include "rk3399-sdram-lpddr4-100.dtsi" - - / { -- aliases { -- spi0 = &spi1; -- }; -- - chosen { - u-boot,spl-boot-order = "same-as-spl", &sdhci, &spiflash, &sdmmc; - }; -diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig -index 1ed54ad0eda..ef00ad92c45 100644 ---- a/configs/pinebook-pro-rk3399_defconfig -+++ b/configs/pinebook-pro-rk3399_defconfig -@@ -37,6 +37,7 @@ CONFIG_SPL_OF_CONTROL=y - CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" - CONFIG_ENV_IS_IN_SPI_FLASH=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_SPL_DM_SEQ_ALIAS=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y - CONFIG_DM_KEYBOARD=y -@@ -49,6 +50,7 @@ CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_SDMA=y - CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_SF_DEFAULT_BUS=1 - CONFIG_SF_DEFAULT_SPEED=20000000 - CONFIG_SPI_FLASH_GIGADEVICE=y - CONFIG_SPI_FLASH_WINBOND=y - From patchwork Sun Nov 22 13:03:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 diff --git a/sources b/sources index 7215d7b..1e6a02f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2021.01-rc5.tar.bz2) = bfc9524860c9557777048350c4081d6068a4bddb354b1896240f415a17559df4dd403609b244adfe23316e8c68ae1ed1fce3412649413a2cccd9033f23b5390a +SHA512 (u-boot-2021.01.tar.bz2) = 40dd4d9ef87a1829158658c433d46a047a39c0d8c314ad8d133f7240343ee3a75b060f009dd2efe598cfb8a766773f6cd773ea7f7745ee88e52a771c77eb1c6e diff --git a/uboot-tools.spec b/uboot-tools.spec index 6c5bdbd..40bf234 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc5 +#global candidate rc1 Name: uboot-tools Version: 2021.01 -Release: 0.5%{?candidate:.%{candidate}}%{?dist} +Release: 1%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -28,15 +28,17 @@ Patch3: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch Patch10: AllWinner-PineTab.patch Patch11: sunxi-add-PineCube-board.patch Patch12: 0001-Fixes-for-AllWinner-ethernet-network-interfaces.patch +Patch13: 0001-sunxi-don-t-define-MACPWR-and-SATAPWR-to-empty-strin.patch # TI fixes -Patch13: 0001-Fix-BeagleAI-detection.patch +Patch14: 0001-Fix-BeagleAI-detection.patch # Rockchips improvements -Patch14: arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch -Patch15: rk3399-Pinebook-pro-EDP-support.patch -Patch16: rockchip-Fix-SPI-boot-on-Pinebook-Pro-Puma-and-RK3399-ROC-PC.patch +Patch15: arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch +Patch16: rk3399-Pinebook-pro-EDP-support.patch +Patch17: rockchip-Fix-SPI-boot-on-Pinebook-Pro-Puma-and-RK3399-ROC-PC.patch # Raspberry Pi improvements -Patch17: Raspberry-Pi-400-Compute-Module-4-support.patch -Patch18: rng-Add-iProc-RNG200-driver.patch +Patch18: Raspberry-Pi-400-Compute-Module-4-support.patch +Patch19: rng-Add-iProc-RNG200-driver.patch +Patch20: Raspberry-Pi-4-PCIe-handover.patch BuildRequires: bc BuildRequires: dtc @@ -237,6 +239,10 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Mon Jan 11 2021 Peter Robinson - 2021.01-1 +- Update to 2021.01 GA +- Updates for Raspberry Pi 4 Series of devices + * Tue Jan 5 2021 Peter Robinson - 2021.01-0.5.rc5 - Update to 2021.01 RC5 diff --git a/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch b/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch index cc2c4f8..39d6c20 100644 --- a/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch +++ b/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch @@ -66,7 +66,7 @@ index ff29ef5a905..769477cd80e 100644 + "fi;" \ + "done; " \ + "done; " \ -+ "run boot_efi_bootmgr\0" \ ++ "run boot_efi_binary\0" \ + "scan_dev_for_efi=" \ "if test -e ${devtype} ${devnum}:${distro_bootpart} " \ "efi/boot/"BOOTEFI_NAME"; then " \ diff --git a/uefi-use-Fedora-specific-path-name.patch b/uefi-use-Fedora-specific-path-name.patch index a7f6a16..68db8b9 100644 --- a/uefi-use-Fedora-specific-path-name.patch +++ b/uefi-use-Fedora-specific-path-name.patch @@ -34,7 +34,7 @@ index 769477cd80e..22ce3685758 100644 "bootefi ${kernel_addr_r} ${fdt_addr_r};" \ "else " \ @@ -169,9 +169,9 @@ - "run boot_efi_bootmgr\0" \ + "run boot_efi_binary\0" \ "scan_dev_for_efi=" \ "if test -e ${devtype} ${devnum}:${distro_bootpart} " \ - "efi/boot/"BOOTEFI_NAME"; then " \