diff --git a/0001-rockchip-rk3399-rock960-Update-config-for-TPL.patch b/0001-rockchip-rk3399-rock960-Update-config-for-TPL.patch deleted file mode 100644 index 22b0ba8..0000000 --- a/0001-rockchip-rk3399-rock960-Update-config-for-TPL.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 28d382273445e8961fb8726aa5e78b3a47c60b7e Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Tue, 12 Nov 2019 09:15:21 +0000 -Subject: [PATCH 1/4] rockchip: rk3399: rock960: Update config for TPL - -The SPL is now running at SDRAM, and 0x10000 is used by BL31, -and the ARM SPL do not support relocate now, we need reserved -0x50000 so that it won't overwrite the code when we load the -bl31 to target space. -We should remove this after we enable the relocate feature. - -The SPL need malloc 0x9000 for MMC as buffer used for transfer -data to IRAM(The EMMC DMA can not transfer data to IRAM directly). - -Signed-off-by: Peter Robinson ---- - configs/rock960-rk3399_defconfig | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig -index 0d6c55ce74..6dcea04b67 100644 ---- a/configs/rock960-rk3399_defconfig -+++ b/configs/rock960-rk3399_defconfig -@@ -2,18 +2,19 @@ CONFIG_ARM=y - CONFIG_ARCH_ROCKCHIP=y - CONFIG_SYS_TEXT_BASE=0x00200000 - CONFIG_ROCKCHIP_RK3399=y --CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000 - CONFIG_TARGET_ROCK960_RK3399=y - CONFIG_DEBUG_UART_BASE=0xFF1A0000 - CONFIG_DEBUG_UART_CLOCK=24000000 - CONFIG_DEBUG_UART=y --CONFIG_SPL_TEXT_BASE=0xff8c2000 - CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb" - # CONFIG_DISPLAY_CPUINFO is not set - CONFIG_DISPLAY_BOARDINFO_LATE=y - # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set - CONFIG_SPL_STACK_R=y --CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 -+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 -+CONFIG_SPL_ATF=y -+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y -+CONFIG_TPL=y - CONFIG_SYS_PROMPT="rock960 => " - CONFIG_CMD_BOOTZ=y - CONFIG_CMD_GPT=y -@@ -55,4 +56,6 @@ CONFIG_USB_ETHER_ASIX88179=y - CONFIG_USB_ETHER_MCS7830=y - CONFIG_USB_ETHER_RTL8152=y - CONFIG_USB_ETHER_SMSC95XX=y -+CONFIG_USE_TINY_PRINTF=y -+CONFIG_SPL_TINY_MEMSET=y - CONFIG_ERRNO_STR=y --- -2.23.0 - diff --git a/0002-rockchip-dts-rk3399-move-the-u-boot-dm-pre-reloc-to-.patch b/0002-rockchip-dts-rk3399-move-the-u-boot-dm-pre-reloc-to-.patch deleted file mode 100644 index d0e4186..0000000 --- a/0002-rockchip-dts-rk3399-move-the-u-boot-dm-pre-reloc-to-.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 230d1e7031d5b5ade3ce50b301fbd144d2fbdc12 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Sat, 9 Nov 2019 20:07:24 +0000 -Subject: [PATCH 2/4] rockchip: dts: rk3399: move the u-boot,dm-pre-reloc to - the u-boot.dtsi - -The u-boot specific pieces in the dts files should be in u-boot.dtsi -not the main files, this allows easier sync with upstream. The -rk3399.dtsi has a mix of both so move them all for consistency. - -Signed-off-by: Peter Robinson ---- - arch/arm/dts/rk3399-u-boot.dtsi | 44 +++++++++++++++++++++++++++++++++ - arch/arm/dts/rk3399.dtsi | 11 --------- - 2 files changed, 44 insertions(+), 11 deletions(-) - -diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi -index 2738a3889e..410e9d452e 100644 ---- a/arch/arm/dts/rk3399-u-boot.dtsi -+++ b/arch/arm/dts/rk3399-u-boot.dtsi -@@ -3,10 +3,46 @@ - * Copyright (C) 2019 Jagan Teki - */ - -+&cic { -+ u-boot,dm-pre-reloc; -+}; -+ -+&cru { -+ u-boot,dm-pre-reloc; -+}; -+ -+&dmc { -+ u-boot,dm-pre-reloc; -+}; -+ -+&grf { -+ u-boot,dm-pre-reloc; -+}; -+ -+&pinctrl { -+ u-boot,dm-pre-reloc; -+}; -+ -+&pmu { -+ u-boot,dm-pre-reloc; -+}; -+ - &pmu { - u-boot,dm-pre-reloc; - }; - -+&pmucru { -+ u-boot,dm-pre-reloc; -+}; -+ -+&pmusgrf { -+ u-boot,dm-pre-reloc; -+}; -+ -+&sdhci { -+ u-boot,dm-pre-reloc; -+}; -+ - &sdmmc { - u-boot,dm-pre-reloc; - }; -@@ -22,3 +58,11 @@ - &uart2 { - u-boot,dm-pre-reloc; - }; -+ -+&vopb { -+ u-boot,dm-pre-reloc; -+}; -+ -+&vopl { -+ u-boot,dm-pre-reloc; -+}; -diff --git a/arch/arm/dts/rk3399.dtsi b/arch/arm/dts/rk3399.dtsi -index b73442ee34..3f773b10f4 100644 ---- a/arch/arm/dts/rk3399.dtsi -+++ b/arch/arm/dts/rk3399.dtsi -@@ -275,7 +275,6 @@ - }; - - sdhci: sdhci@fe330000 { -- u-boot,dm-pre-reloc; - compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1"; - reg = <0x0 0xfe330000 0x0 0x10000>; - interrupts = ; -@@ -1072,7 +1071,6 @@ - }; - - pmugrf: syscon@ff320000 { -- u-boot,dm-pre-reloc; - compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd"; - reg = <0x0 0xff320000 0x0 0x1000>; - -@@ -1083,7 +1081,6 @@ - }; - - pmusgrf: syscon@ff330000 { -- u-boot,dm-pre-reloc; - compatible = "rockchip,rk3399-pmusgrf", "syscon"; - reg = <0x0 0xff330000 0x0 0xe3d4>; - }; -@@ -1204,7 +1201,6 @@ - }; - - cic: syscon@ff620000 { -- u-boot,dm-pre-reloc; - compatible = "rockchip,rk3399-cic", "syscon"; - reg = <0x0 0xff620000 0x0 0x100>; - }; -@@ -1219,7 +1215,6 @@ - }; - - dmc: dmc { -- u-boot,dm-pre-reloc; - compatible = "rockchip,rk3399-dmc"; - devfreq-events = <&dfi>; - interrupts = ; -@@ -1268,7 +1263,6 @@ - }; - - pmucru: pmu-clock-controller@ff750000 { -- u-boot,dm-pre-reloc; - compatible = "rockchip,rk3399-pmucru"; - reg = <0x0 0xff750000 0x0 0x1000>; - rockchip,grf = <&pmugrf>; -@@ -1279,7 +1273,6 @@ - }; - - cru: clock-controller@ff760000 { -- u-boot,dm-pre-reloc; - compatible = "rockchip,rk3399-cru"; - reg = <0x0 0xff760000 0x0 0x1000>; - rockchip,grf = <&grf>; -@@ -1310,7 +1303,6 @@ - }; - - grf: syscon@ff770000 { -- u-boot,dm-pre-reloc; - compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; - reg = <0x0 0xff770000 0x0 0x10000>; - #address-cells = <1>; -@@ -1520,7 +1512,6 @@ - }; - - vopl: vop@ff8f0000 { -- u-boot,dm-pre-reloc; - compatible = "rockchip,rk3399-vop-lit"; - reg = <0x0 0xff8f0000 0x0 0x3efc>; - interrupts = ; -@@ -1578,7 +1569,6 @@ - }; - - vopb: vop@ff900000 { -- u-boot,dm-pre-reloc; - compatible = "rockchip,rk3399-vop-big"; - reg = <0x0 0xff900000 0x0 0x3efc>; - interrupts = ; -@@ -1818,7 +1808,6 @@ - }; - - pinctrl: pinctrl { -- u-boot,dm-pre-reloc; - compatible = "rockchip,rk3399-pinctrl"; - rockchip,grf = <&grf>; - rockchip,pmu = <&pmugrf>; --- -2.23.0 - diff --git a/0003-rockchip-dts-rk3399-evb-move-u-boot-spl-boot-order-t.patch b/0003-rockchip-dts-rk3399-evb-move-u-boot-spl-boot-order-t.patch deleted file mode 100644 index 51918e8..0000000 --- a/0003-rockchip-dts-rk3399-evb-move-u-boot-spl-boot-order-t.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fa9f02cbd6a2baf48f76fc922e5f09755932962e Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Sat, 9 Nov 2019 20:11:45 +0000 -Subject: [PATCH 3/4] rockchip: dts: rk3399-evb: move u-boot,spl-boot-order to - to the u-boot.dtsi - -The u-boot specific device tree directives should be in u-boot.dtsi - -Signed-off-by: Peter Robinson ---- - arch/arm/dts/rk3399-evb-u-boot.dtsi | 6 ++++++ - arch/arm/dts/rk3399-evb.dts | 2 -- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi -index 20910e744b..ccb33d34d1 100644 ---- a/arch/arm/dts/rk3399-evb-u-boot.dtsi -+++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi -@@ -5,3 +5,9 @@ - - #include "rk3399-u-boot.dtsi" - #include "rk3399-sdram-lpddr3-4GB-1600.dtsi" -+ -+/ { -+ chosen { -+ u-boot,spl-boot-order = &sdhci, &sdmmc; -+ }; -+}; -diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts -index a506e8da37..8e887f3a17 100644 ---- a/arch/arm/dts/rk3399-evb.dts -+++ b/arch/arm/dts/rk3399-evb.dts -@@ -15,8 +15,6 @@ - - chosen { - stdout-path = &uart2; -- u-boot,spl-boot-order = \ -- &sdhci, &sdmmc; - }; - - vdd_center: vdd-center { --- -2.23.0 - diff --git a/0004-rockchip-dts-rk3399-firefly-move-u-boot-spl-boot-ord.patch b/0004-rockchip-dts-rk3399-firefly-move-u-boot-spl-boot-ord.patch deleted file mode 100644 index 8c19d40..0000000 --- a/0004-rockchip-dts-rk3399-firefly-move-u-boot-spl-boot-ord.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e27784b9b8c96f46befa6d27a458e0e35d30ad81 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Sat, 9 Nov 2019 20:14:54 +0000 -Subject: [PATCH 4/4] rockchip: dts: rk3399-firefly: move u-boot,spl-boot-order - to to the u-boot.dtsi - -The u-boot specific device tree directives should be in u-boot.dtsi - -Signed-off-by: Peter Robinson ---- - arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 ++++++ - arch/arm/dts/rk3399-firefly.dts | 1 - - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi -index 67b63a8352..38e0897db9 100644 ---- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi -+++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi -@@ -5,3 +5,9 @@ - - #include "rk3399-u-boot.dtsi" - #include "rk3399-sdram-ddr3-1600.dtsi" -+ -+/ { -+ chosen { -+ u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; -+ }; -+}; -diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts -index a4cb64f8bd..89c67fd24c 100644 ---- a/arch/arm/dts/rk3399-firefly.dts -+++ b/arch/arm/dts/rk3399-firefly.dts -@@ -14,7 +14,6 @@ - - chosen { - stdout-path = &uart2; -- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; - }; - - backlight: backlight { --- -2.23.0 - diff --git a/sources b/sources index 67db9e6..feafafb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2020.01-rc2.tar.bz2) = c03acd2192b75245387d470b549dbb401549e006400974439a3b13f2efc089f3508eda9bc01d30cd3ceddfb599f3121f0da6e686a007224a34a00b2fb5c533e9 +SHA512 (u-boot-2020.01-rc3.tar.bz2) = b84c6e91c44f85d7a1e3db0767df25258fed3a985cb36499f215c6d3520bcc1eb0b3d649ec58afd45eda8841cdbcb42117a97128269b6d1f3ad78e9273079e78 diff --git a/uboot-tools.spec b/uboot-tools.spec index 45dedf2..645eb2b 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc2 +%global candidate rc3 Name: uboot-tools Version: 2020.01 -Release: 0.3%{?candidate:.%{candidate}}.1.riscv64%{?dist} +Release: 0.4%{?candidate:.%{candidate}}.0.riscv64%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -27,11 +27,7 @@ Patch5: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch Patch6: dragonboard-fixes.patch Patch7: ARM-tegra-Add-NVIDIA-Jetson-Nano.patch Patch8: arm-tegra-defaine-fdtfile-for-all-devices.patch -Patch10: 0001-rockchip-rk3399-rock960-Update-config-for-TPL.patch -Patch11: 0002-rockchip-dts-rk3399-move-the-u-boot-dm-pre-reloc-to-.patch -Patch12: 0003-rockchip-dts-rk3399-evb-move-u-boot-spl-boot-order-t.patch -Patch13: 0004-rockchip-dts-rk3399-firefly-move-u-boot-spl-boot-ord.patch -Patch14: tools-fix-version.h.patch +Patch9: tools-fix-version.h.patch # PXE depends on fdt_addr (mandatory) # fdt_addr is an address to DTB in HW (e.g. ROM) @@ -330,22 +326,22 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog -* Sat Nov 16 2019 David Abdurachmanov 2020.01-0.3.1.riscv64 -- Rename kernel_gz_addr_r to kernel_comp_addr_r - -* Wed Nov 13 2019 David Abdurachmanov 2020.01-0.3.0.riscv64 +* Tue Nov 19 2019 David Abdurachmanov 2020.01-0.4-rc3.0.riscv64 - Add support for RISC-V (riscv64) -- Define filesize and kernel_gz_addr_r for QEMU virt and SiFive FU540 boards +- Define filesize and kernel_comp_addr_r for QEMU virt and SiFive FU540 boards to support Image.gz with booti - Add 'addappend' label to PXE/EXTLINUX configuration -* Tue Nov 12 2019 Peter Robinson 2020.01-0.3 +* Tue Nov 19 2019 Peter Robinson 2020.01-0.4-rc3 +- 2020.01 RC3 + +* Tue Nov 12 2019 Peter Robinson 2020.01-0.3-rc2 - 2020.01 RC2 -* Tue Nov 5 2019 Peter Robinson 2020.01-0.2 +* Tue Nov 5 2019 Peter Robinson 2020.01-0.2-rc1 - Include new ATF 2.2 -* Wed Oct 30 2019 Peter Robinson 2020.01-0.1 +* Wed Oct 30 2019 Peter Robinson 2020.01-0.1-rc1 - 2020.01 RC1 - Initial migration to python3