From patchwork Tue Jun 15 00:17:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 1491925 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=Yb7EyoVc; 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 4G3pnv54Mgz9sW6 for ; Tue, 15 Jun 2021 10:18:43 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id AF6444046E; Tue, 15 Jun 2021 00:18:36 +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 xuNkv3es7zxC; Tue, 15 Jun 2021 00:18:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 126F640454; Tue, 15 Jun 2021 00:18:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C5CB71BF3FD for ; Tue, 15 Jun 2021 00:18:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B465140534 for ; Tue, 15 Jun 2021 00:18:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=beagleboard-org.20150623.gappssmtp.com 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 7TWNvJeI4aP7 for ; Tue, 15 Jun 2021 00:18:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by smtp4.osuosl.org (Postfix) with ESMTPS id C8DC340533 for ; Tue, 15 Jun 2021 00:18:21 +0000 (UTC) Received: by mail-pf1-x42a.google.com with SMTP id q25so11898374pfh.7 for ; Mon, 14 Jun 2021 17:18:21 -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=rdA/ttfLgI+AEP+gqLda7aFRjbidgfZU+xk+EDpbZ6M=; b=Yb7EyoVcQOA7fq5pgD26/WGsdo8DGb4lucUJso0eY6QBKs7z0XRkcsaiMhwWTxyhW8 xSDXAXnSPTCcU+F+bFktm9IGMVhNwsjI5Q/NDOlZ9ykWyJRScNGeUeUVxH5pCrjn0mrz aAhm1ZqYp2aBgLtJQ6YOdRZ/kTURH/hvrFEwMtjmhx2+GntUMwkw8GzIeyr5cv9GB+Jl qFZFJ3iNFEOS1Jsi9LdE4ZO/5d2akabo0QpYKLJvW+yg6Gx3q5ITAgeCB9mc1Eiek7Hb A0R/HRO//H+WV/RtGH9yw67fE8VJfJFignyndaapYDofR5lXeQ/U+fN/pFj2UpOx8rQ3 sBMA== 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=rdA/ttfLgI+AEP+gqLda7aFRjbidgfZU+xk+EDpbZ6M=; b=NWy1+UMF54b/R8v0gmcYovmVhQ5ToKfWvKxik8jNTZHNkOj0GANqkrMs4qWIvtc+fO 1ciCSYFxXZfJUk0ypeOH+ZK7ZLTfdrY8McTvE/i9kR9Z4FU6KcJfhpSFvIhKSPfBEdpA ZshumwltUkN80HoKcHGENwFhVr/8VqTk4x+XLjjhgna+Lygv7O8/NgfG2nult9ClCxZ/ I511WEaSsjo3tCPm9PXXTx/bSvUCLKXOEPULPlBOpTnbBf9plhH5YUJOe0OVW1V+sByP gtjv4jhem9JP33NV5F2aXKt7MwbDQCEeI11WF2jzqAY9bvohaXVdDHaDStEYGt4ITWJR 8auQ== X-Gm-Message-State: AOAM530X8HYYH8NZnSOl1P6LAAZKJE9zska7SATCvpVLA5BmOORDMD4n Vu/epEi/ieIgCA+4SyqRijxoMLd/9/h8sg== X-Google-Smtp-Source: ABdhPJzeydJgK77iv7JbyYqns6U9aa00iRXsctXX2k2y9plHAJFsfiljuejDAY58K2ML7w3J6YOg4Q== X-Received: by 2002:a05:6a00:23d0:b029:2de:c1a2:f1e with SMTP id g16-20020a056a0023d0b02902dec1a20f1emr1278364pfc.60.1623716300661; Mon, 14 Jun 2021 17:18:20 -0700 (PDT) Received: from x1.hsd1.or.comcast.net ([2601:1c0:4701:ae70:d92:6466:8a78:3f88]) by smtp.gmail.com with ESMTPSA id e10sm14908956pgc.63.2021.06.14.17.18.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 17:18:20 -0700 (PDT) From: Drew Fustini To: buildroot@buildroot.org Date: Mon, 14 Jun 2021 17:17:47 -0700 Message-Id: <20210615001750.421889-2-drew@beagleboard.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210615001750.421889-1-drew@beagleboard.org> References: <20210615001750.421889-1-drew@beagleboard.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 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 , 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/lentinj/u-boot/blob/master/doc/README.fdt-control [2] https://github.com/riscv/opensbi/blob/master/docs/firmware/fw.md Signed-off-by: Drew Fustini Reviewed-by: Bin Meng Reviewed-by: Alistair Francis --- 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 Tue Jun 15 00:17:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 1491926 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=g5b23S6w; 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 4G3pp43Ql4z9sW6 for ; Tue, 15 Jun 2021 10:18:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B40BE400AB; Tue, 15 Jun 2021 00:18:49 +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 AiX6hwlLfxtx; Tue, 15 Jun 2021 00:18:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id DA33640474; Tue, 15 Jun 2021 00:18:47 +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 7CB311BF3FD for ; Tue, 15 Jun 2021 00:18:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 6C0B483C56 for ; Tue, 15 Jun 2021 00:18:23 +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 OK0ql1uE_4jZ for ; Tue, 15 Jun 2021 00:18:22 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by smtp1.osuosl.org (Postfix) with ESMTPS id BCDA882F19 for ; Tue, 15 Jun 2021 00:18:22 +0000 (UTC) Received: by mail-pg1-x536.google.com with SMTP id e22so9987808pgv.10 for ; Mon, 14 Jun 2021 17:18:22 -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=xQMmUeun278mJyzowZDqv9+PfDhVxkE7EW2vMeTOMX8=; b=g5b23S6wmoRDaeVVU1pZV//uKrjoeSv+Js3U/mv6gKcOf6HZHaH1f7lbCpBg+EisvW aQHaXmL12CROB8/nVda2+KarOcgHlZu1A8DpnSKPjG9hnNUrVrfLkQwMgZMdaFJgWOCV 9WWKcY9Ml2iUxwojdFluPWGCR2kZaj+mIdj8UpmSQBKUwqTnUhgnclUTR1Zcf0ukZkSo Jlts9Sgt9s0Jz45fJLraLguolnxZqMzYb2IO7UAnjRiNzklf8ogUgaFRgfEGj34zVT1U XyGsF+noQawlBS2ZY+enDosbcJkVkmtjbhBIBmCBG24/7DfvZGFTyIGDg96rP/dWbCSS 1qUA== 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=xQMmUeun278mJyzowZDqv9+PfDhVxkE7EW2vMeTOMX8=; b=thCTyN3n2eX7Hbr0E2ClZcypnNLtCwUB4JxyggfnR8b9hMyG9F4GyeF8tLUtu2AAgB nXxeCgVnd+frznkA/CWPBT7ebWVm8AAyYQcs8q+NLEnPVYpL2meHN0Y7AQa1Au1aGt7X czyryWfJ5DuU8TkyxhX7wrQhCiuq5Q0WH85QoVVPayu0VNYiNLHgSqUcSxXU9h+9XVIW aSv0GVYxSIvCc+bs9G5cWTDIEZ55KLP/aVBvIDIHWxcR92oRNfWakSqt242rL0nlroIO uHYbqdjsMeCuVHGTNc6hEe4FQuRkr/Ac60cGffjY9ja4lLUkXvNrW0XJ5Ar3GnYlQ1Ly WaFA== X-Gm-Message-State: AOAM532WYHUm8ZjEkV7CGtXQh3JA7KXw15EKuxQhNU1Eeri9oin26FyX eyCnzEp6mANBZd/NiqDbpSHWO8XQyzOrQg== X-Google-Smtp-Source: ABdhPJxuh0BgIXTlesU7VVwXdUz0NVv91NpPQVTVF0x91FqmOFkBQS2kYCWpen76Q7XDpGCHTdZu4g== X-Received: by 2002:aa7:97b8:0:b029:2e9:df45:f83f with SMTP id d24-20020aa797b80000b02902e9df45f83fmr1847225pfq.10.1623716301783; Mon, 14 Jun 2021 17:18:21 -0700 (PDT) Received: from x1.hsd1.or.comcast.net ([2601:1c0:4701:ae70:d92:6466:8a78:3f88]) by smtp.gmail.com with ESMTPSA id e10sm14908956pgc.63.2021.06.14.17.18.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 17:18:21 -0700 (PDT) From: Drew Fustini To: buildroot@buildroot.org Date: Mon, 14 Jun 2021 17:17:48 -0700 Message-Id: <20210615001750.421889-3-drew@beagleboard.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210615001750.421889-1-drew@beagleboard.org> References: <20210615001750.421889-1-drew@beagleboard.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 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 , 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/lentinj/u-boot/blob/master/doc/README.fdt-control [2] https://github.com/riscv/opensbi/blob/master/docs/firmware/fw.md Signed-off-by: Drew Fustini Reviewed-by: Bin Meng Reviewed-by: Alistair Francis --- 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 Tue Jun 15 00:17:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 1491927 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::136; helo=smtp3.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=FcB3xuWu; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4G3ppJ5HCDz9sW6 for ; Tue, 15 Jun 2021 10:19:04 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 7A3C26084D; Tue, 15 Jun 2021 00:19:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xIgnbYDmhEUZ; Tue, 15 Jun 2021 00:19:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id D3E2F6083A; Tue, 15 Jun 2021 00:19:00 +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 AFB4A1BF3FD for ; Tue, 15 Jun 2021 00:18:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id ACB4B83C56 for ; Tue, 15 Jun 2021 00:18:24 +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 yCyoXo3hkz1f for ; Tue, 15 Jun 2021 00:18:24 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0439D82F19 for ; Tue, 15 Jun 2021 00:18:23 +0000 (UTC) Received: by mail-pf1-x42b.google.com with SMTP id p13so11925453pfw.0 for ; Mon, 14 Jun 2021 17:18:23 -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=Ku7swBh/KNFfVindNWNDzp3vxhtmvRvcfvU+H8bWo1U=; b=FcB3xuWufLovXKRt/PuSbqbNoOhQ7EvLsMdx5exnf9E2QsFLbNZi6GpcWe+S4ZuO2M iwi4hnK+nrjDR61/juZ2uXFnIGRiy22nxCgIDKWDhVyod84F0pN9TMg/ibvRRMRL2hfb la5H336Kb+vsmMgitjg5x/5rRRitn3Syolmy9L9K1NSDUqKu/FGl6KTgPikPgmgINiCw JwpLob/lumrSF3fz83Uxavv92INzbNeiHWtOQn8+E4tnwRpavlpe3oWrGCW8PM8H8+bs LqhzRlp+/tG+KwuaIGiS9AiM4qo8F899bmC4jvc/wT222vfhSz7MqK3V9eQWzti6qUuE OXUQ== 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=Ku7swBh/KNFfVindNWNDzp3vxhtmvRvcfvU+H8bWo1U=; b=hJA3lp28h1C64qJ4NpbFv9hh/k0fLBV7zdM2gxcFjBxKcr+Q6QclOJt3elFylOdgUw 1Jy9oOUNWu0BOhSqPgD60D/SnPQM0Tm9FWE4rFy8wDT8t1t6rfTWOcBiZGaYnzzWCnD5 f2fQCFflpIyL1n+Q2qLYEPCj/b3LE+2v2fpQf/HnPy4UjKOjrNdDy62Y84RtMOOMvKIv nH3pkkqRsJBaWeKdF2uY5ZOwX9NJyO/gKpqVjS4jAr31ueJVP6ADCokotGdrKyGVjizc 2Y7YlyAxH8SCPDIdALPzhasN3tmUG2oV/ES2HBLFI/sPcFThG8B7vtAvazuEhi3AycdJ kB1w== X-Gm-Message-State: AOAM533IsV9GJHleLjcKSI9VdQhIPzneERJPZCBjVdadfWMYxvphsFBY BzZx7r4jbZDxQ3/zxHEFFWHiEbZIEZaRxg== X-Google-Smtp-Source: ABdhPJwUlz3+zpEtB3Z5tRHZv0zaenBC74P7gcsgrbo8WYBjMxdMV8U0O03thb/6EXIIshVNP9gDWg== X-Received: by 2002:aa7:9885:0:b029:2f8:811a:d2 with SMTP id r5-20020aa798850000b02902f8811a00d2mr341983pfl.69.1623716303191; Mon, 14 Jun 2021 17:18:23 -0700 (PDT) Received: from x1.hsd1.or.comcast.net ([2601:1c0:4701:ae70:d92:6466:8a78:3f88]) by smtp.gmail.com with ESMTPSA id e10sm14908956pgc.63.2021.06.14.17.18.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 17:18:22 -0700 (PDT) From: Drew Fustini To: buildroot@buildroot.org Date: Mon, 14 Jun 2021 17:17:49 -0700 Message-Id: <20210615001750.421889-4-drew@beagleboard.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210615001750.421889-1-drew@beagleboard.org> References: <20210615001750.421889-1-drew@beagleboard.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 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 , 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 Signed-off-by: Drew Fustini Reviewed-by: Bin Meng Reviewed-by: Alistair Francis --- 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 Tue Jun 15 00:17:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 1491928 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::136; helo=smtp3.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=YyufmU0e; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4G3ppZ00lfz9sW6 for ; Tue, 15 Jun 2021 10:19:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 2B1E76085E; Tue, 15 Jun 2021 00:19:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DbY9sUk_3okw; Tue, 15 Jun 2021 00:19:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 7A2306063D; Tue, 15 Jun 2021 00:19:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 0FD7E1BF3FD for ; Tue, 15 Jun 2021 00:18:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id F37386083A for ; Tue, 15 Jun 2021 00:18:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BjgnPAT7kmsN for ; Tue, 15 Jun 2021 00:18:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by smtp3.osuosl.org (Postfix) with ESMTPS id 3C04760837 for ; Tue, 15 Jun 2021 00:18:25 +0000 (UTC) Received: by mail-pg1-x52e.google.com with SMTP id t9so9998618pgn.4 for ; Mon, 14 Jun 2021 17:18:25 -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=kx8fKdv39Wg62LeSUG2LlgokR5s989G8aN+k0WWiUQo=; b=YyufmU0e7aY0jA8vscWueM4KYX3JXuv4d/Ucjs+UcDiRwkDXZgXuniX6NftR79gY1H Ou8JfXaQ2LXOGNVHX9zP/m+9gCJYqwomwoz+0etcz4s1FzC3xiZpAp3wtZ4GKuN1SxpY /APCKk0ow73knwl90/hVNRUP7T6NoOWbwU/SKHu6B2hVvaNXjqOnZCqLDkbYI+D9CJpG XW2qG+kTvNosmp/r3jVQip7YhJaykKhGs37F/8y41OyEYcAwQyaMXBNYuBth/6vFmy2M jmbKeRXGpjH9Iqe4EsuTGGqiHKNGJ0hLDw6r9gIiOhjrhL5cQOAb89cRQopOiDCCcRst qh6w== 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=kx8fKdv39Wg62LeSUG2LlgokR5s989G8aN+k0WWiUQo=; b=cW69nVLOOWqugmiFjc16e2TonIGDRu/0Au2LAmvZ5l4Tkji4/cnO5Zo3uBSUONoD2h QMJouT49U1QAJhZWY/JwvI4lguBH5rUn+Ru3HiqCCFBv7ycwCxEr01YFHkcVaw3vUtsn Gl6aCCXb/QE9Kq04cXd0Dj+V6/9QKXE4u74Hrb3SD2Z4BBL72TyVcGK7bYzPgbdyEHWi 1/DhiiKEzUg+dJPfHleC+nAs/zDAo+72cvxNZQXKxC/yoysGua0lyJ2gOplKMuG4XgbD +yuyI6BFVzA/pHS0iecFOJLm6XP6eXKWrsCFHc0erQNPjFQwujNdQ4Y8fccTIaxo+wJl pqsw== X-Gm-Message-State: AOAM531IYQzKVkvVr8+rBqjyTJAcc36XBSo/FjrNIhm6ashXpLCoem8a lUTBFo6lWhpBUBT+qwTdrWFLFd9Ghm0qHQ== X-Google-Smtp-Source: ABdhPJzVvZ5l/pHGEh7l2ju9yRI0MK0NuufGrcDLEEGbqgf73f+1emwY6WEfx879J1gVgNfz7UVe4w== X-Received: by 2002:a05:6a00:1507:b029:2f4:1294:f0e1 with SMTP id q7-20020a056a001507b02902f41294f0e1mr1553959pfu.64.1623716304387; Mon, 14 Jun 2021 17:18:24 -0700 (PDT) Received: from x1.hsd1.or.comcast.net ([2601:1c0:4701:ae70:d92:6466:8a78:3f88]) by smtp.gmail.com with ESMTPSA id e10sm14908956pgc.63.2021.06.14.17.18.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 17:18:23 -0700 (PDT) From: Drew Fustini To: buildroot@buildroot.org Date: Mon, 14 Jun 2021 17:17:50 -0700 Message-Id: <20210615001750.421889-5-drew@beagleboard.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210615001750.421889-1-drew@beagleboard.org> References: <20210615001750.421889-1-drew@beagleboard.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 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 , 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/lentinj/u-boot/blob/master/doc/README.fdt-control Signed-off-by: Drew Fustini Reviewed-by: Bin Meng Reviewed-by: Alistair Francis --- 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