| Message ID | 20240501024316.1767971-10-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | eadad7f88b1304469e71a12944b317a6f2031f48 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [001/149] global: Make <asm/global_data.h> include <asm/u-boot.h> | expand |
On 1/05/24 14:40, Tom Rini wrote: > Remove <common.h> from this board vendor directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > Cc: Stefan Roese <sr@denx.de> > Cc: Chris Packham <chris.packham@alliedtelesis.co.nz> > Cc: Tony Dinh <mibodhi@gmail.com> > Cc: Jason Cooper <u-boot@lakedaemon.net> > Cc: Siddarth Gore <gores@marvell.com> > Cc: Aaron Williams <awilliams@marvell.com> Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > --- > arch/arm/mach-kirkwood/include/mach/mpp.h | 2 ++ > board/Marvell/db-88f6720/db-88f6720.c | 1 - > board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 2 +- > board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 2 +- > board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c | 1 - > board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c | 1 - > board/Marvell/dreamplug/dreamplug.c | 1 - > board/Marvell/guruplug/guruplug.c | 1 - > board/Marvell/mvebu_alleycat-5/board.c | 2 +- > board/Marvell/mvebu_armada-37xx/board.c | 2 +- > board/Marvell/mvebu_armada-8k/board.c | 2 +- > board/Marvell/octeontx2/soc-utils.c | 1 - > board/Marvell/openrd/openrd.c | 1 - > board/Marvell/sheevaplug/sheevaplug.c | 1 - > 14 files changed, 7 insertions(+), 13 deletions(-) > > diff --git a/arch/arm/mach-kirkwood/include/mach/mpp.h b/arch/arm/mach-kirkwood/include/mach/mpp.h > index 4d1f58c0cbdf..e2757942590b 100644 > --- a/arch/arm/mach-kirkwood/include/mach/mpp.h > +++ b/arch/arm/mach-kirkwood/include/mach/mpp.h > @@ -8,6 +8,8 @@ > #ifndef __KIRKWOOD_MPP_H > #define __KIRKWOOD_MPP_H > > +#include <linux/types.h> > + > #define MPP(_num, _sel, _in, _out, _F6180, _F6190, _F6192, _F6281) ( \ > /* MPP number */ ((_num) & 0xff) | \ > /* MPP select value */ (((_sel) & 0xf) << 8) | \ > diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c > index 26c30647fbb0..920421366f11 100644 > --- a/board/Marvell/db-88f6720/db-88f6720.c > +++ b/board/Marvell/db-88f6720/db-88f6720.c > @@ -3,7 +3,6 @@ > * Copyright (C) 2016 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > #include <init.h> > #include <miiphy.h> > #include <net.h> > diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c > index 122c63d11f99..0f92cc385bc8 100644 > --- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c > +++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c > @@ -3,7 +3,7 @@ > * Copyright (C) 2015 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > +#include <config.h> > #include <i2c.h> > #include <init.h> > #include <miiphy.h> > diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c > index 1edc1cb6515c..8f8b2720107a 100644 > --- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c > +++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c > @@ -3,7 +3,7 @@ > * Copyright (C) 2015 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > +#include <config.h> > #include <i2c.h> > #include <init.h> > #include <miiphy.h> > diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c > index 9e1fdecfca4d..6bca1f91a0a4 100644 > --- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c > +++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c > @@ -3,7 +3,6 @@ > * Copyright (C) 2014 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > #include <init.h> > #include <miiphy.h> > #include <net.h> > diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c > index 0abdca1cd210..a7a84798a53b 100644 > --- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c > +++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c > @@ -3,7 +3,6 @@ > * Copyright (C) 2015 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > #include <i2c.h> > #include <init.h> > #include <asm/global_data.h> > diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c > index d15faa1cb7ff..381275061318 100644 > --- a/board/Marvell/dreamplug/dreamplug.c > +++ b/board/Marvell/dreamplug/dreamplug.c > @@ -8,7 +8,6 @@ > * Written-by: Siddarth Gore <gores@marvell.com> > */ > > -#include <common.h> > #include <init.h> > #include <netdev.h> > #include <asm/arch/cpu.h> > diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c > index ea87ded222e6..7c3cea22b936 100644 > --- a/board/Marvell/guruplug/guruplug.c > +++ b/board/Marvell/guruplug/guruplug.c > @@ -5,7 +5,6 @@ > * Written-by: Siddarth Gore <gores@marvell.com> > */ > > -#include <common.h> > #include <init.h> > #include <miiphy.h> > #include <net.h> > diff --git a/board/Marvell/mvebu_alleycat-5/board.c b/board/Marvell/mvebu_alleycat-5/board.c > index 0c4f8e03b859..c1b7cc3b613c 100644 > --- a/board/Marvell/mvebu_alleycat-5/board.c > +++ b/board/Marvell/mvebu_alleycat-5/board.c > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0+ > > -#include <common.h> > +#include <config.h> > #include <asm/global_data.h> > > DECLARE_GLOBAL_DATA_PTR; > diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c > index 1685b12b8478..df3fb6d21645 100644 > --- a/board/Marvell/mvebu_armada-37xx/board.c > +++ b/board/Marvell/mvebu_armada-37xx/board.c > @@ -3,7 +3,7 @@ > * Copyright (C) 2016 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > +#include <config.h> > #include <dm.h> > #include <dm/device-internal.h> > #include <env.h> > diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c > index a8899af6e5af..6d7042117424 100644 > --- a/board/Marvell/mvebu_armada-8k/board.c > +++ b/board/Marvell/mvebu_armada-8k/board.c > @@ -3,7 +3,7 @@ > * Copyright (C) 2016 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > +#include <config.h> > #include <dm.h> > #include <i2c.h> > #include <init.h> > diff --git a/board/Marvell/octeontx2/soc-utils.c b/board/Marvell/octeontx2/soc-utils.c > index 43a19a90717c..64eb95f3b400 100644 > --- a/board/Marvell/octeontx2/soc-utils.c > +++ b/board/Marvell/octeontx2/soc-utils.c > @@ -5,7 +5,6 @@ > * https://scanmail.trustwave.com/?c=20988&d=16yx5qQPZF7h9qYYT3eDGqXkvfa5TUXAUaB6y5oezA&u=https%3a%2f%2fspdx%2eorg%2flicenses > */ > > -#include <common.h> > #include <dm.h> > #include <malloc.h> > #include <errno.h> > diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c > index 581e2e084d6f..dda56a582b3e 100644 > --- a/board/Marvell/openrd/openrd.c > +++ b/board/Marvell/openrd/openrd.c > @@ -10,7 +10,6 @@ > * Written-by: Prafulla Wadaskar <prafulla@marvell.com> > */ > > -#include <common.h> > #include <init.h> > #include <miiphy.h> > #include <net.h> > diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c > index 26ee39ef77f9..23e761d5febf 100644 > --- a/board/Marvell/sheevaplug/sheevaplug.c > +++ b/board/Marvell/sheevaplug/sheevaplug.c > @@ -6,7 +6,6 @@ > * Written-by: Prafulla Wadaskar <prafulla@marvell.com> > */ > > -#include <common.h> > #include <init.h> > #include <netdev.h> > #include <asm/global_data.h>
On Tue, Apr 30, 2024 at 7:43 PM Tom Rini <trini@konsulko.com> wrote: > > Remove <common.h> from this board vendor directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > Cc: Stefan Roese <sr@denx.de> > Cc: Chris Packham <chris.packham@alliedtelesis.co.nz> > Cc: Tony Dinh <mibodhi@gmail.com> > Cc: Jason Cooper <u-boot@lakedaemon.net> > Cc: Siddarth Gore <gores@marvell.com> > Cc: Aaron Williams <awilliams@marvell.com> Reviewed-by: Tony Dinh <mibodhi@gmail.com> > --- > arch/arm/mach-kirkwood/include/mach/mpp.h | 2 ++ > board/Marvell/db-88f6720/db-88f6720.c | 1 - > board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 2 +- > board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 2 +- > board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c | 1 - > board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c | 1 - > board/Marvell/dreamplug/dreamplug.c | 1 - > board/Marvell/guruplug/guruplug.c | 1 - > board/Marvell/mvebu_alleycat-5/board.c | 2 +- > board/Marvell/mvebu_armada-37xx/board.c | 2 +- > board/Marvell/mvebu_armada-8k/board.c | 2 +- > board/Marvell/octeontx2/soc-utils.c | 1 - > board/Marvell/openrd/openrd.c | 1 - > board/Marvell/sheevaplug/sheevaplug.c | 1 - > 14 files changed, 7 insertions(+), 13 deletions(-) > > diff --git a/arch/arm/mach-kirkwood/include/mach/mpp.h b/arch/arm/mach-kirkwood/include/mach/mpp.h > index 4d1f58c0cbdf..e2757942590b 100644 > --- a/arch/arm/mach-kirkwood/include/mach/mpp.h > +++ b/arch/arm/mach-kirkwood/include/mach/mpp.h > @@ -8,6 +8,8 @@ > #ifndef __KIRKWOOD_MPP_H > #define __KIRKWOOD_MPP_H > > +#include <linux/types.h> > + > #define MPP(_num, _sel, _in, _out, _F6180, _F6190, _F6192, _F6281) ( \ > /* MPP number */ ((_num) & 0xff) | \ > /* MPP select value */ (((_sel) & 0xf) << 8) | \ > diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c > index 26c30647fbb0..920421366f11 100644 > --- a/board/Marvell/db-88f6720/db-88f6720.c > +++ b/board/Marvell/db-88f6720/db-88f6720.c > @@ -3,7 +3,6 @@ > * Copyright (C) 2016 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > #include <init.h> > #include <miiphy.h> > #include <net.h> > diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c > index 122c63d11f99..0f92cc385bc8 100644 > --- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c > +++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c > @@ -3,7 +3,7 @@ > * Copyright (C) 2015 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > +#include <config.h> > #include <i2c.h> > #include <init.h> > #include <miiphy.h> > diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c > index 1edc1cb6515c..8f8b2720107a 100644 > --- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c > +++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c > @@ -3,7 +3,7 @@ > * Copyright (C) 2015 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > +#include <config.h> > #include <i2c.h> > #include <init.h> > #include <miiphy.h> > diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c > index 9e1fdecfca4d..6bca1f91a0a4 100644 > --- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c > +++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c > @@ -3,7 +3,6 @@ > * Copyright (C) 2014 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > #include <init.h> > #include <miiphy.h> > #include <net.h> > diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c > index 0abdca1cd210..a7a84798a53b 100644 > --- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c > +++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c > @@ -3,7 +3,6 @@ > * Copyright (C) 2015 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > #include <i2c.h> > #include <init.h> > #include <asm/global_data.h> > diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c > index d15faa1cb7ff..381275061318 100644 > --- a/board/Marvell/dreamplug/dreamplug.c > +++ b/board/Marvell/dreamplug/dreamplug.c > @@ -8,7 +8,6 @@ > * Written-by: Siddarth Gore <gores@marvell.com> > */ > > -#include <common.h> > #include <init.h> > #include <netdev.h> > #include <asm/arch/cpu.h> > diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c > index ea87ded222e6..7c3cea22b936 100644 > --- a/board/Marvell/guruplug/guruplug.c > +++ b/board/Marvell/guruplug/guruplug.c > @@ -5,7 +5,6 @@ > * Written-by: Siddarth Gore <gores@marvell.com> > */ > > -#include <common.h> > #include <init.h> > #include <miiphy.h> > #include <net.h> > diff --git a/board/Marvell/mvebu_alleycat-5/board.c b/board/Marvell/mvebu_alleycat-5/board.c > index 0c4f8e03b859..c1b7cc3b613c 100644 > --- a/board/Marvell/mvebu_alleycat-5/board.c > +++ b/board/Marvell/mvebu_alleycat-5/board.c > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0+ > > -#include <common.h> > +#include <config.h> > #include <asm/global_data.h> > > DECLARE_GLOBAL_DATA_PTR; > diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c > index 1685b12b8478..df3fb6d21645 100644 > --- a/board/Marvell/mvebu_armada-37xx/board.c > +++ b/board/Marvell/mvebu_armada-37xx/board.c > @@ -3,7 +3,7 @@ > * Copyright (C) 2016 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > +#include <config.h> > #include <dm.h> > #include <dm/device-internal.h> > #include <env.h> > diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c > index a8899af6e5af..6d7042117424 100644 > --- a/board/Marvell/mvebu_armada-8k/board.c > +++ b/board/Marvell/mvebu_armada-8k/board.c > @@ -3,7 +3,7 @@ > * Copyright (C) 2016 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > +#include <config.h> > #include <dm.h> > #include <i2c.h> > #include <init.h> > diff --git a/board/Marvell/octeontx2/soc-utils.c b/board/Marvell/octeontx2/soc-utils.c > index 43a19a90717c..64eb95f3b400 100644 > --- a/board/Marvell/octeontx2/soc-utils.c > +++ b/board/Marvell/octeontx2/soc-utils.c > @@ -5,7 +5,6 @@ > * https://spdx.org/licenses > */ > > -#include <common.h> > #include <dm.h> > #include <malloc.h> > #include <errno.h> > diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c > index 581e2e084d6f..dda56a582b3e 100644 > --- a/board/Marvell/openrd/openrd.c > +++ b/board/Marvell/openrd/openrd.c > @@ -10,7 +10,6 @@ > * Written-by: Prafulla Wadaskar <prafulla@marvell.com> > */ > > -#include <common.h> > #include <init.h> > #include <miiphy.h> > #include <net.h> > diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c > index 26ee39ef77f9..23e761d5febf 100644 > --- a/board/Marvell/sheevaplug/sheevaplug.c > +++ b/board/Marvell/sheevaplug/sheevaplug.c > @@ -6,7 +6,6 @@ > * Written-by: Prafulla Wadaskar <prafulla@marvell.com> > */ > > -#include <common.h> > #include <init.h> > #include <netdev.h> > #include <asm/global_data.h> > -- > 2.34.1 >
On 5/1/24 04:40, Tom Rini wrote: > Remove <common.h> from this board vendor directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > Cc: Stefan Roese <sr@denx.de> > Cc: Chris Packham <chris.packham@alliedtelesis.co.nz> > Cc: Tony Dinh <mibodhi@gmail.com> > Cc: Jason Cooper <u-boot@lakedaemon.net> > Cc: Siddarth Gore <gores@marvell.com> > Cc: Aaron Williams <awilliams@marvell.com> > --- > arch/arm/mach-kirkwood/include/mach/mpp.h | 2 ++ > board/Marvell/db-88f6720/db-88f6720.c | 1 - > board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 2 +- > board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 2 +- > board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c | 1 - > board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c | 1 - > board/Marvell/dreamplug/dreamplug.c | 1 - > board/Marvell/guruplug/guruplug.c | 1 - > board/Marvell/mvebu_alleycat-5/board.c | 2 +- > board/Marvell/mvebu_armada-37xx/board.c | 2 +- > board/Marvell/mvebu_armada-8k/board.c | 2 +- > board/Marvell/octeontx2/soc-utils.c | 1 - > board/Marvell/openrd/openrd.c | 1 - > board/Marvell/sheevaplug/sheevaplug.c | 1 - > 14 files changed, 7 insertions(+), 13 deletions(-) Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > diff --git a/arch/arm/mach-kirkwood/include/mach/mpp.h b/arch/arm/mach-kirkwood/include/mach/mpp.h > index 4d1f58c0cbdf..e2757942590b 100644 > --- a/arch/arm/mach-kirkwood/include/mach/mpp.h > +++ b/arch/arm/mach-kirkwood/include/mach/mpp.h > @@ -8,6 +8,8 @@ > #ifndef __KIRKWOOD_MPP_H > #define __KIRKWOOD_MPP_H > > +#include <linux/types.h> > + > #define MPP(_num, _sel, _in, _out, _F6180, _F6190, _F6192, _F6281) ( \ > /* MPP number */ ((_num) & 0xff) | \ > /* MPP select value */ (((_sel) & 0xf) << 8) | \ > diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c > index 26c30647fbb0..920421366f11 100644 > --- a/board/Marvell/db-88f6720/db-88f6720.c > +++ b/board/Marvell/db-88f6720/db-88f6720.c > @@ -3,7 +3,6 @@ > * Copyright (C) 2016 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > #include <init.h> > #include <miiphy.h> > #include <net.h> > diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c > index 122c63d11f99..0f92cc385bc8 100644 > --- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c > +++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c > @@ -3,7 +3,7 @@ > * Copyright (C) 2015 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > +#include <config.h> > #include <i2c.h> > #include <init.h> > #include <miiphy.h> > diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c > index 1edc1cb6515c..8f8b2720107a 100644 > --- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c > +++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c > @@ -3,7 +3,7 @@ > * Copyright (C) 2015 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > +#include <config.h> > #include <i2c.h> > #include <init.h> > #include <miiphy.h> > diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c > index 9e1fdecfca4d..6bca1f91a0a4 100644 > --- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c > +++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c > @@ -3,7 +3,6 @@ > * Copyright (C) 2014 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > #include <init.h> > #include <miiphy.h> > #include <net.h> > diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c > index 0abdca1cd210..a7a84798a53b 100644 > --- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c > +++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c > @@ -3,7 +3,6 @@ > * Copyright (C) 2015 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > #include <i2c.h> > #include <init.h> > #include <asm/global_data.h> > diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c > index d15faa1cb7ff..381275061318 100644 > --- a/board/Marvell/dreamplug/dreamplug.c > +++ b/board/Marvell/dreamplug/dreamplug.c > @@ -8,7 +8,6 @@ > * Written-by: Siddarth Gore <gores@marvell.com> > */ > > -#include <common.h> > #include <init.h> > #include <netdev.h> > #include <asm/arch/cpu.h> > diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c > index ea87ded222e6..7c3cea22b936 100644 > --- a/board/Marvell/guruplug/guruplug.c > +++ b/board/Marvell/guruplug/guruplug.c > @@ -5,7 +5,6 @@ > * Written-by: Siddarth Gore <gores@marvell.com> > */ > > -#include <common.h> > #include <init.h> > #include <miiphy.h> > #include <net.h> > diff --git a/board/Marvell/mvebu_alleycat-5/board.c b/board/Marvell/mvebu_alleycat-5/board.c > index 0c4f8e03b859..c1b7cc3b613c 100644 > --- a/board/Marvell/mvebu_alleycat-5/board.c > +++ b/board/Marvell/mvebu_alleycat-5/board.c > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0+ > > -#include <common.h> > +#include <config.h> > #include <asm/global_data.h> > > DECLARE_GLOBAL_DATA_PTR; > diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c > index 1685b12b8478..df3fb6d21645 100644 > --- a/board/Marvell/mvebu_armada-37xx/board.c > +++ b/board/Marvell/mvebu_armada-37xx/board.c > @@ -3,7 +3,7 @@ > * Copyright (C) 2016 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > +#include <config.h> > #include <dm.h> > #include <dm/device-internal.h> > #include <env.h> > diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c > index a8899af6e5af..6d7042117424 100644 > --- a/board/Marvell/mvebu_armada-8k/board.c > +++ b/board/Marvell/mvebu_armada-8k/board.c > @@ -3,7 +3,7 @@ > * Copyright (C) 2016 Stefan Roese <sr@denx.de> > */ > > -#include <common.h> > +#include <config.h> > #include <dm.h> > #include <i2c.h> > #include <init.h> > diff --git a/board/Marvell/octeontx2/soc-utils.c b/board/Marvell/octeontx2/soc-utils.c > index 43a19a90717c..64eb95f3b400 100644 > --- a/board/Marvell/octeontx2/soc-utils.c > +++ b/board/Marvell/octeontx2/soc-utils.c > @@ -5,7 +5,6 @@ > * https://spdx.org/licenses > */ > > -#include <common.h> > #include <dm.h> > #include <malloc.h> > #include <errno.h> > diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c > index 581e2e084d6f..dda56a582b3e 100644 > --- a/board/Marvell/openrd/openrd.c > +++ b/board/Marvell/openrd/openrd.c > @@ -10,7 +10,6 @@ > * Written-by: Prafulla Wadaskar <prafulla@marvell.com> > */ > > -#include <common.h> > #include <init.h> > #include <miiphy.h> > #include <net.h> > diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c > index 26ee39ef77f9..23e761d5febf 100644 > --- a/board/Marvell/sheevaplug/sheevaplug.c > +++ b/board/Marvell/sheevaplug/sheevaplug.c > @@ -6,7 +6,6 @@ > * Written-by: Prafulla Wadaskar <prafulla@marvell.com> > */ > > -#include <common.h> > #include <init.h> > #include <netdev.h> > #include <asm/global_data.h> Viele Grüße, Stefan Roese
diff --git a/arch/arm/mach-kirkwood/include/mach/mpp.h b/arch/arm/mach-kirkwood/include/mach/mpp.h index 4d1f58c0cbdf..e2757942590b 100644 --- a/arch/arm/mach-kirkwood/include/mach/mpp.h +++ b/arch/arm/mach-kirkwood/include/mach/mpp.h @@ -8,6 +8,8 @@ #ifndef __KIRKWOOD_MPP_H #define __KIRKWOOD_MPP_H +#include <linux/types.h> + #define MPP(_num, _sel, _in, _out, _F6180, _F6190, _F6192, _F6281) ( \ /* MPP number */ ((_num) & 0xff) | \ /* MPP select value */ (((_sel) & 0xf) << 8) | \ diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c index 26c30647fbb0..920421366f11 100644 --- a/board/Marvell/db-88f6720/db-88f6720.c +++ b/board/Marvell/db-88f6720/db-88f6720.c @@ -3,7 +3,6 @@ * Copyright (C) 2016 Stefan Roese <sr@denx.de> */ -#include <common.h> #include <init.h> #include <miiphy.h> #include <net.h> diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c index 122c63d11f99..0f92cc385bc8 100644 --- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c +++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Stefan Roese <sr@denx.de> */ -#include <common.h> +#include <config.h> #include <i2c.h> #include <init.h> #include <miiphy.h> diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c index 1edc1cb6515c..8f8b2720107a 100644 --- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c +++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Stefan Roese <sr@denx.de> */ -#include <common.h> +#include <config.h> #include <i2c.h> #include <init.h> #include <miiphy.h> diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c index 9e1fdecfca4d..6bca1f91a0a4 100644 --- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c +++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c @@ -3,7 +3,6 @@ * Copyright (C) 2014 Stefan Roese <sr@denx.de> */ -#include <common.h> #include <init.h> #include <miiphy.h> #include <net.h> diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c index 0abdca1cd210..a7a84798a53b 100644 --- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c +++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Stefan Roese <sr@denx.de> */ -#include <common.h> #include <i2c.h> #include <init.h> #include <asm/global_data.h> diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c index d15faa1cb7ff..381275061318 100644 --- a/board/Marvell/dreamplug/dreamplug.c +++ b/board/Marvell/dreamplug/dreamplug.c @@ -8,7 +8,6 @@ * Written-by: Siddarth Gore <gores@marvell.com> */ -#include <common.h> #include <init.h> #include <netdev.h> #include <asm/arch/cpu.h> diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c index ea87ded222e6..7c3cea22b936 100644 --- a/board/Marvell/guruplug/guruplug.c +++ b/board/Marvell/guruplug/guruplug.c @@ -5,7 +5,6 @@ * Written-by: Siddarth Gore <gores@marvell.com> */ -#include <common.h> #include <init.h> #include <miiphy.h> #include <net.h> diff --git a/board/Marvell/mvebu_alleycat-5/board.c b/board/Marvell/mvebu_alleycat-5/board.c index 0c4f8e03b859..c1b7cc3b613c 100644 --- a/board/Marvell/mvebu_alleycat-5/board.c +++ b/board/Marvell/mvebu_alleycat-5/board.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ -#include <common.h> +#include <config.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c index 1685b12b8478..df3fb6d21645 100644 --- a/board/Marvell/mvebu_armada-37xx/board.c +++ b/board/Marvell/mvebu_armada-37xx/board.c @@ -3,7 +3,7 @@ * Copyright (C) 2016 Stefan Roese <sr@denx.de> */ -#include <common.h> +#include <config.h> #include <dm.h> #include <dm/device-internal.h> #include <env.h> diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c index a8899af6e5af..6d7042117424 100644 --- a/board/Marvell/mvebu_armada-8k/board.c +++ b/board/Marvell/mvebu_armada-8k/board.c @@ -3,7 +3,7 @@ * Copyright (C) 2016 Stefan Roese <sr@denx.de> */ -#include <common.h> +#include <config.h> #include <dm.h> #include <i2c.h> #include <init.h> diff --git a/board/Marvell/octeontx2/soc-utils.c b/board/Marvell/octeontx2/soc-utils.c index 43a19a90717c..64eb95f3b400 100644 --- a/board/Marvell/octeontx2/soc-utils.c +++ b/board/Marvell/octeontx2/soc-utils.c @@ -5,7 +5,6 @@ * https://spdx.org/licenses */ -#include <common.h> #include <dm.h> #include <malloc.h> #include <errno.h> diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c index 581e2e084d6f..dda56a582b3e 100644 --- a/board/Marvell/openrd/openrd.c +++ b/board/Marvell/openrd/openrd.c @@ -10,7 +10,6 @@ * Written-by: Prafulla Wadaskar <prafulla@marvell.com> */ -#include <common.h> #include <init.h> #include <miiphy.h> #include <net.h> diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c index 26ee39ef77f9..23e761d5febf 100644 --- a/board/Marvell/sheevaplug/sheevaplug.c +++ b/board/Marvell/sheevaplug/sheevaplug.c @@ -6,7 +6,6 @@ * Written-by: Prafulla Wadaskar <prafulla@marvell.com> */ -#include <common.h> #include <init.h> #include <netdev.h> #include <asm/global_data.h>
Remove <common.h> from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini <trini@konsulko.com> --- Cc: Stefan Roese <sr@denx.de> Cc: Chris Packham <chris.packham@alliedtelesis.co.nz> Cc: Tony Dinh <mibodhi@gmail.com> Cc: Jason Cooper <u-boot@lakedaemon.net> Cc: Siddarth Gore <gores@marvell.com> Cc: Aaron Williams <awilliams@marvell.com> --- arch/arm/mach-kirkwood/include/mach/mpp.h | 2 ++ board/Marvell/db-88f6720/db-88f6720.c | 1 - board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 2 +- board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 2 +- board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c | 1 - board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c | 1 - board/Marvell/dreamplug/dreamplug.c | 1 - board/Marvell/guruplug/guruplug.c | 1 - board/Marvell/mvebu_alleycat-5/board.c | 2 +- board/Marvell/mvebu_armada-37xx/board.c | 2 +- board/Marvell/mvebu_armada-8k/board.c | 2 +- board/Marvell/octeontx2/soc-utils.c | 1 - board/Marvell/openrd/openrd.c | 1 - board/Marvell/sheevaplug/sheevaplug.c | 1 - 14 files changed, 7 insertions(+), 13 deletions(-)