diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-07-20 07:50:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-08-09 09:38:36 +0200 |
| commit | 2fc6302090cd77c368cf784adf91dc2beb71764c (patch) | |
| tree | 3f17cfe618da72406f1935a2b97aa6f73baa1bc7 /arch/arm/mach-omap | |
| parent | ef65ce9ba18d53f3aa046fef01ed63672bccf6b8 (diff) | |
| download | barebox-2fc6302090cd77c368cf784adf91dc2beb71764c.tar.gz barebox-2fc6302090cd77c368cf784adf91dc2beb71764c.tar.xz | |
bootsource: rename existing bootsource_set to bootsource_set_raw
Patterns like [ "$bootsource" = mmc ] && boot mmc$bootsource_instance
expect that ${bootsource_instance} and MMC aliases align, which may not
always be the case. In preparation for adding a new bootsource_set
function that consults an optional mapping table from bootrom
bootsource_instance to board-specific device numbering, rename all
existing instances to bootsource_set_raw. While at it, clean up the
legacy split into bootsource_set and bootsource_set_instance and have
the new bootsource_set_raw accept both arguments at once.
No functional change intended.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20220720055042.3510276-2-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-omap')
| -rw-r--r-- | arch/arm/mach-omap/am33xx_generic.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap/omap3_generic.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap/omap4_generic.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-omap/am33xx_generic.c b/arch/arm/mach-omap/am33xx_generic.c index bfe5b3dc73..7f9a2bcf37 100644 --- a/arch/arm/mach-omap/am33xx_generic.c +++ b/arch/arm/mach-omap/am33xx_generic.c @@ -153,8 +153,7 @@ static int am33xx_bootsource(void) default: src = BOOTSOURCE_UNKNOWN; } - bootsource_set(src); - bootsource_set_instance(instance); + bootsource_set_raw(src, instance); return 0; } diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c index 69f2d51a62..cb6105cc04 100644 --- a/arch/arm/mach-omap/omap3_generic.c +++ b/arch/arm/mach-omap/omap3_generic.c @@ -475,8 +475,7 @@ static int omap3_bootsource(void) src = BOOTSOURCE_UNKNOWN; } - bootsource_set(src); - bootsource_set_instance(0); + bootsource_set_raw(src, 0); return 0; } diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c index 6d165b7f68..7c8374eba7 100644 --- a/arch/arm/mach-omap/omap4_generic.c +++ b/arch/arm/mach-omap/omap4_generic.c @@ -498,8 +498,7 @@ static int omap4_bootsource(void) src = BOOTSOURCE_UNKNOWN; } - bootsource_set(src); - bootsource_set_instance(0); + bootsource_set_raw(src, 0); omap_vector_init(); |