From: Alexander Shiyan <eagle.alexander923@gmail.com>
To: barebox@lists.infradead.org
Cc: Alexander Shiyan <eagle.alexander923@gmail.com>
Subject: [PATCH 6/7] ARM: at91: xload: Rename the sama5d2 output image names
Date: Thu, 20 Mar 2025 12:14:18 +0300 [thread overview]
Message-ID: <20250320091419.42095-6-eagle.alexander923@gmail.com> (raw)
In-Reply-To: <20250320091419.42095-1-eagle.alexander923@gmail.com>
Let's make the sama5d2_start_image() function dependent on the
bootsource rather than MMC-specific, so let's rename the calls
and output image names to reflect that.
Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
arch/arm/boards/sama5d27-giantboard/lowlevel.c | 4 ++--
arch/arm/boards/sama5d27-som1/lowlevel.c | 4 ++--
arch/arm/mach-at91/xload.c | 15 ++++++++++++++-
images/Makefile.at91 | 16 ++++++++--------
include/mach/at91/xload.h | 2 +-
5 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boards/sama5d27-giantboard/lowlevel.c b/arch/arm/boards/sama5d27-giantboard/lowlevel.c
index 49540bede0..20042e649d 100644
--- a/arch/arm/boards/sama5d27-giantboard/lowlevel.c
+++ b/arch/arm/boards/sama5d27-giantboard/lowlevel.c
@@ -15,7 +15,7 @@
/* PCK = 492MHz, MCK = 164MHz */
#define MASTER_CLOCK 164000000
-SAMA5D2_ENTRY_FUNCTION(start_sama5d27_giantboard_xload_mmc, r4)
+SAMA5D2_ENTRY_FUNCTION(start_sama5d27_giantboard_xload, r4)
{
void __iomem *dbgu_base;
@@ -31,7 +31,7 @@ SAMA5D2_ENTRY_FUNCTION(start_sama5d27_giantboard_xload_mmc, r4)
sama5d2_udelay_init(MASTER_CLOCK);
sama5d2_d1g_ddrconf();
- sama5d2_sdhci_start_image(r4);
+ sama5d2_start_image(r4);
}
extern char __dtb_z_at91_sama5d27_giantboard_start[];
diff --git a/arch/arm/boards/sama5d27-som1/lowlevel.c b/arch/arm/boards/sama5d27-som1/lowlevel.c
index 67300587fe..633e15898e 100644
--- a/arch/arm/boards/sama5d27-som1/lowlevel.c
+++ b/arch/arm/boards/sama5d27-som1/lowlevel.c
@@ -39,7 +39,7 @@ static void ek_turn_led(unsigned color)
}
}
-SAMA5D2_ENTRY_FUNCTION(start_sama5d27_som1_ek_xload_mmc, r4)
+SAMA5D2_ENTRY_FUNCTION(start_sama5d27_som1_ek_xload, r4)
{
void __iomem *dbgu_base;
sama5d2_lowlevel_init();
@@ -55,7 +55,7 @@ SAMA5D2_ENTRY_FUNCTION(start_sama5d27_som1_ek_xload_mmc, r4)
ek_turn_led(RGB_LED_RED | RGB_LED_GREEN); /* Yellow */
sama5d2_udelay_init(MASTER_CLOCK);
sama5d2_d1g_ddrconf();
- sama5d2_sdhci_start_image(r4);
+ sama5d2_start_image(r4);
}
extern char __dtb_z_at91_sama5d27_som1_ek_start[];
diff --git a/arch/arm/mach-at91/xload.c b/arch/arm/mach-at91/xload.c
index 7a990f35c8..d3bc6f2dc9 100644
--- a/arch/arm/mach-at91/xload.c
+++ b/arch/arm/mach-at91/xload.c
@@ -61,7 +61,7 @@ static const struct xload_instance sama5d2_mci_instances[] = {
* sama5d2_sdhci_start_image - Load and start an image from FAT-formatted SDHCI
* @r4: value of r4 passed by BootROM
*/
-void __noreturn sama5d2_sdhci_start_image(u32 r4)
+static void __noreturn sama5d2_sdhci_start_image(u32 r4)
{
void *buf = (void *)SAMA5_DDRCS;
const struct xload_instance *instance;
@@ -96,6 +96,19 @@ void __noreturn sama5d2_sdhci_start_image(u32 r4)
panic("FAT chainloading failed\n");
}
+void __noreturn sama5d2_start_image(u32 r4)
+{
+ switch (sama5_bootsource(r4)) {
+ case BOOTSOURCE_MMC:
+ sama5d2_sdhci_start_image(r4);
+ break;
+ default:
+ break;
+ }
+
+ panic("Unsupported boot configuration!\n");
+}
+
static const struct xload_instance sama5d3_mci_instances[] = {
[0] = {
.base = IOMEM(SAMA5D3_BASE_HSMCI0),
diff --git a/images/Makefile.at91 b/images/Makefile.at91
index 81e7c22e8b..54f75624ed 100644
--- a/images/Makefile.at91
+++ b/images/Makefile.at91
@@ -42,19 +42,19 @@ pblb-$(CONFIG_MACH_SAMA5D27_SOM1) += start_sama5d27_som1_ek
FILE_barebox-sama5d27-som1-ek.img = start_sama5d27_som1_ek.pblb
image-$(CONFIG_MACH_SAMA5D27_SOM1) += barebox-sama5d27-som1-ek.img
-pblb-$(CONFIG_MACH_SAMA5D27_SOM1) += start_sama5d27_som1_ek_xload_mmc
-MAX_PBL_IMAGE_SIZE_start_sama5d27_som1_ek_xload_mmc = 0x10000
-FILE_barebox-sama5d27-som1-ek-xload-mmc.img = start_sama5d27_som1_ek_xload_mmc.pblb
-image-$(CONFIG_MACH_SAMA5D27_SOM1) += barebox-sama5d27-som1-ek-xload-mmc.img
+pblb-$(CONFIG_MACH_SAMA5D27_SOM1) += start_sama5d27_som1_ek_xload
+MAX_PBL_IMAGE_SIZE_start_sama5d27_som1_ek_xload = 0x10000
+FILE_barebox-sama5d27-som1-ek-xload.img = start_sama5d27_som1_ek_xload.pblb
+image-$(CONFIG_MACH_SAMA5D27_SOM1) += barebox-sama5d27-som1-ek-xload.img
pblb-$(CONFIG_MACH_SAMA5D27_GIANTBOARD) += start_sama5d27_giantboard
FILE_barebox-groboards-sama5d27-giantboard.img = start_sama5d27_giantboard.pblb
image-$(CONFIG_MACH_SAMA5D27_GIANTBOARD) += barebox-groboards-sama5d27-giantboard.img
-pblb-$(CONFIG_MACH_SAMA5D27_GIANTBOARD) += start_sama5d27_giantboard_xload_mmc
-FILE_barebox-groboards-sama5d27-giantboard-xload-mmc.img = start_sama5d27_giantboard_xload_mmc.pblb
-MAX_PBL_IMAGE_SIZE_start_sama5d27_giantboard_xload_mmc = 0xffff
-image-$(CONFIG_MACH_SAMA5D27_GIANTBOARD) += barebox-groboards-sama5d27-giantboard-xload-mmc.img
+pblb-$(CONFIG_MACH_SAMA5D27_GIANTBOARD) += start_sama5d27_giantboard_xload
+FILE_barebox-groboards-sama5d27-giantboard-xload.img = start_sama5d27_giantboard_xload.pblb
+MAX_PBL_IMAGE_SIZE_start_sama5d27_giantboard_xload = 0x10000
+image-$(CONFIG_MACH_SAMA5D27_GIANTBOARD) += barebox-groboards-sama5d27-giantboard-xload.img
pblb-$(CONFIG_MACH_SKOV_ARM9CPU) += start_skov_arm9cpu_xload_mmc
FILE_barebox-skov-arm9cpu-xload-mmc.img = start_skov_arm9cpu_xload_mmc.pblb
diff --git a/include/mach/at91/xload.h b/include/mach/at91/xload.h
index 2886490246..d5fc7596fd 100644
--- a/include/mach/at91/xload.h
+++ b/include/mach/at91/xload.h
@@ -6,7 +6,7 @@
#include <linux/compiler.h>
#include <pbl/bio.h>
-void __noreturn sama5d2_sdhci_start_image(u32 r4);
+void __noreturn sama5d2_start_image(u32 r4);
void __noreturn sama5d3_atmci_start_image(u32 r4, unsigned int clock,
unsigned int slot);
--
2.39.1
next prev parent reply other threads:[~2025-03-20 9:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-20 9:14 [PATCH 1/7] ARM: at91: xload: Unify loader functions to use a single xload_instance structure Alexander Shiyan
2025-03-20 9:14 ` [PATCH 2/7] ARM: at91: xload: Replace magic values with definitions Alexander Shiyan
2025-03-20 9:14 ` [PATCH 3/7] ARM: at91: xload: Remove len argument from at91_fat_start_image() Alexander Shiyan
2025-03-20 9:14 ` [PATCH 4/7] ARM: at91: xload: Use the variable name as described in include/mach/at91/xload.h Alexander Shiyan
2025-03-20 9:14 ` [PATCH 5/7] ARM: at91: xload: Remove intermediate variable Alexander Shiyan
2025-03-20 9:14 ` Alexander Shiyan [this message]
2025-03-20 9:14 ` [PATCH 7/7] ARM: at91: xload: Add QSPI boot support for SAMA5D2 Alexander Shiyan
2025-03-20 11:45 ` [PATCH 1/7] ARM: at91: xload: Unify loader functions to use a single xload_instance structure Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250320091419.42095-6-eagle.alexander923@gmail.com \
--to=eagle.alexander923@gmail.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox