summaryrefslogtreecommitdiff
path: root/drivers/fastboot
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2024-05-20 10:16:33 -0600
committerTom Rini <[email protected]>2024-05-20 10:16:33 -0600
commitd4781422d1268aa6deca3e49d2fb227e79c160b4 (patch)
tree420073c8a29a401a3908803000df6f54673e1731 /drivers/fastboot
parent85854bc3324edd0c81047780ee60033d056fd490 (diff)
parenta7f0154c412859323396111dd0c09dbafbc153cb (diff)
Merge tag 'v2024.07-rc3' into next
Prepare v2024.07-rc3
Diffstat (limited to 'drivers/fastboot')
-rw-r--r--drivers/fastboot/fb_command.c2
-rw-r--r--drivers/fastboot/fb_common.c2
-rw-r--r--drivers/fastboot/fb_getvar.c2
-rw-r--r--drivers/fastboot/fb_mmc.c1
-rw-r--r--drivers/fastboot/fb_nand.c1
5 files changed, 5 insertions, 3 deletions
diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index e4484d65aca..01443c5d39e 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -3,6 +3,7 @@
* Copyright (C) 2016 The Android Open Source Project
*/
+#include <common.h>
#include <command.h>
#include <console.h>
#include <env.h>
@@ -12,7 +13,6 @@
#include <fb_nand.h>
#include <part.h>
#include <stdlib.h>
-#include <vsprintf.h>
#include <linux/printk.h>
/**
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index 12ffb463deb..3576b067729 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -11,11 +11,11 @@
*/
#include <bcb.h>
+#include <common.h>
#include <command.h>
#include <env.h>
#include <fastboot.h>
#include <net.h>
-#include <vsprintf.h>
/**
* fastboot_buf_addr - base address of the fastboot download buffer
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index 93cbd598e02..f65519c57b4 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -3,6 +3,7 @@
* Copyright (C) 2016 The Android Open Source Project
*/
+#include <common.h>
#include <env.h>
#include <fastboot.h>
#include <fastboot-internal.h>
@@ -11,7 +12,6 @@
#include <fs.h>
#include <part.h>
#include <version.h>
-#include <vsprintf.h>
#include <linux/printk.h>
static void getvar_version(char *var_parameter, char *response);
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index f11eb66761b..060918e4910 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -4,6 +4,7 @@
*/
#include <config.h>
+#include <common.h>
#include <blk.h>
#include <env.h>
#include <fastboot.h>
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index afc64fd5280..bbe26ddcc9b 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -5,6 +5,7 @@
*/
#include <config.h>
+#include <common.h>
#include <blk.h>
#include <fastboot.h>