Received: by 2002:ac2:4c26:0:0:0:0:0 with SMTP id u6csp3111833lfq; Tue, 15 Sep 2020 05:12:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPLvse8chP8arAa5Zjz2ljv5EuYlvqIlpGM2lynZkPqlfj/CmGm2MI85nAT3U3qDyqMu0m X-Received: by 2002:ac8:5215:: with SMTP id r21mr17491580qtn.257.1600171927123; Tue, 15 Sep 2020 05:12:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600171927; cv=none; d=google.com; s=arc-20160816; b=AhK3QiMzle56Kyt9pgOg6AeqM6WikXI1pZQh9woZQ85AdfFWRb4jLIBcKtRapfK9MS KBtez4jOnm9g38vwr2xZFeTI2yjKtMQXhxHL/0i3psVw2DXoknyfJDoEFrhwjghoFkoh SY+k6vY6j3Q/DAb2xi5Uqw+91iLdN2GG8ClYaR07uUTuJd4epD0kWSB24SYGkIBvntkP nXO3eGiiXq9XYLvjzccuSWf3vhpG0vEOnxqz4VIbyN3CyOiY8fXQr2DybpWqRfhrMwp+ 1mKCYTkMa2HawLKq7hEzSEPDn8Ui5eoqASnv9kXhJYBz78KM9T7Etf8VV3qkc5tuNwEC NvkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=BG9U3acW9wS4T1HTtBLVqFAocjBatkXSMuRFGxe6fo0=; b=dPSQLiq+oeM4GEu8Q+C7nrN8fxug8fvOV539V1m+ahKFYXU+dqY+EVZsPvENlM1s2i +b4WE/sK/pm/b6A64ueg+o/c1A1XjT1FMGM0bwEFUKe3iQesVia++GcdUTrOM55JA5qg IeQ/aPgySfDe0mR3SEfN2FWjnWVJeN5paTuoP7RkoKSicltpSCxC5WfQKcA86XNWM8cg +LOIg6UKikt8IRI/0UvXFk1gwejeMjGQiHRmC1KE3Ti9En3xmn23V409UzGyyAwJSuQb 5yO+hXwIB5fB7lWA6f8T8F5UY7O+BLbn/LHHEQPikPjwA1uv7/tIHTh8x+i7hgWu4QFR OANw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=ABxXGNTp; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v2si8268112qvf.64.2020.09.15.05.12.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Sep 2020 05:12:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=ABxXGNTp; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:35288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kI9oc-00063c-Bh for alex.bennee@linaro.org; Tue, 15 Sep 2020 08:12:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kI9m8-0003qH-KO for qemu-arm@nongnu.org; Tue, 15 Sep 2020 08:09:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40303) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kI9m6-0007QI-GA for qemu-arm@nongnu.org; Tue, 15 Sep 2020 08:09:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600171768; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BG9U3acW9wS4T1HTtBLVqFAocjBatkXSMuRFGxe6fo0=; b=ABxXGNTpA01ZLJp+mpbrbD/32Y6q9sWZMqMckQzRkYiXhP1lhoGYmb/ObrPT7kZxc8uK4z Hx27lJGIBFnTVCy7m5gIcfQLlMW3C1eiTf50OCyA/mAfAMiptlvwdrZ7koODoB4AK680q3 0QMMIFZxOBHiF31jW+iuOllraxYVkjU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-43-n87yKXXnNZ6JHYoc6QDDXA-1; Tue, 15 Sep 2020 08:09:24 -0400 X-MC-Unique: n87yKXXnNZ6JHYoc6QDDXA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 13DCE801AE0; Tue, 15 Sep 2020 12:09:23 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-85.ams2.redhat.com [10.36.112.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6167C81C5F; Tue, 15 Sep 2020 12:09:10 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7DF7231FC3; Tue, 15 Sep 2020 14:09:09 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v8 01/21] microvm: name qboot binary qboot.rom Date: Tue, 15 Sep 2020 14:08:49 +0200 Message-Id: <20200915120909.20838-2-kraxel@redhat.com> In-Reply-To: <20200915120909.20838-1-kraxel@redhat.com> References: <20200915120909.20838-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 02:10:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Thomas Huth , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Shannon Zhao , qemu-arm@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: hvx5cxP9zJBJ qboot isn't a bios and shouldnt be named that way. Signed-off-by: Gerd Hoffmann Reviewed-by: Sergio Lopez Reviewed-by: Philippe Mathieu-Daudé --- hw/i386/microvm.c | 4 ++-- pc-bios/meson.build | 2 +- pc-bios/{bios-microvm.bin => qboot.rom} | Bin roms/Makefile | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) rename pc-bios/{bios-microvm.bin => qboot.rom} (100%) diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 81d0888930d1..b1dc7e49c159 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -47,7 +47,7 @@ #include "kvm_i386.h" #include "hw/xen/start_info.h" -#define MICROVM_BIOS_FILENAME "bios-microvm.bin" +#define MICROVM_QBOOT_FILENAME "qboot.rom" static void microvm_set_rtc(MicrovmMachineState *mms, ISADevice *s) { @@ -158,7 +158,7 @@ static void microvm_devices_init(MicrovmMachineState *mms) } if (bios_name == NULL) { - bios_name = MICROVM_BIOS_FILENAME; + bios_name = MICROVM_QBOOT_FILENAME; } x86_bios_rom_init(get_system_memory(), true); } diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 182d5ebb35de..9759dba09714 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -27,7 +27,7 @@ endif blobs = files( 'bios.bin', 'bios-256k.bin', - 'bios-microvm.bin', + 'qboot.rom', 'sgabios.bin', 'vgabios.bin', 'vgabios-cirrus.bin', diff --git a/pc-bios/bios-microvm.bin b/pc-bios/qboot.rom similarity index 100% rename from pc-bios/bios-microvm.bin rename to pc-bios/qboot.rom diff --git a/roms/Makefile b/roms/Makefile index 3726f06fe7eb..1395a46695be 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -68,7 +68,7 @@ default help: @echo " efi -- update UEFI (edk2) platform firmware" @echo " opensbi32-generic -- update OpenSBI for 32-bit generic machine" @echo " opensbi64-generic -- update OpenSBI for 64-bit generic machine" - @echo " bios-microvm -- update bios-microvm.bin (qboot)" + @echo " qboot -- update qboot" @echo " clean -- delete the files generated by the previous" \ "build targets" @@ -183,9 +183,9 @@ opensbi64-generic: cp opensbi/build/platform/generic/firmware/fw_dynamic.bin ../pc-bios/opensbi-riscv64-generic-fw_dynamic.bin cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv64-generic-fw_dynamic.elf -bios-microvm: +qboot: $(MAKE) -C qboot - cp qboot/bios.bin ../pc-bios/bios-microvm.bin + cp qboot/bios.bin ../pc-bios/qboot.rom npcm7xx_bootrom: $(MAKE) -C vbootrom CROSS_COMPILE=$(arm_cross_prefix) -- 2.27.0