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 /common/spl | |
parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
download | u-boot-WIP/20May2024-next.zip u-boot-WIP/20May2024-next.tar.gz u-boot-WIP/20May2024-next.tar.bz2 |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"WIP/20May2024-next
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 'common/spl')
-rw-r--r-- | common/spl/spl.c | 3 | ||||
-rw-r--r-- | common/spl/spl_atf.c | 1 | ||||
-rw-r--r-- | common/spl/spl_blk_fs.c | 1 | ||||
-rw-r--r-- | common/spl/spl_bootrom.c | 1 | ||||
-rw-r--r-- | common/spl/spl_dfu.c | 1 | ||||
-rw-r--r-- | common/spl/spl_ext.c | 2 | ||||
-rw-r--r-- | common/spl/spl_fat.c | 2 | ||||
-rw-r--r-- | common/spl/spl_fit.c | 1 | ||||
-rw-r--r-- | common/spl/spl_imx_container.c | 1 | ||||
-rw-r--r-- | common/spl/spl_legacy.c | 1 | ||||
-rw-r--r-- | common/spl/spl_mmc.c | 2 | ||||
-rw-r--r-- | common/spl/spl_nand.c | 1 | ||||
-rw-r--r-- | common/spl/spl_net.c | 1 | ||||
-rw-r--r-- | common/spl/spl_nor.c | 2 | ||||
-rw-r--r-- | common/spl/spl_nvme.c | 1 | ||||
-rw-r--r-- | common/spl/spl_onenand.c | 1 | ||||
-rw-r--r-- | common/spl/spl_opensbi.c | 1 | ||||
-rw-r--r-- | common/spl/spl_ram.c | 1 | ||||
-rw-r--r-- | common/spl/spl_sata.c | 2 | ||||
-rw-r--r-- | common/spl/spl_sdp.c | 1 | ||||
-rw-r--r-- | common/spl/spl_semihosting.c | 1 | ||||
-rw-r--r-- | common/spl/spl_spi.c | 2 | ||||
-rw-r--r-- | common/spl/spl_ubi.c | 1 | ||||
-rw-r--r-- | common/spl/spl_usb.c | 2 | ||||
-rw-r--r-- | common/spl/spl_xip.c | 2 | ||||
-rw-r--r-- | common/spl/spl_ymodem.c | 2 |
26 files changed, 4 insertions, 33 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index e06bc75..9a879e9 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -6,7 +6,7 @@ * Aneesh V <aneesh@ti.com> */ -#include <common.h> +#include <config.h> #include <bloblist.h> #include <binman_sym.h> #include <bootstage.h> @@ -23,7 +23,6 @@ #include <system-constants.h> #include <asm/global_data.h> #include <asm-generic/gpio.h> -#include <asm/u-boot.h> #include <nand.h> #include <fat.h> #include <u-boot/crc.h> diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 3bdd013..0b1c981 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -9,7 +9,6 @@ * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH */ -#include <common.h> #include <atf_common.h> #include <cpu_func.h> #include <errno.h> diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c index 04eac6f..bc551c5 100644 --- a/common/spl/spl_blk_fs.c +++ b/common/spl/spl_blk_fs.c @@ -5,7 +5,6 @@ * */ -#include <common.h> #include <spl.h> #include <spl_load.h> #include <image.h> diff --git a/common/spl/spl_bootrom.c b/common/spl/spl_bootrom.c index 0eefd39..e172a2d 100644 --- a/common/spl/spl_bootrom.c +++ b/common/spl/spl_bootrom.c @@ -3,7 +3,6 @@ * Copyright (C) 2017 Theobroma Systems Design und Consulting GmH */ -#include <common.h> #include <spl.h> __weak int board_return_to_bootrom(struct spl_image_info *spl_image, diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c index 8a779da..e9f381c 100644 --- a/common/spl/spl_dfu.c +++ b/common/spl/spl_dfu.c @@ -5,7 +5,6 @@ * * Ravi B <ravibabu@ti.com> */ -#include <common.h> #include <env.h> #include <spl.h> #include <linux/compiler.h> diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index 2be6f04..76f49a5 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -1,11 +1,9 @@ // SPDX-License-Identifier: GPL-2.0+ -#include <common.h> #include <env.h> #include <part.h> #include <spl.h> #include <spl_load.h> -#include <asm/u-boot.h> #include <ext4fs.h> #include <errno.h> #include <image.h> diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index a52f9e1..bd8aab2 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -8,12 +8,10 @@ * FAT Image Functions copied from spl_mmc.c */ -#include <common.h> #include <env.h> #include <log.h> #include <spl.h> #include <spl_load.h> -#include <asm/u-boot.h> #include <fat.h> #include <errno.h> #include <image.h> diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index e5195d4..988125b 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -4,7 +4,6 @@ * Written by Simon Glass <sjg@chromium.org> */ -#include <common.h> #include <errno.h> #include <fpga.h> #include <gzip.h> diff --git a/common/spl/spl_imx_container.c b/common/spl/spl_imx_container.c index b4ea924..2c31777 100644 --- a/common/spl/spl_imx_container.c +++ b/common/spl/spl_imx_container.c @@ -4,7 +4,6 @@ */ #define LOG_CATEGORY LOGC_ARCH -#include <common.h> #include <stdlib.h> #include <errno.h> #include <imx_container.h> diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c index 08687ca..a778934 100644 --- a/common/spl/spl_legacy.c +++ b/common/spl/spl_legacy.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Stefan Roese <sr@denx.de> */ -#include <common.h> #include <image.h> #include <log.h> #include <malloc.h> diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 3d032bb..ccab0be 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -5,7 +5,6 @@ * * Aneesh V <aneesh@ti.com> */ -#include <common.h> #include <dm.h> #include <log.h> #include <part.h> @@ -13,7 +12,6 @@ #include <spl_load.h> #include <linux/compiler.h> #include <errno.h> -#include <asm/u-boot.h> #include <errno.h> #include <mmc.h> #include <image.h> diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 3b0a152..5631fa6 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -3,7 +3,6 @@ * Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de> */ -#include <common.h> #include <config.h> #include <fdt_support.h> #include <image.h> diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index 898f9df..be7278b 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -6,7 +6,6 @@ * (C) Copyright 2012 * Ilya Yanok <ilya.yanok@gmail.com> */ -#include <common.h> #include <env.h> #include <errno.h> #include <image.h> diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index 7074511..ed76b5e 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 Stefan Roese <sr@denx.de> */ -#include <common.h> +#include <config.h> #include <image.h> #include <imx_container.h> #include <log.h> diff --git a/common/spl/spl_nvme.c b/common/spl/spl_nvme.c index c8774d6..0e15a3c 100644 --- a/common/spl/spl_nvme.c +++ b/common/spl/spl_nvme.c @@ -5,7 +5,6 @@ * */ -#include <common.h> #include <spl.h> #include <nvme.h> diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c index 53a8c6d..f6f6528 100644 --- a/common/spl/spl_onenand.c +++ b/common/spl/spl_onenand.c @@ -7,7 +7,6 @@ * Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de> */ -#include <common.h> #include <config.h> #include <image.h> #include <log.h> diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c index ec62aab..5a26d7c 100644 --- a/common/spl/spl_opensbi.c +++ b/common/spl/spl_opensbi.c @@ -5,7 +5,6 @@ * * Based on common/spl/spl_atf.c */ -#include <common.h> #include <cpu_func.h> #include <errno.h> #include <hang.h> diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index 8aeda23..5a23841 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -9,7 +9,6 @@ * Michal Simek <michal.simek@amd.com> * Stefan Agner <stefan.agner@toradex.com> */ -#include <common.h> #include <binman_sym.h> #include <image.h> #include <log.h> diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 32746ce..67fc620 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -8,9 +8,7 @@ * Derived work from spl_usb.c */ -#include <common.h> #include <spl.h> -#include <asm/u-boot.h> #include <sata.h> #include <scsi.h> #include <errno.h> diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c index 9143c27..9ca80bd 100644 --- a/common/spl/spl_sdp.c +++ b/common/spl/spl_sdp.c @@ -4,7 +4,6 @@ * Author: Stefan Agner <stefan.agner@toradex.com> */ -#include <common.h> #include <log.h> #include <spl.h> #include <usb.h> diff --git a/common/spl/spl_semihosting.c b/common/spl/spl_semihosting.c index 941fa91..2047248 100644 --- a/common/spl/spl_semihosting.c +++ b/common/spl/spl_semihosting.c @@ -3,7 +3,6 @@ * Copyright (C) 2022 Sean Anderson <sean.anderson@seco.com> */ -#include <common.h> #include <image.h> #include <log.h> #include <semihosting.h> diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 89de73c..8ab4803 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -8,7 +8,7 @@ * Heiko Schocher, DENX Software Engineering, hs@denx.de. */ -#include <common.h> +#include <config.h> #include <image.h> #include <imx_container.h> #include <log.h> diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c index d7ab9ef..a8d3f43 100644 --- a/common/spl/spl_ubi.c +++ b/common/spl/spl_ubi.c @@ -4,7 +4,6 @@ * Ladislav Michl <ladis@linux-mips.org> */ -#include <common.h> #include <config.h> #include <image.h> #include <nand.h> diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index 479e2dc..932da56 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -8,10 +8,8 @@ * Derived work from spl_mmc.c */ -#include <common.h> #include <log.h> #include <spl.h> -#include <asm/u-boot.h> #include <errno.h> #include <usb.h> #include <fat.h> diff --git a/common/spl/spl_xip.c b/common/spl/spl_xip.c index 959915f..1465c3e 100644 --- a/common/spl/spl_xip.c +++ b/common/spl/spl_xip.c @@ -4,7 +4,7 @@ * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. */ -#include <common.h> +#include <config.h> #include <image.h> #include <log.h> #include <spl.h> diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c index 1faaa2c..4c7222a 100644 --- a/common/spl/spl_ymodem.c +++ b/common/spl/spl_ymodem.c @@ -8,13 +8,11 @@ * * Matt Porter <mporter@ti.com> */ -#include <common.h> #include <gzip.h> #include <image.h> #include <log.h> #include <spl.h> #include <xyzModem.h> -#include <asm/u-boot.h> #include <linux/libfdt.h> #define BUF_SIZE 1024 |