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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 79D3EC4338F for ; Fri, 23 Jul 2021 16:12:41 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8161560EB5 for ; Fri, 23 Jul 2021 16:12:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8161560EB5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2CEED82D13; Fri, 23 Jul 2021 18:12:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.b="mP+5VGWH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CF9C082D7C; Fri, 23 Jul 2021 18:12:36 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DA87D82CDE for ; Fri, 23 Jul 2021 18:12:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=dimitri.ledkov@canonical.com Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id A7C1D3F346 for ; Fri, 23 Jul 2021 16:12:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1627056752; bh=eoZAAueV32ZRLbwEFo7INcz18LiQiRh7Dk+xHYHTfRw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=mP+5VGWH7HmHyN/ebVlFKqFUf8UnfLY4aA+2oA2ft2gFCaRIRI9o1QLdFhC+uyDbe a6PsaFiautjoXzepAtBWqpu5ASFSRxJ7niO8ew34ddTjYsrF4YHyaW44mA3ho+5UiM iveWMbX4x+M7QiK3FFjHu3CIHktBzJHE1yupCWJSRyOiYg3cWK3kyzmPN/SLJgnFeI i1/g5XuqNggz7bmmJbjXCwh41j8XD4/4IXNizRnBmQQFzES2Fui2bd7nFiXgzFUHHr SzAJpHtTbnK8TsIIJxbWE1VhAqIp0kRrOL1TtfCKzG5opRWR0YTi61G85KNpm9BJGJ anAhFzergpiIA== Received: by mail-wr1-f71.google.com with SMTP id o8-20020a5d4a880000b029013a10564614so1147094wrq.15 for ; Fri, 23 Jul 2021 09:12:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eoZAAueV32ZRLbwEFo7INcz18LiQiRh7Dk+xHYHTfRw=; b=Cd9tHqVfR5CW0kJk6g6fqk70og45N7ZesUGHZ62MAOtLlT7l/eBkQ23tH2gXVqTkYT Sw1rHIzLatq1Hr+eJgCYX/0rZyjEqd3XBMB9t9r/xg7mGximGDRh0sSapmxSqgrn42z+ auw+Xs+T991JV6vrN/V0z9Yi9Ll3vFoHb6mnGEhJ4jKMvgW7Kytq1zwy4Dy9eZdeCHBj rNjaTymGPbR/no1wDJrC44hogTdimRVFhXNHbrXJiFDu/Eo4XprqY0IlexMRrPxVZ6Fp rWHwECa6ninRu+1Ch6PxKv6gomt0j/rwZMIdUJ3rAf0Tf+xkKUqneevUeCWP9mxEo7Nc xP1w== X-Gm-Message-State: AOAM530/gd+ezOWGRMhE5vG4t7jmlbsqMWnfOhNm+iA+/Egbo1T7yKr/ Ww1QZ4dYi+sCMAon1S10BNVhjoIeNn82z2dfH8PsyH3Um54bUFKRH9QnLxZ7ve9qbKVi1y75qvf G908MpYWF548WYkWwseYFsy/3E5d1+tU= X-Received: by 2002:a5d:5271:: with SMTP id l17mr6037069wrc.239.1627056748859; Fri, 23 Jul 2021 09:12:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7cNPw44bsStVJN1WVV9M9Iwt3/NMyXCVOHhT8HTbpxqsgR0dzgXoH6Qw101uTCbX7mWT6Gw== X-Received: by 2002:a5d:5271:: with SMTP id l17mr6037049wrc.239.1627056748624; Fri, 23 Jul 2021 09:12:28 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:8bcb:3f6a:d5a:e4bb]) by smtp.gmail.com with ESMTPSA id z4sm19823869wrv.40.2021.07.23.09.12.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jul 2021 09:12:28 -0700 (PDT) From: Dimitri John Ledkov To: u-boot@lists.denx.de Cc: David Abdurachmanov Subject: [PATCH] qemu-riscv64_smode: fix extlinux (define preboot) Date: Fri, 23 Jul 2021 17:12:25 +0100 Message-Id: <20210723161225.47677-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Commit 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig") removed preboot commands in RISC-V targets and broke extlinux support as reported by Fu Wei . The patch finishes migration of CONFIG_USE_PREBOOT and CONFIG_REBOOT to Kconfig. Signed-off-by: David Abdurachmanov Signed-off-by: Dimitri John Ledkov --- Original patch author is David Abdurachmanov Previously this was submitted in 2019 https://patchwork.ozlabs.org/project/uboot/patch/20190821190720.4286-1-david.abdurachmanov@sifive.com/ Since then the sifive fu540 portion of this change was merged, but not the qemu one. Submitting the qemu portion again. Without this change, qemu smode cannot boot Ubuntu's riscv64 cloud images with extlinux.conf. configs/qemu-riscv64_smode_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig index 0000564e41..cb674c6a75 100644 --- a/configs/qemu-riscv64_smode_defconfig +++ b/configs/qemu-riscv64_smode_defconfig @@ -14,3 +14,5 @@ CONFIG_CMD_NVEDIT_EFI=y CONFIG_OF_PRIOR_STAGE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM_MTD=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" -- 2.30.2