From patchwork Wed Jun 16 15:39:06 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: 1492965 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 4G4q9y0nbfz9sf9 for ; Thu, 17 Jun 2021 01:39:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7161880412; Wed, 16 Jun 2021 17:39:18 +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 CEF2E8295B; Wed, 16 Jun 2021 17:39:15 +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 89913801BE for ; Wed, 16 Jun 2021 17:39:12 +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-wr1-f72.google.com ([209.85.221.72]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1ltXdH-00080D-Sl for u-boot@lists.denx.de; Wed, 16 Jun 2021 15:39:11 +0000 Received: by mail-wr1-f72.google.com with SMTP id t10-20020a5d49ca0000b029011a61d5c96bso1435329wrs.11 for ; Wed, 16 Jun 2021 08:39:11 -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=D6gd7KGVsBJ6nN/shlPTEt+0WTWsAPJtk5TJaFSh5S8=; b=uE4p3/fAer7Z3ThxuY76kFuwqStWNTry7JblEfptCTfwpdV9jJxfi3A15pN62XgxBv eypnQ5RK2+bNqUcGeN8TX4E9r/v7m30exmdsfs/Irh5P1dRTSsnXBCydSGO1AExpnRWL CgAipbS011lWNaPkCUw25GNwAgoUfeJ8MjMVDLwXNWfOBGpacsJTQ+IjnzoV95Ma42pO /WYFg6Zu70aueUYfCvuswdesC4S39P8iqkjWMIeD5XxxJqguTOT7abOD6kxfhbwaLha6 V9RXSwtqso6+kMo6wMRPovJ8PEp710vBxDGj4Lty9MSJBJQApmuR7IU5Fd5ycGXrZDmk Kggw== X-Gm-Message-State: AOAM5301a5owFMLP7QwIDBkYis1+3Zv5vmTnFLYfqqgkvbSMlRVdLt/M LfLSitSpoyRVMyBN4DY14mZfgavpjzWI58QYvN9YMJAO3f6HRB47+emE2nJA/Qg5dJkeX7e5/Ea NlU/VYE6GYmXhidexhYOfbBXf04Wz/x4= X-Received: by 2002:a05:6000:1543:: with SMTP id 3mr23914wry.342.1623857950748; Wed, 16 Jun 2021 08:39:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIqsAxMMxgGJp6hs8R930mADRwAUcz4sLBEJctV2S7waU3uoacZtioflRiRvtW6VdAYMOhcQ== X-Received: by 2002:a05:6000:1543:: with SMTP id 3mr23893wry.342.1623857950527; Wed, 16 Jun 2021 08:39:10 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:e082:f7fc:868b:7bfa]) by smtp.gmail.com with ESMTPSA id e12sm2111086wrw.34.2021.06.16.08.39.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 08:39:10 -0700 (PDT) From: Dimitri John Ledkov To: u-boot@lists.denx.de Cc: Dimitri John Ledkov , Leo Yu-Chi Liang , Bin Meng , Paul Walmsley , Palmer Dabbelt , Anup Patel , Atish Patra , Pragnesh Patel , Green Wan Subject: [PATCH v2] riscv: sifive: Set default fdtfile names Date: Wed, 16 Jun 2021 16:39:06 +0100 Message-Id: <20210616153906.62709-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 RISC-V rootfs images based on fdtdir setting in extlinux.conf. Signed-off-by: Dimitri John Ledkov Reviewed-by: Leo Yu-Chi Liang Reviewed-by: Bin Meng cc: Paul Walmsley cc: Palmer Dabbelt cc: Anup Patel cc: Atish Patra cc: Pragnesh Patel cc: Green Wan --- Changes since v1: In commit message, removed trailing '.' and added hyphen in RISC-V. Added two reviewed-bys. 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 \