diff --git a/bcm283x-dts-Rename-U-Boot-file.patch b/bcm283x-dts-Rename-U-Boot-file.patch deleted file mode 100644 index af64742..0000000 --- a/bcm283x-dts-Rename-U-Boot-file.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5051377a0b2bec1605ce97170585d693a98ec34a Mon Sep 17 00:00:00 2001 -From: Matthias Brugger -Date: Fri, 8 Nov 2019 14:49:47 +0100 -Subject: [PATCH] arm: dts: bcm283x: Rename U-Boot file - -Rename the file bcm283x-uboot.dtsi so that it get -automatically include through the scripts/Makefile.lib -using $(CONFIG_SYS_SOC))-u-boot.dtsi - -Without this uarts and pincontroller miss the property dm-pre-reloc -and the first call to bcm283x_mu_serial_ofdata_to_platdata() fails -as the pins are not set correctly. -As a result the U-Boot banner isn't shown on boot. - -Before commmit -143256b353 ("fdt: update bcm283x device tree sources to Linux 5.1-rc6 state") -we included bcm283x-uboot.dtsi directly in the device-tree file. -Which got deleted by the metioned commit. -This is a much robuster solution. - -Reported-by: Tom Rini -Reported-by: Heinrich Schuchardt -Tested-by: Tom Rini [RPi 3, 32b and 64b modes] -Signed-off-by: Matthias Brugger - -diff --git a/arch/arm/dts/bcm283x-uboot.dtsi b/arch/arm/dts/bcm283x-u-boot.dtsi -similarity index 100% -rename from arch/arm/dts/bcm283x-uboot.dtsi -rename to arch/arm/dts/bcm283x-u-boot.dtsi diff --git a/sources b/sources index e05eecb..03c2370 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2020.01-rc5.tar.bz2) = f39ef40e4a8a030a779d1732bb588fba808140c91d4d92b6228f752b58ecbbdb90a4b8feae1646a42c64ba044d6c503228f877b33e221330b3f96f3c9006d60a +SHA512 (u-boot-2020.01.tar.bz2) = 073d4e0234095c1bda1ffa7a648972aa4530d106ee1a73035e0501b1aba2951653582c8b7bcf338d4e95012fa67e75f97b7e1fbac5cc764d609b671ef29617f7 diff --git a/uboot-tools.spec b/uboot-tools.spec index 0d40917..e9d6025 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc5 +#global candidate rc5 Name: uboot-tools Version: 2020.01 -Release: 0.9%{?candidate:.%{candidate}}.1.riscv64%{?dist} +Release: 1%{?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 @@ -29,7 +29,6 @@ Patch7: ARM-tegra-Add-NVIDIA-Jetson-Nano.patch Patch8: arm-tegra-defaine-fdtfile-for-all-devices.patch Patch9: zynqmp-Add-support-for-u-boot.itb-generation-with-ATF.patch Patch10: zynqmp-Do-not-assing-MIO34-that-early-on-zcu100.patch -Patch11: bcm283x-dts-Rename-U-Boot-file.patch # PXE depends on fdt_addr (mandatory) # fdt_addr is an address to DTB in HW (e.g. ROM) @@ -131,8 +130,6 @@ u-boot bootloader binaries for riscv64 boards cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 %SOURCE6 . -sed -i 's/python/python3/' arch/arm/mach-rockchip/make_fit_atf.py - %build mkdir builds @@ -170,10 +167,10 @@ do # End ATF make $(echo $board)_defconfig O=builds/$(echo $board)/ make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1 O=builds/$(echo $board)/ - if [[ " ${rk3328[*]} " == *" $board "* ]]; then - builds/$(echo $board)/tools/mkimage -n rk3328 -T rksd -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_sd.img - builds/$(echo $board)/tools/mkimage -n rk3328 -T rkspi -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_spi.img - fi + #if [[ " ${rk3328[*]} " == *" $board "* ]]; then + #builds/$(echo $board)/tools/mkimage -n rk3328 -T rksd -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_sd.img + #builds/$(echo $board)/tools/mkimage -n rk3328 -T rkspi -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_spi.img + #fi if [[ " ${rk3399[*]} " == *" $board "* ]]; then builds/$(echo $board)/tools/mkimage -n rk3399 -T rksd -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_sd.img builds/$(echo $board)/tools/mkimage -n rk3399 -T rkspi -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_spi.img @@ -307,13 +304,16 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog -* Thu Jan 02 2020 David Abdurachmanov 2020.01-0.9-rc5.1.riscv64 +* Tue Jan 7 2020 David Abdurachmanov 2020.01-1.0.riscv64 - Add support for RISC-V (riscv64) - 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 - Match CONFIG_NR_CPUS to Linux configuration (32) +* Tue Jan 7 2020 Peter Robinson 2020.01-1 +- 2020.01 + * Tue Dec 17 2019 Peter Robinson 2020.01-0.9-rc5 - 2020.01 RC5