commit bf6903f6944fe75606e4c67d6962b407c7bb5656
author Paolo Bonzini <pbonzini@redhat.com> Fri May 19 13:26:39 2023 +0200
committer Paolo Bonzini <pbonzini@redhat.com> Tue Jun 06 16:30:01 2023 +0200
tree 3fc414add9c6a63800082f0664acb3e21320cbb3
parent b11f9bd96f451f0e60b2b91e19b900ec7c673f29

pc-bios/s390-ccw: always build network bootloader

In the beginning, the network bootloader was considered experimental and
thus optional, but it is well established nowadays and configure always
checks for roms/SLOF before compiling pc-bios/s390-ccw.

Therefore, it makes sense to always build it together with the other
part of the s390-ccw bios.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

pc-bios/s390-ccw/Makefile

diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index 9c5276f..2e8cc01 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -67,12 +67,7 @@
 
 $(OBJECTS): Makefile
 
-ifneq ($(wildcard $(SRC_PATH)/../../roms/SLOF/lib/libnet),)
 include $(SRC_PATH)/netboot.mak
-else
-s390-netboot.img:
-	@echo "s390-netboot.img not built since roms/SLOF/ is not available."
-endif
 
 ALL_OBJS = $(sort $(OBJECTS) $(NETOBJS) $(LIBCOBJS) $(LIBNETOBJS))
 -include $(ALL_OBJS:%.o=%.d)