From patchwork Mon Jul 26 10:17:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1509957 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=PdsXB/Xn; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GYG805b64z9sWl for ; Mon, 26 Jul 2021 20:17:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B260832FD; Mon, 26 Jul 2021 12:17:29 +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="PdsXB/Xn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9893583301; Mon, 26 Jul 2021 12:17:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) (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 F024F832F3 for ; Mon, 26 Jul 2021 12:17:23 +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-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (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-0.canonical.com (Postfix) with ESMTPS id 6F8F33F237 for ; Mon, 26 Jul 2021 10:17:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1627294643; bh=/f3Rfg3rQT2Y1M8ZVFx8w0iE1JoD4Bl/J5QYkV7c8gc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=PdsXB/XnO3sOxRs0X4hFRhFf0FK+HVoRTlps4rWBH1xRqL6d+Xk+LoNyZQcMSejEf y0BzEqibH7Icwb77D2i2NIZAR5yaf6mUfGicP46I6OGBADQGOTj8c/BY4p+NX3G3SQ B9Fon8Y2o+rT5THUwsTPP0AP4f7m5tVpX20KSIS7M1WbLKcamD2ugUgYavCGgZoJiF WUhIs/OLXDmSFxgCPMKIslAcErb1f1w6/W+NPNvOzrSekxUkrJVWHdvMTCSL1OqZIL qGPahy8mhRSShJIFqeFNWYC4p0RETRIOXUiY/EOOLImrPZWGTrQv/U4qBr+++hxmoH L8dOv6mp3uZCA== Received: by mail-wm1-f69.google.com with SMTP id 132-20020a1c018a0000b029025005348905so1388663wmb.7 for ; Mon, 26 Jul 2021 03:17:21 -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=/f3Rfg3rQT2Y1M8ZVFx8w0iE1JoD4Bl/J5QYkV7c8gc=; b=kEGAx5F/89jdquPSAsoTeR5GXUM0y0r/424Z2Hx7n8+w8YGGYdsWuhCRCTNWYH3nYX uG4leCPAVsPF7rOQ0eJobd337Umbx9v5i+0ssixuR9JRJWj/SQmg8BNIpBsntZnT8WSd KSfIYVpa45VftM9PxbfCborKHe+pmCZmlrFu7xblnf7OSlzFkqFoM5fLHaXxiGOoH8kN IZJRa4r9AwdDeoIAhJObWOWURrEYuoeYE9yVn3+c/GAxE0hqmQ5/G2F2Za699PqoaKis wqHGZ/1Ta1SE1crxsRpegA9WWPNddNifzePANNXw/QGlxj2M67so5mKakUuGcUgir8aQ 2V5A== X-Gm-Message-State: AOAM533PrinyIzRH4moBxev1TKSpNxpFadRn+ZUlHZ/IzYVc7OCkmR8Z JK1tHgxSf6g3f7W/3qHv4Q00S3PL4wew/RUIUY1GTYBcvncdKIzJQCql2tgCFhXjAJIWiRPt97n sQZzn7XhFvQ5GelFYTFafl0pqqFdzXZ4= X-Received: by 2002:a7b:c318:: with SMTP id k24mr16726523wmj.144.1627294640426; Mon, 26 Jul 2021 03:17:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpafs2OP3pmxKwKai0CGliq3C+kbrzV7emqnnR2ja995e6p43b7z92O4U8MrsQx/pI++Iurg== X-Received: by 2002:a7b:c318:: with SMTP id k24mr16726509wmj.144.1627294640196; Mon, 26 Jul 2021 03:17:20 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:e841:2407:b739:ad64]) by smtp.gmail.com with ESMTPSA id j1sm11576436wrm.86.2021.07.26.03.17.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 03:17:19 -0700 (PDT) From: Dimitri John Ledkov To: u-boot@lists.denx.de Cc: Fu Wei , David Abdurachmanov Subject: [PATCH v2] qemu-riscv64_smode: fix extlinux (define preboot) Date: Mon, 26 Jul 2021 11:17:11 +0100 Message-Id: <20210726101711.14519-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 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. Fixes: 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig") Reported-By: Fu Wei 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};"