diff --git a/u-boot.changes b/u-boot.changes
index e8940ee..328b429 100644
--- a/u-boot.changes
+++ b/u-boot.changes
@@ -1,8 +1,13 @@
+-------------------------------------------------------------------
+Thu Mar  4 14:59:52 UTC 2021 - Matthias Brugger <mbrugger@suse.com>
+
+- Fix confname assignment for zynqmp and zynq case (bsc#1182962)
+
 -------------------------------------------------------------------
 Thu Mar  4 10:51:38 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
 - Guard 'export BL31' for sun50i_h6 and sun50i_a64 with
-  '%{with uboot_atf}' condition
+  '%{with uboot_atf}' condition (bsc#1182962)
 
 -------------------------------------------------------------------
 Mon Mar  1 13:13:54 UTC 2021 - Matthias Gerstner <matthias.gerstner@suse.com>
diff --git a/u-boot.spec b/u-boot.spec
index fc82aa4..eb77dca 100644
--- a/u-boot.spec
+++ b/u-boot.spec
@@ -437,11 +437,13 @@ cp %{_datadir}/arm-trusted-firmware-rk3399/bl31.elf .
 
 %if %{is_zynq}
 confname="xilinx_zynq_virt_defconfig"
-%elif %{is_zynqmp}
+%else
+%if %{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
+%endif
 
 %if "%target" == "avnetultra96rev1"
 export DEVICE_TREE=avnet-ultra96-rev1