diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-18 20:20:43 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-19 08:16:36 -0600 |
| commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
| tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /api | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
| download | u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.gz | |
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 <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'api')
| -rw-r--r-- | api/api.c | 4 | ||||
| -rw-r--r-- | api/api_display.c | 2 | ||||
| -rw-r--r-- | api/api_net.c | 1 | ||||
| -rw-r--r-- | api/api_platform-arm.c | 1 | ||||
| -rw-r--r-- | api/api_platform-mips.c | 1 | ||||
| -rw-r--r-- | api/api_platform-powerpc.c | 1 | ||||
| -rw-r--r-- | api/api_storage.c | 2 |
7 files changed, 7 insertions, 5 deletions
diff --git a/api/api.c b/api/api.c index d22132f62fe..89003c161c2 100644 --- a/api/api.c +++ b/api/api.c @@ -7,13 +7,11 @@ #include <config.h> #include <command.h> +#include <common.h> #include <env.h> #include <malloc.h> -#include <time.h> #include <env_internal.h> -#include <vsprintf.h> #include <linux/delay.h> -#include <linux/errno.h> #include <linux/types.h> #include <api_public.h> #include <u-boot/crc.h> diff --git a/api/api_display.c b/api/api_display.c index 8fd078c8c4a..2e877a85d14 100644 --- a/api/api_display.c +++ b/api/api_display.c @@ -3,9 +3,9 @@ * Copyright (c) 2011 The Chromium OS Authors. */ +#include <common.h> #include <api_public.h> #include <log.h> -#include <linux/types.h> /* TODO(clchiou): add support of video device */ diff --git a/api/api_net.c b/api/api_net.c index 264ff530563..7515c26e8b4 100644 --- a/api/api_net.c +++ b/api/api_net.c @@ -6,6 +6,7 @@ */ #include <config.h> +#include <common.h> #include <net.h> #include <linux/types.h> #include <api_public.h> diff --git a/api/api_platform-arm.c b/api/api_platform-arm.c index 9afba66c244..6cfd9e6cc20 100644 --- a/api/api_platform-arm.c +++ b/api/api_platform-arm.c @@ -12,6 +12,7 @@ #include <linux/types.h> #include <api_public.h> +#include <asm/u-boot.h> #include <asm/global_data.h> #include "api_private.h" diff --git a/api/api_platform-mips.c b/api/api_platform-mips.c index 262b35a2777..e1509663af5 100644 --- a/api/api_platform-mips.c +++ b/api/api_platform-mips.c @@ -9,6 +9,7 @@ #include <linux/types.h> #include <api_public.h> +#include <asm/u-boot.h> #include <asm/global_data.h> #include "api_private.h" diff --git a/api/api_platform-powerpc.c b/api/api_platform-powerpc.c index 3a04a9f691c..847a4a3015b 100644 --- a/api/api_platform-powerpc.c +++ b/api/api_platform-powerpc.c @@ -12,6 +12,7 @@ #include <linux/types.h> #include <api_public.h> +#include <asm/u-boot.h> #include <asm/global_data.h> #include "api_private.h" diff --git a/api/api_storage.c b/api/api_storage.c index 3d2d9d6ef4c..78becbe39fb 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -6,10 +6,10 @@ */ #include <config.h> +#include <common.h> #include <api_public.h> #include <part.h> #include <scsi.h> -#include <linux/types.h> #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE) #include <usb.h> |