Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""

When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.

This reverts commit c8ffd1356d, reversing
changes made to 2ee6f3a5f7.

Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>

MAINTAINERS

@@ -598,22 +598,6 @@ R:	Marc Murphy <marc.murphy@sancloud.com>
 S:	Supported
 F:	arch/arm/dts/am335x-sancloud*
 
-ARM SC5XX
-M:	Nathan Barrett-Morrison <nathan.morrison@timesys.com>
-M:	Greg Malysa <greg.malysa@timesys.com>
-M:	Ian Roberts <ian.roberts@timesys.com>
-M:	Vasileios Bimpikas <vasileios.bimpikas@analog.com>
-M:	Utsav Agarwal <utsav.agarwal@analog.com>
-M:	Arturs Artamonovs <arturs.artamonovs@analog.com>
-S:	Supported
-T:	git https://github.com/analogdevicesinc/lnxdsp-u-boot
-F:	arch/arm/include/asm/arch-adi/
-F:	arch/arm/mach-sc5xx/
-F:	drivers/clk/adi/
-F:	drivers/serial/serial_adi_uart4.c
-F:	drivers/timer/adi_sc5xx_timer.c
-F:	include/env/adi/
-
 ARM SNAPDRAGON
 M:	Caleb Connolly <caleb.connolly@linaro.org>
 M:	Neil Armstrong <neil.armstrong@linaro.org>

api/api.c

@@ -7,13 +7,11 @@
 
 #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>

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 */
 

api/api_net.c

@@ -6,6 +6,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <net.h>
 #include <linux/types.h>
 #include <api_public.h>

api/api_platform-arm.c

@@ -12,6 +12,7 @@
 #include <linux/types.h>
 #include <api_public.h>
 
+#include <asm/u-boot.h>
 #include <asm/global_data.h>
 
 #include "api_private.h"

api/api_platform-mips.c

@@ -9,6 +9,7 @@
 #include <linux/types.h>
 #include <api_public.h>
 
+#include <asm/u-boot.h>
 #include <asm/global_data.h>
 
 #include "api_private.h"

api/api_platform-powerpc.c

@@ -12,6 +12,7 @@
 #include <linux/types.h>
 #include <api_public.h>
 
+#include <asm/u-boot.h>
 #include <asm/global_data.h>
 
 #include "api_private.h"

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>

arch/arc/include/asm/global_data.h

@@ -6,8 +6,6 @@
 #ifndef	__ASM_ARC_GLOBAL_DATA_H
 #define __ASM_ARC_GLOBAL_DATA_H
 
-#include <asm/u-boot.h>
-
 #ifndef __ASSEMBLY__
 /* Architecture-specific global data */
 struct arch_global_data {

arch/arm/Kconfig

@@ -1853,9 +1853,6 @@ config TARGET_LS1046AFRWY
 	  development platform that supports the QorIQ LS1046A
 	  Layerscape Architecture processor.
 
-config ARCH_SC5XX
-	bool "Analog Devices SC5XX-processor family"
-
 config TARGET_SL28
 	bool "Support sl28"
 	select ARCH_LS1028A
@@ -2289,8 +2286,6 @@ source "arch/arm/mach-rockchip/Kconfig"
 
 source "arch/arm/mach-s5pc1xx/Kconfig"
 
-source "arch/arm/mach-sc5xx/Kconfig"
-
 source "arch/arm/mach-snapdragon/Kconfig"
 
 source "arch/arm/mach-socfpga/Kconfig"

arch/arm/Makefile

@@ -78,7 +78,6 @@ machine-$(CONFIG_ARCH_OWL)		+= owl
 machine-$(CONFIG_ARCH_RENESAS)		+= renesas
 machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
 machine-$(CONFIG_ARCH_S5PC1XX)		+= s5pc1xx
-machine-$(CONFIG_ARCH_SC5XX)		+= sc5xx
 machine-$(CONFIG_ARCH_SNAPDRAGON)	+= snapdragon
 machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga
 machine-$(CONFIG_ARCH_STM32)		+= stm32

arch/arm/cpu/arm11/cpu.c

@@ -14,6 +14,7 @@
  * CPU specific code
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>

arch/arm/cpu/arm1136/mx31/devices.c

@@ -6,6 +6,7 @@
  * (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
  */
 
+#include <common.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 

arch/arm/cpu/arm1136/mx31/generic.c

@@ -4,6 +4,7 @@
  * Sascha Hauer, Pengutronix
  */
 
+#include <common.h>
 #include <div64.h>
 #include <init.h>
 #include <asm/arch/imx-regs.h>

arch/arm/cpu/arm1136/mx31/timer.c

@@ -4,6 +4,7 @@
  * Sascha Hauer, Pengutronix
  */
 
+#include <common.h>
 #include <init.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>

arch/arm/cpu/arm720t/interrupts.c

@@ -9,7 +9,7 @@
  * Alex Zuepke <azu@sysgo.de>
  */
 
-#include <linux/types.h>
+#include <common.h>
 
 #if defined(CONFIG_ARCH_TEGRA)
 static ulong timestamp;

arch/arm/cpu/arm920t/cpu.c

@@ -12,6 +12,7 @@
  * CPU specific code
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>

arch/arm/cpu/arm920t/start.S

@@ -8,6 +8,7 @@
  */
 
 #include <asm-offsets.h>
+#include <common.h>
 #include <config.h>
 
 /*

arch/arm/cpu/arm926ejs/cache.c

@@ -6,6 +6,7 @@
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/types.h>
+#include <common.h>
 
 #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 void invalidate_dcache_all(void)

arch/arm/cpu/arm926ejs/cpu.c

@@ -12,6 +12,7 @@
  * CPU specific code
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>

arch/arm/cpu/arm926ejs/mxs/clock.c

@@ -9,6 +9,7 @@
  * Copyright (C) 2010 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <log.h>
 #include <linux/errno.h>
 #include <asm/io.h>

arch/arm/cpu/arm926ejs/mxs/iomux.c

@@ -6,6 +6,7 @@
  *                       <armlinux@phytec.de>
  */
 
+#include <common.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>

arch/arm/cpu/arm926ejs/mxs/mxs.c

@@ -9,6 +9,7 @@
  * Copyright (C) 2010 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <hang.h>

arch/arm/cpu/arm926ejs/mxs/spl_boot.c

@@ -6,6 +6,7 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
+#include <common.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>

arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c

@@ -6,6 +6,7 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
+#include <common.h>
 #include <config.h>
 #include <log.h>
 #include <asm/io.h>

arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c

@@ -6,6 +6,7 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
+#include <common.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>

arch/arm/cpu/arm926ejs/mxs/spl_power_init.c

@@ -6,6 +6,7 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
+#include <common.h>
 #include <config.h>
 #include <hang.h>
 #include <log.h>

arch/arm/cpu/arm926ejs/mxs/start.S

@@ -20,6 +20,7 @@
 
 #include <asm-offsets.h>
 #include <config.h>
+#include <common.h>
 #include <system-constants.h>
 
 /*

arch/arm/cpu/arm926ejs/mxs/timer.c

@@ -9,6 +9,7 @@
  * (C) Copyright 2009-2010 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>

arch/arm/cpu/arm926ejs/start.S

@@ -16,6 +16,7 @@
 
 #include <asm-offsets.h>
 #include <config.h>
+#include <common.h>
 #include <linux/linkage.h>
 
 /*

arch/arm/cpu/arm946es/cpu.c

@@ -12,6 +12,7 @@
  * CPU specific code
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>

arch/arm/cpu/armv7/arch_timer.c

@@ -4,7 +4,7 @@
  *     Texas Instruments Incorporated, <www.ti.com>
  */
 
-#include <config.h>
+#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>

arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c

@@ -9,6 +9,7 @@
  *
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>

arch/arm/cpu/armv7/bcm235xx/clk-bsc.c

@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>

arch/arm/cpu/armv7/bcm235xx/clk-core.c

@@ -9,6 +9,7 @@
  *
  */
 
+#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <linux/delay.h>

arch/arm/cpu/armv7/bcm235xx/clk-eth.c

@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>

arch/arm/cpu/armv7/bcm235xx/clk-sdio.c

@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>

arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c

@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"

arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c

@@ -9,6 +9,7 @@
  *
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>

arch/arm/cpu/armv7/bcm281xx/clk-bsc.c

@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>

arch/arm/cpu/armv7/bcm281xx/clk-core.c

@@ -9,6 +9,7 @@
  *
  */
 
+#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <linux/delay.h>

arch/arm/cpu/armv7/bcm281xx/clk-eth.c

@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>

arch/arm/cpu/armv7/bcm281xx/clk-sdio.c

@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>

arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c

@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"

arch/arm/cpu/armv7/bcm281xx/reset.c

@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/sysmap.h>

arch/arm/cpu/armv7/bcmcygnus/reset.c

@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 

arch/arm/cpu/armv7/bcmnsp/reset.c

@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 

arch/arm/cpu/armv7/cache_v7.c

@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/types.h>
+#include <common.h>
 #include <asm/armv7.h>
 #include <asm/utils.h>
 

arch/arm/cpu/armv7/cp15.c

@@ -7,6 +7,7 @@
  * CP15 specific code
  */
 
+#include <common.h>
 #include <command.h>
 #include <asm/system.h>
 #include <asm/cache.h>

arch/arm/cpu/armv7/cpu.c

@@ -14,6 +14,7 @@
  * CPU specific code
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>

arch/arm/cpu/armv7/exception_level.c

@@ -8,6 +8,7 @@
  * secure mode before booting an operating system.
  */
 
+#include <common.h>
 #include <bootm.h>
 #include <cpu_func.h>
 #include <log.h>

arch/arm/cpu/armv7/iproc-common/armpll.c

@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <asm/iproc-common/armpll.h>
 #include <asm/iproc-common/sysmap.h>

arch/arm/cpu/armv7/iproc-common/hwinit-common.c

@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 

arch/arm/cpu/armv7/iproc-common/timer.c

@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <div64.h>
 #include <init.h>
 #include <time.h>

arch/arm/cpu/armv7/ls102xa/clock.c

@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <config.h>
+#include <common.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/io.h>

arch/arm/cpu/armv7/ls102xa/cpu.c

@@ -4,6 +4,7 @@
  * Copyright 2021 NXP
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>

arch/arm/cpu/armv7/ls102xa/fdt.c

@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <config.h>
+#include <common.h>
 #include <clock_legacy.h>
 #include <net.h>
 #include <asm/global_data.h>

arch/arm/cpu/armv7/ls102xa/fsl_epu.c

@@ -3,6 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <asm/io.h>
 
 #include "fsl_epu.h"

arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c

@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <linux/errno.h>

arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c

@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <linux/kernel.h>
+#include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
 

arch/arm/cpu/armv7/ls102xa/soc.c

@@ -3,7 +3,7 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 
-#include <config.h>
+#include <common.h>
 #include <log.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>

arch/arm/cpu/armv7/ls102xa/spl.c

@@ -3,6 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <spl.h>
 
 u32 spl_boot_device(void)

arch/arm/cpu/armv7/ls102xa/timer.c

@@ -3,6 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>

arch/arm/cpu/armv7/mpu_v7r.c

@@ -6,6 +6,7 @@
  *	Lokesh Vutla <lokeshvutla@ti.com>
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <asm/armv7.h>

arch/arm/cpu/armv7/s5p-common/cpu_info.c

@@ -3,6 +3,7 @@
  * Copyright (C) 2009 Samsung Electronics
  * Minkyu Kang <mk7.kang@samsung.com>
  */
+#include <common.h>
 #include <display_options.h>
 #include <fdtdec.h>
 #include <init.h>

arch/arm/cpu/armv7/s5p-common/pwm.c

@@ -5,7 +5,7 @@
  * Donghwa Lee <dh09.lee@samsung.com>
  */
 
-#include <config.h>
+#include <common.h>
 #include <errno.h>
 #include <asm/io.h>
 #include <asm/arch/pwm.h>

arch/arm/cpu/armv7/s5p-common/sromc.c

@@ -4,7 +4,7 @@
  * Naveen Krishna Ch <ch.naveen@samsung.com>
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/sromc.h>
 

arch/arm/cpu/armv7/s5p-common/timer.c

@@ -6,6 +6,7 @@
  * Minkyu Kang <mk7.kang@samsung.com>
  */
 
+#include <common.h>
 #include <div64.h>
 #include <init.h>
 #include <time.h>

arch/arm/cpu/armv7/s5p4418/cpu.c

@@ -4,6 +4,7 @@
  * Hyunseok, Jung <hsjung@nexell.co.kr>
  */
 
+#include <common.h>
 #include <command.h>
 #include <asm/system.h>
 #include <asm/cache.h>

arch/arm/cpu/armv7/sunxi/psci.c

@@ -7,6 +7,7 @@
  * which was based on code by Carl van Schaik <carl@ok-labs.com>.
  */
 #include <config.h>
+#include <common.h>
 #include <asm/cache.h>
 
 #include <asm/arch/cpu.h>

arch/arm/cpu/armv7/sunxi/sram.c

@@ -9,6 +9,7 @@
  * SRAM init for older sunxi SoCs.
  */
 
+#include <common.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>

arch/arm/cpu/armv7/syslib.c

@@ -7,6 +7,7 @@
  * Syed Mohammed Khasim <khasim@ti.com>
  */
 
+#include <common.h>
 #include <asm/io.h>
 
 /************************************************************

arch/arm/cpu/armv7/vf610/generic.c

@@ -3,6 +3,7 @@
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <clock_legacy.h>
 #include <command.h>
 #include <cpu_func.h>

arch/arm/cpu/armv7/vf610/timer.c

@@ -3,6 +3,7 @@
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>

arch/arm/cpu/armv7/virt-dt.c

@@ -15,6 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <common.h>
 #include <errno.h>
 #include <log.h>
 #include <stdio_dev.h>

arch/arm/cpu/armv7/virt-v7.c

@@ -8,6 +8,7 @@
  * needed to enable ARMv7 virtualization for current hypervisors
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <asm/armv7.h>
 #include <asm/cache.h>

arch/arm/cpu/armv7m/cache.c

@@ -4,6 +4,7 @@
  * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <errno.h>
 #include <log.h>

arch/arm/cpu/armv7m/cpu.c

@@ -7,6 +7,7 @@
  * Kamil Lulko, <kamil.lulko@gmail.com>
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <asm/io.h>

arch/arm/cpu/armv7m/systick-timer.c

@@ -21,7 +21,7 @@
  * using CFG_SYS_HZ_CLOCK.
  */
 
-#include <config.h>
+#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>

arch/arm/cpu/armv8/cache_v8.c

@@ -7,6 +7,7 @@
  * Alexander Graf <agraf@suse.de>
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <log.h>

arch/arm/cpu/armv8/cpu-dt.c

@@ -3,6 +3,7 @@
  * Copyright 2016 NXP Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <asm/cache.h>
 #include <asm/psci.h>
 #include <asm/system.h>

arch/arm/cpu/armv8/cpu.c

@@ -10,6 +10,7 @@
  * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>

arch/arm/cpu/armv8/exception_level.c

@@ -8,6 +8,7 @@
  * level before booting an operating system.
  */
 
+#include <common.h>
 #include <bootm.h>
 #include <cpu_func.h>
 #include <log.h>

arch/arm/cpu/armv8/fsl-layerscape/cpu.c

@@ -4,7 +4,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <config.h>
+#include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <env.h>

arch/arm/cpu/armv8/fsl-layerscape/fdt.c

@@ -4,7 +4,7 @@
  * Copyright 2020-2021 NXP
  */
 
-#include <config.h>
+#include <common.h>
 #include <clock_legacy.h>
 #include <efi_loader.h>
 #include <log.h>

arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c

@@ -3,12 +3,11 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 
-#include <config.h>
+#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
-#include <linux/string.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 

arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c

@@ -4,7 +4,7 @@
  * Copyright 2019 NXP.
  */
 
-#include <config.h>
+#include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>

arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c

@@ -4,7 +4,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <config.h>
+#include <common.h>
 #include <env.h>
 #include <log.h>
 #include <asm/io.h>

arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c

@@ -6,7 +6,7 @@
  * Derived from arch/power/cpu/mpc85xx/speed.c
  */
 
-#include <config.h>
+#include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>

arch/arm/cpu/armv8/fsl-layerscape/icid.c

@@ -3,7 +3,7 @@
  * Copyright 2018 NXP
  */
 
-#include <config.h>
+#include <common.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 

arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c

@@ -3,7 +3,7 @@
  * Copyright 2016 Freescale Semiconductor, Inc.
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
 

arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c

@@ -3,9 +3,9 @@
  * Copyright 2019 NXP
  */
 
+#include <common.h>
 #include <fdt_support.h>
 #include <log.h>
-#include <asm/arch/stream_id_lsch3.h>
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>

arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c

@@ -3,8 +3,7 @@
  * Copyright 2019 NXP
  */
 
-#include <config.h>
+#include <common.h>
-#include <linux/kernel.h>
 #include <asm/arch/fsl_serdes.h>
 
 struct serdes_config {

arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c

@@ -3,12 +3,11 @@
  * Copyright 2018 NXP
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/arch-fsl-layerscape/immap_lsch2.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
 #include <fsl_sec.h>
-#include <asm/arch/stream_id_lsch3.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {

arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c

@@ -3,7 +3,7 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
 

arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c

@@ -3,11 +3,10 @@
  * Copyright 2018 NXP
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/arch-fsl-layerscape/immap_lsch2.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
-#include <asm/arch/stream_id_lsch3.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {

arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c

@@ -4,7 +4,7 @@
  * Copyright 2019 NXP
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
 

arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c

@@ -3,11 +3,10 @@
  * Copyright 2019 NXP
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
-#include <asm/arch/stream_id_lsch3.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),

arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c

@@ -3,7 +3,7 @@
  * Copyright 2017-2019 NXP
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <asm/io.h>

arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c

@@ -3,7 +3,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/arch/fsl_serdes.h>
 
 struct serdes_config {