Accepting request 736323 from hardware👢staging

- Add avnetultra96rev1
- update_git.sh: Allow GIT_LOCAL_TREE to be a soft link as well
- Add u-boot-zynqzturn

OBS-URL: https://build.opensuse.org/request/show/736323
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=49
This commit is contained in:
Guillaume GARDET 2019-10-09 07:07:17 +00:00 committed by Git OBS Bridge
parent e2bbdb9b35
commit 8d377c23c8
4 changed files with 27 additions and 2 deletions

View File

@ -8,6 +8,7 @@
<flavor>a20-olinuxinomicro</flavor>
<flavor>am335xevm</flavor>
<flavor>am57xxevm</flavor>
<flavor>avnetultra96rev1</flavor>
<flavor>arndale</flavor>
<flavor>bananapi</flavor>
<flavor>bananapim2plush3</flavor>
@ -78,4 +79,5 @@
<flavor>udooneo</flavor>
<flavor>xilinxzynqmpgeneric</flavor>
<flavor>xilinxzynqmpzcu102rev10</flavor>
<flavor>zynqzturn</flavor>
</multibuild>

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Sep 4 21:56:21 UTC 2019 - Andreas Färber <afaerber@suse.de>
- Add avnetultra96rev1
-------------------------------------------------------------------
Wed Aug 21 14:27:40 UTC 2019 - Matthias Brugger <mbrugger@suse.com>
- update_git.sh: Allow GIT_LOCAL_TREE to be a soft link as well
-------------------------------------------------------------------
Sat Aug 10 19:11:07 UTC 2019 - Matwey Kornilov <matwey.kornilov@gmail.com>
- Add u-boot-zynqzturn
-------------------------------------------------------------------
Mon Jul 22 13:15:36 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>

View File

@ -140,7 +140,7 @@
%define is_armv8 1
%endif
%if "%target" == "xilinxzynqmpgeneric" || "%target" == "xilinxzynqmpzcu102rev10"
%if "%target" == "avnetultra96rev1" || "%target" == "xilinxzynqmpgeneric" || "%target" == "xilinxzynqmpzcu102rev10"
%define is_armv8 1
%define binext .elf
%endif
@ -149,6 +149,11 @@
%define is_armv7 1
%endif
%if "%target" == "zynqzturn"
%define is_armv7 1
%define binext .img
%endif
%if "%target" == "qemu-riscv64" || "%target" == "qemu-riscv64smode" || "%target" == "sifivefu540"
%define is_riscv64 1
%endif
@ -436,6 +441,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
%if %socfpga_spl == 1
install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
%endif
%if "%{name}" == "u-boot-zynqzturn"
install -D -m 0644 spl/boot.bin %{buildroot}%{uboot_dir}/boot.bin
%endif
%if "%{name}" == "u-boot-rpi3"
echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
echo -e "\nkernel_address=0x11000000" >> %{buildroot}%{uboot_dir}/ubootconfig.txt

View File

@ -21,7 +21,7 @@ CMP_DIR=/dev/shm/u-boot-factory-cmp-dir
rm -rf $GIT_DIR
rm -rf $CMP_DIR
if [ -d "$GIT_LOCAL_TREE" ]; then
if [ -d "$GIT_LOCAL_TREE" ] || [ -L "$GIT_LOCAL_TREE" ]; then
echo "Processing $GIT_BRANCH branch of local git tree, using tag:" \
"$GIT_UPSTREAM_TAG"
if ! (cd $GIT_LOCAL_TREE && git show-branch $GIT_BRANCH &>/dev/null); then