Accepting request 842535 from hardware👢staging

- Fix last change
- Add xilinxzynqvirt virtual flavor (similar to xilinxzynqmpvirt)
- zynq-zturn is provided by xilinx_zynq_virt config

OBS-URL: https://build.opensuse.org/request/show/842535
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=105
This commit is contained in:
Matthias Brugger 2020-10-19 11:57:33 +00:00 committed by Git OBS Bridge
parent 0060a0156a
commit 103053c11e
3 changed files with 24 additions and 4 deletions

View File

@ -84,6 +84,7 @@
<flavor>turrisomnia</flavor>
<flavor>udoo</flavor>
<flavor>udooneo</flavor>
<flavor>xilinxzynqvirt</flavor>
<flavor>xilinxzynqmpvirt</flavor>
<flavor>xilinxzynqmpzcu102rev10</flavor>
<flavor>zynqzturn</flavor>

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Oct 14 09:48:25 UTC 2020 - Andreas Schwab <schwab@suse.de>
- Fix last change
-------------------------------------------------------------------
Mon Oct 12 09:55:35 UTC 2020 - Matwey Kornilov <matwey.kornilov@gmail.com>
- 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 <guillaume.gardet@opensuse.org>

View File

@ -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