Merge remote-tracking branch 'up/main' into main-riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
commit
8e8806b6aa
GPG Key ID:
8B7F1DA0E2C9FDBB
|
|
@ -1,53 +0,0 @@
|
|||
From 1c56fc2835e10cdc039a4c1d049c1a6978e036f3 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Thu, 22 Jul 2021 16:22:48 +0100
|
||||
Subject: [PATCH] Revert "spi: spi-uclass: Add support to manually relocate spi
|
||||
memory ops"
|
||||
|
||||
This reverts commit 346df7d4fa62afc578d820b3a18815eec765074f.
|
||||
|
||||
This patch broke booting Rockchip systems from U-Boot residing on SPI
|
||||
flash, for at least the Pinebook Pro and Rockpro64, and also confirmed
|
||||
with the not yet upstream Helios64.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
Cc: T Karthik Reddy <t.karthik.reddy@xilinx.com>
|
||||
Cc: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com>
|
||||
Cc: Michal Simek <michal.simek@xilinx.com>
|
||||
Cc: Pratyush Yadav <p.yadav@ti.com>
|
||||
---
|
||||
drivers/spi/spi-uclass.c | 11 -----------
|
||||
1 file changed, 11 deletions(-)
|
||||
|
||||
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
|
||||
index d867b27806..ec7f4652b3 100644
|
||||
--- a/drivers/spi/spi-uclass.c
|
||||
+++ b/drivers/spi/spi-uclass.c
|
||||
@@ -11,7 +11,6 @@
|
||||
#include <log.h>
|
||||
#include <malloc.h>
|
||||
#include <spi.h>
|
||||
-#include <spi-mem.h>
|
||||
#include <dm/device_compat.h>
|
||||
#include <asm/global_data.h>
|
||||
#include <dm/device-internal.h>
|
||||
@@ -200,16 +199,6 @@ static int spi_post_probe(struct udevice *bus)
|
||||
ops->set_mode += gd->reloc_off;
|
||||
if (ops->cs_info)
|
||||
ops->cs_info += gd->reloc_off;
|
||||
- if (ops->mem_ops) {
|
||||
- struct spi_controller_mem_ops *mem_ops =
|
||||
- (struct spi_controller_mem_ops *)ops->mem_ops;
|
||||
- if (mem_ops->adjust_op_size)
|
||||
- mem_ops->adjust_op_size += gd->reloc_off;
|
||||
- if (mem_ops->supports_op)
|
||||
- mem_ops->supports_op += gd->reloc_off;
|
||||
- if (mem_ops->exec_op)
|
||||
- mem_ops->exec_op += gd->reloc_off;
|
||||
- }
|
||||
reloc_done++;
|
||||
}
|
||||
#endif
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -0,0 +1,136 @@
|
|||
From 2d9350c50a9659cc2a247cdea07f0eacffa3cb32 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sun, 12 Jun 2022 14:44:44 +0100
|
||||
Subject: [PATCH] rockchip: pinebook-pro: minor SPI flash fixes
|
||||
|
||||
Set a default offset for environment so it doesn't write it to
|
||||
unexpected locations, drop unneeded mtd config option.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
configs/pinebook-pro-rk3399_defconfig | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
|
||||
index 8ca1d0708f9..aaa52c6ea70 100644
|
||||
--- a/configs/pinebook-pro-rk3399_defconfig
|
||||
+++ b/configs/pinebook-pro-rk3399_defconfig
|
||||
@@ -5,6 +5,7 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_ENV_SIZE=0x8000
|
||||
+CONFIG_ENV_OFFSET=0x3F8000
|
||||
CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_TARGET_PINEBOOK_PRO_RK3399=y
|
||||
@@ -22,7 +23,6 @@ CONFIG_MISC_INIT_R=y
|
||||
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
||||
CONFIG_SPL_STACK_R=y
|
||||
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
|
||||
-CONFIG_SPL_MTD_SUPPORT=y
|
||||
CONFIG_SPL_SPI_LOAD=y
|
||||
CONFIG_TPL=y
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
--
|
||||
2.36.1
|
||||
|
||||
From 27ba8e2f904063aec5196f86dd0332bf58a60259 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sun, 12 Jun 2022 14:50:42 +0100
|
||||
Subject: [PATCH] rockchip: rockpro64: enable leds
|
||||
|
||||
The Rockpro64 has some GPIO leds so let's enable them so the
|
||||
user gets some output in early boot.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
configs/rockpro64-rk3399_defconfig | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
|
||||
index e6f7a8469a3..b0c3527fab0 100644
|
||||
--- a/configs/rockpro64-rk3399_defconfig
|
||||
+++ b/configs/rockpro64-rk3399_defconfig
|
||||
@@ -42,6 +42,8 @@ CONFIG_AHCI_PCI=y
|
||||
CONFIG_SATA_SIL=y
|
||||
CONFIG_ROCKCHIP_GPIO=y
|
||||
CONFIG_SYS_I2C_ROCKCHIP=y
|
||||
+CONFIG_LED=y
|
||||
+CONFIG_LED_GPIO=y
|
||||
CONFIG_MISC=y
|
||||
CONFIG_ROCKCHIP_EFUSE=y
|
||||
CONFIG_MMC_DW=y
|
||||
--
|
||||
2.36.1
|
||||
|
||||
From 8bca90472e0d71e5344711b6f5fe8dc95e19af5a Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sun, 12 Jun 2022 15:12:47 +0100
|
||||
Subject: [PATCH] rockchip: pinebook-pro: sync PBP dtb to 5.18
|
||||
|
||||
Sync the pinebook pro to upstream 5.18, in particular this brings
|
||||
brings in a fix so the DP is disabled so Linux will actually boot.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
arch/arm/dts/rk3399-pinebook-pro.dts | 11 +++--------
|
||||
1 file changed, 3 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/dts/rk3399-pinebook-pro.dts b/arch/arm/dts/rk3399-pinebook-pro.dts
|
||||
index 2b5f001ff4a..d6b68d77d63 100644
|
||||
--- a/arch/arm/dts/rk3399-pinebook-pro.dts
|
||||
+++ b/arch/arm/dts/rk3399-pinebook-pro.dts
|
||||
@@ -17,6 +17,7 @@
|
||||
/ {
|
||||
model = "Pine64 Pinebook Pro";
|
||||
compatible = "pine64,pinebook-pro", "rockchip,rk3399";
|
||||
+ chassis-type = "laptop";
|
||||
|
||||
aliases {
|
||||
mmc0 = &sdio0;
|
||||
@@ -242,12 +243,12 @@
|
||||
vdd_log: vdd-log {
|
||||
compatible = "pwm-regulator";
|
||||
pwms = <&pwm2 0 25000 1>;
|
||||
+ pwm-supply = <&vcc_sysin>;
|
||||
regulator-name = "vdd_log";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <800000>;
|
||||
regulator-max-microvolt = <1400000>;
|
||||
- vin-supply = <&vcc_sysin>;
|
||||
|
||||
regulator-state-mem {
|
||||
regulator-on-in-suspend;
|
||||
@@ -385,10 +386,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
-&cdn_dp {
|
||||
- status = "okay";
|
||||
-};
|
||||
-
|
||||
&cpu_b0 {
|
||||
cpu-supply = <&vdd_cpu_b>;
|
||||
};
|
||||
@@ -475,8 +472,6 @@
|
||||
vcc10-supply = <&vcc_sysin>;
|
||||
vcc11-supply = <&vcc_sysin>;
|
||||
vcc12-supply = <&vcc3v3_sys>;
|
||||
- vcc13-supply = <&vcc_sysin>;
|
||||
- vcc14-supply = <&vcc_sysin>;
|
||||
|
||||
regulators {
|
||||
/* rk3399 center logic supply */
|
||||
@@ -711,7 +706,7 @@
|
||||
|
||||
connector {
|
||||
compatible = "usb-c-connector";
|
||||
- data-role = "host";
|
||||
+ data-role = "dual";
|
||||
label = "USB-C";
|
||||
op-sink-microwatt = <1000000>;
|
||||
power-role = "dual";
|
||||
--
|
||||
2.36.1
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (u-boot-2022.07-rc3.tar.bz2) = 1ebc19ca9828f38e5568a3415281917a12d086f3e4e23749441faf77771612526d95a84af5433057f6caa09b424aff9d4709d2d223cbe98f7d6356049c3b0d3c
|
||||
SHA512 (u-boot-2022.07-rc4.tar.bz2) = e54b9df6e4854fa8314e815409eb7b7b9d29af956aa021df8f7138f997bc683bc84bb1a80e71cb02821fe82e77ce12aa404d84841684f7b4e14f36756a6843f2
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%global candidate rc3
|
||||
%global candidate rc4
|
||||
%bcond_without toolsonly
|
||||
|
||||
# Set it to "opensbi" (stable) or opensbi-unstable (unstable, git)
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
Name: uboot-tools
|
||||
Version: 2022.07
|
||||
Release: 0.3%{?candidate:.%{candidate}}.1.riscv64%{?dist}
|
||||
Release: 0.4%{?candidate:.%{candidate}}.1.riscv64%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||
URL: http://www.denx.de/wiki/U-Boot
|
||||
|
|
@ -26,8 +26,8 @@ Patch3: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
|||
Patch4: rpi-fallback-to-max-clock-for-mmc.patch
|
||||
Patch5: rpi-bcm2835_sdhost-firmware-managed-clock.patch
|
||||
# Rockchips improvements
|
||||
Patch8: 0001-Revert-spi-spi-uclass-Add-support-to-manually-reloca.patch
|
||||
Patch9: rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
|
||||
Patch7: rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
|
||||
Patch8: rockchip-general-fixes.patch
|
||||
|
||||
# RISC-V (riscv64) patches
|
||||
Patch40: 0001-riscv-sifive-unmatched-Adjust-for-big-ramdisk-image.patch
|
||||
|
|
@ -138,6 +138,11 @@ do
|
|||
%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" O=builds/$(echo $board)/
|
||||
|
||||
# build spi images for rockchip boards with SPI flash
|
||||
rkspi=(rock64-rk3328)
|
||||
if [[ " ${rkspi[*]} " == *" $board "* ]]; then
|
||||
echo "Board: $board with SPI flash"
|
||||
builds/$(echo $board)/tools/mkimage -n rk3328 -T rkspi -d builds/$(echo $board)/tpl/u-boot-tpl.bin:builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/idbloader.spi
|
||||
fi
|
||||
rkspi=(evb-rk3399 khadas-edge-captain-rk3399 khadas-edge-rk3399 khadas-edge-v-rk3399 nanopc-t4-rk3399 pinebook-pro-rk3399 pinephone-pro-rk3399 rockpro64-rk3399 roc-pc-mezzanine-rk3399 roc-pc-rk3399)
|
||||
if [[ " ${rkspi[*]} " == *" $board "* ]]; then
|
||||
echo "Board: $board with SPI flash"
|
||||
|
|
@ -246,9 +251,13 @@ cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jun 02 2022 David Abdurachmanov <davidlt@rivosinc.com> - 2022.07-0.3.rc3.1.riscv64
|
||||
* Thu Jun 13 2022 David Abdurachmanov <davidlt@rivosinc.com> - 2022.07-0.4.rc4.1.riscv64
|
||||
- Rebuild for riscv64
|
||||
|
||||
* Sun Jun 12 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.07-0.4.rc4
|
||||
- Update to 2022.07 RC4
|
||||
- Some minor Rockchips device fixes
|
||||
|
||||
* Wed May 25 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.07-0.3.rc3
|
||||
- Update to 2022.07 RC3
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue