From patchwork Wed Jun 16 05:03:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 1492696 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=beagleboard-org.20150623.gappssmtp.com header.i=@beagleboard-org.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=IwHQSA0y; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4G4Y5m1XCLz9sWX for ; Wed, 16 Jun 2021 15:05:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5EF56405C2; Wed, 16 Jun 2021 05:04:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y9zCPABAWBm0; Wed, 16 Jun 2021 05:04:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 43DF1405ED; Wed, 16 Jun 2021 05:04:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4525D1BF5DA for ; Wed, 16 Jun 2021 05:04:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 330F5839BF for ; Wed, 16 Jun 2021 05:04:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=beagleboard-org.20150623.gappssmtp.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p7JH96fuk9ZC for ; Wed, 16 Jun 2021 05:04:52 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by smtp1.osuosl.org (Postfix) with ESMTPS id 7BF8383A15 for ; Wed, 16 Jun 2021 05:04:52 +0000 (UTC) Received: by mail-pf1-x435.google.com with SMTP id k6so1186911pfk.12 for ; Tue, 15 Jun 2021 22:04:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=beagleboard-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z3tG9Pg28TXRF0yx77p88MBEr0VISn+tQSsYUwH4o0U=; b=IwHQSA0yaTvkjoJFK6yOEZIiSG+uQsKPxjZ7c9A33fUnegWiphpZVqBIIcOwAcKDyd C9hbp7koijA9M+f/NBDyEXj2tGPsWforbNI6OXw1aDWlu1COhPRWlSiHnsmazNWFcuqW ZJxXT6l41oDPZ8FcuvW+O1iOuvEjOhiZLn2VW3glKSeETTG73KzWmAZc5Cyoys4zzgqw pSvO0SHaL7LAaeX+oO+JBrfeQGLk03T+Xih9aUsdvys/pEv48oaGIsbSkWG0uXXwUVvB 7/6NuxnQIG8DOVMYMNxMyGleO0QVQrpo0T19JOp9m1ytpVgL3FELiBYvp/GteKC2d3ZY tlng== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z3tG9Pg28TXRF0yx77p88MBEr0VISn+tQSsYUwH4o0U=; b=PRL+05floMDVT2qEhfEc0avCIpP7fMkGnPB9tcIircGZFEkeMThN7hBQwFO6MOjfxs j7OMOV/45nZ3O8LT2BoI23JErvD5qgItfOFmGZjrSKWUkgpr1iC4yBKNcNw89Kne+hNq BppyO9nQ4E/LsnUL7ntyfCHt2rwpk1PrVNHRm5diX/F/xYnbIZNrIfiN9P/cxjTv+Olf aqM8PuC/b04x1Xe/2QOfNSq/Bbag35XxenPKk5/PV2lvLOdPOmNExLAJbJOmmLxWEcZf 1JZ6FEMrtF2+qQjabeuIMFPujDFGmpUmjvVAqwDnh82Ez3TARk9/F5rLFSRwqIdhi6HV nqMA== X-Gm-Message-State: AOAM530eX53Y4GWbBh7D54Rke+WiBoaQfS4TOHa485dGdEv6SHqE7WsQ l55fXPJnHUFnjGkfj5p6Wa+4rqOGjOKahw== X-Google-Smtp-Source: ABdhPJwq0y+FIGPypJ5rEf4LniAvXJtr4oh7og5zkvJeJu0Oi9Jm8IuS89SZRZVqtikUZX8jp9n4dg== X-Received: by 2002:a63:145a:: with SMTP id 26mr3136880pgu.324.1623819891188; Tue, 15 Jun 2021 22:04:51 -0700 (PDT) Received: from x1.hsd1.or.comcast.net ([2601:1c0:4701:ae70:e309:599f:f8cb:f28d]) by smtp.gmail.com with ESMTPSA id f8sm719456pfv.73.2021.06.15.22.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 22:04:50 -0700 (PDT) From: Drew Fustini To: buildroot@buildroot.org Date: Tue, 15 Jun 2021 22:03:39 -0700 Message-Id: <20210616050341.510702-2-drew@beagleboard.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210616050341.510702-1-drew@beagleboard.org> References: <20210616050341.510702-1-drew@beagleboard.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/4] boot/uboot: introduce BR2_TARGET_UBOOT_FORMAT_DTB X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Drew Fustini , Alistair Francis , Alistair Francis , Thomas Petazzoni , Bin Meng Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" If U-Boot CONFIG_OF_SEPARATE is defined [1], then the device tree will be built and placed in a u-boot.dtb file alongside u-boot.bin. When BR2_TARGET_UBOOT_FORMAT_DTB is enabled, buildroot will copy u-boot.dtb to $(BINARIES_DIR). This is useful for RISC-V platforms that want to build OpenSBI with an external DTB by using FW_FDT_PATH [2]. [1] https://github.com/u-boot/u-boot/blob/master/doc/README.fdt-control [2] https://github.com/riscv/opensbi/blob/master/docs/firmware/fw.md Reviewed-by: Alistair Francis Reviewed-by: Bin Meng Signed-off-by: Drew Fustini --- boot/uboot/Config.in | 3 +++ boot/uboot/uboot.mk | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 00c667412006..44a16d892a60 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -252,6 +252,9 @@ config BR2_TARGET_UBOOT_FORMAT_BIN bool "u-boot.bin" default y +config BR2_TARGET_UBOOT_FORMAT_DTB + bool "u-boot.dtb" + config BR2_TARGET_UBOOT_FORMAT_DTB_BIN bool "u-boot-dtb.bin" diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dbe82e65b17e..923fd0c1d46c 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -48,6 +48,10 @@ ifeq ($(BR2_TARGET_UBOOT_FORMAT_BIN),y) UBOOT_BINS += u-boot.bin endif +ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB),y) +UBOOT_BINS += u-boot.dtb +endif + ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y) UBOOT_BINS += u-boot # To make elf usable for debuging on ARC use special target From patchwork Wed Jun 16 05:03:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 1492697 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=beagleboard-org.20150623.gappssmtp.com header.i=@beagleboard-org.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=0rl+9fY5; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4G4Y603pSlz9sWX for ; Wed, 16 Jun 2021 15:05:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BFD07406AB; Wed, 16 Jun 2021 05:05:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2vva8ZzsD6au; Wed, 16 Jun 2021 05:05:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 9FA8240672; Wed, 16 Jun 2021 05:05:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 15E141BF5DA for ; Wed, 16 Jun 2021 05:05:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 0FAD3401AE for ; Wed, 16 Jun 2021 05:05:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=beagleboard-org.20150623.gappssmtp.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pTduIFYgMLGf for ; Wed, 16 Jun 2021 05:05:04 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by smtp2.osuosl.org (Postfix) with ESMTPS id 36E93401CA for ; Wed, 16 Jun 2021 05:05:04 +0000 (UTC) Received: by mail-pf1-x42d.google.com with SMTP id q25so1209616pfh.7 for ; Tue, 15 Jun 2021 22:05:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=beagleboard-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/sR1vuwqhtQA7ufhRZ8n4VUfLcEVpAkqxp3UYRBv17Y=; b=0rl+9fY5DId+0YyBQc8HLpxlvci4s5drDsp4dEEP2Hbqd9jVVRREI7cJMzRmIXQUxx rskk1M/KWD+YJgUMjc/h67Vy6bvPRcpJj5egJpu7WLUigRWsjVd47clZSGVIs+Kr+JC3 xtCNgb1uXB6m4+ETxotUhsdhx6Nr9k1Ou5BD4we24NCIaBkoV7kzXkbOybWh5RtlHwCq 45H7d4Qca45pXfoNHiX+gYBVN8ZEPyJJtOjEFE/QucVRGZpGaUT51kpW/ooMyyRy4pV2 WcJ5Xx1HdU70XydLh5tvTQLz9QMv1H0S15Mid2TbSnRPG2ztsxqWKRmDP4rO/iOGKJAC BQCw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=/sR1vuwqhtQA7ufhRZ8n4VUfLcEVpAkqxp3UYRBv17Y=; b=gKnN8U7aZS+9TbujvaNA5BPDwuGQGrqvq43XJF/TrL/oCpVty3SAyrQnJxSo5U6O5k mg8l7Ku/7miLv9g//b2UTffYAowD04K5rxvKTM0dXUGhaSmcd0iTIJakClpCv1xHangU KqczjIP91sKAqjnrWnKqphN6j1b3PYi0sSFYqSgruyWfUpyEIlAqXUDeRxxfBqqE7jyo o2tBW+06+8HvlZq4E3tzoBezW1+lOGpuJrc/vfp2OeEgedxowaEB+fKUi4aALVd2ER5k ctI+mZ4bMQU/Or2++K0tVaKkzXQSF8ufLHSf8chrzHNWMA76znUQmTAHX++xQv9xRbZt fX8Q== X-Gm-Message-State: AOAM532oMQGRMbPZGOtlf7XbAf5WUnFwr4AyyCUchZ49YKjGxFtkjmiO ZcXzZX5/Le4RnwI2VXgji3utCL3cllXlyg== X-Google-Smtp-Source: ABdhPJxmsdCbjLsZyMYDN97rB3e3lgIhhHkaKqbgY+AVymzm6fyRzE2YB1iGTB2ERY/J5SdS5JYWZQ== X-Received: by 2002:a62:8c55:0:b029:2ea:2165:503d with SMTP id m82-20020a628c550000b02902ea2165503dmr7806943pfd.68.1623819902898; Tue, 15 Jun 2021 22:05:02 -0700 (PDT) Received: from x1.hsd1.or.comcast.net ([2601:1c0:4701:ae70:e309:599f:f8cb:f28d]) by smtp.gmail.com with ESMTPSA id f8sm719456pfv.73.2021.06.15.22.05.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 22:05:02 -0700 (PDT) From: Drew Fustini To: buildroot@buildroot.org Date: Tue, 15 Jun 2021 22:03:41 -0700 Message-Id: <20210616050341.510702-3-drew@beagleboard.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210616050341.510702-1-drew@beagleboard.org> References: <20210616050341.510702-1-drew@beagleboard.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/4] boot/opensbi: introduce BR2_TARGET_OPENSBI_FW_FDT_PATH X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Drew Fustini , Alistair Francis , Alistair Francis , Thomas Petazzoni , Bin Meng Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" If U-Boot CONFIG_OF_SEPARATE is defined [1], then the device tree will be built and placed in a u-boot.dtb file alongside u-boot.bin. When BR2_TARGET_UBOOT_FORMAT_DTB is enabled, buildroot will copy u-boot.dtb to $(BINARIES_DIR). This is useful for RISC-V platforms that want to build OpenSBI with an external DTB by using FW_FDT_PATH [2]. [1] https://github.com/u-boot/u-boot/blob/master/doc/README.fdt-control [2] https://github.com/riscv/opensbi/blob/master/docs/firmware/fw.md Reviewed-by: Alistair Francis Reviewed-by: Bin Meng Signed-off-by: Drew Fustini --- boot/opensbi/Config.in | 10 ++++++++++ boot/opensbi/opensbi.mk | 3 +++ 2 files changed, 13 insertions(+) diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in index 632eeec88d77..bd4bd5ee6175 100644 --- a/boot/opensbi/Config.in +++ b/boot/opensbi/Config.in @@ -109,4 +109,14 @@ config BR2_TARGET_OPENSBI_UBOOT_PAYLOAD help Build OpenSBI with the U-Boot as a Payload. +config BR2_TARGET_OPENSBI_FW_FDT_PATH + bool "Include U-Boot DTB in OpenSBI Payload" + depends on BR2_TARGET_OPENSBI_PLAT != "" + depends on BR2_TARGET_UBOOT + depends on BR2_TARGET_OPENSBI_UBOOT_PAYLOAD + select BR2_TARGET_OPENSBI_INSTALL_PAYLOAD_IMG + help + Build OpenSBI with FW_FDT_PATH set to $(BINARIES_DIR)/u-boot.dtb + Note that CONFIG_OF_SEPARATE must be set in the u-boot kconfig. + endif diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk index a525b8aea348..8e055633a82d 100644 --- a/boot/opensbi/opensbi.mk +++ b/boot/opensbi/opensbi.mk @@ -46,6 +46,9 @@ endif ifeq ($(BR2_TARGET_OPENSBI_UBOOT_PAYLOAD),y) OPENSBI_DEPENDENCIES += uboot OPENSBI_MAKE_ENV += FW_PAYLOAD_PATH="$(BINARIES_DIR)/u-boot.bin" +ifeq ($(BR2_TARGET_OPENSBI_FW_FDT_PATH),y) +OPENSBI_MAKE_ENV += FW_FDT_PATH="$(BINARIES_DIR)/u-boot.dtb" +endif endif define OPENSBI_BUILD_CMDS From patchwork Wed Jun 16 05:03:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 1492698 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=beagleboard-org.20150623.gappssmtp.com header.i=@beagleboard-org.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=KuioK0p9; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 4G4Y6H59sZz9sWX for ; Wed, 16 Jun 2021 15:05:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E10B883B69; Wed, 16 Jun 2021 05:05:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y72eWCnnZew7; Wed, 16 Jun 2021 05:05:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 590F783AEF; Wed, 16 Jun 2021 05:05:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CB9B51BF5DA for ; Wed, 16 Jun 2021 05:05:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C324083AEF for ; Wed, 16 Jun 2021 05:05:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Um1qyFugHdaP for ; Wed, 16 Jun 2021 05:05:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by smtp1.osuosl.org (Postfix) with ESMTPS id 081DC83A15 for ; Wed, 16 Jun 2021 05:05:20 +0000 (UTC) Received: by mail-pg1-x52d.google.com with SMTP id i34so972724pgl.9 for ; Tue, 15 Jun 2021 22:05:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=beagleboard-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o+WIpmoLL3qwtNUat+5DEYdfEuSzOHpSvZ3Kdl8yRYM=; b=KuioK0p9gNVgBWivrLhLCzWh2B3gNtffa3GtE4skSxlMs5cWpQWmkybMZIj3W0vUnq BCvMParJ2dU9YywGYwljVbUNZhy6R/8zFrTmzc7LregEF/iknPLNIoRI9bVfDM+74PPn Wdo4D7kgpxLCjc5nTShuMyRPtcKkXQ+v5xb0ejkEooQ2BB5fBwEye5aiE11MDLMeGEJ1 Pp9fubkn1lvx6SxyLnvEAHMwozMJJSrH/KV60rX5E1cDN8ZU622zh9oK8RS5eJw/SP9S PsjRAQ1e2G596r5GHSQ0N6GWhwqcaTnxhZgouSlr8CbziRDaDptqNEtYH7YwMxPwGd5D ADYw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=o+WIpmoLL3qwtNUat+5DEYdfEuSzOHpSvZ3Kdl8yRYM=; b=HtOiHn3zywdsvTDrctnsHG+DxjUgujmkh71l4vHQj1UWS/Gy3lq8sF0UUrL+8yF4Xz YEJZE7l50eL9DiWa8UfLmrvhNxapUSrv3ohuw/bFtBglfZecDFtw64t8+CfIcmZvn6zY 6R/+Aj0BdDQJht5AER4dBjS/XkznNbfLSKkoiw6GmeNewLh11kkPpIIvfg41dglKDK7I bS8zDB7+gsfSX8rYo7IQOTz0+wSGgaZZT087Rn4IjgYE81cco7idYAUWxDcEILqjJXbj a8W1t798QCAWbShqAcbajbZRfajcaR1CjH13Ttm84q24wD9b90EJVpOUNTHUY7C1fyhi +/GA== X-Gm-Message-State: AOAM533Tj+Zi2ErGaHYETXCKXxPljQmWaYofPMZ03U7/5FWGhrP0Uu7G MsunVkJkRgotpmhYb2VfaDUlxp6/Iu6GYQ== X-Google-Smtp-Source: ABdhPJwnQqQrr+oP+MJ4dV3djDc7lbvjnbH1Bgc9SeSC9OfYVqtOGbsr1bZS4MBegKlkYdlztqqoGg== X-Received: by 2002:aa7:9515:0:b029:2e9:c6f4:2c44 with SMTP id b21-20020aa795150000b02902e9c6f42c44mr8028562pfp.28.1623819920175; Tue, 15 Jun 2021 22:05:20 -0700 (PDT) Received: from x1.hsd1.or.comcast.net ([2601:1c0:4701:ae70:e309:599f:f8cb:f28d]) by smtp.gmail.com with ESMTPSA id f8sm719456pfv.73.2021.06.15.22.05.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 22:05:19 -0700 (PDT) From: Drew Fustini To: buildroot@buildroot.org Date: Tue, 15 Jun 2021 22:03:43 -0700 Message-Id: <20210616050341.510702-4-drew@beagleboard.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210616050341.510702-1-drew@beagleboard.org> References: <20210616050341.510702-1-drew@beagleboard.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/4] configs/beaglev: update U-Boot to enable OF_SEPARATE X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Drew Fustini , Alistair Francis , Alistair Francis , Thomas Petazzoni , Bin Meng Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Update commit ID of U-Boot to latest commit in starfive-tech repo [1] which enables OF_SEPARATE [2]. [1] https://github.com/starfive-tech/u-boot/tree/Fedora_VIC_7100_2021.04 [2] https://github.com/starfive-tech/u-boot/commit/64ead5b83959da8eb87b6963843addf5942e6ed4 Reviewed-by: Alistair Francis Reviewed-by: Bin Meng Signed-off-by: Drew Fustini --- configs/beaglev_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig index 895902a11a7c..fcbea2cdec86 100644 --- a/configs/beaglev_defconfig +++ b/configs/beaglev_defconfig @@ -33,7 +33,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # HEAD of the starfive-tech:Fedora_VIC_7100_2021.04 branch -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,u-boot,494e5ef7b8071d0b2fba50616d97771e44cbcb7c)/uboot-494e5ef7b8071d0b2fba50616d97771e44cbcb7c.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,u-boot,64ead5b83959da8eb87b6963843addf5942e6ed4)/uboot-64ead5b83959da8eb87b6963843addf5942e6ed4.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_vic7100_beagle_v_smode" BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_JH71XX_TOOLS=y From patchwork Wed Jun 16 05:03:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 1492699 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=beagleboard-org.20150623.gappssmtp.com header.i=@beagleboard-org.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=DVlbL4pW; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4G4Y6g4BvTz9sWX for ; Wed, 16 Jun 2021 15:05:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 98D30401D0; Wed, 16 Jun 2021 05:05:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FpFS6FjZoR1d; Wed, 16 Jun 2021 05:05:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id C721D401AE; Wed, 16 Jun 2021 05:05:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 18E521BF5DA for ; Wed, 16 Jun 2021 05:05:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 15F13401AE for ; Wed, 16 Jun 2021 05:05:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9O29MlJVrXoF for ; Wed, 16 Jun 2021 05:05:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by smtp2.osuosl.org (Postfix) with ESMTPS id 43A8C400CF for ; Wed, 16 Jun 2021 05:05:40 +0000 (UTC) Received: by mail-pf1-x430.google.com with SMTP id g6so1239441pfq.1 for ; Tue, 15 Jun 2021 22:05:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=beagleboard-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=71ucyzXykg851MyZ1Ojh7VtgUaqQIXsVrKXfRmTReHs=; b=DVlbL4pW4X5Q165NEsZ/QBysWhAZyzF6Yrq7WUbAC260Mazb1CKigB6htx5sOmcTqq +9zz5oNYTIez8Rkyo+6w9EIROGUK5H30QjR6i8Ohugvqvb1t8REasaaUP8uzWJkYvBgs freuB4ifFLAizqw20eS/3V3d4eIVIn0M1/hj9gBZJZ06o7iHUCtIdKhrrNk0D4a1BsSD dMgDz/vZjFdVtiLH0AIR0H8k2inYfTTROKloSz0vIUmprDsHQfAD9R2hwsEeezXJS0EU UKWwPfERH+GftRI4JhDgxwqjs/oWJp8jTKYquMAqk4xzO8rgTNjEvz6egSpF7PT+mZHH +3dg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=71ucyzXykg851MyZ1Ojh7VtgUaqQIXsVrKXfRmTReHs=; b=NiWSl0qJhyX2T4+vWI1IBkwiom5wXZ7mxVqM3c9SR+t3NB4g0D2hif03oPugIzjQgL S1HERvvtZh7rMDG8JQP6koGeLKiWwpB8K6GLNGr3UF8aBtoMe0Cn8gqpy21UVYdoSWnz a8uCoyxzqMBMq1rQDxwYraqBgfi76pLVXRnnyaGCFQQ9/SH+CgHxkJCP+5a03AGCPQCR w7ABKNdquHbBeauXOVfWGIefPM+mR4WyxMRlOY6LYeodIwDVa8wdCyHmDPkrqMA7+1f0 OmliMQzgBf2YEOcZCb/7vmmkZfucPZsdNfesw0AT0jvK83opZg5G8n+8cUXqP7zV5j/p 25BQ== X-Gm-Message-State: AOAM533uu33R/t4YC7tq3R+iJku2HnIsY3TyfeAxJgSxRX/gNPax9OAz RKnUvUsOHF5QvqnD5shrmV/pC5NCPmVvvA== X-Google-Smtp-Source: ABdhPJys20/cv0dNxtU4qF+BP9DAR4DKNN8rf8ArD7puNcLZ4UI6eyZtkOqTMULjoEcoPd9f4F1ztw== X-Received: by 2002:a63:ee10:: with SMTP id e16mr3160660pgi.135.1623819939443; Tue, 15 Jun 2021 22:05:39 -0700 (PDT) Received: from x1.hsd1.or.comcast.net ([2601:1c0:4701:ae70:e309:599f:f8cb:f28d]) by smtp.gmail.com with ESMTPSA id f8sm719456pfv.73.2021.06.15.22.05.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 22:05:38 -0700 (PDT) From: Drew Fustini To: buildroot@buildroot.org Date: Tue, 15 Jun 2021 22:03:45 -0700 Message-Id: <20210616050341.510702-5-drew@beagleboard.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210616050341.510702-1-drew@beagleboard.org> References: <20210616050341.510702-1-drew@beagleboard.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 4/4] configs/beaglev: switch to upstream opensbi generic platform X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Drew Fustini , Alistair Francis , Alistair Francis , Thomas Petazzoni , Bin Meng Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Switch from the starfive-tech opensbi to upstream repo and use generic platform now that it supports the console uart [1]. This landed after the 0.9 release [2], so the current head of master branch is used [3]. FW_FDT_PATH is set to u-boot.dtb so that the device tree from U-Boot will be included in the OpenSBI build [4]. Note that U-Boot must have CONFIG_OF_SEPARATE enabled for U-Boot to build u-boot.dtb [5]. [1] https://github.com/riscv/opensbi/commit/e822b7504df0583a6a227d51cb7da8ea9fc79c0a [2] https://github.com/riscv/opensbi/commit/234ed8e427f4d92903123199f6590d144e0d9351 [3] https://github.com/riscv/opensbi/commit/79f9b4220ffa7f74356054be25d450d7958bf16c [4] https://github.com/riscv/opensbi/blob/master/docs/firmware/fw.md [5] https://github.com/u-boot/u-boot/blob/master/doc/README.fdt-control Reviewed-by: Alistair Francis Reviewed-by: Bin Meng Signed-off-by: Drew Fustini --- configs/beaglev_defconfig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig index fcbea2cdec86..29e3a52be36c 100644 --- a/configs/beaglev_defconfig +++ b/configs/beaglev_defconfig @@ -23,17 +23,19 @@ BR2_TARGET_BEAGLEV_DDRINIT=y BR2_TARGET_BEAGLEV_SECONDBOOT=y BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y -# HEAD of the Fedora branch -BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,opensbi,2524b0ecd8684b42bc7a4c69794f40f11cbbe2a5)/opensbi-2524b0ecd8684b42bc7a4c69794f40f11cbbe2a5.tar.gz" -BR2_TARGET_OPENSBI_PLAT="starfive/vic7100" +# upstream opensbi master branch +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,riscv,opensbi,79f9b4220ffa7f74356054be25d450d7958bf16c)/opensbi-79f9b4220ffa7f74356054be25d450d7958bf16c.tar.gz" +BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_DYNAMIC_IMG is not set # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_OPENSBI_FW_FDT_PATH=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # HEAD of the starfive-tech:Fedora_VIC_7100_2021.04 branch BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,u-boot,64ead5b83959da8eb87b6963843addf5942e6ed4)/uboot-64ead5b83959da8eb87b6963843addf5942e6ed4.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_vic7100_beagle_v_smode" +BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_JH71XX_TOOLS=y