colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct SPL uses of FASTBOOT_FLASH

Browse Source 
This converts 3 usages of this option to the non-SPL form, since there is
no SPL_FASTBOOT_FLASH defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Simon Glass
2023-02-05 15:39:53 -07:00
committed by Tom Rini
parent 418f2173b1
commit 64d6bfb660
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/fastboot/fb_getvar.c
View File

@@ -57,7 +57,7 @@ static const struct {
}, { }, {
.variable = "current-slot", .variable = "current-slot",
.dispatch = getvar_current_slot .dispatch = getvar_current_slot
#if CONFIG_IS_ENABLED(FASTBOOT_FLASH) #if IS_ENABLED(CONFIG_FASTBOOT_FLASH)
}, { }, {
.variable = "has-slot", .variable = "has-slot",
.dispatch = getvar_has_slot .dispatch = getvar_has_slot
@@ -67,7 +67,7 @@ static const struct {
.variable = "partition-type", .variable = "partition-type",
.dispatch = getvar_partition_type .dispatch = getvar_partition_type
#endif #endif
#if CONFIG_IS_ENABLED(FASTBOOT_FLASH) #if IS_ENABLED(CONFIG_FASTBOOT_FLASH)
}, { }, {
.variable = "partition-size", .variable = "partition-size",
.dispatch = getvar_partition_size .dispatch = getvar_partition_size

2
net/fastboot.c
View File

@@ -307,7 +307,7 @@ void fastboot_start_server(void)
fastboot_our_port = CONFIG_UDP_FUNCTION_FASTBOOT_PORT; fastboot_our_port = CONFIG_UDP_FUNCTION_FASTBOOT_PORT;
if (CONFIG_IS_ENABLED(FASTBOOT_FLASH)) if (IS_ENABLED(CONFIG_FASTBOOT_FLASH))
fastboot_set_progress_callback(fastboot_timed_send_info); fastboot_set_progress_callback(fastboot_timed_send_info);
net_set_udp_handler(fastboot_handler); net_set_udp_handler(fastboot_handler);