diff --git a/_multibuild b/_multibuild index bcf788d..8d9c72b 100644 --- a/_multibuild +++ b/_multibuild @@ -8,6 +8,7 @@ a20-olinuxinomicro am335xevm am57xxevm + avnetultra96rev1 arndale bananapi bananapim2plush3 @@ -78,4 +79,5 @@ udooneo xilinxzynqmpgeneric xilinxzynqmpzcu102rev10 + zynqzturn diff --git a/u-boot.changes b/u-boot.changes index a20c35c..d1d457c 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Sep 4 21:56:21 UTC 2019 - Andreas Färber + +- Add avnetultra96rev1 + +------------------------------------------------------------------- +Wed Aug 21 14:27:40 UTC 2019 - Matthias Brugger + +- update_git.sh: Allow GIT_LOCAL_TREE to be a soft link as well + +------------------------------------------------------------------- +Sat Aug 10 19:11:07 UTC 2019 - Matwey Kornilov + +- Add u-boot-zynqzturn + ------------------------------------------------------------------- Mon Jul 22 13:15:36 UTC 2019 - Guillaume GARDET diff --git a/u-boot.spec b/u-boot.spec index 734387d..a9f53b8 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -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 diff --git a/update_git.sh b/update_git.sh index 7ffee9f..8f0e481 100644 --- a/update_git.sh +++ b/update_git.sh @@ -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