diff --git a/u-boot.changes b/u-boot.changes
index 09877e3..e8940ee 100644
--- a/u-boot.changes
+++ b/u-boot.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 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 0824733..fc82aa4 100644
--- a/u-boot.spec
+++ b/u-boot.spec
@@ -408,11 +408,15 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" tools-only
 %else
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/u-boot.changes | tail -n 1 | cut -d- -f1 )" +%s)
 %if 0%{?is_a64} || 0%{?is_h5}
+%if %{with uboot_atf}
 export BL31=%{_datadir}/arm-trusted-firmware-sun50i_a64/bl31.bin
+%endif
 export SCP=/dev/null
 %endif
 %if 0%{?is_h6}
+%if %{with uboot_atf}
 export BL31=%{_datadir}/arm-trusted-firmware-sun50i_h6/bl31.bin
+%endif
 export SCP=/dev/null
 %endif
 %if "%{name}" == "u-boot-qemu-riscv64spl"