diff --git a/_multibuild b/_multibuild index 8ae9988..fb1133a 100644 --- a/_multibuild +++ b/_multibuild @@ -84,6 +84,7 @@ turrisomnia udoo udooneo + xilinxzynqvirt xilinxzynqmpvirt xilinxzynqmpzcu102rev10 zynqzturn diff --git a/u-boot.changes b/u-boot.changes index 88c3ebc..9e56088 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Oct 14 09:48:25 UTC 2020 - Andreas Schwab + +- Fix last change + +------------------------------------------------------------------- +Mon Oct 12 09:55:35 UTC 2020 - Matwey Kornilov + +- Add xilinxzynqvirt virtual flavor (similar to xilinxzynqmpvirt) +- zynq-zturn is provided by xilinx_zynq_virt config + ------------------------------------------------------------------- Thu Oct 8 10:04:51 UTC 2020 - Guillaume GARDET diff --git a/u-boot.spec b/u-boot.spec index 0c7b34e..4c35219 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -35,6 +35,7 @@ %define is_armv8 0 %define is_ppc 0 %define is_riscv64 0 +%define is_zynq 0 %define is_zynqmp 0 %define tools_only 0 %if "%target" == "rpi" || "%target" == "rpi2" || "%target" == "rpi3" || "%target" == "rpi4" || "%target" == "rpiarm64" @@ -153,7 +154,8 @@ %define is_armv7 1 %define binext .img %endif -%if "%target" == "zynqzturn" +%if "%target" == "zynqzturn" || "%target" == "xilinxzynqvirt" +%define is_zynq 1 %define is_armv7 1 %define binext .img %endif @@ -388,16 +390,22 @@ cp %{_datadir}/arm-trusted-firmware-rk3399/bl31.elf . %endif %endif -%if !%{is_zynqmp} -confname=$(ls configs | perl -ne '$l=lc; $l=~ s,_,,g; $l eq "%{target}defconfig\n" && print;') -%else +%if %{is_zynq} +confname="xilinx_zynq_virt_defconfig" +%elif %{is_zynqmp} confname="xilinx_zynqmp_virt_defconfig" +%else +confname=$(ls configs | perl -ne '$l=lc; $l=~ s,_,,g; $l eq "%{target}defconfig\n" && print;') +%endif + %if "%target" == "avnetultra96rev1" export DEVICE_TREE=avnet-ultra96-rev1 %endif %if "%target" == "xilinxzynqmpzcu102rev10" export DEVICE_TREE=zynqmp-zcu102-rev1.0 %endif +%if "%target" == "zynqzturn" +export DEVICE_TREE=zynq-zturn %endif make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="%{optflags}" $confname