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-socfpga | |
| 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-socfpga')
| -rw-r--r-- | arch/arm/mach-socfpga/arria10-bootsource.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/cyclone5-bootsource.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-socfpga/arria10-bootsource.c b/arch/arm/mach-socfpga/arria10-bootsource.c index 3319dc4bf9..9055570c07 100644 --- a/arch/arm/mach-socfpga/arria10-bootsource.c +++ b/arch/arm/mach-socfpga/arria10-bootsource.c @@ -55,8 +55,7 @@ static int arria10_boot_save_loc(void) src = arria10_get_bootsource(); - bootsource_set(src); - bootsource_set_instance(0); + bootsource_set_raw(src, 0); return 0; } diff --git a/arch/arm/mach-socfpga/cyclone5-bootsource.c b/arch/arm/mach-socfpga/cyclone5-bootsource.c index 717a003425..ab18d03302 100644 --- a/arch/arm/mach-socfpga/cyclone5-bootsource.c +++ b/arch/arm/mach-socfpga/cyclone5-bootsource.c @@ -50,8 +50,7 @@ static int cyclone5_boot_save_loc(void) break; } - bootsource_set(src); - bootsource_set_instance(0); + bootsource_set_raw(src, 0); return 0; } @@ -84,8 +83,7 @@ static int arria10_boot_save_loc(void) break; } - bootsource_set(src); - bootsource_set_instance(0); + bootsource_set_raw(src, 0); return 0; } |