From patchwork Tue May 18 21:37:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1480564 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=) 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 4Fl8WW0nnJz9sW1 for ; Wed, 19 May 2021 07:38:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 899284067A; Tue, 18 May 2021 21:38:28 +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 XO7jwQHq12VV; Tue, 18 May 2021 21:38:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 92E6440E72; Tue, 18 May 2021 21:38:26 +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 32EEB1BF30E for ; Tue, 18 May 2021 21:38:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 2F3F460A5C for ; Tue, 18 May 2021 21:38: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 IYIbjCJnsHpP for ; Tue, 18 May 2021 21:38:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by smtp3.osuosl.org (Postfix) with ESMTPS id A59A4605D1 for ; Tue, 18 May 2021 21:38:00 +0000 (UTC) Received: (Authenticated sender: thomas.petazzoni@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 1CFAF240002; Tue, 18 May 2021 21:37:56 +0000 (UTC) From: Thomas Petazzoni To: Buildroot List Date: Tue, 18 May 2021 23:37:46 +0200 Message-Id: <20210518213749.144355-2-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518213749.144355-1-thomas.petazzoni@bootlin.com> References: <20210518213749.144355-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3] boot/at91bootstrap3: add support for at91bootstrap 4.x series 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: Eugen Hristev , alexandre.belloni@bootlin.com, Simon Dawson , Nicolas Ferre , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Eugen Hristev The project at https://github.com/linux4sam/at91bootstrap was until now releasing 3.x versions, which were packaged using boot/at91bootstrap3/ in Buildroot. Microchip has now started a new branch of at91bootstrap, called 4.x, which will only support the following devices: sam9x60, sama5d2, sama5d3, sama5d4, sama7g5. A number of older devices from Microchip will only be supported by the existing 3.x series. Therefore, we cannot simply remove support for the 3.x series, and allow using only the 4.x series. So what this commit does is extend the boot/at91bootstrap3 package to support building both 3.x and 4.x versions. In detail, this implies: * Having the BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION symbol point to the latest 4.x version. Indeed, we want BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION to really point to the latest upstream version, even if that means potential breakage for users. Users who want to use a fixed version of at91bootstrap should anyway not be using BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION. * Introduce BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X for users who would like to use the latest 3.x series. * Adjust the installation logic, as images to install are now in build/binaries/*.bin instead of binaries/*.bin. In order to not have to differentiate 3.x and 4.x, we simply use $(wildcard ...) to expand the list of files to install. * To make it clear that boot/at91bootstrap3 supports both 3.x and 4.x, we also update the prompt of the package. Signed-off-by: Eugen Hristev [Thomas: while this patch is based on previous work by Eugen, it was reworked quite significantly.] Signed-off-by: Thomas Petazzoni --- boot/at91bootstrap3/Config.in | 10 +++++++--- boot/at91bootstrap3/at91bootstrap3.hash | 1 + boot/at91bootstrap3/at91bootstrap3.mk | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index 25ab30489f..ebc912e46c 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -1,5 +1,5 @@ config BR2_TARGET_AT91BOOTSTRAP3 - bool "AT91 Bootstrap 3" + bool "AT91 Bootstrap 3+" depends on BR2_arm926t || BR2_cortex_a5 || BR2_cortex_a7 help AT91Bootstrap is a first level bootloader for the Atmel AT91 @@ -16,9 +16,12 @@ if BR2_TARGET_AT91BOOTSTRAP3 choice - prompt "AT91 Bootstrap 3 version" + prompt "AT91 Bootstrap 3+ version" config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + bool "4.0.0-rc2" + +config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X bool "3.9.3" config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT @@ -51,7 +54,8 @@ endif config BR2_TARGET_AT91BOOTSTRAP3_VERSION string - default "v3.9.3" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + default "v4.0.0-rc2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + default "v3.9.3" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \ if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT default "custom" if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL diff --git a/boot/at91bootstrap3/at91bootstrap3.hash b/boot/at91bootstrap3/at91bootstrap3.hash index 6b6257b0ab..a63eb1d623 100644 --- a/boot/at91bootstrap3/at91bootstrap3.hash +++ b/boot/at91bootstrap3/at91bootstrap3.hash @@ -1,3 +1,4 @@ # Locally calculated sha256 dd6a3c57c1c84fc3b18187bee3d139146a0e032dd1d8edea7b242730e0bc4fe1 at91bootstrap3-v3.9.3.tar.gz +sha256 b5d5f042297cad0d091f7d8734e61eb9ec7b6020898e086503fb5f8bc71fb9fc at91bootstrap3-v4.0.0-rc2.tar.gz sha256 fd7a1ce5719bb7abf5e289da2e0ea8c933af3ba0f6ad03dbdbd2b7f54a77498a main.c diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk index a942afcdc9..fdd87591bb 100644 --- a/boot/at91bootstrap3/at91bootstrap3.mk +++ b/boot/at91bootstrap3/at91bootstrap3.mk @@ -48,7 +48,7 @@ define AT91BOOTSTRAP3_BUILD_CMDS endef define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS - cp $(@D)/binaries/*.bin $(BINARIES_DIR) + cp $(wildcard $(@D)/build/binaries/*.bin $(@D)/binaries/*.bin) $(BINARIES_DIR) endef ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_USE_DEFCONFIG),y) From patchwork Tue May 18 21:37:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1480563 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::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::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 4Fl8WH08Z8z9sW1 for ; Wed, 19 May 2021 07:38:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 530AC843B2; Tue, 18 May 2021 21:38:16 +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 iR4avi0HQFgk; Tue, 18 May 2021 21:38:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 0C88D843A2; Tue, 18 May 2021 21:38:14 +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 866BE1BF30E for ; Tue, 18 May 2021 21:38:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 75EF9400DF for ; Tue, 18 May 2021 21:38:01 +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 3NCNx4O9h777 for ; Tue, 18 May 2021 21:38:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp2.osuosl.org (Postfix) with ESMTPS id A48DD40296 for ; Tue, 18 May 2021 21:38:00 +0000 (UTC) Received: (Authenticated sender: thomas.petazzoni@bootlin.com) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 7ED331BF204; Tue, 18 May 2021 21:37:58 +0000 (UTC) From: Thomas Petazzoni To: Buildroot List Date: Tue, 18 May 2021 23:37:47 +0200 Message-Id: <20210518213749.144355-3-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518213749.144355-1-thomas.petazzoni@bootlin.com> References: <20210518213749.144355-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/3] boot/at91bootstrap3: bump 3.x series to 3.10.2 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: Eugen Hristev , alexandre.belloni@bootlin.com, Simon Dawson , Nicolas Ferre , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Thomas Petazzoni --- boot/at91bootstrap3/Config.in | 4 ++-- boot/at91bootstrap3/at91bootstrap3.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index ebc912e46c..18301a0dc0 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -22,7 +22,7 @@ config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION bool "4.0.0-rc2" config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X - bool "3.9.3" + bool "3.10.2" config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT bool "Custom Git repository" @@ -55,7 +55,7 @@ endif config BR2_TARGET_AT91BOOTSTRAP3_VERSION string default "v4.0.0-rc2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION - default "v3.9.3" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X + default "v3.10.2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \ if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT default "custom" if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL diff --git a/boot/at91bootstrap3/at91bootstrap3.hash b/boot/at91bootstrap3/at91bootstrap3.hash index a63eb1d623..6af997b8eb 100644 --- a/boot/at91bootstrap3/at91bootstrap3.hash +++ b/boot/at91bootstrap3/at91bootstrap3.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 dd6a3c57c1c84fc3b18187bee3d139146a0e032dd1d8edea7b242730e0bc4fe1 at91bootstrap3-v3.9.3.tar.gz +sha256 33e4ba431af93a4fc2e81c1458cd31901b9f69c583ebe4c74ca78c0846479bfd at91bootstrap3-v3.10.2.tar.gz sha256 b5d5f042297cad0d091f7d8734e61eb9ec7b6020898e086503fb5f8bc71fb9fc at91bootstrap3-v4.0.0-rc2.tar.gz sha256 fd7a1ce5719bb7abf5e289da2e0ea8c933af3ba0f6ad03dbdbd2b7f54a77498a main.c From patchwork Tue May 18 21:37:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1480565 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=) 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 4Fl8Wn2r0Qz9sW1 for ; Wed, 19 May 2021 07:38:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 26A8840E72; Tue, 18 May 2021 21:38:42 +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 8L8xHFsl0vaA; Tue, 18 May 2021 21:38:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id DA7A240EDB; Tue, 18 May 2021 21:38:39 +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 7C21F1BF30E for ; Tue, 18 May 2021 21:38:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 6B407843A0 for ; Tue, 18 May 2021 21:38:02 +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 FUs33zOcTZrU for ; Tue, 18 May 2021 21:38:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by smtp1.osuosl.org (Postfix) with ESMTPS id A3A688439F for ; Tue, 18 May 2021 21:38:01 +0000 (UTC) Received: (Authenticated sender: thomas.petazzoni@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id BB0AF240005; Tue, 18 May 2021 21:37:59 +0000 (UTC) From: Thomas Petazzoni To: Buildroot List Date: Tue, 18 May 2021 23:37:48 +0200 Message-Id: <20210518213749.144355-4-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518213749.144355-1-thomas.petazzoni@bootlin.com> References: <20210518213749.144355-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/3] boot/at91bootstrap3: add BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3 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: Eugen Hristev , alexandre.belloni@bootlin.com, Simon Dawson , Nicolas Ferre , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Eugen Hristev Some at91bootstrap3 configurations now use Python scripts on the host for NAND/PMEC related utilities. In order to be able to use those scripts, this commit adds a new BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3 which allows to express the need for host-python3 as a dependency to build at91bootstrap3. Signed-off-by: Eugen Hristev [Thomas: this was extracted from a patch from Eugen adding at91bootstrap 4.x support.] Signed-off-by: Thomas Petazzoni --- boot/at91bootstrap3/Config.in | 8 ++++++++ boot/at91bootstrap3/at91bootstrap3.mk | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index 18301a0dc0..966e393db5 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -101,3 +101,11 @@ config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE Path to the at91bootstrap3 configuration file endif # BR2_TARGET_AT91BOOTSTRAP3 + +config BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3 + bool "needs host-python3" + help + Enable this option if the at91bootstrap build process needs + Python 3.x to be available on the host. This is needed in + some at91bootstrap configurations to use NAND/PMECC Python + scripts. diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk index fdd87591bb..48200b2b6e 100644 --- a/boot/at91bootstrap3/at91bootstrap3.mk +++ b/boot/at91bootstrap3/at91bootstrap3.mk @@ -30,6 +30,10 @@ AT91BOOTSTRAP3_CPE_ID_PRODUCT = at91bootstrap AT91BOOTSTRAP3_INSTALL_IMAGES = YES AT91BOOTSTRAP3_INSTALL_TARGET = NO +ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3),y) +AT91BOOTSTRAP3_DEPENDENCIES += host-python3 +endif + AT91BOOTSTRAP3_CUSTOM_PATCH_DIR = \ $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR))