From patchwork Tue Jun 15 16:34:14 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: 1492359 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=) 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G4DRy41wtz9sRK for ; Wed, 16 Jun 2021 02:34:37 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9B3DF828C2; Tue, 15 Jun 2021 18:34:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id E8BFE82917; Tue, 15 Jun 2021 18:34:24 +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=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 41BE4828A4 for ; Tue, 15 Jun 2021 18:34:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=dimitri.ledkov@canonical.com Received: from mail-wm1-f71.google.com ([209.85.128.71]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1ltC17-0006pu-Si for u-boot@lists.denx.de; Tue, 15 Jun 2021 16:34:21 +0000 Received: by mail-wm1-f71.google.com with SMTP id w186-20020a1cdfc30000b02901ced88b501dso671345wmg.2 for ; Tue, 15 Jun 2021 09:34: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=xGgOYcVnP7hs9W+k/YXpQIri/e+tqc70kNk7+t0wMWM=; b=t8DxeyJClExJQcJ7kn6kQXi7g2DhLaAAALO8qZNFlsQjm3e+ZyROyDw2xWOBCbgyVt 45wWlaXCB7u+9W1gcs1MKYozB0Ba2lpk1HEB5rv80JYcH4R5tMpB4W/3ujp3BW3I6M5j DwUdCTDQJkgURus8iYqrAK5IMemILF5QPJsZJdMFKnA5XC+KypbyCQzz1sqMIVek9ZWZ 43OHum7Sf9U51FIcL6C8jT2M+7JPGURNoTdMvYfkaptzwCuleIMuFJinZZaXcKM/vcEK 7xVyM/u9g1vU0L7O2/kxzXNTXjBotI+kSLaP8ZLKPAbtmWBzh8FdBSz4EQZLzitJwZPL nmjg== X-Gm-Message-State: AOAM530pbtH0MjOXeneBSb8o1ymHXdLfqaThobGqlRupFbpGe7a8+qQy AXlopJdEVHqDAwdvoiCF9Ht4vmzOtre9ZV5VV/nLg6zKC9PqxJ187STcsi5GHrPVnc8OUUzvP8f hBtNWdbdrFc4XjOFR8jf2vvvPzJ9tCmc= X-Received: by 2002:a5d:6409:: with SMTP id z9mr3568979wru.279.1623774861031; Tue, 15 Jun 2021 09:34:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw79+f2UG1tTTUbu6RSsb+8vgfIqpszfWhJxqpVWOFB8/MbWKeeodPQl1rBt8ntNCnDMRypeQ== X-Received: by 2002:a5d:6409:: with SMTP id z9mr3568962wru.279.1623774860801; Tue, 15 Jun 2021 09:34:20 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:dc22:6ba5:a376:4d8d]) by smtp.gmail.com with ESMTPSA id i15sm18913745wmq.23.2021.06.15.09.34.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:34:20 -0700 (PDT) From: Dimitri John Ledkov To: u-boot@lists.denx.de Cc: Dimitri John Ledkov , Paul Walmsley , Palmer Dabbelt , Anup Patel , Atish Patra , Pragnesh Patel , Green Wan Subject: [PATCH] riscv: sifive: Set default fdtfile names. Date: Tue, 15 Jun 2021 17:34:14 +0100 Message-Id: <20210615163414.359494-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.27.0 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 Set default fdtfile names for unleashed and unmatched boards, as used in the upstream Linux kernel. This allows sysboot command to find and load appropriate dtb for the matching kernel from universal stock Ubuntu RISCV rootfs images based on fdtdir setting in extlinux.conf. Signed-off-by: Dimitri John Ledkov cc: Paul Walmsley cc: Palmer Dabbelt cc: Anup Patel cc: Atish Patra cc: Pragnesh Patel cc: Green Wan Reviewed-by: Leo Yu-Chi Liang Reviewed-by: Bin Meng --- configs/sifive_unleashed_defconfig | 1 + configs/sifive_unmatched_defconfig | 1 + include/configs/sifive-unleashed.h | 1 + include/configs/sifive-unmatched.h | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/sifive_unleashed_defconfig b/configs/sifive_unleashed_defconfig index 62416a7c1d..7ef0e4b241 100644 --- a/configs/sifive_unleashed_defconfig +++ b/configs/sifive_unleashed_defconfig @@ -14,6 +14,7 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000 +CONFIG_DEFAULT_FDT_FILE="sifive/hifive-unleashed-a00.dtb" CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_MISC_INIT_R=y diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig index 01ca2d8c23..66e9a23ee4 100644 --- a/configs/sifive_unmatched_defconfig +++ b/configs/sifive_unmatched_defconfig @@ -14,6 +14,7 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000 +CONFIG_DEFAULT_FDT_FILE="sifive/hifive-unmatched-a00.dtb" CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h index 0d69d1c548..b6c29f8c60 100644 --- a/include/configs/sifive-unleashed.h +++ b/include/configs/sifive-unleashed.h @@ -75,6 +75,7 @@ "type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \ "type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \ "partitions=" PARTS_DEFAULT "\0" \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ BOOTENV \ BOOTENV_SF diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index 4fad69bb19..80cfd41ceb 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -73,6 +73,7 @@ "type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \ "type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \ "partitions=" PARTS_DEFAULT "\0" \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ BOOTENV #define CONFIG_PREBOOT \