In one case (mcffec.c), had to replace common.h include with config.h, to avoid CFG_SYS_CACHE_ACR0 redefine-order conflict.

Signed-off-by: Angelo Dureghello angelo@kernel-space.org --- drivers/net/mcffec.c | 2 +- drivers/net/mcfmii.c | 1 - drivers/rtc/mcfrtc.c | 2 -- drivers/serial/serial_mcf.c | 1 - drivers/watchdog/mcf_wdt.c | 1 - 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index ec1fae9688..4e0a9a8b7c 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -10,8 +10,8 @@ * (C) 2019 Angelo Dureghello angelo.dureghello@timesys.com */

-#include <common.h> #include <env.h> +#include <config.h> #include <hang.h> #include <malloc.h> #include <command.h> diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c index eae2065451..9bf887035d 100644 --- a/drivers/net/mcfmii.c +++ b/drivers/net/mcfmii.c @@ -4,7 +4,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */

-#include <common.h> #include <config.h> #include <net.h> #include <netdev.h> diff --git a/drivers/rtc/mcfrtc.c b/drivers/rtc/mcfrtc.c index d2ac889c30..9708971c5c 100644 --- a/drivers/rtc/mcfrtc.c +++ b/drivers/rtc/mcfrtc.c @@ -4,8 +4,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */

-#include <common.h> - #include <command.h> #include <rtc.h> #include <asm/immap.h> diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c index bb2afd0d8c..76143575fa 100644 --- a/drivers/serial/serial_mcf.c +++ b/drivers/serial/serial_mcf.c @@ -15,7 +15,6 @@ * as serial console interface. */

-#include <common.h> #include <dm.h> #include <asm/global_data.h> #include <dm/platform_data/serial_coldfire.h> diff --git a/drivers/watchdog/mcf_wdt.c b/drivers/watchdog/mcf_wdt.c index b36488bb5b..b555bbeb68 100644 --- a/drivers/watchdog/mcf_wdt.c +++ b/drivers/watchdog/mcf_wdt.c @@ -6,7 +6,6 @@ * */

-#include <common.h> #include <dm.h> #include <hang.h> #include <asm/io.h>