From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B428A606A31C for ; Mon, 9 Nov 2026 11:37:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=w2Vj3a+p Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xQNgM-0005Yq-Sc; Mon, 09 Nov 2026 06:37:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xQNfq-0005Py-2S for qemu-devel@nongnu.org; Mon, 09 Nov 2026 06:36:31 -0500 Received: from mail-dy1-x132e.google.com ([2607:f8b0:4864:20::132e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xQNfo-0000Iw-G8 for qemu-devel@nongnu.org; Mon, 09 Nov 2026 06:36:29 -0500 Received: by mail-dy1-x132e.google.com with SMTP id 5a478bee46e88-36fc0a3fe93so1548918eec.0 for ; Mon, 09 Nov 2026 03:36:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794224187; x=1794828987; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=5+AgCcrIqg4nuy8x7X+EnudU0XBtlTWc0meswcQqgy0=; b=w2Vj3a+puqxFYa8TAmgqo2DA2G2icNpUXgvvL+M4LhvgmGscKqDhTzRIFjylTzbdi+ IX9gbmYYJLtN9g+ErNZY9b+LPqweY3CE1L26iTxHyCAAjzYi/wipTP62lf3YXJ/ZzU5k 2jjCvWonrHbVttEp+7fN8NI8NyMh8Ha/YYKBMqCXHxL3hZRQED1itcD3TMvxEWYzXewj 1H9A3CWPKqsvDkZyaR0+1L02vzD3zxMX+tN0aCe7cIqcwc4yRgGTX1d0UHK1anOf3bS9 vQlv5NTctUYFbyKB9ivAOMOn/Rtm6vu8hLXVg67I1hJSOnT0CEfSZqMGZE/H2XZ/raST R5ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794224187; x=1794828987; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=5+AgCcrIqg4nuy8x7X+EnudU0XBtlTWc0meswcQqgy0=; b=wle//2DwDLgCNIRX3LZnpKFZwRLBswT5GuN2goz3ZqADdx9iAcBhXNQm6R6BUsG822 Ud4/T5c7WZFo+YXl11em2XdGdXik5TRcRbbHXMv5j/seijGxtE83hwtV+rLD/WLYJMhW NGwxSRyund1wOfIVyHJUGYTjFjI2yUTV06zldqXA9ew4wvDDft0dHb2cg+dpmlfo1/0/ 0QD/ai76HFT1xkEudgBJcTo/YaqqHenjRjsMy7F1lQXHXSLeDBmYdp83YDtLymef2ffZ PfL3ktgb1aj+00e5DeouIN4sXzoSGDJ1bKEM+tOdUWpmfCeX2BrpHrRQDIIWpNKMyHy9 +o8g== X-Gm-Message-State: APuU4Z8QUH9uCnjn+eKsdsY1jqW+lxIfkez1g9aNbq0SA+dXAL91tNOo eegXTqIyS7Tu6oErHoPzaJiOQCiOuDVgK0T3WdKQc2qkBNLgatKsxxH8pTJ7/+vVV/E= X-Gm-Gg: AYBFou33fFdfb6lKoMco1I+R4YfHji4ZKAusNv1xreRpMMgCeGgPs6FmlK+H8Vmhf2Z E7iNmnPRGIQ0u+TpvQN/tm/axuY2if3vVQdkQNYLmP98MubSJ4AHRoWK43VxHv9h7rT01tmB7hD zMXHg56L8qz8kawNZkSJiyF9h61kHtfO9cxPxHmgCNGYF4Oo2ubzCMLHMXwIoRAJIJGEFdSeYMT 6m3jthTUVc+tqHy7pWwbYKRHoR4F5/RQIkOiHm0Mvu36gYTkDfl7vMso5x8AHPZFtJX54ILWaug 4Hqm/fHlQqgoLX0LFZ1wye3R9Vw4JZ1VoyWeKZceEuZmO8Xg2CroKzOPQgtXWcKWr228yojObsu vN3cLxPdVJqlVboRpXRdAKbi5fi+iIln0Ru67Ko/DPbRPGnxZxDxreeuYSDc6wvhCjucNeLhowa RY3Tf7+GWELMi7ST93PQvymPLAJpeJBzAIvcJ/2xiyB2GHnHlmWeKYQSJR/++y2zwQ9S67XGspV oNVtfPSCT09EcuaLrMoguDobu2IVFAhqrmfUgrrhVSPIyossk6optIOeklvozPDK2ZWcjZ5MBtR 8iFOD11OCQ9eKU8TVdCyQE9RxU+XD1rV X-Received: by 2002:a05:693c:87c9:10b0:369:ef92:bd7b with SMTP id 5a478bee46e88-37257c94c98mr7179291eec.41.1794224186841; Mon, 09 Nov 2026 03:36:26 -0800 (PST) Received: from ubuntu.lan ([2405:4802:913e:86f0:35c7:7294:a0c3:69b2]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-372660f444csm19762941eec.19.2026.11.09.03.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2026 03:36:26 -0800 (PST) From: Khai Do To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: peter.maydell@linaro.org, pbonzini@redhat.com, strahinja.p.jankovic@gmail.com, Khai Do Subject: [PATCH v2 8/8] hw/arm/orangepi-zero2w: Wire up SD card and support firmware loading Date: Mon, 9 Nov 2026 18:35:36 +0700 Message-ID: <20261109113545.18561-9-dovankhai97@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261109113545.18561-1-dovankhai97@gmail.com> References: <20261109113545.18561-1-dovankhai97@gmail.com> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::132e; envelope-from=dovankhai97@gmail.com; helo=mail-dy1-x132e.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: qemu development List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 Connect the SD card block backend to the H618 "sd-bus", allowing booting from MicroSD card images via `-drive if=sd,format=raw,file=...`. In addition, support loading raw firmware binaries (such as EDK2 UEFI or U-Boot) at 0x40080000 via the `-bios` command-line option. Signed-off-by: Khai Do --- hw/arm/orangepi-zero2w.c | 41 ++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/hw/arm/orangepi-zero2w.c b/hw/arm/orangepi-zero2w.c index 1cc9ad7ba6..5b0e64cff4 100644 --- a/hw/arm/orangepi-zero2w.c +++ b/hw/arm/orangepi-zero2w.c @@ -13,8 +13,12 @@ #include "qemu/error-report.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" +#include "hw/core/qdev-properties-system.h" #include "hw/arm/allwinner-h618.h" #include "hw/arm/boot.h" +#include "hw/core/loader.h" +#include "hw/sd/sd.h" +#include "system/blockdev.h" #define TYPE_ORANGEPI_ZERO2W_MACHINE MACHINE_TYPE_NAME("orangepi-zero2w") OBJECT_DECLARE_SIMPLE_TYPE(OrangePiZero2WMachineState, ORANGEPI_ZERO2W_MACHINE) @@ -29,12 +33,10 @@ static void orangepi_zero2w_init(MachineState *machine) { OrangePiZero2WMachineState *opms = ORANGEPI_ZERO2W_MACHINE(machine); AwH618State *h618; - - /* BIOS is not supported by this board */ - if (machine->firmware) { - error_report("BIOS not supported for this machine"); - exit(1); - } + DriveInfo *di; + BlockBackend *blk; + BusState *bus; + DeviceState *carddev; h618 = AW_H618(object_new(TYPE_AW_H618)); object_property_add_child(OBJECT(machine), "soc", OBJECT(h618)); @@ -51,6 +53,15 @@ static void orangepi_zero2w_init(MachineState *machine) /* Mark H618 object realized */ qdev_realize(DEVICE(h618), NULL, &error_abort); + /* Retrieve SD bus and plug in SD card */ + di = drive_get(IF_SD, 0, 0); + blk = di ? blk_by_legacy_dinfo(di) : NULL; + bus = qdev_get_child_bus(DEVICE(h618), "sd-bus"); + + carddev = qdev_new(TYPE_SD_CARD); + qdev_prop_set_drive_err(carddev, "drive", blk, &error_fatal); + qdev_realize_and_unref(carddev, bus, &error_fatal); + /* SDRAM */ memory_region_add_subregion(get_system_memory(), h618->memmap[AW_H618_DEV_SDRAM], @@ -59,6 +70,24 @@ static void orangepi_zero2w_init(MachineState *machine) opms->bootinfo.loader_start = h618->memmap[AW_H618_DEV_SDRAM]; opms->bootinfo.ram_size = machine->ram_size; opms->bootinfo.psci_conduit = QEMU_PSCI_CONDUIT_SMC; + + /* Load firmware if specified (-bios) */ + if (machine->firmware) { + hwaddr firmware_addr = 0x40080000; + int r; + + r = load_image_targphys(machine->firmware, firmware_addr, + machine->ram_size - + (firmware_addr - 0x40000000), NULL); + if (r < 0) { + error_report("Failed to load firmware from %s", machine->firmware); + exit(1); + } + + opms->bootinfo.entry = firmware_addr; + opms->bootinfo.firmware_loaded = true; + } + arm_load_kernel(&h618->cpus[0], machine, &opms->bootinfo); } -- 2.43.0