Don't look for riscv_logo.txt if logo is not enabled

3 files changed, 19 insertions, 3 deletions

diff --git a/bbl/bbl.ac b/bbl/bbl.ac
index b803ae9..dc3cf42 100644
--- a/bbl/bbl.ac
+++ b/bbl/bbl.ac
@@ -2,6 +2,7 @@
 
 AC_ARG_ENABLE([logo], AS_HELP_STRING([--enable-logo], [Enable boot logo]))
 AS_IF([test "x$enable_logo" == "xyes"], [
+  AC_SUBST([BBL_ENABLE_LOGO], 1)
   AC_DEFINE([PK_ENABLE_LOGO],,[Define if the RISC-V logo is to be displayed])
 ])
 
diff --git a/bbl/bbl.mk.in b/bbl/bbl.mk.in
index 4d40987..ca679d3 100644
--- a/bbl/bbl.mk.in
+++ b/bbl/bbl.mk.in
@@ -23,8 +23,13 @@ bbl_payload: $(BBL_PAYLOAD)
 
 raw_logo.o: bbl_logo_file
 
+ifeq (@BBL_ENABLE_LOGO@,1)
 bbl_logo_file: @BBL_LOGO_FILE@
 	cat $^ | sed 's/$$/\r/' > $@
+else
+bbl_logo_file:
+	touch $@
+endif
 
 bbl_test_srcs =
 
diff --git a/configure b/configure
index 5a37513..1ab2f31 100755
--- a/configure
+++ b/configure
@@ -592,6 +592,7 @@ subprojects_enabled
 subprojects
 BBL_LOGO_FILE
 BBL_PAYLOAD
+BBL_ENABLE_LOGO
 WITH_ARCH
 RISCV
 EGREP
@@ -4078,6 +4079,7 @@ if test "${with_arch+set}" = set; then :
 
 fi
 
+
 # Check whether --enable-print-device-tree was given.
 if test "${enable_print_device_tree+set}" = set; then :
   enableval=$enable_print_device_tree;
@@ -4162,7 +4164,9 @@ $as_echo "$as_me: configuring default subproject : pk" >&6;}
 
 $as_echo "#define PK_ENABLED /**/" >>confdefs.h
 
-      # Check whether --enable-vm was given.
+      # See LICENSE for license details.
+
+# Check whether --enable-vm was given.
 if test "${enable_vm+set}" = set; then :
   enableval=$enable_vm;
 fi
@@ -4219,13 +4223,17 @@ $as_echo "$as_me: configuring default subproject : bbl" >&6;}
 
 $as_echo "#define BBL_ENABLED /**/" >>confdefs.h
 
-      # Check whether --enable-logo was given.
+      # See LICENSE for license details.
+
+# Check whether --enable-logo was given.
 if test "${enable_logo+set}" = set; then :
   enableval=$enable_logo;
 fi
 
 if test "x$enable_logo" == "xyes"; then :
 
+  BBL_ENABLE_LOGO=1
+
 
 $as_echo "#define PK_ENABLE_LOGO /**/" >>confdefs.h
 
@@ -4398,7 +4406,9 @@ $as_echo "$as_me: configuring default subproject : machine" >&6;}
 
 $as_echo "#define MACHINE_ENABLED /**/" >>confdefs.h
 
-      # Check whether --enable-fp-emulation was given.
+      # See LICENSE for license details.
+
+# Check whether --enable-fp-emulation was given.
 if test "${enable_fp_emulation+set}" = set; then :
   enableval=$enable_fp_emulation;
 fi