diff options
| author | Tom Rini <[email protected]> | 2024-05-07 08:01:06 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-07 08:01:06 -0600 |
| commit | 7e2938beabac24e6c8baad33e254b2383dbe9490 (patch) | |
| tree | dbefd5a48f5b034108c6b5b7c2138430539622b2 /api | |
| parent | 52835266d3e933656a217233eaf672dd9ccd7352 (diff) | |
| parent | 47558a4fce629390133bc6f410a942f109165efd (diff) | |
Merge branch '2024-05-06-remove-include-common_h' into next
- Merge the four series that I made to finally remove include/common.h.
For the most part, this is just removing <common.h> entirely. In a few
cases we needed to add <linux/types.h> or <time.h>. In the case of
PowerPC related code, we instead need to bring in <asm/ppc.h>.
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, 5 insertions, 7 deletions
diff --git a/api/api.c b/api/api.c index 89003c161c2..d22132f62fe 100644 --- a/api/api.c +++ b/api/api.c @@ -7,11 +7,13 @@ #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 2e877a85d14..8fd078c8c4a 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 7515c26e8b4..264ff530563 100644 --- a/api/api_net.c +++ b/api/api_net.c @@ -6,7 +6,6 @@ */ #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 6cfd9e6cc20..9afba66c244 100644 --- a/api/api_platform-arm.c +++ b/api/api_platform-arm.c @@ -12,7 +12,6 @@ #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 e1509663af5..262b35a2777 100644 --- a/api/api_platform-mips.c +++ b/api/api_platform-mips.c @@ -9,7 +9,6 @@ #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 847a4a3015b..3a04a9f691c 100644 --- a/api/api_platform-powerpc.c +++ b/api/api_platform-powerpc.c @@ -12,7 +12,6 @@ #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 78becbe39fb..3d2d9d6ef4c 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> |