From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76109C35647 for ; Fri, 21 Feb 2020 13:08:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 41C242073A for ; Fri, 21 Feb 2020 13:08:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="fWlubCz/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 41C242073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5837-0008NN-EX for qemu-devel@archiver.kernel.org; Fri, 21 Feb 2020 08:08:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56447) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5823-0006WD-15 for qemu-devel@nongnu.org; Fri, 21 Feb 2020 08:07:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5822-0002Uw-2q for qemu-devel@nongnu.org; Fri, 21 Feb 2020 08:07:50 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41637) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5821-0002UY-Sc for qemu-devel@nongnu.org; Fri, 21 Feb 2020 08:07:50 -0500 Received: by mail-wr1-x442.google.com with SMTP id c9so1984388wrw.8 for ; Fri, 21 Feb 2020 05:07:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=B9G9wP9yd2t33Xt2CQJ/kBsj3Yd6lYldXl2KRvMY6ks=; b=fWlubCz/PjHPuPsSpd7VhJ5DmSGdB1Tc3ZjTqDK7VYc+wkMX4XZf5WZSGmWMOr2f1R YZTCJkr8l2eWi4sTMnl7JY1GLgpCSjuwz5FmwpW/Prp33pEypAuw+Dn5iIeFAuVW7S0Z njyPBfnivx+wRlFQAOiU1e48IwweFDlPay3JpH4fpJZCoChzsmjQ35ur3FHN9vBJPEN8 RkSY8yE9aEMn7y8zi8DVEgJ2Vfmi1dn85sURHygrE2/yQLdD+8Igz/Cb/fGXqwNORcOw yln8dh+c6T0sl9JVINR6+nTQvaxBWeY30ieLGPFiRwkMYHJbcdQvKsgxJZPxxiu3rjqG YNaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B9G9wP9yd2t33Xt2CQJ/kBsj3Yd6lYldXl2KRvMY6ks=; b=ew7A+0IspT5uuD+QxVJ2mhtxpF+ySsVTZjvyRoCEW+jX66buGznBdCjQ1ypJFuksOo 86A0f/VYabzalmJV0PGJp8tEo1RoVUQWOTbwCAWE2aeImPPs2us//y6tq4PI49kGPnJq ZYZvDkpfVt2RSn8ZA9QbYKkEzxQxhXxwbb+WSISmAzSSm6EuTGLI08t9hde5KYpZa2LC mmmLby2/VJUH+hmRsp5smJGfIJObavOE5Y3aShONnFx87LnbCLucHlfakDorApaAqP+z Gu6YdtDKLzsACOfMGODvxxMMhgtgWeclCnS9+mlog6Rjy6BTP+G9wWgGFnrgOqR7V4pR KkRQ== X-Gm-Message-State: APjAAAVsES96GYf8JBtJpxjRqwPi15bizxaMJBAza9t782GDfCHTnuhU 9tPLr9G5NJGpkb5y3Yhi37yHu/DFkKbpsg== X-Google-Smtp-Source: APXvYqyCmNDKPjpaOrLY6uZR9M4mSpdzlMq+rJw5WZplzZIrm1Wigi8DMRxOF1Hk2GlK7IPZ8Ue76A== X-Received: by 2002:adf:a1d9:: with SMTP id v25mr47782570wrv.160.1582290468546; Fri, 21 Feb 2020 05:07:48 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id p15sm3598892wma.40.2020.02.21.05.07.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2020 05:07:47 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/52] z2: Make providing flash images non-mandatory Date: Fri, 21 Feb 2020 13:06:53 +0000 Message-Id: <20200221130740.7583-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200221130740.7583-1-peter.maydell@linaro.org> References: <20200221130740.7583-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Guenter Roeck Up to now, the z2 machine only boots if a flash image is provided. This is not really necessary; the machine can boot from initrd or from SD without it. At the same time, having to provide dummy flash images is a nuisance and does not add any real value. Make it optional. Signed-off-by: Guenter Roeck Reviewed-by: Philippe Mathieu-Daudé Message-id: 20200217210903.18602-1-linux@roeck-us.net Signed-off-by: Peter Maydell --- hw/arm/z2.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 34794fe3ae6..4bb237f22d2 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -314,12 +314,6 @@ static void z2_init(MachineState *machine) be = 0; #endif dinfo = drive_get(IF_PFLASH, 0, 0); - if (!dinfo && !qtest_enabled()) { - error_report("Flash image must be given with the " - "'pflash' parameter"); - exit(1); - } - if (!pflash_cfi01_register(Z2_FLASH_BASE, "z2.flash0", Z2_FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, sector_len, 4, 0, 0, 0, 0, be)) { -- 2.20.1