From patchwork Tue Jun 6 14:31:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1791253 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=RnnSnnG8; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QbCdj5cPzz20Ty for ; Wed, 7 Jun 2023 00:33:45 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6XjU-00067g-BN; Tue, 06 Jun 2023 10:32:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6Xiz-0005b3-PJ for qemu-devel@nongnu.org; Tue, 06 Jun 2023 10:31:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6Xiw-0001KV-NO for qemu-devel@nongnu.org; Tue, 06 Jun 2023 10:31:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686061910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ge4jdihkScBNcEVqkgKh2RLw5xeyUC0ajU6o0YN3Ua0=; b=RnnSnnG8ktEHyhylkFeSdBgR+ZcmcNO/z8Xc+P3SGIa4kFeYvLjJC1/bEB7Ngm14UPzaGI q/hexOr1DBZqjrW+toYH0p1kPW5AcEGmiTOQoHMdddr0sir4zVt6iDktbxW3BiKfT6/Z1U nGrJo6CZ2RDAL/lZGa+dp9XIjbFreuw= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-205-hw5ghIN4MMG-m7sjeWAuQQ-1; Tue, 06 Jun 2023 10:31:48 -0400 X-MC-Unique: hw5ghIN4MMG-m7sjeWAuQQ-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-977cb78acfcso232114666b.3 for ; Tue, 06 Jun 2023 07:31:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686061907; x=1688653907; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ge4jdihkScBNcEVqkgKh2RLw5xeyUC0ajU6o0YN3Ua0=; b=Pg683VBRqdIHF3qRhiBO5P6HWLq7Wd1Cyc8QXcUtPPFKIyQOCKeOiKpZ3GqOcvLIeX av/lmvSaW65Lg5xnKapQOw4o8rELBeJ5tSKM/pou/bLayzSz3Rz70XLH/wKbFln2i94M eAcuSjAnnbAtkaVBEm5casgyD0lDQT2+1VNPLqkX8jfzZ8qmw/lpG9f3N4t8RHqdNfB+ d9oljXiU1rLviwBEujOgLvU2IkiUgslwtGBVfAB/uwo6rM+AAb8eWsvIe+qgLkQvuwhN 9m3DLQBMgqigScE2UidGgVuKLQKmBKlZg08WHU3fWtbcoBaekOOGluxbKovL/r9PEhxZ 0BUA== X-Gm-Message-State: AC+VfDygOes7mJMwb67yFSoTnh+IekprRPA5Tn5LEaxxQTAaUBJ18YLX KS0RV5B9eYfWIQ0eVVFjD0rcBdv55BiPS6guDrmUErxRslrz2kIuVP3NXay/0sN2XCmY0cu/sR5 G0XrWrvbcYNW+OE2Q1zkzN2shNJ9Se3269M6S8EJwQT+g4dq66i1bLnIENTuZoWFk/WHjgd5H34 o= X-Received: by 2002:a17:907:6d8c:b0:977:1dae:2500 with SMTP id sb12-20020a1709076d8c00b009771dae2500mr2359283ejc.1.1686061906955; Tue, 06 Jun 2023 07:31:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7IQ6WOhR//ArdbucUTfm/9ibUkuKz0rCNDX8N2G7UedhVGGA4Du+LcxqPnVID6aKGAxA5Osw== X-Received: by 2002:a17:907:6d8c:b0:977:1dae:2500 with SMTP id sb12-20020a1709076d8c00b009771dae2500mr2359271ejc.1.1686061906756; Tue, 06 Jun 2023 07:31:46 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id ot12-20020a170906cccc00b0096f4c9ce526sm5638194ejb.225.2023.06.06.07.31.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 07:31:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Subject: [PULL 18/21] pc-bios/s390-ccw: always build network bootloader Date: Tue, 6 Jun 2023 16:31:13 +0200 Message-Id: <20230606143116.685644-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230606143116.685644-1-pbonzini@redhat.com> References: <20230606143116.685644-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Daniel P. Berrangé Signed-off-by: Paolo Bonzini --- pc-bios/s390-ccw/Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index 9c5276f8ade..2e8cc015aa0 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -67,12 +67,7 @@ s390-ccw.img: s390-ccw.elf $(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)