diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2021-07-22 15:35:17 +0200 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2021-07-22 16:30:40 +0200 |
| commit | afdae87857e9fcd729e3b5fb72cbc41c74fd632d (patch) | |
| tree | 560a03422c90ed5ee2bda748982c0cd220cee2de /configs/platform-v7a/patches | |
| parent | d1b543d41f402b27c58a415da256662ff4c61f8a (diff) | |
| download | DistroKit-afdae87857e9fcd729e3b5fb72cbc41c74fd632d.tar.gz DistroKit-afdae87857e9fcd729e3b5fb72cbc41c74fd632d.tar.xz | |
v7a: barebox: version bump v2021.05.0 → v2021.07.0
barebox v2021.07.0 now comes with support for first stage boot on the
SAMA5D3. The SAMA5D3 has a v7a CPU but lacks NEON, so it doesn't make
sense to enable for the v7a platform. Unfortunately, barebox master
is upset if you don't build both sama5d2 and sama5d3 at the same time.
Instead of working around this in the defconfig and enabling a board
we don't need and may forget to disable, import a small patch.
We should be able to drop this with v2021.08.0.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.pengutronix.de/20210722133520.17946-1-a.fatoum@pengutronix.de
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'configs/platform-v7a/patches')
| -rw-r--r-- | configs/platform-v7a/patches/barebox-2021.07.0/0001-ARM-at91-fix-building-samad2-images-without-sama5d3.patch | 31 | ||||
| -rw-r--r-- | configs/platform-v7a/patches/barebox-2021.07.0/series | 4 |
2 files changed, 35 insertions, 0 deletions
diff --git a/configs/platform-v7a/patches/barebox-2021.07.0/0001-ARM-at91-fix-building-samad2-images-without-sama5d3.patch b/configs/platform-v7a/patches/barebox-2021.07.0/0001-ARM-at91-fix-building-samad2-images-without-sama5d3.patch new file mode 100644 index 0000000..a755c6c --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2021.07.0/0001-ARM-at91-fix-building-samad2-images-without-sama5d3.patch @@ -0,0 +1,31 @@ +From: Ahmad Fatoum <a.fatoum@pengutronix.de> +Date: Thu, 22 Jul 2021 13:52:58 +0200 +Subject: [PATCH] ARM: at91: fix building samad2 images without sama5d3 + +Addition of first stage support for SAMA5D3 added a dependency +between sama5d2 and sama5d3 first stages: They both needed to be +enabled to generate images for either. Break up this dependency +to fix build failures for configs that e.g. only build one SoC. + +Fixes: e30fb46597d3 ("ARM: at91: xload-mmc: add sama5d3_atmci_start_image() helper") +Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> +--- + arch/arm/mach-at91/Kconfig | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig +index 28a82c1a9351..290178706a40 100644 +--- a/arch/arm/mach-at91/Kconfig ++++ b/arch/arm/mach-at91/Kconfig +@@ -44,10 +44,7 @@ config HAVE_AT91_DDRAMC + bool + + config AT91_MCI_PBL +- bool +- depends on MCI_ATMEL_PBL +- depends on MCI_ATMEL_SDHCI_PBL +- default y ++ def_bool MCI_ATMEL_PBL || MCI_ATMEL_SDHCI_PBL + + # Select if board uses the common at91sam926x_board_init + config AT91SAM926X_BOARD_INIT diff --git a/configs/platform-v7a/patches/barebox-2021.07.0/series b/configs/platform-v7a/patches/barebox-2021.07.0/series new file mode 100644 index 0000000..8408441 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2021.07.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-ARM-at91-fix-building-samad2-images-without-sama5d3.patch +# 3632b7775588d8916f5d8c68ef5db538 - git-ptx-patches magic |