diff options
author | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /api | |
parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
download | u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.tar.gz u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.tar.bz2 u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.zip |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.
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, 5 insertions, 7 deletions
@@ -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 2e877a85d1..8fd078c8c4 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 7515c26e8b..264ff53056 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 6cfd9e6cc2..9afba66c24 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 e1509663af..262b35a277 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 847a4a3015..3a04a9f691 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 78becbe39f..3d2d9d6ef4 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> |