diff options
| author | Tom Rini <[email protected]> | 2024-05-18 20:20:43 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-19 08:16:36 -0600 |
| commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
| tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /drivers/fastboot | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.
This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.
Reported-by: Jonas Karlman <[email protected]>
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'drivers/fastboot')
| -rw-r--r-- | drivers/fastboot/fb_command.c | 2 | ||||
| -rw-r--r-- | drivers/fastboot/fb_common.c | 2 | ||||
| -rw-r--r-- | drivers/fastboot/fb_getvar.c | 2 | ||||
| -rw-r--r-- | drivers/fastboot/fb_mmc.c | 1 | ||||
| -rw-r--r-- | drivers/fastboot/fb_nand.c | 1 |
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> |