diff options
| author | Simon Glass <sjg@chromium.org> | 2020-10-30 21:38:53 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-02 15:33:42 -0500 |
| commit | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (patch) | |
| tree | 0122abb2a3f1ea9837eaccc6150d2dae9570388e /drivers/net/phy | |
| parent | fdcb93e1709ab1a2ebb562455621617c29e2099c (diff) | |
| download | u-boot-401d1c4f5d2d29c4bc4beaec95402ca23eb63295.tar.gz | |
common: Drop asm/global_data.h from common headerWIP/2021-02-02-drop-asm_global_data-when-unused
Move this out of the common header and include it only where needed. In
a number of cases this requires adding "struct udevice;" to avoid adding
another large header or in other cases replacing / adding missing header
files that had been pulled in, very indirectly. Finally, we have a few
cases where we did not need to include <asm/global_data.h> at all, so
remove that include.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/fixed.c | 1 | ||||
| -rw-r--r-- | drivers/net/phy/miiphybb.c | 1 | ||||
| -rw-r--r-- | drivers/net/phy/phy.c | 1 | ||||
| -rw-r--r-- | drivers/net/phy/xilinx_gmii2rgmii.c | 4 |
4 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index 9d9f746e1d..3228672fc4 100644 --- a/drivers/net/phy/fixed.c +++ b/drivers/net/phy/fixed.c @@ -11,6 +11,7 @@ #include <phy.h> #include <dm.h> #include <fdt_support.h> +#include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c index 59a32c4913..24d617553e 100644 --- a/drivers/net/phy/miiphybb.c +++ b/drivers/net/phy/miiphybb.c @@ -16,6 +16,7 @@ #include <ioports.h> #include <ppc_asm.tmpl> #include <miiphy.h> +#include <asm/global_data.h> #define BB_MII_RELOCATE(v,off) (v += (v?off:0)) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 662ea2b98c..a2be398736 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -17,6 +17,7 @@ #include <miiphy.h> #include <phy.h> #include <errno.h> +#include <asm/global_data.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/err.h> diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c index e2feb17048..74105c0b7d 100644 --- a/drivers/net/phy/xilinx_gmii2rgmii.c +++ b/drivers/net/phy/xilinx_gmii2rgmii.c @@ -5,11 +5,11 @@ * Copyright (C) 2018 Xilinx, Inc. */ +#include <common.h> #include <dm.h> #include <log.h> #include <phy.h> -#include <config.h> -#include <common.h> +#include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; |