Re: [PATCH 2/4] board: add support for Milk-V Mars CM
On 30.04.24 00:46, E Shattow wrote:
On Sun, Apr 28, 2024 at 9:13 AM Emil Renner Berthing
wrote:
Heinrich Schuchardt wrote:
We already support the VisionFive 2 and the Milk-V Mars board by
patching the VisionFive 2 device tree. With this patch the same
is done for the Milk-V Mars CM.
Hi Heinrich.
Thanks for the patch. As far as I can tell the Milk-V documentation[1] is
pretty consistent in calling the version without eMMC "Milk-V Mars CM Lite"
and the version with eMMC just "Milk-V Mars CM". So I'd prefer the model,
compatible and filenames suggested below.
[1]: https://milkv.io/docs/mars/compute-module/introduction#design-philosophy
Are there any actual differences that need representation in the dtb
file for downstream OS different from Milk-V Mars to Milk-V Mars CM
(or CM Lite)?
I did find this vendor repo commit "kernel: dts reconfig sdio0 for
SDCard version"
https://github.com/milkv-mars/mars-buildroot-sdk/commit/042ea06598995db99dd252ee439c42b9c1a9
but it does not seem necessary in mainline Linux, SD Card is working
without changes.
It was necessary for U-Boot and the Mars CM Lite with SD Card to apply
s/GPIO62/GPIO22/ as in the vendor commit "u-boot: configure sdio0 as
mars-cm sdcard version"
https://github.com/milkv-mars/mars-buildroot-sdk/commit/880a249518f72ecf1e2947dfeb2c66e5035fce90
This is what is patched in fdt_fixup_marc().
Then also there is some mention about PMIC and renamed i2c reference,
already obsolete. That's all, is there more to it? Possibly a dtb for
Mars is enough to also be used on Mars CM and Mars Lite?
Looking at the schematics the biggest difference between the Mars and
the Mars CM (Lite) is on the USB side. The Mars board has USB 3.0 via a
PCIe lane and a VIA VL805/806 while the Mars CM has USB directly via the
SoC.
To add USB support for the Mars CM we will need an adapted device-tree.
Best regards
Heinrich
Signed-off-by: Heinrich Schuchardt
---
board/starfive/visionfive2/spl.c | 27 ++-
.../visionfive2/starfive_visionfive2.c| 11 +++-
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c
index 45848db6d8b..bb0f28d7aad 100644
--- a/board/starfive/visionfive2/spl.c
+++ b/board/starfive/visionfive2/spl.c
@@ -129,6 +129,29 @@ void spl_fdt_fixup_mars(void *fdt)
}
}
+void spl_fdt_fixup_marc(void *fdt)
+{
+ const char *compat;
+ const char *model;
+
+ spl_fdt_fixup_mars(fdt);
+
+ if (!get_mmc_size_from_eeprom()) {
+ int offset;
+
+ model = "Milk-V Mars CM SDCard";
"Milk-V Mars CM Lite"
+ compat = "milkv,mars-cm-sdcard\0starfive,jh7110";
"milkv,mars-cm-lite\0starfive,jh7110"
+
+ offset = fdt_path_offset(fdt,
"/soc/pinctrl/mmc0-pins/mmc0-pins-rest");
+ fdt_setprop_u32(fdt, offset, "pinmux", 0xff130016);
+ } else {
+ model = "Milk-V Mars CM eMMC";
"Milk-V Mars CM"
+ compat = "milkv,mars-cm-emmc\0starfive,jh7110";
"milkv,mars-cm\0starfive,jh7110"
+ }
+ fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat,
sizeof(compat));
+ fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", model);
+}
+
void spl_fdt_fixup_version_a(void *fdt)
{
static const char compat[] =
"starfive,visionfive-2-v1.2a\0starfive,jh7110";
@@ -236,7 +259,9 @@ void spl_perform_fixups(struct spl_image_info *spl_image)
pr_err("Can't read EEPROM\n");
return;
}
- if (!strncmp(product_id, "MARS", 4)) {
+ if (!strncmp(product_id, "MARC", 4)) {
+ spl_fdt_fixup_marc(spl_image->fdt_addr);
+ } else if (!strncmp(product_id, "MARS", 4)) {
spl_fdt_fixup_mars(spl_image->fdt_addr);
} else if (!strncmp(product_id, "VF7110", 6)) {
version = get_pcb_revision_from_eeprom();
diff --git a/board/starfive/visionfive2/starfive_visionfive2.c
b/board/starfive/visionfive2/starfive_visionfive2.c
index a86bca533b2..be6ca85b030 100644
--- a/board/starfive/visionfive2/starfive_visionfive2.c
+++ b/board/starfive/visionfive2/starfive_visionfive2.c
@@ -17,6 +17,10 @@
DECLARE_GLOBAL_DATA_PTR;
#define JH7110_L2_PREFETCHER_BASE_ADDR 0x203
#define JH7110_L2_PREFETCHER_HART_OFFSET 0x2000
+#define FDTFILE_MILK_V_MARC_SD \
+ "starfive/jh7110-milkv-mars-cm-sdcard.dtb"
"starfive/jh7110-milkv-mars-cm-lite.dtb"
+#define FDTFILE_MILK_V_MARC_MMC \
+ "starfive/jh7110-milkv-mars-cm-emmc.dtb"
"starfive/jh7110-milkv-mars-cm.dtb"
#define FDTFILE_MILK_V_MARS \
"starfive/jh7110-milkv-mars.dtb"
#define FDTFILE_VISIONFIVE2_1_2A \
@@ -61,7 +65,12 @@ static void set_fdtfile(void)
log_err("Can't read EEPROM\n");
return;
}
- if (!strncmp(product_id, "MARS", 4)) {
+ if (!strncmp(product_id, "MARC", 4)) {
+ if (get_mmc_size_from_eeprom())
+
Re: [GIT PULL] Please pull u-boot-mmc master
On Mon, Apr 29, 2024 at 03:39:53PM -0500, Judith Mendez wrote: > On 4/26/24 10:51 AM, Tom Rini wrote: > > On Fri, Apr 26, 2024 at 07:38:30PM +0900, Jaehoon Chung wrote: > > > Please pull u-boot-mmc master into u-boot master branch. > > > If there is any problem, let me know, plz > > Applied to u-boot/master, thanks! > A patch in this series caused a regression for AM62x SK with the > following error: +1, this affects also Verdin AM62. ``` Trying to boot from MMC1 mmc_load_image_raw_sector: mmc block read error Partition 1 invalid on device 0 spl_register_fat_device: fat register err - -1 spl_load_image_fat: error reading image u-boot.img, err - -1 SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### ``` Francesco
[PATCH v3] test/py: net_boot: Add test cases for net boot
Add tests for booting image using tftpboot/pxe boot commands, tftpboot
boot case loads the FIT image into DDR and boots using bootm command
whereas pxe boot cases downloads the pxe configuration file from the
TFTP server and interprets it to boot the images mentioned in the pxe
configurations file.
This test relies on boardenv_* containing configuration values including
the parameter 'pattern'. tftpboot/pxe boot cases boots the Linux till the
boot log pattern value is matched. For example, if the parameter
'pattern' is defined as 'login:', it will boot till login prompt.
Signed-off-by: Love Kumar
---
Changes in v2:
- Expand commit message
Changes in v3:
- Add the config option to skip the test
- Remove imi command to check FIT image config
- Configure static networking only if DHCP fails
---
test/py/tests/test_net_boot.py | 391 +
1 file changed, 391 insertions(+)
create mode 100644 test/py/tests/test_net_boot.py
diff --git a/test/py/tests/test_net_boot.py b/test/py/tests/test_net_boot.py
new file mode 100644
index ..cf7d5cca5cbd
--- /dev/null
+++ b/test/py/tests/test_net_boot.py
@@ -0,0 +1,391 @@
+# SPDX-License-Identifier: GPL-2.0
+# (C) Copyright 2023, Advanced Micro Devices, Inc.
+
+import pytest
+import u_boot_utils
+import test_net
+
+"""
+Note: This test relies on boardenv_* containing configuration values to define
+which the network environment available for testing. Without this, this test
+will be automatically skipped.
+
+For example:
+
+# Details regarding a boot image file that may be read from a TFTP server. This
+# variable may be omitted or set to None if TFTP boot testing is not possible
+# or desired.
+env__net_tftp_bootable_file = {
+'fn': 'image.ub',
+'addr': 0x1000,
+'size': 5058624,
+'crc32': 'c2244b26',
+'pattern': 'Linux',
+'config': 'config@2',
+'timeout': 5,
+}
+
+# False or omitted if a TFTP boot test should be tested.
+# If TFTP boot testing is not possible or desired, set this variable to True.
+# For example: If FIT image is not proper to boot
+env__tftp_boot_test_skip = False
+
+# Here is the example of FIT image configurations:
+configurations {
+default = "config@1";
+config@1 {
+description = "Boot Linux kernel with config@1";
+kernel = "kernel@0";
+fdt = "fdt@0";
+ramdisk = "ramdisk@0";
+hash@1 {
+algo = "sha1";
+};
+};
+config@2 {
+description = "Boot Linux kernel with config@2";
+kernel = "kernel@1";
+fdt = "fdt@1";
+ramdisk = "ramdisk@1";
+hash@1 {
+algo = "sha1";
+};
+};
+};
+
+# Details regarding a file that may be read from a TFTP server. This variable
+# may be omitted or set to None if PXE testing is not possible or desired.
+env__net_pxe_bootable_file = {
+'fn': 'default',
+'addr': 0x1000,
+'size': 74,
+'timeout': 5,
+'pattern': 'Linux',
+'valid_label': '1',
+'invalid_label': '2',
+'exp_str_invalid': 'Skipping install for failure retrieving',
+'local_label': '3',
+'exp_str_local': 'missing environment variable: localcmd',
+'empty_label': '4',
+'exp_str_empty': 'No kernel given, skipping boot',
+}
+
+# False or omitted if a PXE boot test should be tested.
+# If PXE boot testing is not possible or desired, set this variable to True.
+# For example: If pxe configuration file is not proper to boot
+env__pxe_boot_test_skip = False
+
+# Here is the example of pxe configuration file ordered based on the execution
+# flow:
+1) /tftpboot/pxelinux.cfg/default-arm-zynqmp
+
+menu include pxelinux.cfg/default-arm
+timeout 50
+
+default Linux
+
+2) /tftpboot/pxelinux.cfg/default-arm
+
+menu title Linux boot selections
+menu include pxelinux.cfg/default
+
+label install
+menu label Invalid boot
+kernel kernels/install.bin
+append console=ttyAMA0,38400 debug earlyprintk
+initrd initrds/uzInitrdDebInstall
+
+label local
+menu label Local boot
+append root=/dev/sdb1
+localboot 1
+
+label boot
+menu label Empty boot
+
+3) /tftpboot/pxelinux.cfg/default
+
+label Linux
+menu label Boot kernel
+kernel Image
+fdt system.dtb
+initrd rootfs.cpio.gz.u-boot
+"""
+
+def setup_tftpboot_boot(u_boot_console):
+f = u_boot_console.config.env.get('env__net_tftp_bootable_file', None)
+if not f:
+pytest.skip('No TFTP bootable file to read')
+
+test_net.test_net_dhcp(u_boot_console)
+if not test_net.net_set_up:
+test_net.test_net_setup_static(u_boot_console)
+
+addr = f.get('addr', None)
+if not addr:
+addr = u_boot_utils.find_ram_base(u_boot_console)
+
+fn = f['fn']
+output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn))
+expected_text = 'Bytes transferred = '
+sz = f.get('size', None)
+if sz:
+expecte
Re: [PATCH 2/4] board: add support for Milk-V Mars CM
On Tue, Apr 30, 2024 at 12:18 AM Heinrich Schuchardt
wrote:
>
> On 30.04.24 00:46, E Shattow wrote:
> > On Sun, Apr 28, 2024 at 9:13 AM Emil Renner Berthing
> > wrote:
> >>
> >> Heinrich Schuchardt wrote:
> >>> We already support the VisionFive 2 and the Milk-V Mars board by
> >>> patching the VisionFive 2 device tree. With this patch the same
> >>> is done for the Milk-V Mars CM.
> >>
> >> Hi Heinrich.
> >>
> >> Thanks for the patch. As far as I can tell the Milk-V documentation[1] is
> >> pretty consistent in calling the version without eMMC "Milk-V Mars CM Lite"
> >> and the version with eMMC just "Milk-V Mars CM". So I'd prefer the model,
> >> compatible and filenames suggested below.
> >>
> >> [1]:
> >> https://milkv.io/docs/mars/compute-module/introduction#design-philosophy
> >>
> >
> > Are there any actual differences that need representation in the dtb
> > file for downstream OS different from Milk-V Mars to Milk-V Mars CM
> > (or CM Lite)?
> >
> > I did find this vendor repo commit "kernel: dts reconfig sdio0 for
> > SDCard version"
> > https://github.com/milkv-mars/mars-buildroot-sdk/commit/042ea06598995db99dd252ee439c42b9c1a9
> > but it does not seem necessary in mainline Linux, SD Card is working
> > without changes.
> >
> > It was necessary for U-Boot and the Mars CM Lite with SD Card to apply
> > s/GPIO62/GPIO22/ as in the vendor commit "u-boot: configure sdio0 as
> > mars-cm sdcard version"
> > https://github.com/milkv-mars/mars-buildroot-sdk/commit/880a249518f72ecf1e2947dfeb2c66e5035fce90
>
> This is what is patched in fdt_fixup_marc().
That's the Mars fixup with a conditional for the s/GPIO62/GPIO22/ of
CM Lite; which Linux seems not to mind either way so long as this was
done at the U-Boot phase, it is functional for eMMC/SD mmc access with
unmodified visionfive2 1.3b dtb (GPIO62 pinmux) from Linux.
It is not clear to me why in vendor U-Boot this is s/GPIO62/GPIO22/
but in vendor Linux kernel this is s/GPIO62/GPIO24/ ? It seems not
needed (in Linux).
>
> >
> > Then also there is some mention about PMIC and renamed i2c reference,
> > already obsolete. That's all, is there more to it? Possibly a dtb for
> > Mars is enough to also be used on Mars CM and Mars Lite?
>
> Looking at the schematics the biggest difference between the Mars and
> the Mars CM (Lite) is on the USB side. The Mars board has USB 3.0 via a
> PCIe lane and a VIA VL805/806 while the Mars CM has USB directly via the
> SoC.
>
> To add USB support for the Mars CM we will need an adapted device-tree.
Mars also needs this direct-to-SoC USB support, as its USB ports are a
mix of VL805 and directly via the SoC. This can be the same for Mars
and Mars CM/Lite.
See this photo from
https://milkv.io/docs/mars/getting-started/bootloader what highlights
this direct SoC USB port of Milk-V Mars:
https://milkv.io/assets/images/mars-usb-port-a-b48fe1ff1003539d42bf5e1dde1725a3.jpg
The over-current errata
https://doc-en.rvspace.org/VisionFive2/DG_USB/JH7110_SDK/usb_overcurrent_debug.html
suggests "please modify the above settings during the U-Boot phase".
-E
>
> Best regards
>
> Heinrich
> >
> >>> Signed-off-by: Heinrich Schuchardt
> >>> ---
> >>> board/starfive/visionfive2/spl.c | 27 ++-
> >>> .../visionfive2/starfive_visionfive2.c| 11 +++-
> >>> 2 files changed, 36 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/board/starfive/visionfive2/spl.c
> >>> b/board/starfive/visionfive2/spl.c
> >>> index 45848db6d8b..bb0f28d7aad 100644
> >>> --- a/board/starfive/visionfive2/spl.c
> >>> +++ b/board/starfive/visionfive2/spl.c
> >>> @@ -129,6 +129,29 @@ void spl_fdt_fixup_mars(void *fdt)
> >>>}
> >>> }
> >>>
> >>> +void spl_fdt_fixup_marc(void *fdt)
> >>> +{
> >>> + const char *compat;
> >>> + const char *model;
> >>> +
> >>> + spl_fdt_fixup_mars(fdt);
> >>> +
> >>> + if (!get_mmc_size_from_eeprom()) {
> >>> + int offset;
> >>> +
> >>> + model = "Milk-V Mars CM SDCard";
> >>
> >> "Milk-V Mars CM Lite"
> >>
> >>> + compat = "milkv,mars-cm-sdcard\0starfive,jh7110";
> >>
> >> "milkv,mars-cm-lite\0starfive,jh7110"
> >>
> >>> +
> >>> + offset = fdt_path_offset(fdt,
> >>> "/soc/pinctrl/mmc0-pins/mmc0-pins-rest");
> >>> + fdt_setprop_u32(fdt, offset, "pinmux", 0xff130016);
> >>> + } else {
> >>> + model = "Milk-V Mars CM eMMC";
> >>
> >> "Milk-V Mars CM"
> >>
> >>> + compat = "milkv,mars-cm-emmc\0starfive,jh7110";
> >>
> >> "milkv,mars-cm\0starfive,jh7110"
> >>
> >>> + }
> >>> + fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat,
> >>> sizeof(compat));
> >>> + fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", model);
> >>> +}
> >>> +
> >>> void spl_fdt_fixup_version_a(void *fdt)
> >>> {
> >>>static const char compat[] =
> >>> "starfive,visionfive-2-v1.2a\0starfive,jh7110";
> >>> @@ -236,7 +259,9 @@ void spl_perform_fixups(stru
[PATCH 1/2] remoteproc: pru: Add support for AM64x PRU / RTU cores
Add support for AM64x PRU cores by adding compatibles for AM64x.
Signed-off-by: MD Danish Anwar
---
drivers/remoteproc/pru_rproc.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c
index 6ec55e27d9..5e9334e117 100644
--- a/drivers/remoteproc/pru_rproc.c
+++ b/drivers/remoteproc/pru_rproc.c
@@ -399,10 +399,12 @@ static void pru_set_id(struct pru_privdata *priv, struct
udevice *dev)
{
u32 mask2 = 0x38000;
- if (device_is_compatible(dev, "ti,am654-rtu"))
+ if (device_is_compatible(dev, "ti,am654-rtu") ||
+ device_is_compatible(dev, "ti,am642-rtu"))
mask2 = 0x6000;
- if (device_is_compatible(dev, "ti,am654-tx-pru"))
+ if (device_is_compatible(dev, "ti,am654-tx-pru") ||
+ device_is_compatible(dev, "ti,am642-tx-pru"))
mask2 = 0xc000;
if ((priv->pru_iram & mask2) == mask2)
@@ -448,6 +450,9 @@ static const struct udevice_id pru_ids[] = {
{ .compatible = "ti,am654-pru"},
{ .compatible = "ti,am654-rtu"},
{ .compatible = "ti,am654-tx-pru" },
+ { .compatible = "ti,am642-pru"},
+ { .compatible = "ti,am642-rtu"},
+ { .compatible = "ti,am642-tx-pru" },
{}
};
--
2.34.1
[PATCH 0/2] Add AM64x Support to PRUSS and PRU_RPROC driver
This series adds AM64x related compatibles to PRUSS and PRU_RPROC drivers. This series is a prerequisite for ICSSG Ethernet driver. Once Support for AM64x is added to PRUSS and PRU_RPROC driver, I'll send another series to enable ICSSG Ethernet driver for AM64x as well. MD Danish Anwar (2): remoteproc: pru: Add support for AM64x PRU / RTU cores soc: ti: pruss: Add support for AM64x drivers/remoteproc/pru_rproc.c | 9 +++-- drivers/soc/ti/pruss.c | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) base-commit: ff0de1f0557ed7d2dab47ba976a37347a1fdc432 -- 2.34.1
[PATCH 2/2] soc: ti: pruss: Add support for AM64x
Add support for AM64x by adding it's compatible in pruss driver.
Signed-off-by: MD Danish Anwar
---
drivers/soc/ti/pruss.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
index 461390925d..5317b8335b 100644
--- a/drivers/soc/ti/pruss.c
+++ b/drivers/soc/ti/pruss.c
@@ -205,6 +205,7 @@ static int pruss_probe(struct udevice *dev)
static const struct udevice_id pruss_ids[] = {
{ .compatible = "ti,am654-icssg"},
+ { .compatible = "ti,am642-icssg"},
{}
};
--
2.34.1
Re: [PATCH 2/4] board: add support for Milk-V Mars CM
On 30.04.24 11:59, E Shattow wrote:
On Tue, Apr 30, 2024 at 12:18 AM Heinrich Schuchardt
wrote:
On 30.04.24 00:46, E Shattow wrote:
On Sun, Apr 28, 2024 at 9:13 AM Emil Renner Berthing
wrote:
Heinrich Schuchardt wrote:
We already support the VisionFive 2 and the Milk-V Mars board by
patching the VisionFive 2 device tree. With this patch the same
is done for the Milk-V Mars CM.
Hi Heinrich.
Thanks for the patch. As far as I can tell the Milk-V documentation[1] is
pretty consistent in calling the version without eMMC "Milk-V Mars CM Lite"
and the version with eMMC just "Milk-V Mars CM". So I'd prefer the model,
compatible and filenames suggested below.
[1]: https://milkv.io/docs/mars/compute-module/introduction#design-philosophy
Are there any actual differences that need representation in the dtb
file for downstream OS different from Milk-V Mars to Milk-V Mars CM
(or CM Lite)?
I did find this vendor repo commit "kernel: dts reconfig sdio0 for
SDCard version"
https://github.com/milkv-mars/mars-buildroot-sdk/commit/042ea06598995db99dd252ee439c42b9c1a9
but it does not seem necessary in mainline Linux, SD Card is working
without changes.
It was necessary for U-Boot and the Mars CM Lite with SD Card to apply
s/GPIO62/GPIO22/ as in the vendor commit "u-boot: configure sdio0 as
mars-cm sdcard version"
https://github.com/milkv-mars/mars-buildroot-sdk/commit/880a249518f72ecf1e2947dfeb2c66e5035fce90
This is what is patched in fdt_fixup_marc().
That's the Mars fixup with a conditional for the s/GPIO62/GPIO22/ of
CM Lite; which Linux seems not to mind either way so long as this was
done at the U-Boot phase, it is functional for eMMC/SD mmc access with
unmodified visionfive2 1.3b dtb (GPIO62 pinmux) from Linux.
It is not clear to me why in vendor U-Boot this is s/GPIO62/GPIO22/
but in vendor Linux kernel this is s/GPIO62/GPIO24/ ? It seems not
needed (in Linux).
According to the schematics GPIO22 is connected to SD_PWR_ON on the the
low speed connector both on the Mars CM and the Mars CM Lite. GPIO62 is
connected to SDMMC_RST_N on the eMMC. Both the SD-card and the eMMC are
connected to SDI0. This is why only one of them can be usable.
GPIO024 is used for the MIPI camera interface.
I guess unless you reset the SD-card or eMMC GPIO062 and GPI022 are not
used and this is why Linux is working in both configurations.
Then also there is some mention about PMIC and renamed i2c reference,
already obsolete. That's all, is there more to it? Possibly a dtb for
Mars is enough to also be used on Mars CM and Mars Lite?
Looking at the schematics the biggest difference between the Mars and
the Mars CM (Lite) is on the USB side. The Mars board has USB 3.0 via a
PCIe lane and a VIA VL805/806 while the Mars CM has USB directly via the
SoC.
To add USB support for the Mars CM we will need an adapted device-tree.
Mars also needs this direct-to-SoC USB support, as its USB ports are a
mix of VL805 and directly via the SoC. This can be the same for Mars
and Mars CM/Lite.
The schematics say:
"One USB Controller only, supports either USB 2.0 or USB 3.0."
This sounds to me like you cannot have both in functional state.
Maybe Minda or Hal know more?
Best regards
Heinrich
See this photo from
https://milkv.io/docs/mars/getting-started/bootloader what highlights
this direct SoC USB port of Milk-V Mars:
https://milkv.io/assets/images/mars-usb-port-a-b48fe1ff1003539d42bf5e1dde1725a3.jpg
The over-current errata
https://doc-en.rvspace.org/VisionFive2/DG_USB/JH7110_SDK/usb_overcurrent_debug.html
suggests "please modify the above settings during the U-Boot phase".
-E
Best regards
Heinrich
Signed-off-by: Heinrich Schuchardt
---
board/starfive/visionfive2/spl.c | 27 ++-
.../visionfive2/starfive_visionfive2.c| 11 +++-
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c
index 45848db6d8b..bb0f28d7aad 100644
--- a/board/starfive/visionfive2/spl.c
+++ b/board/starfive/visionfive2/spl.c
@@ -129,6 +129,29 @@ void spl_fdt_fixup_mars(void *fdt)
}
}
+void spl_fdt_fixup_marc(void *fdt)
+{
+ const char *compat;
+ const char *model;
+
+ spl_fdt_fixup_mars(fdt);
+
+ if (!get_mmc_size_from_eeprom()) {
+ int offset;
+
+ model = "Milk-V Mars CM SDCard";
"Milk-V Mars CM Lite"
+ compat = "milkv,mars-cm-sdcard\0starfive,jh7110";
"milkv,mars-cm-lite\0starfive,jh7110"
+
+ offset = fdt_path_offset(fdt,
"/soc/pinctrl/mmc0-pins/mmc0-pins-rest");
+ fdt_setprop_u32(fdt, offset, "pinmux", 0xff130016);
+ } else {
+ model = "Milk-V Mars CM eMMC";
"Milk-V Mars CM"
+ compat = "milkv,mars-cm-emmc\0starfive,jh7110";
"milkv,mars-cm\0starfive,jh7110"
+ }
+ fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat,
sizeof(compat));
+ fdt_setprop_s
[PATCH] sandbox: make function 'do_undefined' properly compiles for PowerPC
The 2 bytes 0x is too short for being a PowerPC instruction, resulting in an error similar to: /tmp/ccW8yjie.s: Assembler messages: /tmp/ccW8yjie.s: Error: unaligned opcodes detected in executable segment /tmp/ccW8yjie.s:223: Error: instruction address is not a multiple of 4 make[2]: *** [/tmp/ccyF4HIC.mk:17: /tmp/ccCKUFuF.ltrans5.ltrans.o] Error 1 Signed-off-by: WHR 0001-sandbox-make-function-do_undefined-properly-compiles Description: /
[PATCH] zfs: fix function 'zlib_decompress' pointlessly calling itself
To prevent crashing due infinite recursion and actually decompress the requested data, call the zlib function 'uncompress' instead. Signed-off-by: WHR 0001-zfs-fix-function-zlib_decompress-pointlessly-calling Description: /
[PATCH] fs: ubifs: Add support for ZSTD decompression
Signed-off-by: Piotr Wojtaszczyk
---
fs/ubifs/ubifs-media.h | 2 ++
fs/ubifs/ubifs.c | 55 --
2 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/fs/ubifs/ubifs-media.h b/fs/ubifs/ubifs-media.h
index 2b5b26a01b..299d80f928 100644
--- a/fs/ubifs/ubifs-media.h
+++ b/fs/ubifs/ubifs-media.h
@@ -320,12 +320,14 @@ enum {
* UBIFS_COMPR_NONE: no compression
* UBIFS_COMPR_LZO: LZO compression
* UBIFS_COMPR_ZLIB: ZLIB compression
+ * UBIFS_COMPR_ZSTD: ZSTD compression
* UBIFS_COMPR_TYPES_CNT: count of supported compression types
*/
enum {
UBIFS_COMPR_NONE,
UBIFS_COMPR_LZO,
UBIFS_COMPR_ZLIB,
+ UBIFS_COMPR_ZSTD,
UBIFS_COMPR_TYPES_CNT,
};
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index a509584e5d..4df7cbb951 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -27,6 +27,11 @@
#include
#include
+#if IS_ENABLED(CONFIG_ZSTD)
+#include
+#include
+#endif
+
DECLARE_GLOBAL_DATA_PTR;
/* compress.c */
@@ -42,6 +47,26 @@ static int gzip_decompress(const unsigned char *in, size_t
in_len,
(unsigned long *)out_len, 0, 0);
}
+#if IS_ENABLED(CONFIG_ZSTD)
+static int zstd_decompress_wrapper(const unsigned char *in, size_t in_len,
+ unsigned char *out, size_t *out_len)
+{
+ struct abuf abuf_in, abuf_out;
+ int ret;
+
+ abuf_init_set(&abuf_in, (void *)in, in_len);
+ abuf_init_set(&abuf_out, (void *)out, *out_len);
+
+ ret = zstd_decompress(&abuf_in, &abuf_out);
+ if (ret < 0) {
+ return ret;
+ }
+
+ *out_len = ret;
+ return 0;
+}
+#endif
+
/* Fake description object for the "none" compressor */
static struct ubifs_compressor none_compr = {
.compr_type = UBIFS_COMPR_NONE,
@@ -71,8 +96,22 @@ static struct ubifs_compressor zlib_compr = {
.decompress = gzip_decompress,
};
+#if IS_ENABLED(CONFIG_ZSTD)
+static struct ubifs_compressor zstd_compr = {
+ .compr_type = UBIFS_COMPR_ZSTD,
+#ifndef __UBOOT__
+ .comp_mutex = &zstd_enc_mutex,
+ .decomp_mutex = &zstd_dec_mutex,
+#endif
+ .name = "zstd",
+ .capi_name = "zstd",
+ .decompress = zstd_decompress_wrapper,
+};
+#endif
+
+
/* All UBIFS compressors */
-struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT];
+struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT] = {NULL};
#ifdef __UBOOT__
@@ -166,8 +205,14 @@ int ubifs_decompress(const struct ubifs_info *c, const
void *in_buf,
compr = ubifs_compressors[compr_type];
+ if (unlikely(!compr)) {
+ ubifs_err(c, "compression type %d is not compiled in",
compr_type);
+ return -EINVAL;
+ }
+
if (unlikely(!compr->capi_name)) {
- ubifs_err(c, "%s compression is not compiled in", compr->name);
+ ubifs_err(c, "%s compression is not compiled in",
+ compr->name ? compr->name : "unknown");
return -EINVAL;
}
@@ -232,6 +277,12 @@ int __init ubifs_compressors_init(void)
if (err)
return err;
+#if IS_ENABLED(CONFIG_ZSTD)
+ err = compr_init(&zstd_compr);
+ if (err)
+ return err;
+#endif
+
err = compr_init(&none_compr);
if (err)
return err;
--
2.25.1
[PATCH 01/33] arm: mach-versatile: Remove dead code
This platform is no longer supported in tree, remove.
Signed-off-by: Tom Rini
---
arch/arm/mach-versatile/Makefile | 7
arch/arm/mach-versatile/reset.S | 28 ---
arch/arm/mach-versatile/timer.c | 62
3 files changed, 97 deletions(-)
delete mode 100644 arch/arm/mach-versatile/Makefile
delete mode 100644 arch/arm/mach-versatile/reset.S
delete mode 100644 arch/arm/mach-versatile/timer.c
diff --git a/arch/arm/mach-versatile/Makefile b/arch/arm/mach-versatile/Makefile
deleted file mode 100644
index 858ca9414c05..
--- a/arch/arm/mach-versatile/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-obj-y = timer.o
-obj-y += reset.o
diff --git a/arch/arm/mach-versatile/reset.S b/arch/arm/mach-versatile/reset.S
deleted file mode 100644
index c7f1225fb298..
--- a/arch/arm/mach-versatile/reset.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * armboot - Startup Code for ARM926EJS CPU-core
- *
- * Copyright (c) 2003 Texas Instruments
- *
- * - Adapted for OMAP1610 OMAP730 from ARM925t code --
- *
- * Copyright (c) 2001 Marius Gröger
- * Copyright (c) 2002 Alex Züpke
- * Copyright (c) 2002 Gary Jennejohn
- * Copyright (c) 2003 Richard Woodruff
- * Copyright (c) 2003 Kshitij
- */
-
- .align 5
-.globl reset_cpu
-reset_cpu:
- ldr r1, rstctl1 /* get clkm1 reset ctl */
- mov r3, #0x0
- strhr3, [r1]/* clear it */
- mov r3, #0x8
- strhr3, [r1]/* force dsp+arm reset */
-_loop_forever:
- b _loop_forever
-
-rstctl1:
- .word 0xfffece10
diff --git a/arch/arm/mach-versatile/timer.c b/arch/arm/mach-versatile/timer.c
deleted file mode 100644
index b471412186d1..
--- a/arch/arm/mach-versatile/timer.c
+++ /dev/null
@@ -1,62 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2003
- * Texas Instruments
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH
- * Marius Groeger
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH
- * Alex Zuepke
- *
- * (C) Copyright 2002-2004
- * Gary Jennejohn, DENX Software Engineering,
- *
- * (C) Copyright 2004
- * Philippe Robin, ARM Ltd.
- */
-
-#include
-
-#define TIMER_ENABLE (1 << 7)
-#define TIMER_MODE_MSK (1 << 6)
-#define TIMER_MODE_FR (0 << 6)
-#define TIMER_MODE_PD (1 << 6)
-
-#define TIMER_INT_EN (1 << 5)
-#define TIMER_PRS_MSK (3 << 2)
-#define TIMER_PRS_8S (1 << 3)
-#define TIMER_SIZE_MSK (1 << 2)
-#define TIMER_ONE_SHT (1 << 0)
-
-int timer_init (void)
-{
- ulong tmr_ctrl_val;
-
- /* 1st disable the Timer */
- tmr_ctrl_val = *(volatile ulong *)(CFG_SYS_TIMERBASE + 8);
- tmr_ctrl_val &= ~TIMER_ENABLE;
- *(volatile ulong *)(CFG_SYS_TIMERBASE + 8) = tmr_ctrl_val;
-
- /*
-* The Timer Control Register has one Undefined/Shouldn't Use Bit
-* So we should do read/modify/write Operation
-*/
-
- /*
-* Timer Mode : Free Running
-* Interrupt : Disabled
-* Prescale : 8 Stage, Clk/256
-* Tmr Siz : 16 Bit Counter
-* Tmr in Wrapping Mode
-*/
- tmr_ctrl_val = *(volatile ulong *)(CFG_SYS_TIMERBASE + 8);
- tmr_ctrl_val &= ~(TIMER_MODE_MSK | TIMER_INT_EN | TIMER_PRS_MSK |
TIMER_SIZE_MSK | TIMER_ONE_SHT );
- tmr_ctrl_val |= (TIMER_ENABLE | TIMER_PRS_8S);
-
- *(volatile ulong *)(CFG_SYS_TIMERBASE + 8) = tmr_ctrl_val;
-
- return 0;
-}
--
2.34.1
[PATCH 02/33] include: Add missing headers in a few instances
A few headers rely on indirect inclusion of or
so add them directly. In the case of add a
"struct bd_info;" as well rather than the large header chain to resolve
that.
Signed-off-by: Tom Rini
---
include/mailbox.h | 2 ++
include/netdev.h| 3 +++
include/phy_interface.h | 1 +
include/u-boot/sha1.h | 2 ++
include/u-boot/sha256.h | 2 ++
include/u-boot/sha512.h | 2 ++
6 files changed, 12 insertions(+)
diff --git a/include/mailbox.h b/include/mailbox.h
index 323b6c2bc5d8..e70266fb61c9 100644
--- a/include/mailbox.h
+++ b/include/mailbox.h
@@ -6,6 +6,8 @@
#ifndef _MAILBOX_H
#define _MAILBOX_H
+#include
+
/**
* A mailbox is a hardware mechanism for transferring small fixed-size messages
* and/or notifications between the CPU on which U-Boot runs and some other
diff --git a/include/netdev.h b/include/netdev.h
index 2a7f40e5040e..2a06d9a261bb 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -10,9 +10,12 @@
#ifndef _NETDEV_H_
#define _NETDEV_H_
+
+#include
#include
struct udevice;
+struct bd_info;
/*
* Board and CPU-specific initialization functions
diff --git a/include/phy_interface.h b/include/phy_interface.h
index 31be3228c7c4..b74f4ccd84ad 100644
--- a/include/phy_interface.h
+++ b/include/phy_interface.h
@@ -11,6 +11,7 @@
#define _PHY_INTERFACE_H
#include
+#include
typedef enum {
PHY_INTERFACE_MODE_NA, /* don't touch */
diff --git a/include/u-boot/sha1.h b/include/u-boot/sha1.h
index 09fee594d263..c1e9f67068d4 100644
--- a/include/u-boot/sha1.h
+++ b/include/u-boot/sha1.h
@@ -14,6 +14,8 @@
#ifndef _SHA1_H
#define _SHA1_H
+#include
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/u-boot/sha256.h b/include/u-boot/sha256.h
index 9aa1251789a3..a4fe176c0b46 100644
--- a/include/u-boot/sha256.h
+++ b/include/u-boot/sha256.h
@@ -1,6 +1,8 @@
#ifndef _SHA256_H
#define _SHA256_H
+#include
+
#define SHA256_SUM_LEN 32
#define SHA256_DER_LEN 19
diff --git a/include/u-boot/sha512.h b/include/u-boot/sha512.h
index 516729d77506..90bd96a3f8c2 100644
--- a/include/u-boot/sha512.h
+++ b/include/u-boot/sha512.h
@@ -1,6 +1,8 @@
#ifndef _SHA512_H
#define _SHA512_H
+#include
+
#define SHA384_SUM_LEN 48
#define SHA384_DER_LEN 19
#define SHA512_SUM_LEN 64
--
2.34.1
[PATCH 03/33] arm: xilinx: Remove and add needed includes
Remove from all mach-versal-net, mach-versal, mach-zynq and mach-zynqmp files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Michal Simek --- arch/arm/mach-versal-net/clk.c | 2 +- arch/arm/mach-versal-net/cpu.c | 2 +- arch/arm/mach-versal/clk.c | 2 +- arch/arm/mach-versal/cpu.c | 2 +- arch/arm/mach-versal/mp.c | 3 ++- arch/arm/mach-zynq/clk.c | 1 - arch/arm/mach-zynq/cpu.c | 3 ++- arch/arm/mach-zynq/ddrc.c | 2 +- arch/arm/mach-zynq/slcr.c | 1 - arch/arm/mach-zynq/spl.c | 1 - arch/arm/mach-zynqmp-r5/cpu.c | 1 - arch/arm/mach-zynqmp/aes.c | 3 +-- arch/arm/mach-zynqmp/clk.c | 2 +- arch/arm/mach-zynqmp/cpu.c | 4 +++- arch/arm/mach-zynqmp/ecc_spl_init.c| 1 - arch/arm/mach-zynqmp/handoff.c | 1 - arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h | 2 ++ arch/arm/mach-zynqmp/mp.c | 4 +++- arch/arm/mach-zynqmp/psu_spl_init.c| 1 - arch/arm/mach-zynqmp/spl.c | 1 - 20 files changed, 19 insertions(+), 20 deletions(-) diff --git a/arch/arm/mach-versal-net/clk.c b/arch/arm/mach-versal-net/clk.c index d097de7afa63..a88b5101eb1b 100644 --- a/arch/arm/mach-versal-net/clk.c +++ b/arch/arm/mach-versal-net/clk.c @@ -6,10 +6,10 @@ * Michal Simek */ -#include #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-versal-net/cpu.c b/arch/arm/mach-versal-net/cpu.c index a82741e70fc8..59b0cb2e78f3 100644 --- a/arch/arm/mach-versal-net/cpu.c +++ b/arch/arm/mach-versal-net/cpu.c @@ -6,11 +6,11 @@ * Michal Simek */ -#include #include #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-versal/clk.c b/arch/arm/mach-versal/clk.c index 5e3f44c77822..0c7d468f1dd0 100644 --- a/arch/arm/mach-versal/clk.c +++ b/arch/arm/mach-versal/clk.c @@ -4,10 +4,10 @@ * Michal Simek */ -#include #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c index e4dc305d9288..7de431e55005 100644 --- a/arch/arm/mach-versal/cpu.c +++ b/arch/arm/mach-versal/cpu.c @@ -4,11 +4,11 @@ * Michal Simek */ -#include #include #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c index 2487b482ddb1..921ca49c3596 100644 --- a/arch/arm/mach-versal/mp.c +++ b/arch/arm/mach-versal/mp.c @@ -4,7 +4,8 @@ * Siva Durga Prasad Paladugu */ -#include +#include +#include #include #include #include diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c index 5e1ba8d43ed1..c1b018cf22e9 100644 --- a/arch/arm/mach-zynq/clk.c +++ b/arch/arm/mach-zynq/clk.c @@ -4,7 +4,6 @@ * Copyright (C) 2013 Xilinx, Inc. All rights reserved. */ #include -#include #include #include #include diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c index 3b6518c71c90..c75e453d5730 100644 --- a/arch/arm/mach-zynq/cpu.c +++ b/arch/arm/mach-zynq/cpu.c @@ -3,10 +3,11 @@ * Copyright (C) 2012 Michal Simek * Copyright (C) 2012 Xilinx, Inc. All rights reserved. */ -#include +#include #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c index 28988ef95b5a..b9a2eef5a6f0 100644 --- a/arch/arm/mach-zynq/ddrc.c +++ b/arch/arm/mach-zynq/ddrc.c @@ -4,7 +4,7 @@ * Copyright (C) 2012 - 2017 Xilinx, Inc. All rights reserved. */ -#include +#include #include #include #include diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c index 5d9f4d23f34b..ef877df0fe85 100644 --- a/arch/arm/mach-zynq/slcr.c +++ b/arch/arm/mach-zynq/slcr.c @@ -3,7 +3,6 @@ * Copyright (c) 2013 - 2017 Xilinx Inc. */ -#include #include #include #include diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c index fea1c9b12ad1..8ef12ed65ceb 100644 --- a/arch/arm/mach-zynq/spl.c +++ b/arch/arm/mach-zynq/spl.c @@ -2,7 +2,6 @@ /* * (C) Copyright 2014 - 2017 Xilinx, Inc. Michal Simek */ -#include #include #include #include diff --git a/arch/arm/mach-zynqmp-r5/cpu.c b/arch/arm/mach-zynqmp-r5/cpu.c index 0d368443d824..9a912dd5bd7c 100644 --- a/arch/arm/mach-zynqmp-r5/cpu.c +++ b/arch/arm/mach-zynqmp-r5/cpu.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 Xilinx, Inc. (Michal Simek) */ -#include #include #include #include diff --git a/arch/arm/mach-zynqmp/aes.c b/arch/arm/mach-zynqmp/aes.c index 8a2b7fdcbe9f..9a05fbf9c11b 100644 --- a/arch/arm/mach-zynqmp/aes.c +++ b/arch/arm/mach-zynqmp/aes.c @@ -7,9 +7,8 @@ * Christian Taedcke */ -#inc
[PATCH 04/33] arm: u8500: Remove and add needed includes
Remove from all mach-u8500 files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Stephan Gerhold Cc: Linus Walleij --- arch/arm/mach-u8500/cache.c | 2 +- arch/arm/mach-u8500/cpuinfo.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-u8500/cache.c b/arch/arm/mach-u8500/cache.c index 05a91346a897..7541b567d0fd 100644 --- a/arch/arm/mach-u8500/cache.c +++ b/arch/arm/mach-u8500/cache.c @@ -3,7 +3,7 @@ * Copyright (C) 2019 Stephan Gerhold */ -#include +#include #include #include #include diff --git a/arch/arm/mach-u8500/cpuinfo.c b/arch/arm/mach-u8500/cpuinfo.c index ab05b8a51b23..6d4c6196c3df 100644 --- a/arch/arm/mach-u8500/cpuinfo.c +++ b/arch/arm/mach-u8500/cpuinfo.c @@ -3,7 +3,6 @@ * Copyright (C) 2019 Stephan Gerhold */ -#include #include #include -- 2.34.1
[PATCH 05/33] arm: tegra: Remove and add needed includes
Remove from all mach-tegra and include/asm/arch-tegra files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Thierry Reding Cc: Svyatoslav Ryhel --- arch/arm/include/asm/arch-tegra/ap.h | 1 + arch/arm/include/asm/arch-tegra/cboot.h| 2 ++ arch/arm/mach-tegra/ap.c | 2 +- arch/arm/mach-tegra/arm64-mmu.c| 1 - arch/arm/mach-tegra/board.c| 2 +- arch/arm/mach-tegra/board2.c | 2 +- arch/arm/mach-tegra/cache.c| 1 - arch/arm/mach-tegra/cboot.c| 1 - arch/arm/mach-tegra/clock.c| 1 - arch/arm/mach-tegra/cmd_enterrcm.c | 1 - arch/arm/mach-tegra/cpu.c | 1 - arch/arm/mach-tegra/crypto.c | 1 - arch/arm/mach-tegra/dt-setup.c | 1 - arch/arm/mach-tegra/emc.c | 1 - arch/arm/mach-tegra/fuse.c | 1 - arch/arm/mach-tegra/gpu.c | 1 - arch/arm/mach-tegra/ivc.c | 2 +- arch/arm/mach-tegra/pmc.c | 1 - arch/arm/mach-tegra/powergate.c| 2 +- arch/arm/mach-tegra/spl.c | 1 - arch/arm/mach-tegra/sys_info.c | 1 - arch/arm/mach-tegra/tegra114/clock.c | 1 - arch/arm/mach-tegra/tegra114/cpu.c | 1 - arch/arm/mach-tegra/tegra124/clock.c | 2 +- arch/arm/mach-tegra/tegra124/cpu.c | 1 - arch/arm/mach-tegra/tegra124/pmc.c | 1 - arch/arm/mach-tegra/tegra124/psci.c| 1 - arch/arm/mach-tegra/tegra124/xusb-padctl.c | 2 +- arch/arm/mach-tegra/tegra20/bct.c | 1 - arch/arm/mach-tegra/tegra20/clock.c| 1 - arch/arm/mach-tegra/tegra20/cpu.c | 1 - arch/arm/mach-tegra/tegra20/display.c | 1 - arch/arm/mach-tegra/tegra20/emc.c | 2 +- arch/arm/mach-tegra/tegra20/pmu.c | 1 - arch/arm/mach-tegra/tegra20/warmboot.c | 1 - arch/arm/mach-tegra/tegra20/warmboot_avp.c | 2 +- arch/arm/mach-tegra/tegra210/clock.c | 2 +- arch/arm/mach-tegra/tegra210/xusb-padctl.c | 2 +- arch/arm/mach-tegra/tegra30/bct.c | 2 +- arch/arm/mach-tegra/tegra30/clock.c| 1 - arch/arm/mach-tegra/tegra30/cpu.c | 1 - arch/arm/mach-tegra/xusb-padctl-common.c | 1 - arch/arm/mach-tegra/xusb-padctl-dummy.c| 2 +- 43 files changed, 16 insertions(+), 41 deletions(-) diff --git a/arch/arm/include/asm/arch-tegra/ap.h b/arch/arm/include/asm/arch-tegra/ap.h index 78aeb25ac78e..b922b2d30ea0 100644 --- a/arch/arm/include/asm/arch-tegra/ap.h +++ b/arch/arm/include/asm/arch-tegra/ap.h @@ -4,6 +4,7 @@ * NVIDIA Corporation */ #include +#include /* Stabilization delays, in usec */ #define PLL_STABILIZATION_DELAY(300) diff --git a/arch/arm/include/asm/arch-tegra/cboot.h b/arch/arm/include/asm/arch-tegra/cboot.h index 4e1da98d1f21..d0ba83ae8bc8 100644 --- a/arch/arm/include/asm/arch-tegra/cboot.h +++ b/arch/arm/include/asm/arch-tegra/cboot.h @@ -6,6 +6,8 @@ #ifndef _TEGRA_CBOOT_H_ #define _TEGRA_CBOOT_H_ +#include +#include #include #ifdef CONFIG_ARM64 diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c index 532730fe7270..1ea620e4ab59 100644 --- a/arch/arm/mach-tegra/ap.c +++ b/arch/arm/mach-tegra/ap.c @@ -6,7 +6,7 @@ /* Tegra AP (Application Processor) code */ -#include +#include #include #include #include diff --git a/arch/arm/mach-tegra/arm64-mmu.c b/arch/arm/mach-tegra/arm64-mmu.c index ea4eac392d96..4fbe47a91e1e 100644 --- a/arch/arm/mach-tegra/arm64-mmu.c +++ b/arch/arm/mach-tegra/arm64-mmu.c @@ -7,7 +7,6 @@ * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. */ -#include #include #include diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index 327d70bd4cc0..c382e0428603 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -4,7 +4,7 @@ * NVIDIA Corporation */ -#include +#include #include #include #include diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index adea12c9b7f9..479137e457cb 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -4,7 +4,7 @@ * NVIDIA Corporation */ -#include +#include #include #include #include diff --git a/arch/arm/mach-tegra/cache.c b/arch/arm/mach-tegra/cache.c index d7063490e222..462364abf038 100644 --- a/arch/arm/mach-tegra/cache.c +++ b/arch/arm/mach-tegra/cache.c @@ -5,7 +5,6 @@ /* Tegra cache routines */ -#include #include #include #if IS_ENABLED(CONFIG_TEGRA_GP_PADCTRL) diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c index 8f5bb2f261a9..c12543d71ac0 100644 --- a/arch/arm/mach-tegra/cboot.c +++ b/arch/arm/mach-tegra/cboot.c @@ -3,7 +3,6 @@ * Copyright (c) 2016-2018, NVIDIA CORPORATION. */ -#include #include #include #include diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c index 575da2bdb5a2..157e6c4911a4
[PATCH 06/33] arm: stm32/stm32mp: Remove and add needed includes
Remove from all mach-stm32 and mach-stm32mp files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Patrick Delaunay Cc: Patrice Chotard --- arch/arm/mach-stm32/soc.c | 1 - arch/arm/mach-stm32mp/boot_params.c| 2 +- arch/arm/mach-stm32mp/bsec.c | 1 - arch/arm/mach-stm32mp/cmd_stm32key.c | 1 - arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c| 1 - arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c | 2 +- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c| 1 - arch/arm/mach-stm32mp/dram_init.c | 1 - arch/arm/mach-stm32mp/stm32mp1/cpu.c | 1 - arch/arm/mach-stm32mp/stm32mp1/fdt.c | 2 +- arch/arm/mach-stm32mp/stm32mp1/psci.c | 2 +- arch/arm/mach-stm32mp/stm32mp1/pwr_regulator.c | 2 +- arch/arm/mach-stm32mp/stm32mp1/spl.c | 2 +- arch/arm/mach-stm32mp/stm32mp1/stm32mp13x.c| 2 +- arch/arm/mach-stm32mp/stm32mp1/stm32mp15x.c| 1 - arch/arm/mach-stm32mp/syscon.c | 1 - 16 files changed, 7 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-stm32/soc.c b/arch/arm/mach-stm32/soc.c index 0bd8d7b22c4d..737e6809f8d3 100644 --- a/arch/arm/mach-stm32/soc.c +++ b/arch/arm/mach-stm32/soc.c @@ -4,7 +4,6 @@ * Author(s): Patrice Chotard, for STMicroelectronics. */ -#include #include #include #include diff --git a/arch/arm/mach-stm32mp/boot_params.c b/arch/arm/mach-stm32mp/boot_params.c index 158bf40cb97e..ebddf6a7dbcc 100644 --- a/arch/arm/mach-stm32mp/boot_params.c +++ b/arch/arm/mach-stm32mp/boot_params.c @@ -5,7 +5,7 @@ #define LOG_CATEGORY LOGC_ARCH -#include +#include #include #include #include diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c index 5b869017ec1a..9ba7a6c9a892 100644 --- a/arch/arm/mach-stm32mp/bsec.c +++ b/arch/arm/mach-stm32mp/bsec.c @@ -5,7 +5,6 @@ #define LOG_CATEGORY UCLASS_MISC -#include #include #include #include diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c index c7fe232f86e0..0cb3c7a9fa44 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32key.c +++ b/arch/arm/mach-stm32mp/cmd_stm32key.c @@ -3,7 +3,6 @@ * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ -#include #include #include #include diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c index adee6e05b636..967fa4e06c0e 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c @@ -3,7 +3,6 @@ * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ -#include #include #include #include diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c index 35bed3199422..07c5e0456f82 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c @@ -3,12 +3,12 @@ * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ -#include #include #include #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c index d18455bf36f1..4b1ed50e9fe5 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c @@ -3,7 +3,6 @@ * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ -#include #include #include #include diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c index fb1208fc5d57..78b12fcbb6ac 100644 --- a/arch/arm/mach-stm32mp/dram_init.c +++ b/arch/arm/mach-stm32mp/dram_init.c @@ -5,7 +5,6 @@ #define LOG_CATEGORY LOGC_ARCH -#include #include #include #include diff --git a/arch/arm/mach-stm32mp/stm32mp1/cpu.c b/arch/arm/mach-stm32mp/stm32mp1/cpu.c index 524778f00c67..478c3efae73e 100644 --- a/arch/arm/mach-stm32mp/stm32mp1/cpu.c +++ b/arch/arm/mach-stm32mp/stm32mp1/cpu.c @@ -5,7 +5,6 @@ #define LOG_CATEGORY LOGC_ARCH -#include #include #include #include diff --git a/arch/arm/mach-stm32mp/stm32mp1/fdt.c b/arch/arm/mach-stm32mp/stm32mp1/fdt.c index d0b6c3cc5a55..e1e4dc04e01c 100644 --- a/arch/arm/mach-stm32mp/stm32mp1/fdt.c +++ b/arch/arm/mach-stm32mp/stm32mp1/fdt.c @@ -5,11 +5,11 @@ #define LOG_CATEGORY LOGC_ARCH -#include #include #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-stm32mp/stm32mp1/psci.c b/arch/arm/mach-stm32mp/stm32mp1/psci.c index 4f2379df45fb..7772546b2fef 100644 --- a/arch/arm/mach-stm32mp/stm32mp1/psci.c +++ b/arch/arm/mach-stm32mp/stm32mp1/psci.c @@ -4,7 +4,6 @@
[PATCH 08/33] arm: socfpga: Remove and add needed includes
Remove from all mach-socfpga files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Marek Vasut Cc: Simon Goldschmidt Cc: Tien Fong Chee --- arch/arm/mach-socfpga/board.c | 2 +- arch/arm/mach-socfpga/clock_manager.c | 2 +- arch/arm/mach-socfpga/clock_manager_agilex.c | 1 - arch/arm/mach-socfpga/clock_manager_arria10.c | 1 - arch/arm/mach-socfpga/clock_manager_gen5.c | 1 - arch/arm/mach-socfpga/clock_manager_n5x.c | 1 - arch/arm/mach-socfpga/clock_manager_s10.c | 2 +- arch/arm/mach-socfpga/firewall.c | 2 +- arch/arm/mach-socfpga/fpga_manager.c | 2 +- arch/arm/mach-socfpga/freeze_controller.c | 2 +- arch/arm/mach-socfpga/include/mach/clock_manager.h | 2 ++ arch/arm/mach-socfpga/mailbox_s10.c| 1 - arch/arm/mach-socfpga/misc.c | 2 +- arch/arm/mach-socfpga/misc_arria10.c | 2 +- arch/arm/mach-socfpga/misc_gen5.c | 2 +- arch/arm/mach-socfpga/misc_soc64.c | 1 - arch/arm/mach-socfpga/mmu-arm64_s10.c | 1 - arch/arm/mach-socfpga/pinmux_arria10.c | 2 +- arch/arm/mach-socfpga/reset_manager_arria10.c | 1 - arch/arm/mach-socfpga/reset_manager_gen5.c | 2 +- arch/arm/mach-socfpga/reset_manager_s10.c | 1 - arch/arm/mach-socfpga/scan_manager.c | 2 +- arch/arm/mach-socfpga/secure_reg_helper.c | 1 - arch/arm/mach-socfpga/secure_vab.c | 1 - arch/arm/mach-socfpga/smc_api.c| 3 ++- arch/arm/mach-socfpga/spl_a10.c| 2 +- arch/arm/mach-socfpga/spl_agilex.c | 1 - arch/arm/mach-socfpga/spl_gen5.c | 1 - arch/arm/mach-socfpga/spl_n5x.c| 1 - arch/arm/mach-socfpga/spl_s10.c| 1 - arch/arm/mach-socfpga/spl_soc64.c | 1 - arch/arm/mach-socfpga/system_manager_gen5.c| 1 - arch/arm/mach-socfpga/system_manager_soc64.c | 1 - arch/arm/mach-socfpga/timer.c | 2 +- arch/arm/mach-socfpga/timer_s10.c | 1 - arch/arm/mach-socfpga/vab.c| 2 +- arch/arm/mach-socfpga/wrap_handoff_soc64.c | 1 - arch/arm/mach-socfpga/wrap_iocsr_config.c | 2 +- arch/arm/mach-socfpga/wrap_pinmux_config.c | 3 ++- arch/arm/mach-socfpga/wrap_pll_config.c| 2 +- arch/arm/mach-socfpga/wrap_pll_config_soc64.c | 1 - arch/arm/mach-socfpga/wrap_sdram_config.c | 4 +++- 42 files changed, 26 insertions(+), 41 deletions(-) diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c index 616e1afe5de6..feaf5ce45964 100644 --- a/arch/arm/mach-socfpga/board.c +++ b/arch/arm/mach-socfpga/board.c @@ -5,7 +5,7 @@ * Copyright (C) 2015 Marek Vasut */ -#include +#include #include #include #include diff --git a/arch/arm/mach-socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c index 9e645a425317..4fcb13f17e6c 100644 --- a/arch/arm/mach-socfpga/clock_manager.c +++ b/arch/arm/mach-socfpga/clock_manager.c @@ -3,10 +3,10 @@ * Copyright (C) 2013-2017 Altera Corporation */ -#include #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-socfpga/clock_manager_agilex.c b/arch/arm/mach-socfpga/clock_manager_agilex.c index 28f593b60e63..9987d5bcee6f 100644 --- a/arch/arm/mach-socfpga/clock_manager_agilex.c +++ b/arch/arm/mach-socfpga/clock_manager_agilex.c @@ -5,7 +5,6 @@ */ #include -#include #include #include #include diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c index 8ab18f6b7252..58b9321131a9 100644 --- a/arch/arm/mach-socfpga/clock_manager_arria10.c +++ b/arch/arm/mach-socfpga/clock_manager_arria10.c @@ -3,7 +3,6 @@ * Copyright (C) 2016-2017 Intel Corporation */ -#include #include #include #include diff --git a/arch/arm/mach-socfpga/clock_manager_gen5.c b/arch/arm/mach-socfpga/clock_manager_gen5.c index 8fa2760798b8..154ad2154ae7 100644 --- a/arch/arm/mach-socfpga/clock_manager_gen5.c +++ b/arch/arm/mach-socfpga/clock_manager_gen5.c @@ -3,7 +3,6 @@ * Copyright (C) 2013-2017 Altera Corporation */ -#include #include #include #include diff --git a/arch/arm/mach-socfpga/clock_manager_n5x.c b/arch/arm/mach-socfpga/clock_manager_n5x.c index 0ed480de670d..c4c071330fc3 100644 --- a/arch/arm/mach-socfpga/clock_manager_n5x.c +++ b/arch/arm/mach-socfpga/clock_manager_n5x.c @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/arch/arm/mach-socfpga/clock_manager_s10.c b/arch/arm/mach-socfpga/clock_manager_s10.c index 45300336d52a..1e148947a338 100644 --- a/arch/arm/mach-socfpga/clock_manager_s10.c +++ b/arch/arm/mach-socfpga/clock_manager_s10.c @@ -4,7 +4,7 @@ * */ -#
[PATCH 07/33] arm: sunxi: Remove and add needed includes
Remove from all mach-sunxi and board/sunxi files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Jagan Teki Cc: Andre Przywara --- arch/arm/cpu/armv7/sunxi/psci.c | 1 - arch/arm/cpu/armv7/sunxi/sram.c | 1 - arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c | 1 - arch/arm/mach-sunxi/dram_timings/ddr3_1333.c| 1 - arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c | 1 - arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c | 1 - arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c | 1 - arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c | 1 - arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c| 1 - arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c | 1 - board/sunxi/board.c | 1 - board/sunxi/chip.c | 1 - board/sunxi/dram_sun4i_auto.c | 1 - board/sunxi/dram_sun5i_auto.c | 1 - board/sunxi/gmac.c | 1 - 15 files changed, 15 deletions(-) diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c index 5cb8cfa6cf3f..4c30f3294b7a 100644 --- a/arch/arm/cpu/armv7/sunxi/psci.c +++ b/arch/arm/cpu/armv7/sunxi/psci.c @@ -7,7 +7,6 @@ * which was based on code by Carl van Schaik . */ #include -#include #include #include diff --git a/arch/arm/cpu/armv7/sunxi/sram.c b/arch/arm/cpu/armv7/sunxi/sram.c index 28ff6a1b7c23..bc25719c9c46 100644 --- a/arch/arm/cpu/armv7/sunxi/sram.c +++ b/arch/arm/cpu/armv7/sunxi/sram.c @@ -9,7 +9,6 @@ * SRAM init for older sunxi SoCs. */ -#include #include #include #include diff --git a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c index 9077f86a8b4c..3666dddca15c 100644 --- a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c +++ b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c @@ -1,4 +1,3 @@ -#include #include #include diff --git a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c index 0471e8a49e58..ceaafd6ec6fa 100644 --- a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c +++ b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c @@ -1,4 +1,3 @@ -#include #include #include diff --git a/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c index 232b4fe2df7f..3faf8d5bd974 100644 --- a/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c +++ b/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c @@ -11,7 +11,6 @@ * SPDX-License-Identifier:GPL-2.0+ */ -#include #include #include diff --git a/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c b/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c index b6d6a6874682..ce2ffa7a020e 100644 --- a/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c +++ b/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c @@ -11,7 +11,6 @@ * SPDX-License-Identifier:GPL-2.0+ */ -#include #include #include diff --git a/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c b/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c index c11cb8678f64..e6446b9180da 100644 --- a/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c +++ b/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier:GPL-2.0+ */ -#include #include #include diff --git a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c index 2136ca3a4cb0..afe8e25c7f58 100644 --- a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c +++ b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c @@ -19,7 +19,6 @@ * SPDX-License-Identifier:GPL-2.0+ */ -#include #include #include diff --git a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c index 10008601134a..c243b574406d 100644 --- a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c +++ b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c @@ -6,7 +6,6 @@ * SPDX-License-Identifier:GPL-2.0+ */ -#include #include #include diff --git a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c index bd57e2f6aac2..bc47a4638533 100644 --- a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c +++ b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c @@ -1,4 +1,3 @@ -#include #include #include diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 1313b01dcea5..ed86f1df5dc4 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -10,7 +10,6 @@ * Some board init for the Allwinner A10-evb board. */ -#include #include #include #include diff --git a/board/sunxi/chip.c b/board/sunxi/chip.c index 6319e799..270af2506d21 100644 --- a/board/sunxi/chip.c +++ b/board/sunxi/chip.c @@ -5,7 +5,6 @@ * Based on initial code from Maxime Ripard */ -#include #include #include #include diff --git a/board/sunxi/dram_sun4i_auto.c b/board/sunxi/dr
[PATCH 09/33] arm: s5pc1xx: Remove and add needed includes
Remove from all mach-s5pc1xx and cpu/armv7/s5p-common files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Minkyu Kang --- arch/arm/cpu/armv7/s5p-common/cpu_info.c | 1 - arch/arm/cpu/armv7/s5p-common/pwm.c | 2 +- arch/arm/cpu/armv7/s5p-common/sromc.c| 2 +- arch/arm/cpu/armv7/s5p-common/timer.c| 1 - arch/arm/mach-s5pc1xx/cache.c| 1 - arch/arm/mach-s5pc1xx/clock.c| 2 +- arch/arm/mach-s5pc1xx/pinmux.c | 1 - 7 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c index fb2920950d42..4331dde7643d 100644 --- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c +++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c @@ -3,7 +3,6 @@ * Copyright (C) 2009 Samsung Electronics * Minkyu Kang */ -#include #include #include #include diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/s5p-common/pwm.c index 5068327d3c5f..986b585b70e9 100644 --- a/arch/arm/cpu/armv7/s5p-common/pwm.c +++ b/arch/arm/cpu/armv7/s5p-common/pwm.c @@ -5,7 +5,7 @@ * Donghwa Lee */ -#include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/s5p-common/sromc.c b/arch/arm/cpu/armv7/s5p-common/sromc.c index 0fc170936ae4..c0035fb18ebb 100644 --- a/arch/arm/cpu/armv7/s5p-common/sromc.c +++ b/arch/arm/cpu/armv7/s5p-common/sromc.c @@ -4,7 +4,7 @@ * Naveen Krishna Ch */ -#include +#include #include #include diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c index 9d981cce145d..12994ecc843e 100644 --- a/arch/arm/cpu/armv7/s5p-common/timer.c +++ b/arch/arm/cpu/armv7/s5p-common/timer.c @@ -6,7 +6,6 @@ * Minkyu Kang */ -#include #include #include #include diff --git a/arch/arm/mach-s5pc1xx/cache.c b/arch/arm/mach-s5pc1xx/cache.c index b390bdf82784..f0aec7c0fe02 100644 --- a/arch/arm/mach-s5pc1xx/cache.c +++ b/arch/arm/mach-s5pc1xx/cache.c @@ -7,7 +7,6 @@ * based on arch/arm/cpu/armv7/omap3/cache.S */ -#include #include #include diff --git a/arch/arm/mach-s5pc1xx/clock.c b/arch/arm/mach-s5pc1xx/clock.c index c90c341b5082..b92ce1152f66 100644 --- a/arch/arm/mach-s5pc1xx/clock.c +++ b/arch/arm/mach-s5pc1xx/clock.c @@ -5,7 +5,7 @@ * Heungjun Kim */ -#include +#include #include #include #include diff --git a/arch/arm/mach-s5pc1xx/pinmux.c b/arch/arm/mach-s5pc1xx/pinmux.c index 818d75164dee..23b9252827ae 100644 --- a/arch/arm/mach-s5pc1xx/pinmux.c +++ b/arch/arm/mach-s5pc1xx/pinmux.c @@ -6,7 +6,6 @@ * Written by Simon Glass */ -#include #include int exynos_pinmux_config(int peripheral, int flags) -- 2.34.1
[PATCH u-boot-mvebu] arm: mvebu: turris_omnia: Fix ethernet PHY reset gpio FDT fixup
For board revisions where the WAN ethernet PHY reset GPIO is controllable
via MCU we currently insert a phy-reset-gpios property into the ethernet
controller node. The mvneta driver parses this property and uses the
GPIO to reset the PHY.
But this phy-reset-gpios property is not a valid DT binding in upstream
kernel. Instead, a reset-gpios property should be inserted into the
ethernet PHY node. This correct DT binding is supported by the DM ETH PHY
U-Boot driver.
Insert the reset-gpios property into the WAN PHY node instead the
phy-reset-gpios property in WAN ETH node so that Linux will correctly use
the reset GPIO.
Enable the CONFIG_DM_ETH_PHY config option so that U-Boot will also use
the correct DT property.
Note: currently there are 4 ethernet controller drivers parsing the
wrong DT property: dwc_eth_qos, fex_mxc, mvneta and mvpp2. We should
convert all relevant device-trees to use reset-gpios so that we can get
rid of these drivers parsing this property.
Fixes: 1da53ae26afc ("arm: mvebu: turris_omnia: Add support for design with SW
reset signals")
Signed-off-by: Marek Behún
---
board/CZ.NIC/turris_omnia/turris_omnia.c | 44 ++--
configs/turris_omnia_defconfig | 1 +
2 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c
b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 3b7a71bdad..448655c294 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -978,11 +978,21 @@ static int fixup_mcu_gpio_in_pcie_nodes(void *blob)
return 0;
}
-static int fixup_mcu_gpio_in_eth_wan_node(void *blob)
+static int get_phy_wan_node_offset(const void *blob)
+{
+ u32 phy_wan_phandle;
+
+ phy_wan_phandle = fdt_getprop_u32_default(blob, "ethernet2",
"phy-handle", 0);
+ if (!phy_wan_phandle)
+ return -FDT_ERR_NOTFOUND;
+
+ return fdt_node_offset_by_phandle(blob, phy_wan_phandle);
+}
+
+static int fixup_mcu_gpio_in_phy_wan_node(void *blob)
{
unsigned int mcu_phandle;
- int eth_wan_node;
- int ret;
+ int phy_wan_node, ret;
ret = fdt_increase_size(blob, 64);
if (ret < 0) {
@@ -990,21 +1000,17 @@ static int fixup_mcu_gpio_in_eth_wan_node(void *blob)
return ret;
}
- eth_wan_node = fdt_path_offset(blob, "ethernet2");
- if (eth_wan_node < 0)
- return eth_wan_node;
+ phy_wan_node = get_phy_wan_node_offset(blob);
+ if (phy_wan_node < 0)
+ return phy_wan_node;
mcu_phandle = fdt_create_phandle_by_compatible(blob,
"cznic,turris-omnia-mcu");
if (!mcu_phandle)
return -FDT_ERR_NOPHANDLES;
- /* insert: phy-reset-gpios = <&mcu 2 gpio GPIO_ACTIVE_LOW>; */
- ret = insert_mcu_gpio_prop(blob, eth_wan_node, "phy-reset-gpios",
- mcu_phandle, 2, ilog2(EXT_CTL_nRES_PHY),
GPIO_ACTIVE_LOW);
- if (ret < 0)
- return ret;
-
- return 0;
+ /* insert: reset-gpios = <&mcu 2 gpio GPIO_ACTIVE_LOW>; */
+ return insert_mcu_gpio_prop(blob, phy_wan_node, "reset-gpios",
+ mcu_phandle, 2, ilog2(EXT_CTL_nRES_PHY),
GPIO_ACTIVE_LOW);
}
static void fixup_atsha_node(void *blob)
@@ -1033,7 +1039,7 @@ int board_fix_fdt(void *blob)
{
if (omnia_mcu_has_feature(FEAT_PERIPH_MCU)) {
fixup_mcu_gpio_in_pcie_nodes(blob);
- fixup_mcu_gpio_in_eth_wan_node(blob);
+ fixup_mcu_gpio_in_phy_wan_node(blob);
}
fixup_msata_port_nodes(blob);
@@ -1218,14 +1224,14 @@ int ft_board_setup(void *blob, struct bd_info *bd)
int node;
/*
-* U-Boot's FDT blob contains phy-reset-gpios in ethernet2
-* node when MCU controls all peripherals resets.
+* U-Boot's FDT blob contains reset-gpios in ethernet2 PHY node when MCU
+* controls all peripherals resets.
* Fixup MCU GPIO nodes in PCIe and eth wan nodes in this case.
*/
- node = fdt_path_offset(gd->fdt_blob, "ethernet2");
- if (node >= 0 && fdt_getprop(gd->fdt_blob, node, "phy-reset-gpios",
NULL)) {
+ node = get_phy_wan_node_offset(gd->fdt_blob);
+ if (node >= 0 && fdt_getprop(gd->fdt_blob, node, "reset-gpios", NULL)) {
fixup_mcu_gpio_in_pcie_nodes(blob);
- fixup_mcu_gpio_in_eth_wan_node(blob);
+ fixup_mcu_gpio_in_phy_wan_node(blob);
}
fixup_spi_nor_partitions(blob);
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index 11256be8dd..d7005e7334 100644
--- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig
@@ -100,6 +100,7 @@ CONFIG_SPI_FLASH_MTD=y
CONFIG_PHY_MARVELL=y
CONFIG_PHY_FIXED=y
CONFIG_DM_DSA=y
+CONFIG_DM_ETH_PHY=y
CONFIG_PHY_GIGE=y
CONFIG_MV88E6XXX=y
CONFIG_MVNETA=y
--
2.43.2
[PATCH 11/33] arm: owl: Remove and add needed includes
Remove from all mach-owl files and when needed add missing
include files directly.
Signed-off-by: Tom Rini
---
Cc: Manivannan Sadhasivam
---
arch/arm/mach-owl/soc.c| 3 ++-
arch/arm/mach-owl/sysmap-owl.c | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c
index f0f46f2dcb74..e6332452e3ee 100644
--- a/arch/arm/mach-owl/soc.c
+++ b/arch/arm/mach-owl/soc.c
@@ -5,13 +5,14 @@
* Copyright (C) 2018 Manivannan Sadhasivam
*/
+#include
#include
#include
#include
#include
+#include
#include
#include
-#include
#include
#include
#include
diff --git a/arch/arm/mach-owl/sysmap-owl.c b/arch/arm/mach-owl/sysmap-owl.c
index 81f6ca2e4919..6f0a220320e4 100644
--- a/arch/arm/mach-owl/sysmap-owl.c
+++ b/arch/arm/mach-owl/sysmap-owl.c
@@ -6,7 +6,6 @@
* Copyright (C) 2018 Manivannan Sadhasivam
*/
-#include
#include
static struct mm_region owl_mem_map[] = {
--
2.34.1
[PATCH 10/33] arm: rockchip: Remove and add needed includes
Remove from all mach-rockchip and include/asm/arch-rockchip files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Simon Glass Cc: Philipp Tomsich Cc: Kever Yang --- arch/arm/include/asm/arch-rockchip/bootrom.h | 2 ++ arch/arm/include/asm/arch-rockchip/clock.h| 2 ++ arch/arm/mach-rockchip/board.c| 2 +- arch/arm/mach-rockchip/boot_mode.c| 1 - arch/arm/mach-rockchip/bootrom.c | 1 - arch/arm/mach-rockchip/cpu-info.c | 1 - arch/arm/mach-rockchip/px30-board-tpl.c | 1 - arch/arm/mach-rockchip/px30/clk_px30.c| 1 - arch/arm/mach-rockchip/px30/px30.c| 1 - arch/arm/mach-rockchip/px30/syscon_px30.c | 1 - arch/arm/mach-rockchip/rk3036-board-spl.c | 1 - arch/arm/mach-rockchip/rk3036/clk_rk3036.c| 1 - arch/arm/mach-rockchip/rk3036/rk3036.c| 1 - arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 2 +- arch/arm/mach-rockchip/rk3036/syscon_rk3036.c | 1 - arch/arm/mach-rockchip/rk3066/clk_rk3066.c| 1 - arch/arm/mach-rockchip/rk3066/rk3066.c| 1 - arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 1 - arch/arm/mach-rockchip/rk3128/clk_rk3128.c| 1 - arch/arm/mach-rockchip/rk3128/syscon_rk3128.c | 1 - arch/arm/mach-rockchip/rk3188/clk_rk3188.c| 1 - arch/arm/mach-rockchip/rk3188/rk3188.c| 1 - arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 1 - arch/arm/mach-rockchip/rk322x/clk_rk322x.c| 1 - arch/arm/mach-rockchip/rk322x/syscon_rk322x.c | 1 - arch/arm/mach-rockchip/rk3288/clk_rk3288.c| 1 - arch/arm/mach-rockchip/rk3288/rk3288.c| 1 - arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 1 - arch/arm/mach-rockchip/rk3308/clk_rk3308.c| 1 - arch/arm/mach-rockchip/rk3308/rk3308.c| 1 - arch/arm/mach-rockchip/rk3308/syscon_rk3308.c | 1 - arch/arm/mach-rockchip/rk3328/clk_rk3328.c| 1 - arch/arm/mach-rockchip/rk3328/rk3328.c| 1 - arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 1 - arch/arm/mach-rockchip/rk3368/clk_rk3368.c| 1 - arch/arm/mach-rockchip/rk3368/rk3368.c| 1 - arch/arm/mach-rockchip/rk3368/syscon_rk3368.c | 1 - arch/arm/mach-rockchip/rk3399/clk_rk3399.c| 1 - arch/arm/mach-rockchip/rk3399/rk3399.c| 1 - arch/arm/mach-rockchip/rk3399/syscon_rk3399.c | 1 - arch/arm/mach-rockchip/rk3568/clk_rk3568.c| 1 - arch/arm/mach-rockchip/rk3568/rk3568.c| 1 - arch/arm/mach-rockchip/rk3568/syscon_rk3568.c | 1 - arch/arm/mach-rockchip/rk3588/clk_rk3588.c| 1 - arch/arm/mach-rockchip/rk3588/rk3588.c| 1 - arch/arm/mach-rockchip/rk3588/syscon_rk3588.c | 1 - arch/arm/mach-rockchip/rv1108/clk_rv1108.c| 1 - arch/arm/mach-rockchip/rv1108/syscon_rv1108.c | 1 - arch/arm/mach-rockchip/rv1126/clk_rv1126.c| 1 - arch/arm/mach-rockchip/rv1126/rv1126.c| 1 - arch/arm/mach-rockchip/rv1126/syscon_rv1126.c | 1 - arch/arm/mach-rockchip/sdram.c| 2 +- arch/arm/mach-rockchip/spl-boot-order.c | 1 - arch/arm/mach-rockchip/tpl.c | 1 - 54 files changed, 7 insertions(+), 52 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/bootrom.h b/arch/arm/include/asm/arch-rockchip/bootrom.h index ecf3b4e7428c..e736772fda75 100644 --- a/arch/arm/include/asm/arch-rockchip/bootrom.h +++ b/arch/arm/include/asm/arch-rockchip/bootrom.h @@ -7,6 +7,8 @@ #ifndef _ASM_ARCH_BOOTROM_H #define _ASM_ARCH_BOOTROM_H +#include + /* * Saved Stack pointer address. * Access might be needed in some special cases. diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h index f01c5aeb71cb..73e5283108b1 100644 --- a/arch/arm/include/asm/arch-rockchip/clock.h +++ b/arch/arm/include/asm/arch-rockchip/clock.h @@ -6,6 +6,8 @@ #ifndef _ASM_ARCH_CLOCK_H #define _ASM_ARCH_CLOCK_H +#include + struct udevice; /* define pll mode */ diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index cd226844b638..8a57b8217ff2 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -8,7 +8,7 @@ * Based on puma-rk3399.c: * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH */ -#include +#include #include #include #include diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c index f9be396aa558..55e9456668ae 100644 --- a/arch/arm/mach-rockchip/boot_mode.c +++ b/arch/arm/mach-rockchip/boot_mode.c @@ -3,7 +3,6 @@ * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ -#include #include #include #include diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c index b36e559e8719..82a0b3efef92 100644 --- a/arch/arm/mach-rockchip/bootrom.c +++ b/arch/arm/mach-rockchip/bootrom.c @@ -3,7 +3,6 @@ * Copyright (c) 2017 Google, Inc */ -#include #include #include #include diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c
[PATCH 12/33] arm: orion5x: Remove and add needed includes
Remove from all mach-orion5x files and when needed add missing include files directly. Signed-off-by: Tom Rini --- arch/arm/mach-orion5x/cpu.c | 1 - arch/arm/mach-orion5x/dram.c | 1 - arch/arm/mach-orion5x/timer.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c index ffae9a01e37c..58ee67eca50f 100644 --- a/arch/arm/mach-orion5x/cpu.c +++ b/arch/arm/mach-orion5x/cpu.c @@ -8,7 +8,6 @@ * Written-by: Prafulla Wadaskar */ -#include #include #include #include diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c index 5647f847d78f..228a3f7ad075 100644 --- a/arch/arm/mach-orion5x/dram.c +++ b/arch/arm/mach-orion5x/dram.c @@ -8,7 +8,6 @@ * Written-by: Prafulla Wadaskar */ -#include #include #include #include diff --git a/arch/arm/mach-orion5x/timer.c b/arch/arm/mach-orion5x/timer.c index b373e59e6fe3..85736f04e672 100644 --- a/arch/arm/mach-orion5x/timer.c +++ b/arch/arm/mach-orion5x/timer.c @@ -7,7 +7,7 @@ * Written-by: Prafulla Wadaskar */ -#include +#include #include #include #include -- 2.34.1
[PATCH 14/33] arm: octeontx2: Remove and add needed includes
Remove from all mach-octeontx2 files and when needed add missing include files directly. Signed-off-by: Tom Rini --- arch/arm/mach-octeontx2/clock.c | 1 - arch/arm/mach-octeontx2/cpu.c | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm/mach-octeontx2/clock.c b/arch/arm/mach-octeontx2/clock.c index 9da21077ecdc..ffdee8799fb6 100644 --- a/arch/arm/mach-octeontx2/clock.c +++ b/arch/arm/mach-octeontx2/clock.c @@ -5,7 +5,6 @@ * https://spdx.org/licenses */ -#include #include #include #include diff --git a/arch/arm/mach-octeontx2/cpu.c b/arch/arm/mach-octeontx2/cpu.c index 723deef719b6..0a44af71a40d 100644 --- a/arch/arm/mach-octeontx2/cpu.c +++ b/arch/arm/mach-octeontx2/cpu.c @@ -5,7 +5,6 @@ * https://spdx.org/licenses */ -#include #include #include #include -- 2.34.1
[PATCH 15/33] arm: octeontx: Remove and add needed includes
Remove from all mach-octeontx files and when needed add missing include files directly. Signed-off-by: Tom Rini --- arch/arm/mach-octeontx/clock.c | 1 - arch/arm/mach-octeontx/cpu.c | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm/mach-octeontx/clock.c b/arch/arm/mach-octeontx/clock.c index 9da21077ecdc..ffdee8799fb6 100644 --- a/arch/arm/mach-octeontx/clock.c +++ b/arch/arm/mach-octeontx/clock.c @@ -5,7 +5,6 @@ * https://spdx.org/licenses */ -#include #include #include #include diff --git a/arch/arm/mach-octeontx/cpu.c b/arch/arm/mach-octeontx/cpu.c index aa5f4585c6f5..90454edca257 100644 --- a/arch/arm/mach-octeontx/cpu.c +++ b/arch/arm/mach-octeontx/cpu.c @@ -5,7 +5,6 @@ * https://spdx.org/licenses */ -#include #include #include #include -- 2.34.1
[PATCH 13/33] arm: omap2: Remove and add needed includes
Remove from all mach-omap2 files and when needed add missing include files directly. Signed-off-by: Tom Rini --- arch/arm/include/asm/arch-am33xx/clk_synthesizer.h | 2 ++ arch/arm/mach-omap2/abb.c | 1 - arch/arm/mach-omap2/am33xx/board.c | 2 +- arch/arm/mach-omap2/am33xx/chilisom.c | 1 - arch/arm/mach-omap2/am33xx/clk_synthesizer.c | 3 +-- arch/arm/mach-omap2/am33xx/clock.c | 1 - arch/arm/mach-omap2/am33xx/clock_am33xx.c | 1 - arch/arm/mach-omap2/am33xx/clock_am43xx.c | 1 - arch/arm/mach-omap2/am33xx/ddr.c | 2 +- arch/arm/mach-omap2/am33xx/emif4.c | 1 - arch/arm/mach-omap2/am33xx/fdt.c | 1 - arch/arm/mach-omap2/am33xx/mux.c | 1 - arch/arm/mach-omap2/am33xx/sys_info.c | 1 - arch/arm/mach-omap2/boot-common.c | 1 - arch/arm/mach-omap2/clocks-common.c| 1 - arch/arm/mach-omap2/emif-common.c | 2 +- arch/arm/mach-omap2/fdt-common.c | 2 +- arch/arm/mach-omap2/hwinit-common.c| 1 - arch/arm/mach-omap2/mem-common.c | 2 +- arch/arm/mach-omap2/omap-cache.c | 3 ++- arch/arm/mach-omap2/omap3/am35x_musb.c | 2 +- arch/arm/mach-omap2/omap3/board.c | 1 - arch/arm/mach-omap2/omap3/boot.c | 1 - arch/arm/mach-omap2/omap3/clock.c | 3 ++- arch/arm/mach-omap2/omap3/emac.c | 1 - arch/arm/mach-omap2/omap3/emif4.c | 3 ++- arch/arm/mach-omap2/omap3/sdrc.c | 2 +- arch/arm/mach-omap2/omap3/spl_id_nand.c| 1 - arch/arm/mach-omap2/omap3/sys_info.c | 3 ++- arch/arm/mach-omap2/omap4/boot.c | 1 - arch/arm/mach-omap2/omap4/emif.c | 1 - arch/arm/mach-omap2/omap4/hw_data.c| 1 - arch/arm/mach-omap2/omap4/hwinit.c | 1 - arch/arm/mach-omap2/omap4/sdram_elpida.c | 1 - arch/arm/mach-omap2/omap5/abb.c| 2 +- arch/arm/mach-omap2/omap5/boot.c | 1 - arch/arm/mach-omap2/omap5/dra7xx_iodelay.c | 2 +- arch/arm/mach-omap2/omap5/emif.c | 1 - arch/arm/mach-omap2/omap5/fdt.c| 2 +- arch/arm/mach-omap2/omap5/hw_data.c| 1 - arch/arm/mach-omap2/omap5/hwinit.c | 1 - arch/arm/mach-omap2/omap5/sdram.c | 1 - arch/arm/mach-omap2/sec-common.c | 2 +- arch/arm/mach-omap2/timer.c| 2 +- arch/arm/mach-omap2/utils.c| 2 +- arch/arm/mach-omap2/vc.c | 2 +- 46 files changed, 25 insertions(+), 46 deletions(-) diff --git a/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h b/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h index 8e3d55f3e763..393bc7a6a8a5 100644 --- a/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h +++ b/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h @@ -10,6 +10,8 @@ #ifndef __CLK_SYNTHESIZER_H #define __CLK_SYNTHESIZER_H +#include + #define CLK_SYNTHESIZER_ID_REG 0x0 #define CLK_SYNTHESIZER_XCSEL 0x05 #define CLK_SYNTHESIZER_MUX_REG0x14 diff --git a/arch/arm/mach-omap2/abb.c b/arch/arm/mach-omap2/abb.c index 722e6db0566d..ce33d2fe1297 100644 --- a/arch/arm/mach-omap2/abb.c +++ b/arch/arm/mach-omap2/abb.c @@ -8,7 +8,6 @@ * Andrii Tseglytskyi */ -#include #include #include #include diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c index 09659da5867d..78c1e965c9f5 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++ b/arch/arm/mach-omap2/am33xx/board.c @@ -7,7 +7,7 @@ * Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/ */ -#include +#include #include #include #include diff --git a/arch/arm/mach-omap2/am33xx/chilisom.c b/arch/arm/mach-omap2/am33xx/chilisom.c index d4f2abe17a97..4765ce0adeea 100644 --- a/arch/arm/mach-omap2/am33xx/chilisom.c +++ b/arch/arm/mach-omap2/am33xx/chilisom.c @@ -4,7 +4,6 @@ * Copyright (C) 2017, Grinn - http://grinn-global.com/ */ -#include #include #include #include diff --git a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c index 0969a404bf69..b75eb58ee827 100644 --- a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c +++ b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c @@ -7,8 +7,7 @@ * Copyright (C) 2016, Texas Instruments, Incorporated - https://www.ti.com/ */ - -#include +#include #include #include diff --git a/arch/arm/mach-omap2/am33xx/clock.c b/arch/arm/mach-omap2/am33xx/clock.c index 3273632c648d..f07003c95bc2 100644 --- a/arch/arm/mach-omap2/am33xx/clock.c +++ b/arch/arm/mach-omap2/am33xx/clock.c @@ -7,7 +7,6 @@ * * Copyright (C) 2013, Texas Instru
[PATCH 16/33] arm: npcm: Remove and add needed includes
Remove from all mach-npcm files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Jim Liu --- arch/arm/mach-npcm/npcm7xx/cpu.c| 1 - arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c | 2 +- arch/arm/mach-npcm/npcm8xx/cpu.c| 1 - arch/arm/mach-npcm/npcm8xx/reset.c | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/mach-npcm/npcm7xx/cpu.c b/arch/arm/mach-npcm/npcm7xx/cpu.c index dd74bb9e0871..47d51cab5c76 100644 --- a/arch/arm/mach-npcm/npcm7xx/cpu.c +++ b/arch/arm/mach-npcm/npcm7xx/cpu.c @@ -3,7 +3,6 @@ * Copyright (c) 2021 Nuvoton Technology Corp. */ -#include #include #include #include diff --git a/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c b/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c index ed4b1ca5c983..df80687c8571 100644 --- a/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c +++ b/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c @@ -3,7 +3,7 @@ * Copyright (c) 2021 Nuvoton Technology Corp. */ -#include +#include #include #include diff --git a/arch/arm/mach-npcm/npcm8xx/cpu.c b/arch/arm/mach-npcm/npcm8xx/cpu.c index af594526094c..a1fb400b2645 100644 --- a/arch/arm/mach-npcm/npcm8xx/cpu.c +++ b/arch/arm/mach-npcm/npcm8xx/cpu.c @@ -3,7 +3,6 @@ * Copyright (c) 2022 Nuvoton Technology Corp. */ -#include #include #include #include diff --git a/arch/arm/mach-npcm/npcm8xx/reset.c b/arch/arm/mach-npcm/npcm8xx/reset.c index 6954e6c6a17f..e28b4ae7ae4b 100644 --- a/arch/arm/mach-npcm/npcm8xx/reset.c +++ b/arch/arm/mach-npcm/npcm8xx/reset.c @@ -3,7 +3,6 @@ * Copyright (c) 2022 Nuvoton Technology Corp. */ -#include #include #include #include -- 2.34.1
[PATCH 17/33] arm: nexell: Remove and add needed includes
Remove from all mach-nexell files and when needed add missing
include files directly.
Signed-off-by: Tom Rini
---
Cc: Stefan Bosch
---
arch/arm/mach-nexell/clock.c | 2 +-
arch/arm/mach-nexell/include/mach/reset.h | 2 ++
arch/arm/mach-nexell/reset.c | 1 -
arch/arm/mach-nexell/tieoff.c | 1 -
arch/arm/mach-nexell/timer.c | 1 -
5 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-nexell/clock.c b/arch/arm/mach-nexell/clock.c
index 59ffa26255f5..3082f6077b73 100644
--- a/arch/arm/mach-nexell/clock.c
+++ b/arch/arm/mach-nexell/clock.c
@@ -4,8 +4,8 @@
* Hyunseok, Jung
*/
-#include
#include
+#include
#include
#include
#include
diff --git a/arch/arm/mach-nexell/include/mach/reset.h
b/arch/arm/mach-nexell/include/mach/reset.h
index e1301d4e53d3..0c6a13043f91 100644
--- a/arch/arm/mach-nexell/include/mach/reset.h
+++ b/arch/arm/mach-nexell/include/mach/reset.h
@@ -7,6 +7,8 @@
#ifndef __NEXELL_RESET__
#define __NEXELL_RESET__
+#include
+
#define NUMBER_OF_RESET_MODULE_PIN 69
enum rstcon {
diff --git a/arch/arm/mach-nexell/reset.c b/arch/arm/mach-nexell/reset.c
index 1f732a3d3732..627f568270b6 100644
--- a/arch/arm/mach-nexell/reset.c
+++ b/arch/arm/mach-nexell/reset.c
@@ -8,7 +8,6 @@
*FIXME : Not support device tree & reset control driver.
*will remove after support device tree & reset control driver.
*/
-#include
#include
#include
#include
diff --git a/arch/arm/mach-nexell/tieoff.c b/arch/arm/mach-nexell/tieoff.c
index 5a4744c296a2..51cca6744d6f 100644
--- a/arch/arm/mach-nexell/tieoff.c
+++ b/arch/arm/mach-nexell/tieoff.c
@@ -4,7 +4,6 @@
* Youngbok, Park
*/
-#include
#include
#include
#include
diff --git a/arch/arm/mach-nexell/timer.c b/arch/arm/mach-nexell/timer.c
index 3b311fd22a56..b35c7b1bb33a 100644
--- a/arch/arm/mach-nexell/timer.c
+++ b/arch/arm/mach-nexell/timer.c
@@ -4,7 +4,6 @@
* Hyunseok, Jung
*/
-#include
#include
#include
--
2.34.1
[PATCH 18/33] arm: mvebu: Remove and add needed includes
Remove from all mach-mvebu files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Stefan Roese Cc: "Marek Behún" --- arch/arm/mach-mvebu/alleycat5/cpu.c | 2 +- arch/arm/mach-mvebu/alleycat5/soc.c | 1 - arch/arm/mach-mvebu/arm64-common.c| 2 +- arch/arm/mach-mvebu/armada3700/cpu.c | 1 - arch/arm/mach-mvebu/armada3700/efuse.c| 3 ++- arch/arm/mach-mvebu/armada3700/mbox.c | 2 +- arch/arm/mach-mvebu/armada8k/cpu.c| 1 - arch/arm/mach-mvebu/armada8k/dram.c | 3 ++- arch/arm/mach-mvebu/cpu.c | 2 +- arch/arm/mach-mvebu/dram.c| 2 +- arch/arm/mach-mvebu/efuse.c | 1 - arch/arm/mach-mvebu/gpio.c| 1 - arch/arm/mach-mvebu/mbus.c| 2 +- arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c | 1 - arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c | 2 +- arch/arm/mach-mvebu/serdes/a38x/seq_exec.c| 1 - arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c | 1 - arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 2 +- arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c | 1 - arch/arm/mach-mvebu/spl.c | 1 - arch/arm/mach-mvebu/system-controller.c | 1 - 21 files changed, 12 insertions(+), 21 deletions(-) diff --git a/arch/arm/mach-mvebu/alleycat5/cpu.c b/arch/arm/mach-mvebu/alleycat5/cpu.c index 0f72ae1709be..be2d9a25bf90 100644 --- a/arch/arm/mach-mvebu/alleycat5/cpu.c +++ b/arch/arm/mach-mvebu/alleycat5/cpu.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Marvell International Ltd. */ -#include +#include #include #include #include diff --git a/arch/arm/mach-mvebu/alleycat5/soc.c b/arch/arm/mach-mvebu/alleycat5/soc.c index 734b0a87dd49..98e66735eb9e 100644 --- a/arch/arm/mach-mvebu/alleycat5/soc.c +++ b/arch/arm/mach-mvebu/alleycat5/soc.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 Marvell International Ltd. */ -#include #include #include #include diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index 4c67f1aba4de..63a12f7d7743 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -3,7 +3,7 @@ * Copyright (C) 2016 Stefan Roese */ -#include +#include #include #include #include diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c index ab72b304e5da..17525691e682 100644 --- a/arch/arm/mach-mvebu/armada3700/cpu.c +++ b/arch/arm/mach-mvebu/armada3700/cpu.c @@ -4,7 +4,6 @@ * Copyright (C) 2020 Marek Behún */ -#include #include #include #include diff --git a/arch/arm/mach-mvebu/armada3700/efuse.c b/arch/arm/mach-mvebu/armada3700/efuse.c index 07d5f394354c..84a1e388c11b 100644 --- a/arch/arm/mach-mvebu/armada3700/efuse.c +++ b/arch/arm/mach-mvebu/armada3700/efuse.c @@ -5,9 +5,10 @@ */ #include -#include #include #include +#include +#include #include #include diff --git a/arch/arm/mach-mvebu/armada3700/mbox.c b/arch/arm/mach-mvebu/armada3700/mbox.c index 6555b8673ce0..5ac543abce5b 100644 --- a/arch/arm/mach-mvebu/armada3700/mbox.c +++ b/arch/arm/mach-mvebu/armada3700/mbox.c @@ -4,11 +4,11 @@ * Copyright (C) 2021 Pali Rohár */ -#include #include #include #include #include +#include #include #define RWTM_BASE (MVEBU_REGISTER(0xb)) diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c index 939abce000f6..7908f75809c5 100644 --- a/arch/arm/mach-mvebu/armada8k/cpu.c +++ b/arch/arm/mach-mvebu/armada8k/cpu.c @@ -3,7 +3,6 @@ * Copyright (C) 2016 Stefan Roese */ -#include #include #include #include diff --git a/arch/arm/mach-mvebu/armada8k/dram.c b/arch/arm/mach-mvebu/armada8k/dram.c index 6c801bfa1db7..8a87e4a8e035 100644 --- a/arch/arm/mach-mvebu/armada8k/dram.c +++ b/arch/arm/mach-mvebu/armada8k/dram.c @@ -3,10 +3,11 @@ * Copyright (C) 2016 Stefan Roese */ -#include +#include #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 7c62a5dbb6a0..e603ab9ffb75 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -3,7 +3,7 @@ * Copyright (C) 2014-2016 Stefan Roese */ -#include +#include #include #include #include diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c index d398d0f7676a..daf2f8e3f671 100644 --- a/arch/arm/mach-mvebu/dram.c +++ b/arch/arm/mach-mvebu/dram.c @@ -6,9 +6,9 @@ */ #include -#include #include #include +#include #include #include #include diff --git a/arch/arm/mach-mvebu/efuse.c b/arch/arm/mach-mvebu/efuse.c index be5dc0
[PATCH 19/33] arm: meson: Remove and add needed includes
Remove from all mach-meson files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Neil Armstrong Cc: u-boot-amlo...@groups.io --- arch/arm/mach-meson/board-a1.c | 2 +- arch/arm/mach-meson/board-axg.c| 1 - arch/arm/mach-meson/board-common.c | 1 - arch/arm/mach-meson/board-g12a.c | 1 - arch/arm/mach-meson/board-gx.c | 1 - arch/arm/mach-meson/board-info.c | 1 - arch/arm/mach-meson/sm.c | 1 - 7 files changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/arm/mach-meson/board-a1.c b/arch/arm/mach-meson/board-a1.c index 967bb671822e..f848c0f068ed 100644 --- a/arch/arm/mach-meson/board-a1.c +++ b/arch/arm/mach-meson/board-a1.c @@ -3,12 +3,12 @@ * (C) Copyright 2023 SberDevices, Inc. */ -#include #include #include #include #include #include +#include #include phys_size_t get_effective_memsize(void) diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index fdf18752cdd0..6535539184cc 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -4,7 +4,6 @@ * (C) Copyright 2018 Neil Armstrong */ -#include #include #include #include diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c index 7ceba7cede85..39774c43049a 100644 --- a/arch/arm/mach-meson/board-common.c +++ b/arch/arm/mach-meson/board-common.c @@ -3,7 +3,6 @@ * (C) Copyright 2016 Beniamino Galvani */ -#include #include #include #include diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c index d5a830fb1db8..dc4abe1e1074 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -4,7 +4,6 @@ * (C) Copyright 2018 Neil Armstrong */ -#include #include #include #include diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index c3fbdfffeae8..0370ed57e205 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -4,7 +4,6 @@ * (C) Copyright 2018 Neil Armstrong */ -#include #include #include #include diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c index d51d9b8f0645..b4058f593234 100644 --- a/arch/arm/mach-meson/board-info.c +++ b/arch/arm/mach-meson/board-info.c @@ -4,7 +4,6 @@ * (C) Copyright 2019 Neil Armstrong */ -#include #include #include #include diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c index 914fd11c9894..4d9f83d3b38d 100644 --- a/arch/arm/mach-meson/sm.c +++ b/arch/arm/mach-meson/sm.c @@ -5,7 +5,6 @@ * Secure monitor calls. */ -#include #include #include #include -- 2.34.1
[PATCH 20/33] arm: mediatek: Remove and add needed includes
Remove from all mach-mediatek files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Ryder Lee Cc: Weijie Gao Cc: Chunfeng Yun Cc: GSS_MTK_Uboot_upstream --- arch/arm/mach-mediatek/cpu.c | 1 - arch/arm/mach-mediatek/mt7623/init.c | 2 +- arch/arm/mach-mediatek/mt7629/init.c | 2 +- arch/arm/mach-mediatek/mt8183/init.c | 1 - arch/arm/mach-mediatek/mt8512/init.c | 1 - arch/arm/mach-mediatek/mt8516/init.c | 1 - arch/arm/mach-mediatek/mt8518/init.c | 1 - arch/arm/mach-mediatek/spl.c | 1 - 8 files changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-mediatek/cpu.c b/arch/arm/mach-mediatek/cpu.c index c329e7cc98a8..8e8bc4f9ceaa 100644 --- a/arch/arm/mach-mediatek/cpu.c +++ b/arch/arm/mach-mediatek/cpu.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 MediaTek Inc. */ -#include #include #include #include diff --git a/arch/arm/mach-mediatek/mt7623/init.c b/arch/arm/mach-mediatek/mt7623/init.c index 988b057e5984..3d6ba3f383c5 100644 --- a/arch/arm/mach-mediatek/mt7623/init.c +++ b/arch/arm/mach-mediatek/mt7623/init.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 MediaTek Inc. */ -#include +#include #include #include #include diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c index 0130554ff35c..7cb8b72c364c 100644 --- a/arch/arm/mach-mediatek/mt7629/init.c +++ b/arch/arm/mach-mediatek/mt7629/init.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include diff --git a/arch/arm/mach-mediatek/mt8183/init.c b/arch/arm/mach-mediatek/mt8183/init.c index 7496029705f6..37243547da81 100644 --- a/arch/arm/mach-mediatek/mt8183/init.c +++ b/arch/arm/mach-mediatek/mt8183/init.c @@ -6,7 +6,6 @@ */ #include -#include #include #include #include diff --git a/arch/arm/mach-mediatek/mt8512/init.c b/arch/arm/mach-mediatek/mt8512/init.c index 5a21e9a4485c..3b48caf5196c 100644 --- a/arch/arm/mach-mediatek/mt8512/init.c +++ b/arch/arm/mach-mediatek/mt8512/init.c @@ -7,7 +7,6 @@ */ #include -#include #include #include #include diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c index 3460dcc24943..892bd441a33b 100644 --- a/arch/arm/mach-mediatek/mt8516/init.c +++ b/arch/arm/mach-mediatek/mt8516/init.c @@ -6,7 +6,6 @@ */ #include -#include #include #include #include diff --git a/arch/arm/mach-mediatek/mt8518/init.c b/arch/arm/mach-mediatek/mt8518/init.c index f7e03de36507..c04bcb635178 100644 --- a/arch/arm/mach-mediatek/mt8518/init.c +++ b/arch/arm/mach-mediatek/mt8518/init.c @@ -7,7 +7,6 @@ */ #include -#include #include #include #include diff --git a/arch/arm/mach-mediatek/spl.c b/arch/arm/mach-mediatek/spl.c index d3cda94617e1..247d7ee6f1db 100644 --- a/arch/arm/mach-mediatek/spl.c +++ b/arch/arm/mach-mediatek/spl.c @@ -5,7 +5,6 @@ */ #include -#include #include #include #include -- 2.34.1
[PATCH 21/33] arm: lpc32xx: Remove and add needed includes
Remove from all mach-lpc32xx files and when needed add missing include files directly. Signed-off-by: Tom Rini --- arch/arm/mach-lpc32xx/clk.c | 1 - arch/arm/mach-lpc32xx/cpu.c | 1 - arch/arm/mach-lpc32xx/devices.c | 2 +- arch/arm/mach-lpc32xx/dram.c| 1 - arch/arm/mach-lpc32xx/timer.c | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm/mach-lpc32xx/clk.c b/arch/arm/mach-lpc32xx/clk.c index cb2344d79fec..2e11903e7e07 100644 --- a/arch/arm/mach-lpc32xx/clk.c +++ b/arch/arm/mach-lpc32xx/clk.c @@ -3,7 +3,6 @@ * Copyright (C) 2011 by Vladimir Zapolskiy */ -#include #include #include #include diff --git a/arch/arm/mach-lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c index a97f9a1958ab..80f5e7c88eb4 100644 --- a/arch/arm/mach-lpc32xx/cpu.c +++ b/arch/arm/mach-lpc32xx/cpu.c @@ -3,7 +3,6 @@ * Copyright (C) 2011-2015 by Vladimir Zapolskiy */ -#include #include #include #include diff --git a/arch/arm/mach-lpc32xx/devices.c b/arch/arm/mach-lpc32xx/devices.c index 6a67a3591aa6..49308d6d4be0 100644 --- a/arch/arm/mach-lpc32xx/devices.c +++ b/arch/arm/mach-lpc32xx/devices.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 by Vladimir Zapolskiy */ -#include +#include #include #include diff --git a/arch/arm/mach-lpc32xx/dram.c b/arch/arm/mach-lpc32xx/dram.c index 160223792353..ab7c13512a5a 100644 --- a/arch/arm/mach-lpc32xx/dram.c +++ b/arch/arm/mach-lpc32xx/dram.c @@ -10,7 +10,6 @@ * This code runs from SRAM. */ -#include #include #include #include diff --git a/arch/arm/mach-lpc32xx/timer.c b/arch/arm/mach-lpc32xx/timer.c index 90183e3014eb..523f9cfc8c48 100644 --- a/arch/arm/mach-lpc32xx/timer.c +++ b/arch/arm/mach-lpc32xx/timer.c @@ -3,7 +3,6 @@ * Copyright (C) 2011 Vladimir Zapolskiy */ -#include #include #include #include -- 2.34.1
[PATCH 22/33] arm: kirkwood: Remove and add needed includes
Remove from all mach-kirkwood files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Stefan Roese --- arch/arm/mach-kirkwood/cache.c | 1 - arch/arm/mach-kirkwood/cpu.c | 1 - arch/arm/mach-kirkwood/mpp.c | 1 - 3 files changed, 3 deletions(-) diff --git a/arch/arm/mach-kirkwood/cache.c b/arch/arm/mach-kirkwood/cache.c index 009b7deeca64..acd2e8b1145e 100644 --- a/arch/arm/mach-kirkwood/cache.c +++ b/arch/arm/mach-kirkwood/cache.c @@ -3,7 +3,6 @@ * Copyright (c) 2012 Michael Walle * Michael Walle */ -#include #include #include diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c index 2b493b36c20d..a432abe615d3 100644 --- a/arch/arm/mach-kirkwood/cpu.c +++ b/arch/arm/mach-kirkwood/cpu.c @@ -5,7 +5,6 @@ * Written-by: Prafulla Wadaskar */ -#include #include #include #include diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c index 4fdad99cadef..7938820e513f 100644 --- a/arch/arm/mach-kirkwood/mpp.c +++ b/arch/arm/mach-kirkwood/mpp.c @@ -9,7 +9,6 @@ * warranty of any kind, whether express or implied. */ -#include #include #include #include -- 2.34.1
[PATCH 23/33] arm: imx: Remove and add needed includes
Remove from all mach-imx, CPU specific sub-directories and include/asm/arch-mx* files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Stefano Babic Cc: Fabio Estevam Cc: "NXP i.MX U-Boot Team" --- arch/arm/cpu/arm1136/mx31/devices.c | 1 - arch/arm/cpu/arm1136/mx31/generic.c | 1 - arch/arm/cpu/arm1136/mx31/timer.c | 1 - arch/arm/cpu/arm926ejs/mxs/clock.c | 1 - arch/arm/cpu/arm926ejs/mxs/iomux.c | 1 - arch/arm/cpu/arm926ejs/mxs/mxs.c| 1 - arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 1 - arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c | 1 - arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 - arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 1 - arch/arm/cpu/arm926ejs/mxs/start.S | 1 - arch/arm/cpu/arm926ejs/mxs/timer.c | 1 - arch/arm/include/asm/arch-mx5/clock.h | 2 ++ arch/arm/include/asm/arch-mx7/sys_proto.h | 2 ++ arch/arm/mach-imx/cache.c | 2 +- arch/arm/mach-imx/cmd_bmode.c | 1 - arch/arm/mach-imx/cmd_dek.c | 3 ++- arch/arm/mach-imx/cmd_hdmidet.c | 1 - arch/arm/mach-imx/cmd_mfgprot.c | 2 +- arch/arm/mach-imx/cmd_nandbcb.c | 1 - arch/arm/mach-imx/cpu.c | 1 - arch/arm/mach-imx/ddrmc-vf610-calibration.c | 1 - arch/arm/mach-imx/ddrmc-vf610.c | 1 - arch/arm/mach-imx/ele_ahab.c| 2 +- arch/arm/mach-imx/hab.c | 1 - arch/arm/mach-imx/i2c-mxv7.c| 2 +- arch/arm/mach-imx/image-container.c | 2 +- arch/arm/mach-imx/imx8/ahab.c | 1 - arch/arm/mach-imx/imx8/clock.c | 1 - arch/arm/mach-imx/imx8/cpu.c| 1 - arch/arm/mach-imx/imx8/fdt.c| 1 - arch/arm/mach-imx/imx8/iomux.c | 1 - arch/arm/mach-imx/imx8/misc.c | 1 - arch/arm/mach-imx/imx8/snvs_security_sc.c | 1 - arch/arm/mach-imx/imx8m/clock_imx8mm.c | 1 - arch/arm/mach-imx/imx8m/clock_imx8mq.c | 1 - arch/arm/mach-imx/imx8m/clock_slice.c | 1 - arch/arm/mach-imx/imx8m/psci.c | 1 - arch/arm/mach-imx/imx8m/soc.c | 2 +- arch/arm/mach-imx/imx8ulp/cgc.c | 1 - arch/arm/mach-imx/imx8ulp/clock.c | 1 - arch/arm/mach-imx/imx8ulp/iomux.c | 1 - arch/arm/mach-imx/imx8ulp/pcc.c | 1 - arch/arm/mach-imx/imx8ulp/rdc.c | 3 ++- arch/arm/mach-imx/imx9/clock.c | 1 - arch/arm/mach-imx/imx9/clock_root.c | 2 +- arch/arm/mach-imx/imx9/imx_bootaux.c| 3 ++- arch/arm/mach-imx/imx9/soc.c| 2 +- arch/arm/mach-imx/imx9/trdc.c | 2 +- arch/arm/mach-imx/imx_bootaux.c | 5 - arch/arm/mach-imx/imxrt/soc.c | 1 - arch/arm/mach-imx/iomux-v3.c| 1 - arch/arm/mach-imx/mac.c | 1 - arch/arm/mach-imx/misc.c| 1 - arch/arm/mach-imx/mmc_env.c | 1 - arch/arm/mach-imx/mmdc_size.c | 2 +- arch/arm/mach-imx/mx5/clock.c | 1 - arch/arm/mach-imx/mx5/mx53_dram.c | 2 +- arch/arm/mach-imx/mx5/soc.c | 1 - arch/arm/mach-imx/mx6/clock.c | 2 +- arch/arm/mach-imx/mx6/ddr.c | 1 - arch/arm/mach-imx/mx6/litesom.c | 2 +- arch/arm/mach-imx/mx6/module_fuse.c | 1 - arch/arm/mach-imx/mx6/mp.c | 1 - arch/arm/mach-imx/mx6/opos6ul.c | 2 +- arch/arm/mach-imx/mx6/soc.c | 1 - arch/arm/mach-imx/mx7/clock.c | 3 ++- arch/arm/mach-imx/mx7/clock_slice.c | 1 - arch/arm/mach-imx/mx7/ddr.c | 1 - arch/arm/mach-imx/mx7/psci-mx7.c| 1 - arch/arm/mach-imx/mx7/soc.c | 1 - arch/arm/mach-imx/mx7ulp/clock.c| 2 +- arch/arm/mach-imx/mx7ulp/iomux.c| 1 - arch/arm/mach-imx/mx7ulp/pcc.c | 1 - arch/arm/mach-imx/mx7ulp/scg.c | 2 +- arch/arm/mach-imx/mx7ulp/soc.c | 2 +- arch/arm/mach-imx/priblob.c | 1 - arch/arm/mach-imx/rdc-sema.c| 1 - arch/arm/mach-imx/speed.c | 2 +- arch/arm/mach-imx/spl.c | 2 +- arch/arm/mach-imx/spl_imx_romapi.c | 1 - arch/arm/mach-imx/syscounter.c | 2 +- arch/arm/mach-imx/timer.c | 1 - arch/arm/mach-imx/video.c | 3 ++- 84 files changed, 38 insertions(+), 82 deletions(-) diff --git a/arch/arm/cpu/arm1136/mx31/devices.c b/arch/arm/cpu/arm1136/mx31/devices.c index 9997e8fc3396..87ca303e31ba 100644 --- a/arch/arm/cpu/arm1136/mx31/devices.c +++ b/arch/arm/cpu/arm1136/mx31/devices.c @@ -6,7 +6,6 @@ * (c) 2007 Pengutronix, Sascha Hauer */ -#include #include #include diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx3
[PATCH 24/33] arm: histb: Remove and add needed includes
Remove from all mach-histb files and when needed add missing
include files directly.
Signed-off-by: Tom Rini
---
Cc: Peter Griffin
Cc: Manivannan Sadhasivam
---
arch/arm/mach-histb/board_common.c | 1 -
arch/arm/mach-histb/sysmap-histb.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/arch/arm/mach-histb/board_common.c
b/arch/arm/mach-histb/board_common.c
index a26c2066e028..84d02c9aca21 100644
--- a/arch/arm/mach-histb/board_common.c
+++ b/arch/arm/mach-histb/board_common.c
@@ -5,7 +5,6 @@
* (C) Copyright 2023 Yang Xiwen
*/
-#include
#include
#include
#include
diff --git a/arch/arm/mach-histb/sysmap-histb.c
b/arch/arm/mach-histb/sysmap-histb.c
index 83a2bb941799..76414558379f 100644
--- a/arch/arm/mach-histb/sysmap-histb.c
+++ b/arch/arm/mach-histb/sysmap-histb.c
@@ -5,7 +5,6 @@
* (C) Copyright 2023 Yang Xiwen
*/
-#include
#include
static struct mm_region histb_mem_map[] = {
--
2.34.1
[PATCH 25/33] arm: highbank: Remove and add needed includes
Remove from all mach-highbank files and when needed add missing include files directly. Signed-off-by: Tom Rini --- arch/arm/mach-highbank/timer.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-highbank/timer.c b/arch/arm/mach-highbank/timer.c index 2423a0e37855..32ec6f0ac0e2 100644 --- a/arch/arm/mach-highbank/timer.c +++ b/arch/arm/mach-highbank/timer.c @@ -5,7 +5,6 @@ * Based on arm926ejs/mx27/timer.c */ -#include #include #include #include -- 2.34.1
[PATCH 26/33] arm: exynos: Remove and add needed includes
Remove from all mach-exynos files and when needed add missing
include files directly.
Signed-off-by: Tom Rini
---
Cc: Minkyu Kang
---
arch/arm/mach-exynos/clock.c | 3 ++-
arch/arm/mach-exynos/clock_init_exynos4.c | 1 -
arch/arm/mach-exynos/clock_init_exynos5.c | 1 -
arch/arm/mach-exynos/common_setup.h | 2 ++
arch/arm/mach-exynos/dmc_common.c | 2 +-
arch/arm/mach-exynos/dmc_init_ddr3.c | 1 -
arch/arm/mach-exynos/exynos5_setup.h | 1 +
arch/arm/mach-exynos/include/mach/power.h | 2 ++
arch/arm/mach-exynos/lowlevel_init.c | 1 -
arch/arm/mach-exynos/mmu-arm64.c | 1 -
arch/arm/mach-exynos/pinmux.c | 1 -
arch/arm/mach-exynos/power.c | 2 +-
arch/arm/mach-exynos/soc.c| 1 -
arch/arm/mach-exynos/spl_boot.c | 1 -
arch/arm/mach-exynos/system.c | 2 +-
arch/arm/mach-exynos/tzpc.c | 2 +-
16 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index f91f2ee862de..ee71b95237df 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -4,9 +4,10 @@
* Minkyu Kang
*/
-#include
#include
#include
+#include
+#include
#include
#include
#include
diff --git a/arch/arm/mach-exynos/clock_init_exynos4.c
b/arch/arm/mach-exynos/clock_init_exynos4.c
index 584e4bac09fc..95ed1956a077 100644
--- a/arch/arm/mach-exynos/clock_init_exynos4.c
+++ b/arch/arm/mach-exynos/clock_init_exynos4.c
@@ -23,7 +23,6 @@
* MA 02111-1307 USA
*/
-#include
#include
#include
#include
diff --git a/arch/arm/mach-exynos/clock_init_exynos5.c
b/arch/arm/mach-exynos/clock_init_exynos5.c
index 1cb8d391e7c9..232a2482dc65 100644
--- a/arch/arm/mach-exynos/clock_init_exynos5.c
+++ b/arch/arm/mach-exynos/clock_init_exynos5.c
@@ -5,7 +5,6 @@
* Copyright (C) 2012 Samsung Electronics
*/
-#include
#include
#include
#include
diff --git a/arch/arm/mach-exynos/common_setup.h
b/arch/arm/mach-exynos/common_setup.h
index d7f02231fdfa..4f56160ee50a 100644
--- a/arch/arm/mach-exynos/common_setup.h
+++ b/arch/arm/mach-exynos/common_setup.h
@@ -23,6 +23,8 @@
* MA 02111-1307 USA
*/
+#include
+#include
#include
#define DMC_OFFSET 0x1
diff --git a/arch/arm/mach-exynos/dmc_common.c
b/arch/arm/mach-exynos/dmc_common.c
index 44923dd5520f..a96ded443b9a 100644
--- a/arch/arm/mach-exynos/dmc_common.c
+++ b/arch/arm/mach-exynos/dmc_common.c
@@ -5,7 +5,7 @@
* Copyright (C) 2012 Samsung Electronics
*/
-#include
+#include
#include
#include "clock_init.h"
diff --git a/arch/arm/mach-exynos/dmc_init_ddr3.c
b/arch/arm/mach-exynos/dmc_init_ddr3.c
index cad8ccc5315f..193de4c3a595 100644
--- a/arch/arm/mach-exynos/dmc_init_ddr3.c
+++ b/arch/arm/mach-exynos/dmc_init_ddr3.c
@@ -5,7 +5,6 @@
* Copyright (C) 2012 Samsung Electronics
*/
-#include
#include
#include
#include
diff --git a/arch/arm/mach-exynos/exynos5_setup.h
b/arch/arm/mach-exynos/exynos5_setup.h
index e9874a8c1b24..4e508edba0c6 100644
--- a/arch/arm/mach-exynos/exynos5_setup.h
+++ b/arch/arm/mach-exynos/exynos5_setup.h
@@ -8,6 +8,7 @@
#ifndef _SMDK5250_SETUP_H
#define _SMDK5250_SETUP_H
+#include
#include
#define NOT_AVAILABLE 0
diff --git a/arch/arm/mach-exynos/include/mach/power.h
b/arch/arm/mach-exynos/include/mach/power.h
index a3d8974dcb5b..757e1586bde4 100644
--- a/arch/arm/mach-exynos/include/mach/power.h
+++ b/arch/arm/mach-exynos/include/mach/power.h
@@ -8,6 +8,8 @@
#define __ASM_ARM_ARCH_POWER_H_
#ifndef __ASSEMBLY__
+#include
+
struct exynos4_power {
unsigned intom_stat;
unsigned char res1[0x8];
diff --git a/arch/arm/mach-exynos/lowlevel_init.c
b/arch/arm/mach-exynos/lowlevel_init.c
index c57b8aee7989..0967ab995a93 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -23,7 +23,6 @@
* MA 02111-1307 USA
*/
-#include
#include
#include
#include
diff --git a/arch/arm/mach-exynos/mmu-arm64.c b/arch/arm/mach-exynos/mmu-arm64.c
index 30e522804fbf..e2f32547adfc 100644
--- a/arch/arm/mach-exynos/mmu-arm64.c
+++ b/arch/arm/mach-exynos/mmu-arm64.c
@@ -4,7 +4,6 @@
* Thomas Abraham
*/
-#include
#include
#include
diff --git a/arch/arm/mach-exynos/pinmux.c b/arch/arm/mach-exynos/pinmux.c
index ad3fbf2da7a8..4061dd4aafae 100644
--- a/arch/arm/mach-exynos/pinmux.c
+++ b/arch/arm/mach-exynos/pinmux.c
@@ -4,7 +4,6 @@
* Abhilash Kesavan
*/
-#include
#include
#include
#include
diff --git a/arch/arm/mach-exynos/power.c b/arch/arm/mach-exynos/power.c
index f2a6c00dd629..599d3ccff603 100644
--- a/arch/arm/mach-exynos/power.c
+++ b/arch/arm/mach-exynos/power.c
@@ -4,7 +4,7 @@
* Donghwa Lee
*/
-#include
+#include
#include
#include
diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c
index aff2b5e1b6e8..be18f181a7aa 100644
--- a/arch/arm/mach-exynos/soc.c
+++ b/arch/arm/ma
[PATCH 28/33] arm: bcm: Remove and add needed includes
Remove from all mach-bcmbca, mach-bcm283x and bcm* CPU directory files and when needed add missing include files directly. Signed-off-by: Tom Rini --- arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c | 1 - arch/arm/cpu/armv7/bcm235xx/clk-bsc.c | 1 - arch/arm/cpu/armv7/bcm235xx/clk-core.c | 1 - arch/arm/cpu/armv7/bcm235xx/clk-eth.c | 1 - arch/arm/cpu/armv7/bcm235xx/clk-sdio.c | 1 - arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c | 1 - arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c | 1 - arch/arm/cpu/armv7/bcm281xx/clk-bsc.c | 1 - arch/arm/cpu/armv7/bcm281xx/clk-core.c | 1 - arch/arm/cpu/armv7/bcm281xx/clk-eth.c | 1 - arch/arm/cpu/armv7/bcm281xx/clk-sdio.c | 1 - arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c | 1 - arch/arm/cpu/armv7/bcm281xx/reset.c| 1 - arch/arm/cpu/armv7/bcmcygnus/reset.c | 1 - arch/arm/cpu/armv7/bcmnsp/reset.c | 1 - arch/arm/mach-bcm283x/init.c | 1 - arch/arm/mach-bcm283x/mbox.c | 2 +- arch/arm/mach-bcm283x/msg.c| 1 - arch/arm/mach-bcm283x/reset.c | 2 +- arch/arm/mach-bcmbca/bcm4908/mmu_table.c | 1 - arch/arm/mach-bcmbca/bcm4912/mmu_table.c | 1 - arch/arm/mach-bcmbca/bcm63146/mmu_table.c | 1 - arch/arm/mach-bcmbca/bcm63158/mmu_table.c | 1 - arch/arm/mach-bcmbca/bcm6813/mmu_table.c | 1 - arch/arm/mach-bcmbca/bcm6856/mmu_table.c | 1 - arch/arm/mach-bcmbca/bcm6858/mmu_table.c | 1 - 26 files changed, 2 insertions(+), 26 deletions(-) diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c index 39217c5b2bf1..7f73f893458b 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c @@ -9,7 +9,6 @@ * */ -#include #include #include #include diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c index 1b3f36aebe11..55dcc2fd78ca 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c @@ -3,7 +3,6 @@ * Copyright 2013 Broadcom Corporation. */ -#include #include #include #include diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c index d7edefee2318..b769c451105f 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c @@ -9,7 +9,6 @@ * */ -#include #include #include #include diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c index 209ceca9a06e..5f7cc4a102d0 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c @@ -3,7 +3,6 @@ * Copyright 2014 Broadcom Corporation. */ -#include #include #include #include diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c index f2ba354c24f8..f3ff29bebe85 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c @@ -3,7 +3,6 @@ * Copyright 2013 Broadcom Corporation. */ -#include #include #include #include diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c index f604aec62fa6..87918059408c 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c @@ -3,7 +3,6 @@ * Copyright 2014 Broadcom Corporation. */ -#include #include #include #include "clk-core.h" diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c index 8f6260e7857e..b258fea45c8e 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c @@ -9,7 +9,6 @@ * */ -#include #include #include #include diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c index 1b3f36aebe11..55dcc2fd78ca 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c @@ -3,7 +3,6 @@ * Copyright 2013 Broadcom Corporation. */ -#include #include #include #include diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c index 26b673a5405e..3f2e021a307c 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-core.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.c @@ -9,7 +9,6 @@ * */ -#include #include #include #include diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c index 209ceca9a06e..5f7cc4a102d0 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c @@ -3,7 +3,6 @@ * Copyright 2014 Broadcom Corporation. */ -#include #include #include #include diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c index f2ba354c24f8..f3ff29bebe85 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c @@ -3,7 +3,6 @@ * Copyright 2013 Broadcom Corporatio
[PATCH 27/33] arm: davinci: Remove and add needed includes
Remove from all mach-davinci files and when needed add missing include files directly. Signed-off-by: Tom Rini --- arch/arm/include/asm/ti-common/davinci_nand.h | 1 + arch/arm/mach-davinci/cpu.c | 3 ++- arch/arm/mach-davinci/da850_lowlevel.c| 2 +- arch/arm/mach-davinci/da850_pinmux.c | 1 - arch/arm/mach-davinci/include/mach/davinci_misc.h | 1 + arch/arm/mach-davinci/misc.c | 3 ++- arch/arm/mach-davinci/pinmux.c| 1 - arch/arm/mach-davinci/psc.c | 1 - arch/arm/mach-davinci/reset.c | 1 - arch/arm/mach-davinci/spl.c | 1 - arch/arm/mach-davinci/timer.c | 2 +- 11 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/arm/include/asm/ti-common/davinci_nand.h b/arch/arm/include/asm/ti-common/davinci_nand.h index 38a1a6ea0d7b..84fe01e3b712 100644 --- a/arch/arm/include/asm/ti-common/davinci_nand.h +++ b/arch/arm/include/asm/ti-common/davinci_nand.h @@ -9,6 +9,7 @@ #ifndef _DAVINCI_NAND_H_ #define _DAVINCI_NAND_H_ +#include #include #define NAND_READ_START0x00 diff --git a/arch/arm/mach-davinci/cpu.c b/arch/arm/mach-davinci/cpu.c index dae60262f5b7..033411235391 100644 --- a/arch/arm/mach-davinci/cpu.c +++ b/arch/arm/mach-davinci/cpu.c @@ -4,11 +4,12 @@ * Copyright (C) 2009 David Brownell */ -#include +#include #include #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c index 08c8f5925243..936b5e116679 100644 --- a/arch/arm/mach-davinci/da850_lowlevel.c +++ b/arch/arm/mach-davinci/da850_lowlevel.c @@ -5,7 +5,7 @@ * Copyright (C) 2011 * Heiko Schocher, DENX Software Engineering, h...@denx.de. */ -#include +#include #include #include #include diff --git a/arch/arm/mach-davinci/da850_pinmux.c b/arch/arm/mach-davinci/da850_pinmux.c index f2536c8dd6d6..4ee3cd0d5b34 100644 --- a/arch/arm/mach-davinci/da850_pinmux.c +++ b/arch/arm/mach-davinci/da850_pinmux.c @@ -5,7 +5,6 @@ * Copyright (C) 2011 OMICRON electronics GmbH */ -#include #include #include #include diff --git a/arch/arm/mach-davinci/include/mach/davinci_misc.h b/arch/arm/mach-davinci/include/mach/davinci_misc.h index 1133a23bdee3..0d0ad1e593e1 100644 --- a/arch/arm/mach-davinci/include/mach/davinci_misc.h +++ b/arch/arm/mach-davinci/include/mach/davinci_misc.h @@ -6,6 +6,7 @@ #ifndef __MISC_H #define __MISC_H +#include #include /* pin muxer definitions */ diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c index cfad28c43d0a..93a144757a9e 100644 --- a/arch/arm/mach-davinci/misc.c +++ b/arch/arm/mach-davinci/misc.c @@ -8,7 +8,7 @@ * Copyright (C) 2004 Texas Instruments. */ -#include +#include #include #include #include @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/arch/arm/mach-davinci/pinmux.c b/arch/arm/mach-davinci/pinmux.c index 7904257b4a42..5ecb434b03b6 100644 --- a/arch/arm/mach-davinci/pinmux.c +++ b/arch/arm/mach-davinci/pinmux.c @@ -8,7 +8,6 @@ * Copyright (C) 2004 Texas Instruments. */ -#include #include #include #include diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c index dae10aa03bbb..90b817860a62 100644 --- a/arch/arm/mach-davinci/psc.c +++ b/arch/arm/mach-davinci/psc.c @@ -7,7 +7,6 @@ * Copyright (C) 2004 Texas Instruments. */ -#include #include #include diff --git a/arch/arm/mach-davinci/reset.c b/arch/arm/mach-davinci/reset.c index 0d59eb6e3cef..e3e2c56a6760 100644 --- a/arch/arm/mach-davinci/reset.c +++ b/arch/arm/mach-davinci/reset.c @@ -6,7 +6,6 @@ * Copyright (C) 2007 Sergey Kubushyn */ -#include #include #include #include diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c index 5f5b9ebbf97a..4603c8fbc575 100644 --- a/arch/arm/mach-davinci/spl.c +++ b/arch/arm/mach-davinci/spl.c @@ -3,7 +3,6 @@ * Copyright (C) 2011 * Heiko Schocher, DENX Software Engineering, h...@denx.de. */ -#include #include #include #include diff --git a/arch/arm/mach-davinci/timer.c b/arch/arm/mach-davinci/timer.c index 83c190b620e7..f2990f718773 100644 --- a/arch/arm/mach-davinci/timer.c +++ b/arch/arm/mach-davinci/timer.c @@ -20,7 +20,7 @@ * Copyright (C) 2007 Sergey Kubushyn */ -#include +#include #include #include #include -- 2.34.1
[PATCH 29/33] arm: at91: Remove and add needed includes
Remove from all mach-at91 files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Eugen Hristev --- arch/arm/mach-at91/arm920t/at91rm9200_devices.c | 1 - arch/arm/mach-at91/arm920t/clock.c| 2 +- arch/arm/mach-at91/arm920t/cpu.c | 2 +- arch/arm/mach-at91/arm920t/reset.c| 1 - arch/arm/mach-at91/arm920t/timer.c| 2 +- arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c| 1 - arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c| 1 - arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c| 1 - arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c | 1 - arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c| 1 - arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c | 1 - arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c | 1 - arch/arm/mach-at91/arm926ejs/clock.c | 3 ++- arch/arm/mach-at91/arm926ejs/cpu.c| 2 +- arch/arm/mach-at91/arm926ejs/eflash.c | 1 - arch/arm/mach-at91/arm926ejs/reset.c | 1 - arch/arm/mach-at91/arm926ejs/sam9x60_devices.c| 1 - arch/arm/mach-at91/arm926ejs/timer.c | 1 - arch/arm/mach-at91/armv7/clock.c | 2 +- arch/arm/mach-at91/armv7/cpu.c| 2 +- arch/arm/mach-at91/armv7/sama5d2_devices.c| 1 - arch/arm/mach-at91/armv7/sama5d3_devices.c| 1 - arch/arm/mach-at91/armv7/sama5d4_devices.c| 1 - arch/arm/mach-at91/armv7/timer.c | 1 - arch/arm/mach-at91/atmel_sfr.c| 2 +- arch/arm/mach-at91/clock.c| 2 +- arch/arm/mach-at91/include/mach/at91_common.h | 2 ++ arch/arm/mach-at91/matrix.c | 1 - arch/arm/mach-at91/mpddrc.c | 1 - arch/arm/mach-at91/phy.c | 2 +- arch/arm/mach-at91/sdram.c| 1 - arch/arm/mach-at91/spl.c | 1 - arch/arm/mach-at91/spl_at91.c | 2 +- arch/arm/mach-at91/spl_atmel.c| 2 +- 34 files changed, 15 insertions(+), 33 deletions(-) diff --git a/arch/arm/mach-at91/arm920t/at91rm9200_devices.c b/arch/arm/mach-at91/arm920t/at91rm9200_devices.c index c849885bc2bb..459edadb5876 100644 --- a/arch/arm/mach-at91/arm920t/at91rm9200_devices.c +++ b/arch/arm/mach-at91/arm920t/at91rm9200_devices.c @@ -10,7 +10,6 @@ * Lead Tech Design */ -#include #include #include #include diff --git a/arch/arm/mach-at91/arm920t/clock.c b/arch/arm/mach-at91/arm920t/clock.c index 09ac66d619d2..ac55a61be647 100644 --- a/arch/arm/mach-at91/arm920t/clock.c +++ b/arch/arm/mach-at91/arm920t/clock.c @@ -7,7 +7,7 @@ * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD */ -#include +#include #include #include #include diff --git a/arch/arm/mach-at91/arm920t/cpu.c b/arch/arm/mach-at91/arm920t/cpu.c index 9bf03fd68ecc..579e76b339d8 100644 --- a/arch/arm/mach-at91/arm920t/cpu.c +++ b/arch/arm/mach-at91/arm920t/cpu.c @@ -10,7 +10,7 @@ * Jean-Christophe PLAGNIOL-VILLARD */ -#include +#include #include #include #include diff --git a/arch/arm/mach-at91/arm920t/reset.c b/arch/arm/mach-at91/arm920t/reset.c index 91e375146ad7..7582cef417ff 100644 --- a/arch/arm/mach-at91/arm920t/reset.c +++ b/arch/arm/mach-at91/arm920t/reset.c @@ -13,7 +13,6 @@ * Alex Zuepke */ -#include #include #include #include diff --git a/arch/arm/mach-at91/arm920t/timer.c b/arch/arm/mach-at91/arm920t/timer.c index 8ef5764e3153..f7b4116344ca 100644 --- a/arch/arm/mach-at91/arm920t/timer.c +++ b/arch/arm/mach-at91/arm920t/timer.c @@ -13,7 +13,7 @@ * Alex Zuepke */ -#include +#include #include #include #include diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c index c10571fa28a0..201c99ade4ec 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c @@ -5,7 +5,6 @@ * Lead Tech Design */ -#include #include #include #include diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c index 0c2b9f2ecc9b..b8d209cbec84 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c @@ -5,7 +5,6 @@ * Lead Tech Design */ -#include #include #include #include diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c index 3b8a4623866c..1749662dae9c 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c @@ -9,7 +9,6 @@ * esd electronic system design gmbh */ -#include #inc
[PATCH 30/33] arm: aspeed: Remove and add needed includes
Remove from all mach-aspeed files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Ryan Chen Cc: Chia-Wei Wang Cc: Aspeed BMC SW team Cc: Joel Stanley --- arch/arm/mach-aspeed/ast2500/board_common.c | 2 +- arch/arm/mach-aspeed/ast2500/clk_ast2500.c | 1 - arch/arm/mach-aspeed/ast2600/board_common.c | 2 +- arch/arm/mach-aspeed/ast2600/spl.c | 1 - arch/arm/mach-aspeed/ast_wdt.c | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-aspeed/ast2500/board_common.c b/arch/arm/mach-aspeed/ast2500/board_common.c index bae10271844a..531c2ad1562c 100644 --- a/arch/arm/mach-aspeed/ast2500/board_common.c +++ b/arch/arm/mach-aspeed/ast2500/board_common.c @@ -2,7 +2,7 @@ /* * Copyright (c) 2016 Google, Inc */ -#include +#include #include #include #include diff --git a/arch/arm/mach-aspeed/ast2500/clk_ast2500.c b/arch/arm/mach-aspeed/ast2500/clk_ast2500.c index 02bd3f67c96a..50d7f99b2643 100644 --- a/arch/arm/mach-aspeed/ast2500/clk_ast2500.c +++ b/arch/arm/mach-aspeed/ast2500/clk_ast2500.c @@ -3,7 +3,6 @@ * Copyright (C) 2016 Google, Inc */ -#include #include #include #include diff --git a/arch/arm/mach-aspeed/ast2600/board_common.c b/arch/arm/mach-aspeed/ast2600/board_common.c index dc6cdc35d15c..4c0b705ea88d 100644 --- a/arch/arm/mach-aspeed/ast2600/board_common.c +++ b/arch/arm/mach-aspeed/ast2600/board_common.c @@ -2,7 +2,7 @@ /* * Copyright (c) Aspeed Technology Inc. */ -#include +#include #include #include #include diff --git a/arch/arm/mach-aspeed/ast2600/spl.c b/arch/arm/mach-aspeed/ast2600/spl.c index 0952e73a4572..05390c16f3af 100644 --- a/arch/arm/mach-aspeed/ast2600/spl.c +++ b/arch/arm/mach-aspeed/ast2600/spl.c @@ -2,7 +2,6 @@ /* * Copyright (c) Aspeed Technology Inc. */ -#include #include #include #include diff --git a/arch/arm/mach-aspeed/ast_wdt.c b/arch/arm/mach-aspeed/ast_wdt.c index 5bc442ef33ce..c420940d1cb9 100644 --- a/arch/arm/mach-aspeed/ast_wdt.c +++ b/arch/arm/mach-aspeed/ast_wdt.c @@ -3,7 +3,6 @@ * (C) Copyright 2016 Google, Inc */ -#include #include #include #include -- 2.34.1
[PATCH 31/33] arm: apple: Remove and add needed includes
Remove from all mach-apple files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Mark Kettenis --- arch/arm/mach-apple/board.c | 1 - arch/arm/mach-apple/rtkit.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-apple/board.c b/arch/arm/mach-apple/board.c index 7a6151a97223..8bace3005eb5 100644 --- a/arch/arm/mach-apple/board.c +++ b/arch/arm/mach-apple/board.c @@ -3,7 +3,6 @@ * (C) Copyright 2021 Mark Kettenis */ -#include #include #include #include diff --git a/arch/arm/mach-apple/rtkit.c b/arch/arm/mach-apple/rtkit.c index a550b553b663..b8f4771e5e71 100644 --- a/arch/arm/mach-apple/rtkit.c +++ b/arch/arm/mach-apple/rtkit.c @@ -4,13 +4,14 @@ * (C) Copyright 2021 Copyright The Asahi Linux Contributors */ -#include #include #include #include #include #include +#include +#include #define APPLE_RTKIT_EP_MGMT 0 #define APPLE_RTKIT_EP_CRASHLOG1 -- 2.34.1
[PATCH 32/33] arm: fsl-layerscape: Remove and add needed includes
Remove from all fsl-layerscape related files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Peng Fan --- arch/arm/cpu/armv7/ls102xa/clock.c | 2 +- arch/arm/cpu/armv7/ls102xa/cpu.c | 1 - arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +- arch/arm/cpu/armv7/ls102xa/fsl_epu.c | 1 - arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c| 2 +- arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c| 2 +- arch/arm/cpu/armv7/ls102xa/soc.c | 2 +- arch/arm/cpu/armv7/ls102xa/spl.c | 1 - arch/arm/cpu/armv7/ls102xa/timer.c | 1 - arch/arm/cpu/armv8/fsl-layerscape/cpu.c| 2 +- arch/arm/cpu/armv8/fsl-layerscape/fdt.c| 2 +- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c| 2 +- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c| 2 +- arch/arm/cpu/armv8/fsl-layerscape/icid.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/mp.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/soc.c| 2 +- arch/arm/cpu/armv8/fsl-layerscape/spl.c| 2 +- arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h | 2 ++ arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 1 + arch/arm/include/asm/arch-ls102xa/fsl_serdes.h | 2 ++ 35 files changed, 40 insertions(+), 32 deletions(-) diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c index 4e1fe281201f..e885a85ce65c 100644 --- a/arch/arm/cpu/armv7/ls102xa/clock.c +++ b/arch/arm/cpu/armv7/ls102xa/clock.c @@ -3,7 +3,7 @@ * Copyright 2014 Freescale Semiconductor, Inc. */ -#include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index c455969609f6..74a2dcbc116a 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -4,7 +4,6 @@ * Copyright 2021 NXP */ -#include #include #include #include diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index 1c3d24bcad94..34eea22eb923 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -3,7 +3,7 @@ * Copyright 2014 Freescale Semiconductor, Inc. */ -#include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c index e31a4fb6c31b..664eae532d5f 100644 --- a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c +++ b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c @@ -3,7 +3,6 @@ * Copyright 2014 Freescale Semiconductor, Inc. */ -#include #include #include "fsl_epu.h" diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c index f74d819ea1ea..c1eadb34523f 100644 --- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c +++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c @@ -3,7 +3,7 @@ * Copyright 2014 Freescale Semiconductor, Inc. */ -#include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c index 8c030be8b36f..3032e266c5d4 100644 --- a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c +++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c @@ -3,7 +3,7 @@ * Copyright 2014 Freescale Semiconductor, Inc. */ -#include +#include #include #include diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c index 84d4ea3a8f4a..7ff59edd452e 100644 --- a/arch/arm/cpu/armv7/ls102xa/soc.c +++ b/arch/arm/cpu/armv7/ls102xa/soc.c @@ -3,7 +3,7 @@ * Copyright 2015 Freescale Semiconductor, Inc. */ -#include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/ls102xa/spl.c b/arch/arm/cpu/armv7/ls102xa/spl.c index a19496862359..374de92d026c 100644 --- a/arch/arm/cpu/armv7/ls102xa/spl.c +++ b/arch/arm/cpu/armv7/ls102xa/spl.c @@ -3,7 +3,6 @@ * Copyright 2014 Freescale Semic
[PATCH 33/33] arm: Remove and add needed includes
Remove from the remainder of the files under arch/arm and when needed add missing include files directly. Signed-off-by: Tom Rini --- arch/arm/cpu/arm11/cpu.c| 1 - arch/arm/cpu/arm720t/interrupts.c | 2 +- arch/arm/cpu/arm920t/cpu.c | 1 - arch/arm/cpu/arm920t/start.S| 1 - arch/arm/cpu/arm926ejs/cache.c | 1 - arch/arm/cpu/arm926ejs/cpu.c| 1 - arch/arm/cpu/arm926ejs/start.S | 1 - arch/arm/cpu/arm946es/cpu.c | 1 - arch/arm/cpu/armv7/arch_timer.c | 2 +- arch/arm/cpu/armv7/cache_v7.c | 1 - arch/arm/cpu/armv7/cp15.c | 1 - arch/arm/cpu/armv7/cpu.c| 1 - arch/arm/cpu/armv7/exception_level.c| 1 - arch/arm/cpu/armv7/iproc-common/armpll.c| 1 - arch/arm/cpu/armv7/iproc-common/hwinit-common.c | 1 - arch/arm/cpu/armv7/iproc-common/timer.c | 1 - arch/arm/cpu/armv7/mpu_v7r.c| 1 - arch/arm/cpu/armv7/s5p4418/cpu.c| 1 - arch/arm/cpu/armv7/syslib.c | 1 - arch/arm/cpu/armv7/vf610/generic.c | 1 - arch/arm/cpu/armv7/vf610/timer.c| 1 - arch/arm/cpu/armv7/virt-dt.c| 1 - arch/arm/cpu/armv7/virt-v7.c| 1 - arch/arm/cpu/armv7m/cache.c | 1 - arch/arm/cpu/armv7m/cpu.c | 1 - arch/arm/cpu/armv7m/systick-timer.c | 2 +- arch/arm/cpu/armv8/cache_v8.c | 1 - arch/arm/cpu/armv8/cpu-dt.c | 1 - arch/arm/cpu/armv8/cpu.c| 1 - arch/arm/cpu/armv8/exception_level.c| 1 - arch/arm/cpu/armv8/generic_timer.c | 1 - arch/arm/cpu/armv8/hisilicon/pinmux.c | 1 - arch/arm/cpu/armv8/sec_firmware.c | 2 +- arch/arm/cpu/armv8/sha1_ce_glue.c | 1 - arch/arm/cpu/armv8/sha256_ce_glue.c | 1 - arch/arm/cpu/armv8/spin_table.c | 1 - arch/arm/cpu/armv8/spl_data.c | 1 - arch/arm/include/asm/esr.h | 1 + arch/arm/lib/asm-offsets.c | 1 - arch/arm/lib/bdinfo.c | 3 ++- arch/arm/lib/bootm-fdt.c| 1 - arch/arm/lib/bootm.c| 1 - arch/arm/lib/cache-cp15.c | 2 +- arch/arm/lib/cache-pl310.c | 1 - arch/arm/lib/cache.c| 2 +- arch/arm/lib/cmd_boot.c | 1 - arch/arm/lib/eabi_compat.c | 4 +++- arch/arm/lib/gic-v3-its.c | 1 - arch/arm/lib/image.c| 1 - arch/arm/lib/interrupts.c | 1 - arch/arm/lib/interrupts_64.c| 1 - arch/arm/lib/interrupts_m.c | 3 ++- arch/arm/lib/psci-dt.c | 1 - arch/arm/lib/reset.c| 1 - arch/arm/lib/save_prev_bl_data.c| 1 - arch/arm/lib/spl.c | 1 - arch/arm/lib/stack.c| 1 - arch/arm/lib/zimage.c | 1 - 58 files changed, 14 insertions(+), 57 deletions(-) diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c index 1e16b89d0066..01d2e1a125d6 100644 --- a/arch/arm/cpu/arm11/cpu.c +++ b/arch/arm/cpu/arm11/cpu.c @@ -14,7 +14,6 @@ * CPU specific code */ -#include #include #include #include diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c index f0fc58deadba..e3d0216158fe 100644 --- a/arch/arm/cpu/arm720t/interrupts.c +++ b/arch/arm/cpu/arm720t/interrupts.c @@ -9,7 +9,7 @@ * Alex Zuepke */ -#include +#include #if defined(CONFIG_ARCH_TEGRA) static ulong timestamp; diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c index 305713e78615..61e182305738 100644 --- a/arch/arm/cpu/arm920t/cpu.c +++ b/arch/arm/cpu/arm920t/cpu.c @@ -12,7 +12,6 @@ * CPU specific code */ -#include #include #include #include diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S index cba4a1f0358f..e792e8e795ef 100644 --- a/arch/arm/cpu/arm920t/start.S +++ b/arch/arm/cpu/arm920t/start.S @@ -8,7 +8,6 @@ */ #include -#include #include /* diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c index 95963d2665f4..5b87a3af91b2 100644 --- a/arch/arm/cpu/arm926ejs/cache.c +++ b/arch/arm/cpu/arm926ejs/cache.c @@ -6,7 +6,6 @@ #include #include #include -#include #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) void invalidate_dcache_all(void) diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c index 2ce413a7f866..07ab04b7b08a 100644 --- a/arch/arm/cpu/arm926ejs/cpu.c +++ b/arch/arm/cpu/arm926ejs/cpu.c @
Re: [PATCH 04/33] arm: u8500: Remove and add needed includes
On Tue, Apr 30, 2024 at 3:36 PM Tom Rini wrote: > Remove from all mach-u8500 files and when needed add missing > include files directly. > > Signed-off-by: Tom Rini Reviewed-by: Linus Walleij Yours, Linus Walleij
Re: [PATCH 07/33] arm: sunxi: Remove and add needed includes
On Tue, 30 Apr 2024 07:35:33 -0600 Tom Rini wrote: Hi, > Remove from all mach-sunxi and board/sunxi files and when > needed add missing include files directly. Oh wow, many thanks, that takes one point of my TODO list! After cherry-picking the netdev.h and phy_interface.h changes from 01/33, I compiled all 168 sunxi boards successfully. > Signed-off-by: Tom Rini Reviewed-by: Andre Przywara Cheers, Andre > --- > Cc: Jagan Teki > Cc: Andre Przywara > --- > arch/arm/cpu/armv7/sunxi/psci.c | 1 - > arch/arm/cpu/armv7/sunxi/sram.c | 1 - > arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c | 1 - > arch/arm/mach-sunxi/dram_timings/ddr3_1333.c| 1 - > arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c | 1 - > arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c | 1 - > arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c | 1 - > arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c | 1 - > arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c| 1 - > arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c | 1 - > board/sunxi/board.c | 1 - > board/sunxi/chip.c | 1 - > board/sunxi/dram_sun4i_auto.c | 1 - > board/sunxi/dram_sun5i_auto.c | 1 - > board/sunxi/gmac.c | 1 - > 15 files changed, 15 deletions(-) > > diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c > index 5cb8cfa6cf3f..4c30f3294b7a 100644 > --- a/arch/arm/cpu/armv7/sunxi/psci.c > +++ b/arch/arm/cpu/armv7/sunxi/psci.c > @@ -7,7 +7,6 @@ > * which was based on code by Carl van Schaik . > */ > #include > -#include > #include > > #include > diff --git a/arch/arm/cpu/armv7/sunxi/sram.c b/arch/arm/cpu/armv7/sunxi/sram.c > index 28ff6a1b7c23..bc25719c9c46 100644 > --- a/arch/arm/cpu/armv7/sunxi/sram.c > +++ b/arch/arm/cpu/armv7/sunxi/sram.c > @@ -9,7 +9,6 @@ > * SRAM init for older sunxi SoCs. > */ > > -#include > #include > #include > #include > diff --git a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c > b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c > index 9077f86a8b4c..3666dddca15c 100644 > --- a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c > +++ b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c > @@ -1,4 +1,3 @@ > -#include > #include > #include > > diff --git a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c > b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c > index 0471e8a49e58..ceaafd6ec6fa 100644 > --- a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c > +++ b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c > @@ -1,4 +1,3 @@ > -#include > #include > #include > > diff --git a/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c > b/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c > index 232b4fe2df7f..3faf8d5bd974 100644 > --- a/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c > +++ b/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c > @@ -11,7 +11,6 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > > -#include > #include > #include > > diff --git a/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c > b/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c > index b6d6a6874682..ce2ffa7a020e 100644 > --- a/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c > +++ b/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c > @@ -11,7 +11,6 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > > -#include > #include > #include > > diff --git a/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c > b/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c > index c11cb8678f64..e6446b9180da 100644 > --- a/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c > +++ b/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c > @@ -9,7 +9,6 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > > -#include > #include > #include > > diff --git a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c > b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c > index 2136ca3a4cb0..afe8e25c7f58 100644 > --- a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c > +++ b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c > @@ -19,7 +19,6 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > > -#include > #include > #include > > diff --git a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c > b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c > index 10008601134a..c243b574406d 100644 > --- a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c > +++ b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c > @@ -6,7 +6,6 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > > -#include > #include > #include > > diff --git a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c > b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c > index bd57e2f6aac2..bc47a4638533 100644 > --- a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c > +++ b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c > @@ -1,4 +1,3 @@ > -#include > #include > #include > > diff --git a/board/su
[PATCH v2 00/18] rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC
This series enables use of FIT signature check for checksum validation in SPL and fixes loading FIT from SD-card when loading FIT from eMMC or SPI flash fails. Changes in v2: - Split series in two, this is the first part, second part will follow - Split a big patch into smaller and more reviewable parts - Change rk3399-puma to use common bss and stack addresses - Skip UART related pinctrl nodes at pre-reloc phase to not slow down boot for i.e. rk3399-puma - Rebase on latest master branch - Collect r-b tags I have runtime tested this series on following devices: - 96boards Rock960 - Khadas Edge Captain - Pine64 PineBook Pro - Pine64 RockPro64 - Radxa ROCK 4C+ - Radxa ROCK 4SE - Radxa ROCK Pi 4A - Radxa ROCK Pi 4B+ Boot times before this series using rock-pi-4-rk3399: => bootstage report Timer summary in microseconds (11 records): MarkElapsed Stage 204,349 SPL 494,212289,863 end phase 8,637 8,637 board_init_f 1,314,991 1,306,354 board_init_r 3,483,389 2,168,398 eth_common_init 3,814,525331,136 eth_initialize 3,814,762237 main_loop 3,823,030 8,268 cli_loop Accumulated time: 22,295 dm_spl 852,152 dm_f 60,268 dm_r After this series the boot time have improved, mostly thanks to the use of ARMv8 crypto, OF_LIVE and reduced clutter in FDT: => bootstage report Timer summary in microseconds (12 records): MarkElapsed Stage 165,322 SPL 419,002253,680 end phase 8,620 8,620 board_init_f 1,314,364 1,305,744 board_init_r 2,234,295919,931 eth_common_init 2,399,375165,080 eth_initialize 2,406,203 6,828 main_loop 2,406,499296 cli_loop Accumulated time: 28,365 dm_spl 864,210 dm_f 11,943 of_live 13,085 dm_r After this the board still spend a long time waiting for timeout during probe of display/hdmi driver (~1200 ms) or reading FDT during pre-reloc phase (~600ms). A copy of this series can be found at [1]. [1] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3399-dt-sync-v2-part1 Jonas Karlman (18): rockchip: rk3399-gru: Fix max SPL size on bob and kevin rockchip: rk3399-puma: Update SPL_PAD_TO Kconfig option rockchip: rk3399-puma: Use common bss and stack addresses rockchip: rk3399-ficus: Enable TPL and use common bss and stack addr rockchip: rk3399: Sort imply statements alphabetically rockchip: rk3399: Enable ARMv8 crypto and FIT checksum validation rockchip: rk3399: Enable random generator on all boards rockchip: rk3399: Imply support for GbE PHY rockchip: rk3399: Enable DT overlay support on all boards rockchip: rk3399: Remove use of xPL_MISC_DRIVERS options rockchip: rk3399: Add a default spl-boot-order prop rockchip: rk3399: Remove inherited bootph-all props rockchip: rk3399: Sort nodes in u-boot.dtsi files rockchip: rk3399: Fix bootph prop for vop nodes rockchip: rk3399-puma: Move uart0 bootph to board u-boot.dtsi rockchip: rk3399: Include uart related pinctrl nodes in TPL/SPL rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC rockchip: rk3399: Configure sdmmc regulator pinctrl in SPL arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi | 1 - arch/arm/dts/rk3399-evb-u-boot.dtsi | 26 +++-- arch/arm/dts/rk3399-ficus-u-boot.dtsi | 12 ++- arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 -- arch/arm/dts/rk3399-gru-u-boot.dtsi | 24 + arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi | 6 -- arch/arm/dts/rk3399-leez-p710-u-boot.dtsi | 6 -- arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 14 ++- arch/arm/dts/rk3399-orangepi-u-boot.dtsi | 12 +++ arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 23 ++-- arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 12 --- arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 25 ++--- arch/arm/dts/rk3399-roc-pc-u-boot.dtsi| 31 -- arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 10 ++ arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi | 6 -- arch/arm/dts/rk3399-rock960-u-boot.dtsi | 13 ++- arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 22 ++-- arch/arm/dts/rk3399-u-boot.dtsi | 101 +- .../arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi | 6 -- arch/arm/mach-rockchip/Kconfig| 36 --- configs/chromebook_bob_defconfig | 6 +- configs/chromebook_kevin_defconfig| 6 +- configs/eaidk-610-rk3399_defconfig| 2 +- configs/evb-rk3399_defconfig | 4 +- configs/ficus-rk3399_defconfig| 16 +-- configs/firefly-rk3399_defconfig | 4 +- configs/khadas-edge-captain-rk3399_defconfig | 2 +- configs/khadas-edge-rk3399_defconfig | 2 +- configs/khadas-edge-v-rk3399_defconfi
[PATCH v2 01/18] rockchip: rk3399-gru: Fix max SPL size on bob and kevin
Chromebook bob and kevin typically run coreboot as the initial boot loader, however, U-Boot proper can be used as a secondary boot loader. It is also possible to run U-Boot SPL and proper bare metal, with SPL and the U-Boot payload loaded from SPI flash. Because of this chromebook bob and kevin only use SPL and not TPL+SPL like other RK3399 boards, this mean that SPL is loaded to and run from SRAM instead of DRAM. The U-Boot payload is located at 0x4 (256 KiB) offset in SPI flash and because the BROM only read first 2 KiB for each 4 KiB page, the size of SPL (idbloader.img) is limited to max 128 KiB. The chosen bss start address further limits the size of SPL to 120 KiB. 0xff8e (SPL_BSS_START_ADDR) - 0xff8c2000 (SPL_TEXT_BASE) = 0x1e000 Update SPL_MAX_SIZE to reflect the 120 KiB max size limitation. Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- v2: Update commit message v2: Collet r-b tag --- configs/chromebook_bob_defconfig | 2 +- configs/chromebook_kevin_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/chromebook_bob_defconfig b/configs/chromebook_bob_defconfig index 55d44700d6ec..805da11dbf6a 100644 --- a/configs/chromebook_bob_defconfig +++ b/configs/chromebook_bob_defconfig @@ -35,7 +35,7 @@ CONFIG_BOARD_EARLY_INIT_R=y CONFIG_BLOBLIST=y CONFIG_BLOBLIST_ADDR=0x10 CONFIG_BLOBLIST_SIZE=0x1000 -CONFIG_SPL_MAX_SIZE=0x2e000 +CONFIG_SPL_MAX_SIZE=0x1e000 CONFIG_SPL_PAD_TO=0x7f8000 CONFIG_HANDOFF=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/chromebook_kevin_defconfig b/configs/chromebook_kevin_defconfig index 48ee8b9fd258..8744152df61d 100644 --- a/configs/chromebook_kevin_defconfig +++ b/configs/chromebook_kevin_defconfig @@ -36,7 +36,7 @@ CONFIG_BOARD_EARLY_INIT_R=y CONFIG_BLOBLIST=y CONFIG_BLOBLIST_ADDR=0x10 CONFIG_BLOBLIST_SIZE=0x1000 -CONFIG_SPL_MAX_SIZE=0x2e000 +CONFIG_SPL_MAX_SIZE=0x1e000 CONFIG_SPL_PAD_TO=0x7f8000 CONFIG_HANDOFF=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -- 2.43.2
[PATCH v2 02/18] rockchip: rk3399-puma: Update SPL_PAD_TO Kconfig option
On rk3399-puma the FIT payload is located at sector 0x200 compared to the more Rockchip common sector 0x4000 offset: SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 Because FIT payload is located at sector 0x200 and IDBlock is located at sector 64, the combined size of TPL+SPL (idbloader.img) cannot take up more than 224 KiB: (0x200 - 64) x 512 = 0x38000 (224 KiB) Adjust SPL_PAD_TO to match the used 0x200 sector offset. Signed-off-by: Jonas Karlman --- v2: New patch split from DT sync patch With this change it should be possible to drop the following u-boot.dtsi override and use the default offset = . offset = <((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512)>; --- configs/puma-rk3399_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index 14a7bc8b1e00..ec7d52a6e13e 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -31,7 +31,7 @@ CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x2e000 -CONFIG_SPL_PAD_TO=0x7f8000 +CONFIG_SPL_PAD_TO=0x38000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 -- 2.43.2
[PATCH v2 03/18] rockchip: rk3399-puma: Use common bss and stack addresses
The rk3399-puma board is currently using SPL stack and bss addr in SRAM,
the same addr typically used by TPL, this differs from most other RK3399
boards.
Switch to use the common bss and stack addresses introduced in commit
008ba0d56d00 ("rockchip: Add common default bss and stack addresses").
Signed-off-by: Jonas Karlman
---
v2: New patch
---
configs/puma-rk3399_defconfig | 10 --
1 file changed, 10 deletions(-)
diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig
index ec7d52a6e13e..bd4926cf0fce 100644
--- a/configs/puma-rk3399_defconfig
+++ b/configs/puma-rk3399_defconfig
@@ -2,11 +2,8 @@ CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=2400
CONFIG_ARCH_ROCKCHIP=y
-CONFIG_TEXT_BASE=0x0020
CONFIG_SPL_GPIO=y
CONFIG_NR_DRAM_BANKS=1
-CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x30
CONFIG_SF_DEFAULT_SPEED=2000
CONFIG_ENV_SIZE=0x3000
CONFIG_ENV_OFFSET=0x3F8000
@@ -16,12 +13,6 @@ CONFIG_ROCKCHIP_RK3399=y
CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0
CONFIG_ROCKCHIP_SPI_IMAGE=y
CONFIG_TARGET_PUMA_RK3399=y
-CONFIG_SPL_STACK=0xff8e
-CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
-CONFIG_SPL_BSS_START_ADDR=0xff8e
-CONFIG_SPL_BSS_MAX_SIZE=0x1
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x1
CONFIG_DEBUG_UART_BASE=0xFF18
CONFIG_DEBUG_UART_CLOCK=2400
CONFIG_SPL_SPI_FLASH_SUPPORT=y
@@ -33,7 +24,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x2e000
CONFIG_SPL_PAD_TO=0x38000
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
-# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
CONFIG_SPL_I2C=y
CONFIG_SPL_POWER=y
--
2.43.2
[PATCH v2 05/18] rockchip: rk3399: Sort imply statements alphabetically
Sort imply statements under ROCKCHIP_RK3399 alphabetically. Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- v2: Collet r-b tags --- arch/arm/mach-rockchip/Kconfig | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 67d3b28d058f..20f1b7572a31 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -261,30 +261,30 @@ config ROCKCHIP_RK3399 select DM_PMIC select DM_REGULATOR_FIXED select BOARD_LATE_INIT + imply BOOTSTD_FULL + imply CMD_BOOTCOUNT if BOOTCOUNT_LIMIT + imply MISC + imply MISC_INIT_R imply PARTITION_TYPE_GUID imply PRE_CONSOLE_BUFFER imply ROCKCHIP_COMMON_BOARD + imply ROCKCHIP_EFUSE imply ROCKCHIP_SDRAM_COMMON imply SPL_ROCKCHIP_COMMON_BOARD - imply TPL_SERIAL + imply SYS_BOOTCOUNT_SINGLEWORD if BOOTCOUNT_LIMIT + imply TPL_CLK + imply TPL_DM + imply TPL_DRIVERS_MISC imply TPL_LIBCOMMON_SUPPORT imply TPL_LIBGENERIC_SUPPORT - imply TPL_SYS_MALLOC_SIMPLE - imply TPL_DRIVERS_MISC imply TPL_OF_CONTROL - imply TPL_DM + imply TPL_RAM imply TPL_REGMAP + imply TPL_ROCKCHIP_COMMON_BOARD + imply TPL_SERIAL + imply TPL_SYS_MALLOC_SIMPLE imply TPL_SYSCON - imply TPL_RAM - imply TPL_CLK imply TPL_TINY_MEMSET - imply TPL_ROCKCHIP_COMMON_BOARD - imply SYS_BOOTCOUNT_SINGLEWORD if BOOTCOUNT_LIMIT - imply BOOTSTD_FULL - imply CMD_BOOTCOUNT if BOOTCOUNT_LIMIT - imply MISC - imply ROCKCHIP_EFUSE - imply MISC_INIT_R help The Rockchip RK3399 is a ARM-based SoC with a dual-core Cortex-A72 and quad-core Cortex-A53. -- 2.43.2
[PATCH v2 04/18] rockchip: rk3399-ficus: Enable TPL and use common bss and stack addr
The rk3399-ficus board is only using SPL and not TPL+SPL like all other
RK3399 boards, chromebook bob/kevin excluded. It does not seem to be any
technical reason why this board was left using only SPL.
Switch to use TPL+SPL and to use the common bss and stack addresses
introduced in commit 008ba0d56d00 ("rockchip: Add common default bss and
stack addresses"). Also add the missing DEFAULT_FDT_FILE option.
Signed-off-by: Jonas Karlman
Reviewed-by: Peter Robinson
Reviewed-by: Kever Yang
---
v2: Update commit message
v2: Collet r-b tags
---
configs/ficus-rk3399_defconfig | 14 ++
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig
index 618f6baf91a5..3bcd0fd66b91 100644
--- a/configs/ficus-rk3399_defconfig
+++ b/configs/ficus-rk3399_defconfig
@@ -2,32 +2,22 @@ CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=2400
CONFIG_ARCH_ROCKCHIP=y
-CONFIG_TEXT_BASE=0x0020
-CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x30
CONFIG_SF_DEFAULT_SPEED=2000
CONFIG_ENV_OFFSET=0x3F8000
CONFIG_DEFAULT_DEVICE_TREE="rk3399-ficus"
-CONFIG_SPL_TEXT_BASE=0xff8c2000
CONFIG_ROCKCHIP_RK3399=y
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
CONFIG_TARGET_ROCK960_RK3399=y
-CONFIG_SPL_STACK=0xff8e
-CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
-CONFIG_SPL_BSS_START_ADDR=0xff8e
-CONFIG_SPL_BSS_MAX_SIZE=0x1
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
CONFIG_DEBUG_UART_BASE=0xFF1A
CONFIG_DEBUG_UART_CLOCK=2400
CONFIG_SYS_LOAD_ADDR=0x800800
CONFIG_DEBUG_UART=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-ficus.dtb"
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x2e000
CONFIG_SPL_PAD_TO=0x7f8000
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
-# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
+CONFIG_TPL=y
CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPT=y
CONFIG_CMD_MMC=y
--
2.43.2
[PATCH v2 08/18] rockchip: rk3399: Imply support for GbE PHY
Imply support for GbE PHY status parsing and configuration when support for onboard ethernet is enabled. Signed-off-by: Jonas Karlman Reviewed-by: Quentin Schulz Reviewed-by: Kever Yang --- v2: Collect r-b tags --- arch/arm/mach-rockchip/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index f580d69ed879..6f1213b1710c 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -271,6 +271,7 @@ config ROCKCHIP_RK3399 imply MISC_INIT_R imply OF_LIVE imply PARTITION_TYPE_GUID + imply PHY_GIGE if GMAC_ROCKCHIP imply PRE_CONSOLE_BUFFER imply RNG_ROCKCHIP imply ROCKCHIP_COMMON_BOARD -- 2.43.2
[PATCH v2 10/18] rockchip: rk3399: Remove use of xPL_MISC_DRIVERS options
The TPL and/or SPL control FDT on RK3399 boards does not contain any node with a compatible that is supported by driver/misc/ drivers. Remove use of xPL_MISC_DRIVERS options to stop including e.g an unused efuse driver in TPL and/or SPL. Signed-off-by: Jonas Karlman Reviewed-by: Quentin Schulz Reviewed-by: Kever Yang --- v2: Collect r-b tags --- arch/arm/mach-rockchip/Kconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index bfde9bf8dd16..7d6374b73586 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -251,7 +251,6 @@ config ROCKCHIP_RK3399 select TPL_NEEDS_SEPARATE_STACK if TPL select SPL_SEPARATE_BSS select SPL_SERIAL - select SPL_DRIVERS_MISC select CLK select FIT select PINCTRL @@ -283,7 +282,6 @@ config ROCKCHIP_RK3399 imply SYS_BOOTCOUNT_SINGLEWORD if BOOTCOUNT_LIMIT imply TPL_CLK imply TPL_DM - imply TPL_DRIVERS_MISC imply TPL_LIBCOMMON_SUPPORT imply TPL_LIBGENERIC_SUPPORT imply TPL_OF_CONTROL -- 2.43.2
[PATCH v2 12/18] rockchip: rk3399: Remove inherited bootph-all props
Remove superfluous bootph-all props already inherited from main soc
u-boot.dtsi file.
Signed-off-by: Jonas Karlman
---
v2: New patch split from "Fix loading FIT from SD-card" patch
---
arch/arm/dts/rk3399-evb-u-boot.dtsi | 1 -
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 2 --
arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 2 --
3 files changed, 5 deletions(-)
diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi
b/arch/arm/dts/rk3399-evb-u-boot.dtsi
index 796ac9642399..9df4a02c3e74 100644
--- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
@@ -38,7 +38,6 @@
};
&sdmmc {
- bootph-all;
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
index 83b0c44e9ec5..56fdaf440aea 100644
--- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
@@ -12,12 +12,10 @@
&sdhci {
max-frequency = <2500>;
- bootph-all;
};
&sdmmc {
max-frequency = <2000>;
- bootph-all;
};
&spiflash {
diff --git a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
index 5dc7d0db5f73..dcfcec4f3072 100644
--- a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
@@ -8,10 +8,8 @@
&sdhci {
max-frequency = <2500>;
- bootph-all;
};
&sdmmc {
max-frequency = <2000>;
- bootph-all;
};
--
2.43.2
[PATCH v2 07/18] rockchip: rk3399: Enable random generator on all boards
The RK3399 SoC contain a crypto engine block that can generate random
numbers.
Imply DM_RNG and RNG_ROCKCHIP Kconfig options to take advantage of the
random generator on all RK3399 boards. Also remove the unnecessary use
of a status = "okay" prop.
Signed-off-by: Jonas Karlman
Reviewed-by: Quentin Schulz
Reviewed-by: Peter Robinson
Reviewed-by: Kever Yang
---
v2: Move rng node cleanup to this patch
v2: Collect r-b tags
---
arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 4
arch/arm/dts/rk3399-u-boot.dtsi | 1 -
arch/arm/mach-rockchip/Kconfig| 2 ++
configs/chromebook_bob_defconfig | 2 --
configs/chromebook_kevin_defconfig| 2 --
configs/evb-rk3399_defconfig | 2 --
configs/firefly-rk3399_defconfig | 2 --
configs/pinebook-pro-rk3399_defconfig | 2 --
configs/pinephone-pro-rk3399_defconfig| 2 --
configs/roc-pc-rk3399_defconfig | 2 --
configs/rock960-rk3399_defconfig | 2 --
configs/rockpro64-rk3399_defconfig| 2 --
12 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
index cabf0a9dae89..0e46e87e1fa0 100644
--- a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
@@ -12,10 +12,6 @@
};
};
-&rng {
- status = "okay";
-};
-
&sdhci {
max-frequency = <2500>;
bootph-all;
diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
index 87b173e59579..0b0a90acf431 100644
--- a/arch/arm/dts/rk3399-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-u-boot.dtsi
@@ -32,7 +32,6 @@
rng: rng@ff8b8000 {
compatible = "rockchip,rk3399-crypto";
reg = <0x0 0xff8b8000 0x0 0x1000>;
- status = "okay";
};
dmc: dmc {
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 7c0116da4921..f580d69ed879 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -265,12 +265,14 @@ config ROCKCHIP_RK3399
imply ARMV8_SET_SMPEN
imply BOOTSTD_FULL
imply CMD_BOOTCOUNT if BOOTCOUNT_LIMIT
+ imply DM_RNG
imply LEGACY_IMAGE_FORMAT
imply MISC
imply MISC_INIT_R
imply OF_LIVE
imply PARTITION_TYPE_GUID
imply PRE_CONSOLE_BUFFER
+ imply RNG_ROCKCHIP
imply ROCKCHIP_COMMON_BOARD
imply ROCKCHIP_EFUSE
imply ROCKCHIP_SDRAM_COMMON
diff --git a/configs/chromebook_bob_defconfig b/configs/chromebook_bob_defconfig
index 400b2d7ed7de..5ffd5195ea19 100644
--- a/configs/chromebook_bob_defconfig
+++ b/configs/chromebook_bob_defconfig
@@ -89,8 +89,6 @@ CONFIG_DM_REGULATOR_GPIO=y
CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_CROS_EC=y
CONFIG_PWM_ROCKCHIP=y
-CONFIG_DM_RNG=y
-CONFIG_RNG_ROCKCHIP=y
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550_MEM32=y
CONFIG_ROCKCHIP_SPI=y
diff --git a/configs/chromebook_kevin_defconfig
b/configs/chromebook_kevin_defconfig
index a881028cc7eb..bacdcc367bda 100644
--- a/configs/chromebook_kevin_defconfig
+++ b/configs/chromebook_kevin_defconfig
@@ -90,8 +90,6 @@ CONFIG_DM_REGULATOR_GPIO=y
CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_CROS_EC=y
CONFIG_PWM_ROCKCHIP=y
-CONFIG_DM_RNG=y
-CONFIG_RNG_ROCKCHIP=y
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550_MEM32=y
CONFIG_ROCKCHIP_SPI=y
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
index d81c7f9604e1..c4936768ffb6 100644
--- a/configs/evb-rk3399_defconfig
+++ b/configs/evb-rk3399_defconfig
@@ -47,8 +47,6 @@ CONFIG_PMIC_RK8XX=y
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y
-CONFIG_DM_RNG=y
-CONFIG_RNG_ROCKCHIP=y
CONFIG_BAUDRATE=150
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550_MEM32=y
diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
index 545c047c6df8..8f68ffbd3a49 100644
--- a/configs/firefly-rk3399_defconfig
+++ b/configs/firefly-rk3399_defconfig
@@ -45,8 +45,6 @@ CONFIG_PMIC_RK8XX=y
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y
-CONFIG_DM_RNG=y
-CONFIG_RNG_ROCKCHIP=y
CONFIG_BAUDRATE=150
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550_MEM32=y
diff --git a/configs/pinebook-pro-rk3399_defconfig
b/configs/pinebook-pro-rk3399_defconfig
index 23ac24a0bffe..e4aad1b710cb 100644
--- a/configs/pinebook-pro-rk3399_defconfig
+++ b/configs/pinebook-pro-rk3399_defconfig
@@ -75,8 +75,6 @@ CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y
CONFIG_RAM_ROCKCHIP_LPDDR4=y
-CONFIG_DM_RNG=y
-CONFIG_RNG_ROCKCHIP=y
CONFIG_BAUDRATE=150
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550_MEM32=y
diff --git a/configs/pinephone-pro-rk3399_defconfig
b/configs/pinephone-pro-rk3399_defconfig
index 8c6323f6c516..285c47d76b6e 100644
--- a/configs/pinephone-pro-rk3399_defconfig
+++ b/configs/pinephone-pro-rk3399_defconfig
[PATCH v2 06/18] rockchip: rk3399: Enable ARMv8 crypto and FIT checksum validation
The RK3399 SoC support the ARMv8 Cryptography Extensions, use of ARMv8 crypto can speed up FIT checksum validation in SPL. Imply ARMV8_SET_SMPEN and ARMV8_CRYPTO to take advantage of the crypto extensions for SHA256 when validating checksum of FIT images. Imply SPL_FIT_SIGNATURE and LEGACY_IMAGE_FORMAT to enable FIT checksum validation to almost all RK3399 boards. The following boards have been excluded: - chromebook_bob: SPL max size limitation of 120 KiB - chromebook_kevin: SPL max size limitation of 120 KiB Also imply OF_LIVE to help speed up init of U-Boot proper and disable CONFIG_SPL_RAW_IMAGE_SUPPORT on leez-rk3399 to ensure SPL does not try to jump to code that failed checksum validation. Signed-off-by: Jonas Karlman --- v2: Do not exclude puma-rk3399 from FIT checksum validation in SPL --- arch/arm/mach-rockchip/Kconfig | 5 + configs/chromebook_bob_defconfig | 1 + configs/chromebook_kevin_defconfig | 1 + configs/leez-rk3399_defconfig | 1 + configs/puma-rk3399_defconfig | 1 - configs/rock-4se-rk3399_defconfig | 2 -- configs/rock-pi-4-rk3399_defconfig | 1 - configs/rockpro64-rk3399_defconfig | 2 -- 8 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 20f1b7572a31..7c0116da4921 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -261,15 +261,20 @@ config ROCKCHIP_RK3399 select DM_PMIC select DM_REGULATOR_FIXED select BOARD_LATE_INIT + imply ARMV8_CRYPTO + imply ARMV8_SET_SMPEN imply BOOTSTD_FULL imply CMD_BOOTCOUNT if BOOTCOUNT_LIMIT + imply LEGACY_IMAGE_FORMAT imply MISC imply MISC_INIT_R + imply OF_LIVE imply PARTITION_TYPE_GUID imply PRE_CONSOLE_BUFFER imply ROCKCHIP_COMMON_BOARD imply ROCKCHIP_EFUSE imply ROCKCHIP_SDRAM_COMMON + imply SPL_FIT_SIGNATURE imply SPL_ROCKCHIP_COMMON_BOARD imply SYS_BOOTCOUNT_SINGLEWORD if BOOTCOUNT_LIMIT imply TPL_CLK diff --git a/configs/chromebook_bob_defconfig b/configs/chromebook_bob_defconfig index 805da11dbf6a..400b2d7ed7de 100644 --- a/configs/chromebook_bob_defconfig +++ b/configs/chromebook_bob_defconfig @@ -28,6 +28,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y +# CONFIG_SPL_FIT_SIGNATURE is not set CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-bob.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/configs/chromebook_kevin_defconfig b/configs/chromebook_kevin_defconfig index 8744152df61d..a881028cc7eb 100644 --- a/configs/chromebook_kevin_defconfig +++ b/configs/chromebook_kevin_defconfig @@ -29,6 +29,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y +# CONFIG_SPL_FIT_SIGNATURE is not set CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-kevin.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/configs/leez-rk3399_defconfig b/configs/leez-rk3399_defconfig index e5088341389a..2831cfb36689 100644 --- a/configs/leez-rk3399_defconfig +++ b/configs/leez-rk3399_defconfig @@ -15,6 +15,7 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-leez-p710.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x2e000 CONFIG_SPL_PAD_TO=0x7f8000 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_TPL=y CONFIG_CMD_BOOTZ=y diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index bd4926cf0fce..53fc62bf7e35 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -42,7 +42,6 @@ CONFIG_CMD_TIME=y CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_LIVE=y CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y diff --git a/configs/rock-4se-rk3399_defconfig b/configs/rock-4se-rk3399_defconfig index 712502517eb2..04622df3c0a0 100644 --- a/configs/rock-4se-rk3399_defconfig +++ b/configs/rock-4se-rk3399_defconfig @@ -15,8 +15,6 @@ CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_PCI=y CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set -CONFIG_SPL_FIT_SIGNATURE=y -CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-4se.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x2e000 diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig index 315b8b853fc3..9036c51de421 100644 --- a/configs/rock-pi-4-rk3399_defconfig +++ b/configs/rock-pi-4-rk3399_defconfig @@ -19,7 +19,6 @@ CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_PCI=y CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set -CONFIG_SPL_FIT_SIGNATURE=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x4 diff --git a/configs/rockpro
[PATCH v2 09/18] rockchip: rk3399: Enable DT overlay support on all boards
Imply OF_LIBFDT_OVERLAY Kconfig options to add device tree overlay support on all RK3399 boards. Signed-off-by: Jonas Karlman Reviewed-by: Quentin Schulz Reviewed-by: Kever Yang --- v2: Collect r-b tags --- arch/arm/mach-rockchip/Kconfig| 1 + configs/rock-4c-plus-rk3399_defconfig | 1 - configs/rock-4se-rk3399_defconfig | 1 - configs/rock-pi-4-rk3399_defconfig| 1 - configs/rock-pi-4c-rk3399_defconfig | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 6f1213b1710c..bfde9bf8dd16 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -269,6 +269,7 @@ config ROCKCHIP_RK3399 imply LEGACY_IMAGE_FORMAT imply MISC imply MISC_INIT_R + imply OF_LIBFDT_OVERLAY imply OF_LIVE imply PARTITION_TYPE_GUID imply PHY_GIGE if GMAC_ROCKCHIP diff --git a/configs/rock-4c-plus-rk3399_defconfig b/configs/rock-4c-plus-rk3399_defconfig index bebea4fd0691..6c69e8bdcb92 100644 --- a/configs/rock-4c-plus-rk3399_defconfig +++ b/configs/rock-4c-plus-rk3399_defconfig @@ -5,7 +5,6 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-4c-plus" -CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROCKPI4_RK3399=y diff --git a/configs/rock-4se-rk3399_defconfig b/configs/rock-4se-rk3399_defconfig index 04622df3c0a0..e5ed81022bd6 100644 --- a/configs/rock-4se-rk3399_defconfig +++ b/configs/rock-4se-rk3399_defconfig @@ -5,7 +5,6 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-4se" -CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROCKPI4_RK3399=y diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig index 9036c51de421..2801becedb4b 100644 --- a/configs/rock-pi-4-rk3399_defconfig +++ b/configs/rock-pi-4-rk3399_defconfig @@ -6,7 +6,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=1000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4a" -CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3399=y CONFIG_ROCKCHIP_SPI_IMAGE=y diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig index e1adec600174..72d37bff9e9a 100644 --- a/configs/rock-pi-4c-rk3399_defconfig +++ b/configs/rock-pi-4c-rk3399_defconfig @@ -5,7 +5,6 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4c" -CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROCKPI4_RK3399=y -- 2.43.2
[PATCH v2 14/18] rockchip: rk3399: Fix bootph prop for vop nodes
The vop nodes should not be included in TPL/SPL control FDT, it should
only be included at U-Boot proper pre-reloc phase.
Change to use bootph-some-ram prop to fix this.
Signed-off-by: Jonas Karlman
---
v2: New patch split from "Fix loading FIT from SD-card" patch
---
arch/arm/dts/rk3399-u-boot.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
index b9b8d3ee1d92..496f25d9fbf6 100644
--- a/arch/arm/dts/rk3399-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-u-boot.dtsi
@@ -143,9 +143,9 @@
};
&vopb {
- bootph-all;
+ bootph-some-ram;
};
&vopl {
- bootph-all;
+ bootph-some-ram;
};
--
2.43.2
[PATCH v2 13/18] rockchip: rk3399: Sort nodes in u-boot.dtsi files
Sort nodes alphabetically by name, symbol or reg addr in RK3399 related
u-boot.dtsi files. Also remove one of the duplicated &pmu nodes.
Signed-off-by: Jonas Karlman
---
v2: New patch split from "Fix loading FIT from SD-card" patch
---
arch/arm/dts/rk3399-evb-u-boot.dtsi| 24 -
arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 12 -
arch/arm/dts/rk3399-u-boot.dtsi| 37 --
3 files changed, 35 insertions(+), 38 deletions(-)
diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi
b/arch/arm/dts/rk3399-evb-u-boot.dtsi
index 9df4a02c3e74..6dedfeec0722 100644
--- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
@@ -20,6 +20,18 @@
bootph-all;
};
+&sdmmc {
+ bus-width = <4>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
+ cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+ disable-wp;
+ max-frequency = <15000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
+ status = "okay";
+};
+
&tcphy1 {
status = "okay";
};
@@ -36,15 +48,3 @@
&vdd_center {
regulator-init-microvolt = <90>;
};
-
-&sdmmc {
- bus-width = <4>;
- cap-mmc-highspeed;
- cap-sd-highspeed;
- cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
- disable-wp;
- max-frequency = <15000>;
- pinctrl-names = "default";
- pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
- status = "okay";
-};
diff --git a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
index e390cf3abab5..58a3c0afcddd 100644
--- a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
@@ -38,12 +38,11 @@
};
};
-&vdd_log {
- regulator-min-microvolt = <43>;
- regulator-init-microvolt = <95>;
+&vcc5v0_host {
+ regulator-always-on;
};
-&vcc5v0_host {
+&vcc_sdio {
regulator-always-on;
};
@@ -51,6 +50,7 @@
regulator-always-on;
};
-&vcc_sdio {
- regulator-always-on;
+&vdd_log {
+ regulator-min-microvolt = <43>;
+ regulator-init-microvolt = <95>;
};
diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
index 96523a138ae3..b9b8d3ee1d92 100644
--- a/arch/arm/dts/rk3399-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-u-boot.dtsi
@@ -18,19 +18,25 @@
u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
};
- cic: syscon@ff62 {
+ pmusgrf: syscon@ff33 {
+ compatible = "rockchip,rk3399-pmusgrf", "syscon";
+ reg = <0x0 0xff33 0x0 0xe3d4>;
bootph-all;
+ };
+
+ cic: syscon@ff62 {
compatible = "rockchip,rk3399-cic", "syscon";
reg = <0x0 0xff62 0x0 0x100>;
+ bootph-all;
};
dfi: dfi@ff63 {
- bootph-all;
reg = <0x00 0xff63 0x00 0x4000>;
compatible = "rockchip,rk3399-dfi";
rockchip,pmu = <&pmugrf>;
clocks = <&cru PCLK_DDR_MON>;
clock-names = "pclk_ddr_mon";
+ bootph-all;
};
rng: rng@ff8b8000 {
@@ -39,12 +45,7 @@
};
dmc: dmc {
- bootph-all;
compatible = "rockchip,rk3399-dmc";
- devfreq-events = <&dfi>;
- interrupts = ;
- clocks = <&cru SCLK_DDRCLK>;
- clock-names = "dmc_clk";
reg = <0x0 0xffa8 0x0 0x0800
0x0 0xffa80800 0x0 0x1800
0x0 0xffa82000 0x0 0x2000
@@ -53,14 +54,12 @@
0x0 0xffa88800 0x0 0x1800
0x0 0xffa8a000 0x0 0x2000
0x0 0xffa8c000 0x0 0x1000>;
- };
-
- pmusgrf: syscon@ff33 {
+ devfreq-events = <&dfi>;
+ interrupts = ;
+ clocks = <&cru SCLK_DDRCLK>;
+ clock-names = "dmc_clk";
bootph-all;
- compatible = "rockchip,rk3399-pmusgrf", "syscon";
- reg = <0x0 0xff33 0x0 0xe3d4>;
};
-
};
#if defined(CONFIG_ROCKCHIP_SPI_IMAGE) && defined(CONFIG_HAS_ROM)
@@ -108,21 +107,19 @@
bootph-all;
};
-&pmugrf {
- bootph-all;
-};
-
-&pmu {
+&pmucru {
bootph-all;
};
-&pmucru {
+&pmugrf {
bootph-all;
};
&sdhci {
- max-frequency = <2>;
bootph-all;
+ max-frequency = <2>;
+
+ /* mmc to sram can't do dma, prevent aborts transferring TF-A parts */
u-boot,spl-fifo-mode;
};
--
2.43.2
[PATCH v2 15/18] rockchip: rk3399-puma: Move uart0 bootph to board u-boot.dtsi
rk3399-puma is the only supported board that use uart0 for serial
console, other RK3399 boards typically use uart2 for serial console
and may use uart0 for bluetooth.
Move setting bootph prop to board u-boot.dtsi to only include the uart0
node in TPL/SPL control FDT for the rk3399-puma target.
Signed-off-by: Jonas Karlman
---
v2: New patch split from "Fix loading FIT from SD-card" patch
---
arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 4
arch/arm/dts/rk3399-u-boot.dtsi | 4
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
index 2b3ea6da88db..390cf24152a6 100644
--- a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
@@ -110,3 +110,7 @@
&sdmmc_cmd {
bootph-all;
};
+
+&uart0 {
+ bootph-all;
+};
diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
index 496f25d9fbf6..9815dc53e8ed 100644
--- a/arch/arm/dts/rk3399-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-u-boot.dtsi
@@ -134,10 +134,6 @@
bootph-all;
};
-&uart0 {
- bootph-all;
-};
-
&uart2 {
bootph-all;
};
--
2.43.2
[PATCH v2 16/18] rockchip: rk3399: Include uart related pinctrl nodes in TPL/SPL
The initial serial console UART iomux is typically configured in
board_debug_uart_init() at TPL stage on Rockchip platform.
Later stages typically use pinctrl driver to configure iomux UART once
again based on the control FDT.
Include uart related pinctrl nodes in TPL/SPL control FDT to make it
possible for pinctrl driver to configure UART iomux at TPL/SPL stage.
Following debug log message may also be seen at U-Boot pre-reloc stage:
ns16550_serial serial@ff1a: pinctrl_select_state_full:
uclass_get_device_by_phandle_id: err=-19
This can be resolved by including bootph prop for U-Bood pre-reloc
phase (bootph-some-ram or bootph-all). However, this has intentionally
been excluded due to including it unnecessarily slows down boot around
200-400 ms.
Also add the clock-frequency prop similar to what has been done for
other Rockchip SoCs.
Signed-off-by: Jonas Karlman
---
v2: New patch split from "Fix loading FIT from SD-card" patch
v2: Change to only include pinctrl nodes in TPL and SPL phase
Hopefully the clock-frequency prop can be used to help speed up boot in
a future patch series, loading the uart rate from clock driver currently
delays boot at i.e. U-Boot proper pre-reloc.
---
arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 16
arch/arm/dts/rk3399-u-boot.dtsi | 6 ++
2 files changed, 22 insertions(+)
diff --git a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
index 390cf24152a6..d1912a2ef6a9 100644
--- a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
@@ -113,4 +113,20 @@
&uart0 {
bootph-all;
+ clock-frequency = <2400>;
+};
+
+&uart0_cts {
+ bootph-pre-sram;
+ bootph-pre-ram;
+};
+
+&uart0_rts {
+ bootph-pre-sram;
+ bootph-pre-ram;
+};
+
+&uart0_xfer {
+ bootph-pre-sram;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
index 9815dc53e8ed..b39fe39fa2b3 100644
--- a/arch/arm/dts/rk3399-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-u-boot.dtsi
@@ -136,6 +136,12 @@
&uart2 {
bootph-all;
+ clock-frequency = <2400>;
+};
+
+&uart2c_xfer {
+ bootph-pre-sram;
+ bootph-pre-ram;
};
&vopb {
--
2.43.2
[PATCH v2 11/18] rockchip: rk3399: Add a default spl-boot-order prop
A lot of RK3399 boards use a u-boot,spl-boot-order of "same-as-spl",
&sdhci and &sdmmc.
Move this to rk3399-u-boot.dtsi and make this default for boards
currently missing a u-boot,spl-boot-order prop.
Before commit a7e69952eb6d ("rockchip: spl: Cache boot source id for
later use") it was required to include the SPI flash node in the
u-boot,spl-boot-order prop to successfully load FIT from SPI flash.
The SPI flash node reference has been dropped from spl-boot-order from
pinebook-pro, roc-pc and rockpro64 now that "same-as-spl" also gets
resolved to the SPI flash node and loading FIT from SPI flash works
without having the node explicitly referenced in spl-boot-order prop.
Signed-off-by: Jonas Karlman
---
v2: Update commit message
---
arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi | 1 -
arch/arm/dts/rk3399-evb-u-boot.dtsi| 1 -
arch/arm/dts/rk3399-ficus-u-boot.dtsi | 6 --
arch/arm/dts/rk3399-firefly-u-boot.dtsi| 6 --
arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi| 6 --
arch/arm/dts/rk3399-leez-p710-u-boot.dtsi | 6 --
arch/arm/dts/rk3399-nanopi4-u-boot.dtsi| 6 --
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 6 --
arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 6 --
arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 4
arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi | 6 --
arch/arm/dts/rk3399-rock960-u-boot.dtsi| 5 -
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 5 +
arch/arm/dts/rk3399-u-boot.dtsi| 4
arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi | 6 --
15 files changed, 5 insertions(+), 69 deletions(-)
diff --git a/arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi
b/arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi
index a3f27566e438..6c07de98fa01 100644
--- a/arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi
@@ -9,7 +9,6 @@
/ {
chosen {
stdout-path = "serial2:150n8";
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
};
};
diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi
b/arch/arm/dts/rk3399-evb-u-boot.dtsi
index dfce63e4d428..796ac9642399 100644
--- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
@@ -9,7 +9,6 @@
/ {
chosen {
stdout-path = "serial2:150n8";
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
};
};
diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi
b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
index 38e0897db91d..67b63a835238 100644
--- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
@@ -5,9 +5,3 @@
#include "rk3399-u-boot.dtsi"
#include "rk3399-sdram-ddr3-1600.dtsi"
-
-/ {
- chosen {
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
- };
-};
diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi
b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
index c58ad95d120a..1f5fda1d0f1d 100644
--- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
@@ -6,12 +6,6 @@
#include "rk3399-u-boot.dtsi"
#include "rk3399-sdram-ddr3-1600.dtsi"
-/ {
- chosen {
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
- };
-};
-
&vdd_log {
regulator-init-microvolt = <95>;
};
diff --git a/arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi
b/arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi
index a7039d74a016..4a3b23e48313 100644
--- a/arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi
@@ -6,12 +6,6 @@
#include "rk3399-u-boot.dtsi"
#include "rk3399-sdram-lpddr4-100.dtsi"
-/ {
- chosen {
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
- };
-};
-
&vdd_log {
regulator-init-microvolt = <95>;
};
diff --git a/arch/arm/dts/rk3399-leez-p710-u-boot.dtsi
b/arch/arm/dts/rk3399-leez-p710-u-boot.dtsi
index c638ce259731..03b596850635 100644
--- a/arch/arm/dts/rk3399-leez-p710-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-leez-p710-u-boot.dtsi
@@ -6,12 +6,6 @@
#include "rk3399-u-boot.dtsi"
#include "rk3399-sdram-lpddr4-100.dtsi"
-/ {
- chosen {
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
- };
-};
-
&vdd_log {
regulator-init-microvolt = <95>;
};
diff --git a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
index a9d10592d573..a126bbaf086f 100644
--- a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
@@ -5,12 +5,6 @@
#include "rk3399-u-boot.dtsi"
-/{
- chosen {
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
- };
-};
-
&sdmmc {
pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_cd>;
};
diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
index 88a77cad8d43..83b0c44e9ec5 100644
[PATCH v2 18/18] rockchip: rk3399: Configure sdmmc regulator pinctrl in SPL
A few boards have shown to be required to properly configure pinctrl
for the fixed regulator gpio pin used by sdmmc before being able to read
from SD-cards.
Include the related gpio, regulator and pinctrl nodes and enable related
Kconfig options so that pinctrl can be configured in SPL for boards that
may be affected by such issue.
Also change to imply SPL_DM_SEQ_ALIAS for all boards because it must be
enabled for working gpio usage in SPL after a future DT sync.
Signed-off-by: Jonas Karlman
---
v2: New patch split from "Fix loading FIT from SD-card" patch
---
arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 12
arch/arm/dts/rk3399-orangepi-u-boot.dtsi | 12
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 12
arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 12
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi| 12
arch/arm/mach-rockchip/Kconfig | 1 +
configs/chromebook_bob_defconfig | 1 -
configs/chromebook_kevin_defconfig | 1 -
configs/nanopc-t4-rk3399_defconfig | 2 ++
configs/nanopi-m4-2gb-rk3399_defconfig | 2 ++
configs/nanopi-m4-rk3399_defconfig | 2 ++
configs/nanopi-m4b-rk3399_defconfig | 2 ++
configs/nanopi-neo4-rk3399_defconfig | 2 ++
configs/nanopi-r4s-rk3399_defconfig | 2 ++
configs/orangepi-rk3399_defconfig| 2 ++
configs/pinebook-pro-rk3399_defconfig| 3 ++-
configs/pinephone-pro-rk3399_defconfig | 1 -
configs/puma-rk3399_defconfig| 1 -
configs/roc-pc-mezzanine-rk3399_defconfig| 2 +-
configs/roc-pc-rk3399_defconfig | 2 +-
configs/rock-pi-4-rk3399_defconfig | 1 -
configs/rockpro64-rk3399_defconfig | 3 ++-
22 files changed, 81 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
index a126bbaf086f..e0d7a518dfc2 100644
--- a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
@@ -5,6 +5,18 @@
#include "rk3399-u-boot.dtsi"
+&gpio0 {
+ bootph-pre-ram;
+};
+
&sdmmc {
pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_cd>;
};
+
+&sdmmc0_pwr_h {
+ bootph-pre-ram;
+};
+
+&vcc3v0_sd {
+ bootph-pre-ram;
+};
diff --git a/arch/arm/dts/rk3399-orangepi-u-boot.dtsi
b/arch/arm/dts/rk3399-orangepi-u-boot.dtsi
index d4327ea607c4..b7452eca2254 100644
--- a/arch/arm/dts/rk3399-orangepi-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-orangepi-u-boot.dtsi
@@ -6,6 +6,18 @@
#include "rk3399-u-boot.dtsi"
#include "rk3399-sdram-ddr3-1333.dtsi"
+&gpio0 {
+ bootph-pre-ram;
+};
+
+&sdmmc0_pwr_h {
+ bootph-pre-ram;
+};
+
+&vcc3v0_sd {
+ bootph-pre-ram;
+};
+
&vdd_log {
regulator-init-microvolt = <95>;
};
diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
index 17af95a114fc..2341db444ef3 100644
--- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
@@ -10,6 +10,10 @@
rockchip,panel = <&edp_panel>;
};
+&gpio0 {
+ bootph-pre-ram;
+};
+
&sdhci {
max-frequency = <2500>;
};
@@ -18,11 +22,19 @@
max-frequency = <2000>;
};
+&sdmmc0_pwr_h_pin {
+ bootph-pre-ram;
+};
+
&spiflash {
bootph-pre-ram;
bootph-some-ram;
};
+&vcc3v0_sd {
+ bootph-pre-ram;
+};
+
&vdd_log {
regulator-init-microvolt = <95>;
};
diff --git a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
index d40daacc7823..aecf7dbe383c 100644
--- a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
@@ -32,6 +32,10 @@
vin-supply = <&vcc_vbus_typec0>;
};
+&gpio4 {
+ bootph-pre-ram;
+};
+
&spi1 {
flash@0 {
bootph-pre-ram;
@@ -39,6 +43,14 @@
};
};
+&vcc3v0_sd {
+ bootph-pre-ram;
+};
+
+&vcc3v0_sd_en {
+ bootph-pre-ram;
+};
+
&vcc5v0_host {
regulator-always-on;
};
diff --git a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
index e280739057df..43b67991fe5a 100644
--- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
@@ -28,11 +28,19 @@
};
};
+&gpio0 {
+ bootph-pre-ram;
+};
+
&sdhci {
cap-mmc-highspeed;
mmc-ddr-1_8v;
};
+&sdmmc0_pwr_h {
+ bootph-pre-ram;
+};
+
&spi1 {
flash@0 {
bootph-pre-ram;
@@ -40,6 +48,10 @@
};
};
+&vcc3v0_sd {
+ bootph-pre-ram;
+};
+
&vdd_center {
regulator-min-microvolt = <95>;
regulator-max-microvolt = <95>;
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 7d6374b73586..262cb7cba3ea 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -277,6 +277,7 @@ con
[PATCH v2 17/18] rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC
When RK3399 boards run SPL from eMMC and fail to load FIT from eMMC due
to it being missing or checksum validation fails there can be a fallback
to read FIT from SD-card. However, without proper pinctrl configuration
reading FIT from SD-card may fail:
U-Boot SPL 2024.04-rc4 (Mar 17 2024 - 22:54:45 +)
Trying to boot from MMC2
mmc_load_image_raw_sector: mmc block read error
Trying to boot from MMC2
mmc_load_image_raw_sector: mmc block read error
Trying to boot from MMC1
Card did not respond to voltage select! : -110
mmc_init: -95, time 12
spl: mmc init failed with error: -95
SPL: failed to boot from all boot devices (err=-6)
### ERROR ### Please RESET the board ###
Fix this by tagging related sdhci, sdmmc and spi flash pinctrl nodes
with bootph props. Also move bootph for common nodes shared by all
boards to the SoC u-boot.dtsi.
eMMC, SD-Card and SPI flash nodes are also changed to only be tagged
with bootph props for SPL and U-Boot pre-reloc phases.
Signed-off-by: Jonas Karlman
---
v2: Split patch, only keep sdhci, sdmmc and spi1 bootph/pinctrl changes
in this patch
v2: Also include sdhci, sdmmc and spi1 nodes at pre-reloc phase
v2: Update commit message
---
arch/arm/dts/rk3399-ficus-u-boot.dtsi| 10
arch/arm/dts/rk3399-gru-u-boot.dtsi | 24 +
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 3 +-
arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 23 +---
arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 5 +-
arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 10
arch/arm/dts/rk3399-rock960-u-boot.dtsi | 10
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi| 7 ++-
arch/arm/dts/rk3399-u-boot.dtsi | 57 ++--
configs/eaidk-610-rk3399_defconfig | 2 +-
configs/evb-rk3399_defconfig | 2 +-
configs/ficus-rk3399_defconfig | 2 +-
configs/firefly-rk3399_defconfig | 2 +-
configs/khadas-edge-captain-rk3399_defconfig | 2 +-
configs/khadas-edge-rk3399_defconfig | 2 +-
configs/khadas-edge-v-rk3399_defconfig | 2 +-
configs/leez-rk3399_defconfig| 2 +-
configs/nanopc-t4-rk3399_defconfig | 2 +-
configs/nanopi-m4-2gb-rk3399_defconfig | 2 +-
configs/nanopi-m4-rk3399_defconfig | 2 +-
configs/nanopi-m4b-rk3399_defconfig | 2 +-
configs/nanopi-neo4-rk3399_defconfig | 2 +-
configs/nanopi-r4s-rk3399_defconfig | 2 +-
configs/orangepi-rk3399_defconfig| 2 +-
configs/pinebook-pro-rk3399_defconfig| 2 +-
configs/pinephone-pro-rk3399_defconfig | 2 +-
configs/roc-pc-mezzanine-rk3399_defconfig| 2 +-
configs/roc-pc-rk3399_defconfig | 2 +-
configs/rock-4c-plus-rk3399_defconfig| 2 +-
configs/rock-4se-rk3399_defconfig| 2 +-
configs/rock-pi-4-rk3399_defconfig | 2 +-
configs/rock-pi-4c-rk3399_defconfig | 2 +-
configs/rock-pi-n10-rk3399pro_defconfig | 2 +-
configs/rock960-rk3399_defconfig | 2 +-
configs/rockpro64-rk3399_defconfig | 2 +-
35 files changed, 142 insertions(+), 59 deletions(-)
diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi
b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
index 67b63a835238..ac924d6dc592 100644
--- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
@@ -5,3 +5,13 @@
#include "rk3399-u-boot.dtsi"
#include "rk3399-sdram-ddr3-1600.dtsi"
+
+&pcfg_pull_none_18ma {
+ bootph-pre-ram;
+ bootph-some-ram;
+};
+
+&pcfg_pull_up_8ma {
+ bootph-pre-ram;
+ bootph-some-ram;
+};
diff --git a/arch/arm/dts/rk3399-gru-u-boot.dtsi
b/arch/arm/dts/rk3399-gru-u-boot.dtsi
index b1604a6872c0..0cc40eb6d6f6 100644
--- a/arch/arm/dts/rk3399-gru-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-gru-u-boot.dtsi
@@ -54,6 +54,30 @@
enable-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
};
+&sdhci {
+ /delete-property/ bootph-pre-ram;
+};
+
+&sdmmc {
+ /delete-property/ bootph-pre-ram;
+};
+
+&sdmmc_bus4 {
+ /delete-property/ bootph-pre-ram;
+};
+
+&sdmmc_cd {
+ /delete-property/ bootph-pre-ram;
+};
+
+&sdmmc_clk {
+ /delete-property/ bootph-pre-ram;
+};
+
+&sdmmc_cmd {
+ /delete-property/ bootph-pre-ram;
+};
+
&spi5 {
spi-activate-delay = <100>;
spi-max-frequency = <300>;
diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
index 56fdaf440aea..17af95a114fc 100644
--- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
@@ -19,7 +19,8 @@
};
&spiflash {
- bootph-all;
+ bootph-pre-ram;
+ bootph-some-ram;
};
&vdd_log {
diff --git a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
index d1912a2ef6a9..1930e5e10353 100644
--- a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-puma-haikou
[PATCH] zfs: recognize zpools formatted with features support as used in OpenZFS
Currently no features are implemented, only the zpool version 5000 that
indicating the features support, is recognized. Since it is possible for
OpenZFS to create a pool with features support enabled, but without
enabling any actual feature, this change enables U-Boot to read such
pools.
Signed-off-by: WHR
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 4896cc18ef..3575c23a42 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -336,6 +336,12 @@ vdev_uberblock_compare(uberblock_t *ub1, uberblock_t *ub2)
return 0;
}
+static inline int
+is_supported_spa_version(uint64_t version) {
+ return version == FEATURES_SUPPORTED_SPA_VERSION ||
+ (version > 0 && version <= SPA_VERSION);
+}
+
/*
* Three pieces of information are needed to verify an uberblock: the magic
* number, the version number, and the checksum.
@@ -348,6 +354,7 @@ static int
uberblock_verify(uberblock_t *uber, int offset, struct zfs_data *data)
{
int err;
+ uint64_t spa_version;
zfs_endian_t endian = UNKNOWN_ENDIAN;
zio_cksum_t zc;
@@ -357,14 +364,12 @@ uberblock_verify(uberblock_t *uber, int offset, struct
zfs_data *data)
return ZFS_ERR_BAD_FS;
}
- if (zfs_to_cpu64(uber->ub_magic, LITTLE_ENDIAN) == UBERBLOCK_MAGIC
- && zfs_to_cpu64(uber->ub_version, LITTLE_ENDIAN) > 0
- && zfs_to_cpu64(uber->ub_version, LITTLE_ENDIAN) <= SPA_VERSION)
+ if (zfs_to_cpu64(uber->ub_magic, LITTLE_ENDIAN) == UBERBLOCK_MAGIC &&
+ is_supported_spa_version(zfs_to_cpu64(uber->ub_version,
LITTLE_ENDIAN)))
endian = LITTLE_ENDIAN;
- if (zfs_to_cpu64(uber->ub_magic, BIG_ENDIAN) == UBERBLOCK_MAGIC
- && zfs_to_cpu64(uber->ub_version, BIG_ENDIAN) > 0
- && zfs_to_cpu64(uber->ub_version, BIG_ENDIAN) <= SPA_VERSION)
+ if (zfs_to_cpu64(uber->ub_magic, BIG_ENDIAN) == UBERBLOCK_MAGIC &&
+ is_supported_spa_version(zfs_to_cpu64(uber->ub_version,
BIG_ENDIAN)))
endian = BIG_ENDIAN;
if (endian == UNKNOWN_ENDIAN) {
@@ -1790,7 +1795,7 @@ check_pool_label(struct zfs_data *data)
return ZFS_ERR_BAD_FS;
}
- if (version > SPA_VERSION) {
+ if (!is_supported_spa_version(version)) {
free(nvlist);
printf("SPA version too new %llu > %llu\n",
(unsigned long long) version,
[PATCH] zfs: recognize zpools formatted with features support
Currently no features are implemented, only the zpool version 5000 that
indicating the features support, is recognized. Since it is possible for
OpenZFS to create a pool with features support enabled, but without
enabling any actual feature, this change enables U-Boot to read such
pools.
Signed-off-by: WHR
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 4896cc18ef..3575c23a42 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -336,6 +336,12 @@ vdev_uberblock_compare(uberblock_t *ub1, uberblock_t *ub2)
return 0;
}
+static inline int
+is_supported_spa_version(uint64_t version) {
+ return version == FEATURES_SUPPORTED_SPA_VERSION ||
+ (version > 0 && version <= SPA_VERSION);
+}
+
/*
* Three pieces of information are needed to verify an uberblock: the magic
* number, the version number, and the checksum.
@@ -348,6 +354,7 @@ static int
uberblock_verify(uberblock_t *uber, int offset, struct zfs_data *data)
{
int err;
+ uint64_t spa_version;
zfs_endian_t endian = UNKNOWN_ENDIAN;
zio_cksum_t zc;
@@ -357,14 +364,12 @@ uberblock_verify(uberblock_t *uber, int offset, struct
zfs_data *data)
return ZFS_ERR_BAD_FS;
}
- if (zfs_to_cpu64(uber->ub_magic, LITTLE_ENDIAN) == UBERBLOCK_MAGIC
- && zfs_to_cpu64(uber->ub_version, LITTLE_ENDIAN) > 0
- && zfs_to_cpu64(uber->ub_version, LITTLE_ENDIAN) <= SPA_VERSION)
+ if (zfs_to_cpu64(uber->ub_magic, LITTLE_ENDIAN) == UBERBLOCK_MAGIC &&
+ is_supported_spa_version(zfs_to_cpu64(uber->ub_version,
LITTLE_ENDIAN)))
endian = LITTLE_ENDIAN;
- if (zfs_to_cpu64(uber->ub_magic, BIG_ENDIAN) == UBERBLOCK_MAGIC
- && zfs_to_cpu64(uber->ub_version, BIG_ENDIAN) > 0
- && zfs_to_cpu64(uber->ub_version, BIG_ENDIAN) <= SPA_VERSION)
+ if (zfs_to_cpu64(uber->ub_magic, BIG_ENDIAN) == UBERBLOCK_MAGIC &&
+ is_supported_spa_version(zfs_to_cpu64(uber->ub_version,
BIG_ENDIAN)))
endian = BIG_ENDIAN;
if (endian == UNKNOWN_ENDIAN) {
@@ -1790,7 +1795,7 @@ check_pool_label(struct zfs_data *data)
return ZFS_ERR_BAD_FS;
}
- if (version > SPA_VERSION) {
+ if (!is_supported_spa_version(version)) {
free(nvlist);
printf("SPA version too new %llu > %llu\n",
(unsigned long long) version,
diff --git a/include/zfs/zfs.h b/include/zfs/zfs.h
index 17b93c10c8..72d87452dd 100644
--- a/include/zfs/zfs.h
+++ b/include/zfs/zfs.h
@@ -15,6 +15,7 @@
* On-disk version number.
*/
#defineSPA_VERSION 28ULL
+#defineFEATURES_SUPPORTED_SPA_VERSION 5000ULL
/*
* The following are configuration names used in the nvlist describing a pool's
Re: [PATCH] zfs: recognize zpools formatted with features support as used in OpenZFS
> Currently no features are implemented, only the zpool version 5000 that > indicating the features support, is recognized. Since it is possible for > OpenZFS to create a pool with features support enabled, but without > enabling any actual feature, this change enables U-Boot to read such > pools. > > Signed-off-by: WHR > > > This commit is missing changed file include/zfs/zfs.h, has been replaced by https://lists.denx.de/pipermail/u-boot/2024-April/552434.html, please drop.
[PATCH v2] zfs: recognize zpools formatted with features support
Currently no features are implemented, only the zpool version 5000 that
indicating the features support, is recognized. Since it is possible for
OpenZFS to create a pool with features support enabled, but without
enabling any actual feature, this change enables U-Boot to read such
pools.
Signed-off-by: WHR
---
v2:
Remove an unused local variable definition.
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 4896cc18ef..113b428a93 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -336,6 +336,12 @@ vdev_uberblock_compare(uberblock_t *ub1, uberblock_t *ub2)
return 0;
}
+static inline int
+is_supported_spa_version(uint64_t version) {
+ return version == FEATURES_SUPPORTED_SPA_VERSION ||
+ (version > 0 && version <= SPA_VERSION);
+}
+
/*
* Three pieces of information are needed to verify an uberblock: the magic
* number, the version number, and the checksum.
@@ -357,14 +363,12 @@ uberblock_verify(uberblock_t *uber, int offset, struct
zfs_data *data)
return ZFS_ERR_BAD_FS;
}
- if (zfs_to_cpu64(uber->ub_magic, LITTLE_ENDIAN) == UBERBLOCK_MAGIC
- && zfs_to_cpu64(uber->ub_version, LITTLE_ENDIAN) > 0
- && zfs_to_cpu64(uber->ub_version, LITTLE_ENDIAN) <= SPA_VERSION)
+ if (zfs_to_cpu64(uber->ub_magic, LITTLE_ENDIAN) == UBERBLOCK_MAGIC &&
+ is_supported_spa_version(zfs_to_cpu64(uber->ub_version,
LITTLE_ENDIAN)))
endian = LITTLE_ENDIAN;
- if (zfs_to_cpu64(uber->ub_magic, BIG_ENDIAN) == UBERBLOCK_MAGIC
- && zfs_to_cpu64(uber->ub_version, BIG_ENDIAN) > 0
- && zfs_to_cpu64(uber->ub_version, BIG_ENDIAN) <= SPA_VERSION)
+ if (zfs_to_cpu64(uber->ub_magic, BIG_ENDIAN) == UBERBLOCK_MAGIC &&
+ is_supported_spa_version(zfs_to_cpu64(uber->ub_version,
BIG_ENDIAN)))
endian = BIG_ENDIAN;
if (endian == UNKNOWN_ENDIAN) {
@@ -1790,7 +1794,7 @@ check_pool_label(struct zfs_data *data)
return ZFS_ERR_BAD_FS;
}
- if (version > SPA_VERSION) {
+ if (!is_supported_spa_version(version)) {
free(nvlist);
printf("SPA version too new %llu > %llu\n",
(unsigned long long) version,
diff --git a/include/zfs/zfs.h b/include/zfs/zfs.h
index 17b93c10c8..72d87452dd 100644
--- a/include/zfs/zfs.h
+++ b/include/zfs/zfs.h
@@ -15,6 +15,7 @@
* On-disk version number.
*/
#defineSPA_VERSION 28ULL
+#defineFEATURES_SUPPORTED_SPA_VERSION 5000ULL
/*
* The following are configuration names used in the nvlist describing a pool's
[PATCH v2] sandbox: make function 'do_undefined' properly compiles for PowerPC
The 2 bytes 0x is too short for being a PowerPC instruction, resulting
in an error similar to:
/tmp/ccW8yjie.s: Assembler messages:
/tmp/ccW8yjie.s: Error: unaligned opcodes detected in executable
segment /tmp/ccW8yjie.s:223: Error: instruction address is not a
multiple of 4 make[2]: *** [/tmp/ccyF4HIC.mk:17:
/tmp/ccCKUFuF.ltrans5.ltrans.o]
Error 1
Signed-off-by: WHR
---
v2:
Resubmit with diff content in plain text.
cmd/sandbox/exception.c | 4
1 file changed, 4 insertions(+)
diff --git a/cmd/sandbox/exception.c b/cmd/sandbox/exception.c
index cfa153da26..f9c847d8ff 100644
--- a/cmd/sandbox/exception.c
+++ b/cmd/sandbox/exception.c
@@ -19,7 +19,11 @@ static int do_sigsegv(struct cmd_tbl *cmdtp, int flag, int
argc,
static int do_undefined(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
{
+#ifdef __powerpc__
+ asm volatile (".long 0x\n");
+#else
asm volatile (".word 0x\n");
+#endif
return CMD_RET_FAILURE;
}
[PATCH] zfs: fix function 'zlib_decompress' pointlessly calling itself
In order to prevent crashing due to infinite recursion and actually
decompress the requested data, call the zlib function 'uncompress'
instead.
Signed-off-by: WHR
---
v2:
Resubmit with diff content in plain text.
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index bfc11fa667..4896cc18ef 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -17,6 +17,7 @@
#include
#include
#include
+#include
#include "zfs_common.h"
#include "div64.h"
@@ -183,7 +184,8 @@ static int
zlib_decompress(void *s, void *d,
uint32_t slen, uint32_t dlen)
{
- if (zlib_decompress(s, d, slen, dlen) < 0)
+ uLongf z_dest_len = dlen;
+ if (uncompress(d, &z_dest_len, s, slen) != Z_OK)
return ZFS_ERR_BAD_FS;
return ZFS_ERR_NONE;
}
[PATCH v3] sandbox: make function 'do_undefined' properly compiles for PowerPC
The 2 bytes 0x is too short for being a PowerPC instruction, resulting
in an error similar to:
/tmp/ccW8yjie.s: Assembler messages:
/tmp/ccW8yjie.s: Error: unaligned opcodes detected in executable segment
/tmp/ccW8yjie.s:223: Error: instruction address is not a multiple of 4
make[2]: *** [/tmp/ccyF4HIC.mk:17: /tmp/ccCKUFuF.ltrans5.ltrans.o] Error 1
Signed-off-by: WHR
---
v2:
Resubmit with diff content in plain text.
v3:
Reformat commit message body that was previously mangled by my email client.
cmd/sandbox/exception.c | 4
1 file changed, 4 insertions(+)
diff --git a/cmd/sandbox/exception.c b/cmd/sandbox/exception.c
index cfa153da26..f9c847d8ff 100644
--- a/cmd/sandbox/exception.c
+++ b/cmd/sandbox/exception.c
@@ -19,7 +19,11 @@ static int do_sigsegv(struct cmd_tbl *cmdtp, int flag, int
argc,
static int do_undefined(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
{
+#ifdef __powerpc__
+ asm volatile (".long 0x\n");
+#else
asm volatile (".word 0x\n");
+#endif
return CMD_RET_FAILURE;
}
Re: [PATCH v3] test/py: net_boot: Add test cases for net boot
On Tue, Apr 30, 2024 at 02:24:55PM +0530, Love Kumar wrote:
> Add tests for booting image using tftpboot/pxe boot commands, tftpboot
> boot case loads the FIT image into DDR and boots using bootm command
> whereas pxe boot cases downloads the pxe configuration file from the
> TFTP server and interprets it to boot the images mentioned in the pxe
> configurations file.
> This test relies on boardenv_* containing configuration values including
> the parameter 'pattern'. tftpboot/pxe boot cases boots the Linux till the
> boot log pattern value is matched. For example, if the parameter
> 'pattern' is defined as 'login:', it will boot till login prompt.
>
> Signed-off-by: Love Kumar
[snip]
> +def setup_tftpboot_boot(u_boot_console):
> +f = u_boot_console.config.env.get('env__net_tftp_bootable_file', None)
> +if not f:
> +pytest.skip('No TFTP bootable file to read')
> +
> +test_net.test_net_dhcp(u_boot_console)
> +if not test_net.net_set_up:
> +test_net.test_net_setup_static(u_boot_console)
> +
> +addr = f.get('addr', None)
> +if not addr:
> +addr = u_boot_utils.find_ram_base(u_boot_console)
> +
> +fn = f['fn']
> +output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn))
> +expected_text = 'Bytes transferred = '
> +sz = f.get('size', None)
> +if sz:
> +expected_text += '%d' % sz
> +assert expected_text in output
> +
> +expected_crc = f.get('crc32', None)
> +output = u_boot_console.run_command('crc32 %x $filesize' % addr)
> +if expected_crc:
> +assert expected_crc in output
> +
> +pattern = f.get('pattern')
> +config = f.get('config', None)
> +timeout = f.get('timeout', 5)
> +
> +return addr, pattern, timeout, config
The problem here is that we don't get the configured timeout and then
use it while running "tftpboot" nor "crc32". For me this leads to
failure on hardware as I'm tossing it a 83MiB FIT image and it just
doesn't load in the default timeout period.
--
Tom
signature.asc
Description: PGP signature
[PATCH 0/2] introduce basic support for TI's am625-lp-sk
Hello Everyone! The am625-lp-sk is a variant of the am625-sk showcasing the low-power features of the am625 SoC Family. Because it's essentially a board and package spin of the am625-sk I've inherited the am625 configuration and overridden what was needed. This is a new spin of Nitin's original work which has been updated significantly since October 2023 https://lore.kernel.org/u-boot/20231030110138.1347603-1-n-ya...@ti.com/ Unfortunately a few patches have broken the am62x boot currently and need to be added and reverted for this series to work: One to increase the size of MALLOC space to make room for the DM stubs https://lore.kernel.org/u-boot/20240429214936.15187-1...@ti.com And this patch (in active debug) will need to be reverted for MMC boot. https://lore.kernel.org/u-boot/20240422190035.25852-1-greg.mal...@timesys.com/ For those of us interested here is proof of life using buildroot: https://paste.sr.ht/~bryanb/40f7787f7760bee383aa8fbc342a29e8544dbdab Thank you for reviewing ~Bryan Signed-off-by: Bryan Brattlof --- Bryan Brattlof (1): configs: add defconfigs for the am625-lp-sk Nitin Yadav (1): arm: dts: add U-Boot dtbs for the am625-lp-sk arch/arm/dts/k3-am62-lp-sk-binman.dtsi | 21 + arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi | 17 + arch/arm/dts/k3-am62-lp4-50-800-800.dtsi | 2190 ++ arch/arm/dts/k3-am62-r5-lp-sk.dts| 82 ++ configs/am62x_lp_sk_a53_defconfig|3 + configs/am62x_lp_sk_r5_defconfig |2 + 6 files changed, 2315 insertions(+) --- base-commit: b43a0c7ed600fc608262b9a274a1cad4c7465b6a change-id: 20240429-am62q-wip-f3453de038fb Best regards, -- Bryan Brattlof
[PATCH 2/2] configs: add defconfigs for the am625-lp-sk
The am62x-lp-sk is a package and reference board spin of the am62x-sk to showcase the low-power features of the am62x SoC family. Because it so closely resembles the am62x-sk board, us the preprocessor to inherit its configuration making the needed changes for this board. Signed-off-by: Bryan Brattlof --- configs/am62x_lp_sk_a53_defconfig | 3 +++ configs/am62x_lp_sk_r5_defconfig | 2 ++ 2 files changed, 5 insertions(+) diff --git a/configs/am62x_lp_sk_a53_defconfig b/configs/am62x_lp_sk_a53_defconfig new file mode 100644 index 0..904b2142b2f53 --- /dev/null +++ b/configs/am62x_lp_sk_a53_defconfig @@ -0,0 +1,3 @@ +#include +CONFIG_DEFAULT_DEVICE_TREE="ti/k3-am62-lp-sk" +CONFIG_OF_UPSTREAM=y diff --git a/configs/am62x_lp_sk_r5_defconfig b/configs/am62x_lp_sk_r5_defconfig new file mode 100644 index 0..93b3922e6fec5 --- /dev/null +++ b/configs/am62x_lp_sk_r5_defconfig @@ -0,0 +1,2 @@ +#include +CONFIG_DEFAULT_DEVICE_TREE="k3-am62-r5-lp-sk" -- 2.43.2
[PATCH 1/2] arm: dts: add U-Boot dtbs for the am625-lp-sk
From: Nitin Yadav
Add the U-Boot device tree overrides for the am62x-lp-sk reference
board.
Signed-off-by: Nitin Yadav
Signed-off-by: Bryan Brattlof
---
arch/arm/dts/k3-am62-lp-sk-binman.dtsi | 21 +
arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi | 17 +
arch/arm/dts/k3-am62-lp4-50-800-800.dtsi | 2190 ++
arch/arm/dts/k3-am62-r5-lp-sk.dts| 82 ++
4 files changed, 2310 insertions(+)
diff --git a/arch/arm/dts/k3-am62-lp-sk-binman.dtsi
b/arch/arm/dts/k3-am62-lp-sk-binman.dtsi
new file mode 100644
index 0..de425a4b54f81
--- /dev/null
+++ b/arch/arm/dts/k3-am62-lp-sk-binman.dtsi
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+#include "k3-binman.dtsi"
+#include "k3-am625-sk-binman.dtsi"
+
+#ifdef CONFIG_TARGET_AM625_A53_EVM
+
+#define SPL_AM62_LP_SK_DTB "spl/dts/ti/k3-am62-lp-sk.dtb"
+
+&spl_am625_sk_dtb {
+ filename = SPL_AM62_LP_SK_DTB;
+};
+
+&spl_am625_sk_dtb_unsigned {
+ filename = SPL_AM62_LP_SK_DTB;
+};
+
+#endif
diff --git a/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi
b/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi
new file mode 100644
index 0..08f572446657e
--- /dev/null
+++ b/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * AM62x LP SK dts file for SPLs
+ * Copyright (C) 2021-2023 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+#include "k3-am62-lp-sk-binman.dtsi"
+
+/ {
+ chosen {
+ tick-timer = &main_timer0;
+ };
+};
+
+&main_timer0 {
+ clock-frequency = <2500>;
+};
diff --git a/arch/arm/dts/k3-am62-lp4-50-800-800.dtsi
b/arch/arm/dts/k3-am62-lp4-50-800-800.dtsi
new file mode 100644
index 0..c255ae6530f5b
--- /dev/null
+++ b/arch/arm/dts/k3-am62-lp4-50-800-800.dtsi
@@ -0,0 +1,2190 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * This file was generated with the
+ * AM62x SysConfig DDR Subsystem Register Configuration Tool v0.09.07
+ * Wed Mar 01 2023 17:52:11 GMT-0600 (Central Standard Time)
+ * DDR Type: LPDDR4
+ * F0 = 50MHzF1 = NA F2 = 800MHz
+ * Density (per channel): 16Gb
+ * Write DBI: Enable
+ * Number of Ranks: 1
+ */
+
+#define DDRSS_PLL_FHS_CNT 3
+#define DDRSS_PLL_FREQUENCY_1 4
+#define DDRSS_PLL_FREQUENCY_2 4
+
+#define DDRSS_CTL_0_DATA 0x0B00
+#define DDRSS_CTL_1_DATA 0x
+#define DDRSS_CTL_2_DATA 0x
+#define DDRSS_CTL_3_DATA 0x
+#define DDRSS_CTL_4_DATA 0x
+#define DDRSS_CTL_5_DATA 0x
+#define DDRSS_CTL_6_DATA 0x
+#define DDRSS_CTL_7_DATA 0x2710
+#define DDRSS_CTL_8_DATA 0x000186A0
+#define DDRSS_CTL_9_DATA 0x0005
+#define DDRSS_CTL_10_DATA 0x0064
+#define DDRSS_CTL_11_DATA 0x00027100
+#define DDRSS_CTL_12_DATA 0x00186A00
+#define DDRSS_CTL_13_DATA 0x0005
+#define DDRSS_CTL_14_DATA 0x0640
+#define DDRSS_CTL_15_DATA 0x00027100
+#define DDRSS_CTL_16_DATA 0x00186A00
+#define DDRSS_CTL_17_DATA 0x0005
+#define DDRSS_CTL_18_DATA 0x0640
+#define DDRSS_CTL_19_DATA 0x01010100
+#define DDRSS_CTL_20_DATA 0x01010100
+#define DDRSS_CTL_21_DATA 0x01000110
+#define DDRSS_CTL_22_DATA 0x02010002
+#define DDRSS_CTL_23_DATA 0x000A
+#define DDRSS_CTL_24_DATA 0x000186A0
+#define DDRSS_CTL_25_DATA 0x
+#define DDRSS_CTL_26_DATA 0x
+#define DDRSS_CTL_27_DATA 0x
+#define DDRSS_CTL_28_DATA 0x
+#define DDRSS_CTL_29_DATA 0x00020200
+#define DDRSS_CTL_30_DATA 0x
+#define DDRSS_CTL_31_DATA 0x
+#define DDRSS_CTL_32_DATA 0x
+#define DDRSS_CTL_33_DATA 0x
+#define DDRSS_CTL_34_DATA 0x0810
+#define DDRSS_CTL_35_DATA 0x2020
+#define DDRSS_CTL_36_DATA 0x
+#define DDRSS_CTL_37_DATA 0x
+#define DDRSS_CTL_38_DATA 0x040C
+#define DDRSS_CTL_39_DATA 0x
+#define DDRSS_CTL_40_DATA 0x081C
+#define DDRSS_CTL_41_DATA 0x
+#define DDRSS_CTL_42_DATA 0x081C
+#define DDRSS_CTL_43_DATA 0x
+#define DDRSS_CTL_44_DATA 0x05000804
+#define DDRSS_CTL_45_DATA 0x0700
+#define DDRSS_CTL_46_DATA 0x09090004
+#define DDRSS_CTL_47_DATA 0x0203
+#define DDRSS_CTL_48_DATA 0x00320007
+#define DDRSS_CTL_49_DATA 0x09090023
+#define DDRSS_CTL_50_DATA 0x190F
+#define DDRSS_CTL_51_DATA 0x00320007
+#define DDRSS_CTL_52_DATA 0x09090023
+#define DDRSS_CTL_53_DATA 0x0900190F
+#define DDRSS_CTL_54_DATA 0x000A0A09
+#define DDRSS_CTL_55_DATA 0x040006DB
+#define DDRSS_CTL_56_DATA 0x09092004
+#define DDRSS_CTL_57_DATA 0x0C0A
+#define DDRSS_CTL_58_DATA 0x06006DB0
+#define DDRSS_CTL_59_DATA 0x09092006
+#define DDRSS_CTL_60_DATA 0x0C0A
+#define DDRSS_CTL_61_DATA 0x06006DB0
+#define DDRSS_CTL_62_DATA 0x03042006
+#define DDRSS_CTL_63_DATA 0x04050002
+#define DDRSS_CTL_64_DATA 0x100F100F
+#define DDRSS_CTL_65_DATA 0x01010008
+#define DDRSS_CTL_66_DATA 0x041F1F07
+#define DDRSS_CTL_67_DATA 0x0303
+#define DDRSS_CTL_68_DATA 0x
+#define DDRSS_CTL_
RE: [PATCH 32/33] arm: fsl-layerscape: Remove and add needed includes
> Subject: [PATCH 32/33] arm: fsl-layerscape: Remove and add > needed includes > > Remove from all fsl-layerscape related files and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Acked-by: Peng Fan > --- > Cc: Peng Fan > --- > arch/arm/cpu/armv7/ls102xa/clock.c | 2 +- > arch/arm/cpu/armv7/ls102xa/cpu.c | 1 - > arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +- > arch/arm/cpu/armv7/ls102xa/fsl_epu.c | 1 - > arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c| 2 +- > arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c| 2 +- > arch/arm/cpu/armv7/ls102xa/soc.c | 2 +- > arch/arm/cpu/armv7/ls102xa/spl.c | 1 - > arch/arm/cpu/armv7/ls102xa/timer.c | 1 - > arch/arm/cpu/armv8/fsl-layerscape/cpu.c| 2 +- > arch/arm/cpu/armv8/fsl-layerscape/fdt.c| 2 +- > arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c| 2 +- > arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c| 2 +- > arch/arm/cpu/armv8/fsl-layerscape/icid.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c | 3 ++- > arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/mp.c | 2 +- > arch/arm/cpu/armv8/fsl-layerscape/soc.c| 2 +- > arch/arm/cpu/armv8/fsl-layerscape/spl.c| 2 +- > arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h | 2 ++ > arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 1 + > arch/arm/include/asm/arch-ls102xa/fsl_serdes.h | 2 ++ > 35 files changed, 40 insertions(+), 32 deletions(-) > > diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c > b/arch/arm/cpu/armv7/ls102xa/clock.c > index 4e1fe281201f..e885a85ce65c 100644 > --- a/arch/arm/cpu/armv7/ls102xa/clock.c > +++ b/arch/arm/cpu/armv7/ls102xa/clock.c > @@ -3,7 +3,7 @@ > * Copyright 2014 Freescale Semiconductor, Inc. > */ > > -#include > +#include > #include > #include > #include > diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c > b/arch/arm/cpu/armv7/ls102xa/cpu.c > index c455969609f6..74a2dcbc116a 100644 > --- a/arch/arm/cpu/armv7/ls102xa/cpu.c > +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c > @@ -4,7 +4,6 @@ > * Copyright 2021 NXP > */ > > -#include > #include > #include > #include > diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c > b/arch/arm/cpu/armv7/ls102xa/fdt.c > index 1c3d24bcad94..34eea22eb923 100644 > --- a/arch/arm/cpu/armv7/ls102xa/fdt.c > +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c > @@ -3,7 +3,7 @@ > * Copyright 2014 Freescale Semiconductor, Inc. > */ > > -#include > +#include > #include > #include > #include > diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c > b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c > index e31a4fb6c31b..664eae532d5f 100644 > --- a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c > +++ b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c > @@ -3,7 +3,6 @@ > * Copyright 2014 Freescale Semiconductor, Inc. > */ > > -#include > #include > > #include "fsl_epu.h" > diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c > b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c > index f74d819ea1ea..c1eadb34523f 100644 > --- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c > +++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c > @@ -3,7 +3,7 @@ > * Copyright 2014 Freescale Semiconductor, Inc. > */ > > -#include > +#include > #include > #include > #include > diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c > b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c > index 8c030be8b36f..3032e266c5d4 100644 > --- a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c > +++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c > @@ -3,7 +3,7 @@ > * Copyright 2014 Freescale Semiconductor, Inc. > */ > > -#include > +#include > #include > #include > > diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c > b/arch/arm/cpu/armv7/ls102xa/soc.c > index 84d4ea3a8f4a..7ff59edd452e 100644 > --- a/arch/arm/cpu/armv7/ls102xa/soc.c > +++ b/arch/arm/cpu/armv7/ls102xa/soc.c > @@ -3,7 +3,7 @@ > *
RE: [PATCH 23/33] arm: imx: Remove and add needed includes
> Subject: [PATCH 23/33] arm: imx: Remove and add needed > includes > > Remove from all mach-imx, CPU specific sub-directories and > include/asm/arch-mx* files and when needed add missing include files > directly. > > Signed-off-by: Tom Rini Acked-by: Peng Fan > --- > Cc: Stefano Babic > Cc: Fabio Estevam > Cc: "NXP i.MX U-Boot Team" > --- > arch/arm/cpu/arm1136/mx31/devices.c | 1 - > arch/arm/cpu/arm1136/mx31/generic.c | 1 - > arch/arm/cpu/arm1136/mx31/timer.c | 1 - > arch/arm/cpu/arm926ejs/mxs/clock.c | 1 - > arch/arm/cpu/arm926ejs/mxs/iomux.c | 1 - > arch/arm/cpu/arm926ejs/mxs/mxs.c| 1 - > arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 1 - > arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c | 1 - > arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 - > arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 1 - > arch/arm/cpu/arm926ejs/mxs/start.S | 1 - > arch/arm/cpu/arm926ejs/mxs/timer.c | 1 - > arch/arm/include/asm/arch-mx5/clock.h | 2 ++ > arch/arm/include/asm/arch-mx7/sys_proto.h | 2 ++ > arch/arm/mach-imx/cache.c | 2 +- > arch/arm/mach-imx/cmd_bmode.c | 1 - > arch/arm/mach-imx/cmd_dek.c | 3 ++- > arch/arm/mach-imx/cmd_hdmidet.c | 1 - > arch/arm/mach-imx/cmd_mfgprot.c | 2 +- > arch/arm/mach-imx/cmd_nandbcb.c | 1 - > arch/arm/mach-imx/cpu.c | 1 - > arch/arm/mach-imx/ddrmc-vf610-calibration.c | 1 - > arch/arm/mach-imx/ddrmc-vf610.c | 1 - > arch/arm/mach-imx/ele_ahab.c| 2 +- > arch/arm/mach-imx/hab.c | 1 - > arch/arm/mach-imx/i2c-mxv7.c| 2 +- > arch/arm/mach-imx/image-container.c | 2 +- > arch/arm/mach-imx/imx8/ahab.c | 1 - > arch/arm/mach-imx/imx8/clock.c | 1 - > arch/arm/mach-imx/imx8/cpu.c| 1 - > arch/arm/mach-imx/imx8/fdt.c| 1 - > arch/arm/mach-imx/imx8/iomux.c | 1 - > arch/arm/mach-imx/imx8/misc.c | 1 - > arch/arm/mach-imx/imx8/snvs_security_sc.c | 1 - > arch/arm/mach-imx/imx8m/clock_imx8mm.c | 1 - > arch/arm/mach-imx/imx8m/clock_imx8mq.c | 1 - > arch/arm/mach-imx/imx8m/clock_slice.c | 1 - > arch/arm/mach-imx/imx8m/psci.c | 1 - > arch/arm/mach-imx/imx8m/soc.c | 2 +- > arch/arm/mach-imx/imx8ulp/cgc.c | 1 - > arch/arm/mach-imx/imx8ulp/clock.c | 1 - > arch/arm/mach-imx/imx8ulp/iomux.c | 1 - > arch/arm/mach-imx/imx8ulp/pcc.c | 1 - > arch/arm/mach-imx/imx8ulp/rdc.c | 3 ++- > arch/arm/mach-imx/imx9/clock.c | 1 - > arch/arm/mach-imx/imx9/clock_root.c | 2 +- > arch/arm/mach-imx/imx9/imx_bootaux.c| 3 ++- > arch/arm/mach-imx/imx9/soc.c| 2 +- > arch/arm/mach-imx/imx9/trdc.c | 2 +- > arch/arm/mach-imx/imx_bootaux.c | 5 - > arch/arm/mach-imx/imxrt/soc.c | 1 - > arch/arm/mach-imx/iomux-v3.c| 1 - > arch/arm/mach-imx/mac.c | 1 - > arch/arm/mach-imx/misc.c| 1 - > arch/arm/mach-imx/mmc_env.c | 1 - > arch/arm/mach-imx/mmdc_size.c | 2 +- > arch/arm/mach-imx/mx5/clock.c | 1 - > arch/arm/mach-imx/mx5/mx53_dram.c | 2 +- > arch/arm/mach-imx/mx5/soc.c | 1 - > arch/arm/mach-imx/mx6/clock.c | 2 +- > arch/arm/mach-imx/mx6/ddr.c | 1 - > arch/arm/mach-imx/mx6/litesom.c | 2 +- > arch/arm/mach-imx/mx6/module_fuse.c | 1 - > arch/arm/mach-imx/mx6/mp.c | 1 - > arch/arm/mach-imx/mx6/opos6ul.c | 2 +- > arch/arm/mach-imx/mx6/soc.c | 1 - > arch/arm/mach-imx/mx7/clock.c | 3 ++- > arch/arm/mach-imx/mx7/clock_slice.c | 1 - > arch/arm/mach-imx/mx7/ddr.c | 1 - > arch/arm/mach-imx/mx7/psci-mx7.c| 1 - > arch/arm/mach-imx/mx7/soc.c | 1 - > arch/arm/mach-imx/mx7ulp/clock.c| 2 +- > arch/arm/mach-imx/mx7ulp/iomux.c| 1 - > arch/arm/mach-imx/mx7ulp/pcc.c | 1 - > arch/arm/mach-imx/mx7ulp/scg.c | 2 +- > arch/arm/mach-imx/mx7ulp/soc.c | 2 +- > arch/arm/mach-imx/priblob.c | 1 - > arch/arm/mach-imx/rdc-sema.c| 1 - > arch/arm/mach-imx/speed.c | 2 +- > arch/arm/mach-imx/spl.c | 2 +- > arch/arm/mach-imx/spl_imx_romapi.c | 1 - > arch/arm/mach-imx/syscounter.c | 2 +- > arch/arm/mach-imx/timer.c | 1 - > arch/arm/mach-imx/video.c | 3 ++- > 84 files changed, 38 insertions(+), 82 deletions(-) > > diff --git a/arch/arm/cpu/arm1136/mx31/devices.c > b/arch/arm/cpu/arm1136/mx31/devices.c > index 99
[PATCH 002/149] global: Audit usage of
The file include/eeprom.h is used only in some legacy non-DM I2C EEPROM access cases. Remove most inclusions of this file as they are not needed. Signed-off-by: Tom Rini --- board/atmel/common/mac_eeprom.c | 1 - board/compulab/common/eeprom.c | 1 - board/cssi/cmpcpro/cmpcpro.c | 1 - board/dhelectronics/dh_imx6/dh_imx6.c| 1 - board/phytec/phycore_rk3288/phycore-rk3288.c | 1 - board/rockchip/tinker_rk3288/tinker-rk3288.c | 1 - board/ti/am43xx/board.c | 1 - board/ti/common/board_detect.c | 1 - board/ti/ks2_evm/board_k2g.c | 1 - drivers/misc/i2c_eeprom.c| 1 - drivers/rtc/rv3029.c | 1 - 11 files changed, 11 deletions(-) diff --git a/board/atmel/common/mac_eeprom.c b/board/atmel/common/mac_eeprom.c index 4606008c697f..e3ab78fb895b 100644 --- a/board/atmel/common/mac_eeprom.c +++ b/board/atmel/common/mac_eeprom.c @@ -6,7 +6,6 @@ #include #include -#include #include #include #include diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c index c4b257f851d6..4c752821d6cd 100644 --- a/board/compulab/common/eeprom.c +++ b/board/compulab/common/eeprom.c @@ -7,7 +7,6 @@ */ #include -#include #include #include #include diff --git a/board/cssi/cmpcpro/cmpcpro.c b/board/cssi/cmpcpro/cmpcpro.c index ef3041245649..ec13d9a7ed7d 100644 --- a/board/cssi/cmpcpro/cmpcpro.c +++ b/board/cssi/cmpcpro/cmpcpro.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c index 0676587c38a1..9dcfcec9e9e6 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6.c +++ b/board/dhelectronics/dh_imx6/dh_imx6.c @@ -7,7 +7,6 @@ #include #include -#include #include #include #include diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c index 3f49f39e3d5d..1ddb4a4f8085 100644 --- a/board/phytec/phycore_rk3288/phycore-rk3288.c +++ b/board/phytec/phycore_rk3288/phycore-rk3288.c @@ -4,7 +4,6 @@ * Author: Wadim Egorov */ -#include #include #include #include diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c index eff3a00c30a8..e6e75981c2d1 100644 --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c @@ -5,7 +5,6 @@ #include #include -#include #include #include #include diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index a4679a2e2948..fdeb63d47900 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -8,7 +8,6 @@ */ #include -#include #include #include #include diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c index 38e23ccbb67c..644df3b0b6ab 100644 --- a/board/ti/common/board_detect.c +++ b/board/ti/common/board_detect.c @@ -8,7 +8,6 @@ */ #include -#include #include #include #include diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c index 5229afad63b0..4fed42ec1244 100644 --- a/board/ti/ks2_evm/board_k2g.c +++ b/board/ti/ks2_evm/board_k2g.c @@ -6,7 +6,6 @@ * Texas Instruments Incorporated, */ #include -#include #include #include #include diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c index 9111bd724cbb..9cb375a99ab8 100644 --- a/drivers/misc/i2c_eeprom.c +++ b/drivers/misc/i2c_eeprom.c @@ -6,7 +6,6 @@ #define LOG_CATEGORY UCLASS_I2C_EEPROM #include -#include #include #include #include diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c index 3afe5b2fdd67..9c53c7f7dbc7 100644 --- a/drivers/rtc/rv3029.c +++ b/drivers/rtc/rv3029.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include -- 2.34.1
[PATCH 001/149] global: Make include
This follows the example of RISC-V where includes directly as "gd" includes a reference to bd_info already and so the first must include the second anyhow. We then remove from all of the places which include references to "gd" an so have already. Signed-off-by: Tom Rini --- api/api_platform-arm.c | 1 - api/api_platform-mips.c| 1 - api/api_platform-powerpc.c | 1 - arch/arc/include/asm/global_data.h | 2 ++ arch/arm/include/asm/global_data.h | 1 + arch/arm/lib/bdinfo.c | 1 - arch/arm/lib/cache-cp15.c | 1 - arch/arm/mach-davinci/cpu.c| 1 - arch/arm/mach-davinci/misc.c | 1 - arch/arm/mach-davinci/spl.c| 1 - arch/arm/mach-imx/ele_ahab.c | 1 - arch/arm/mach-imx/mx5/mx53_dram.c | 1 - arch/arm/mach-mediatek/mt7622/init.c | 1 - arch/arm/mach-mediatek/mt7981/init.c | 1 - arch/arm/mach-mediatek/mt7986/init.c | 1 - arch/arm/mach-mediatek/mt7988/init.c | 1 - arch/arm/mach-mvebu/armada8k/dram.c| 1 - arch/arm/mach-mvebu/dram.c | 1 - arch/arm/mach-omap2/omap-cache.c | 1 - arch/arm/mach-omap2/omap3/emif4.c | 1 - arch/arm/mach-omap2/omap3/sdrc.c | 1 - arch/arm/mach-owl/soc.c| 1 - arch/arm/mach-renesas/memmap-gen3.c| 1 - arch/arm/mach-renesas/memmap-rzg2l.c | 1 - arch/arm/mach-socfpga/clock_manager.c | 1 - arch/arm/mach-socfpga/clock_manager_agilex5.c | 1 - arch/arm/mach-socfpga/spl_a10.c| 1 - arch/arm/mach-socfpga/spl_agilex.c | 1 - arch/arm/mach-socfpga/spl_gen5.c | 1 - arch/arm/mach-socfpga/spl_n5x.c| 1 - arch/arm/mach-socfpga/spl_s10.c| 1 - arch/arm/mach-uniphier/dram_init.c | 1 - arch/arm/mach-versal-net/clk.c | 1 - arch/arm/mach-versal-net/cpu.c | 1 - arch/arm/mach-versal/clk.c | 1 - arch/arm/mach-versal/cpu.c | 1 - arch/arm/mach-zynqmp/clk.c | 1 - arch/arm/mach-zynqmp/cpu.c | 1 - arch/m68k/include/asm/global_data.h| 2 ++ arch/m68k/lib/bdinfo.c | 1 - arch/microblaze/cpu/spl.c | 1 - arch/microblaze/include/asm/global_data.h | 1 + arch/mips/include/asm/global_data.h| 1 + arch/mips/lib/traps.c | 1 - arch/nios2/include/asm/global_data.h | 1 + arch/powerpc/cpu/mpc83xx/interrupts.c | 1 - arch/powerpc/cpu/mpc83xx/pcie.c| 1 - arch/powerpc/cpu/mpc83xx/spd_sdram.c | 1 - arch/powerpc/cpu/mpc83xx/speed.c | 1 - arch/powerpc/cpu/mpc85xx/b4860_ids.c | 1 + arch/powerpc/cpu/mpc85xx/cmd_errata.c | 1 - arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 1 - arch/powerpc/cpu/mpc85xx/p2041_ids.c | 3 ++- arch/powerpc/cpu/mpc85xx/p2041_serdes.c| 1 - arch/powerpc/cpu/mpc85xx/p3041_ids.c | 1 + arch/powerpc/cpu/mpc85xx/p4080_ids.c | 1 + arch/powerpc/cpu/mpc85xx/p5040_ids.c | 1 + arch/powerpc/cpu/mpc85xx/speed.c | 1 - arch/powerpc/cpu/mpc85xx/spl_minimal.c | 1 - arch/powerpc/cpu/mpc85xx/t1024_ids.c | 3 ++- arch/powerpc/cpu/mpc85xx/t1024_serdes.c| 1 - arch/powerpc/cpu/mpc85xx/t1040_ids.c | 3 ++- arch/powerpc/cpu/mpc85xx/t1040_serdes.c| 3 ++- arch/powerpc/cpu/mpc85xx/t2080_ids.c | 3 ++- arch/powerpc/cpu/mpc85xx/t2080_serdes.c| 3 ++- arch/powerpc/cpu/mpc85xx/t4240_ids.c | 3 ++- arch/powerpc/cpu/mpc85xx/t4240_serdes.c| 1 - arch/powerpc/cpu/mpc8xxx/fsl_lbc.c | 1 - arch/powerpc/cpu/mpc8xxx/fsl_pamu.c| 4 +++- arch/powerpc/cpu/mpc8xxx/law.c | 1 - arch/powerpc/cpu/mpc8xxx/pamu_table.c | 1 - arch/powerpc/cpu/mpc8xxx/srio.c| 3 ++- arch/powerpc/include/asm/fsl_liodn.h | 4 +++- arch/powerpc/include/asm/fsl_portals.h | 2 ++ arch/powerpc/include/asm/global_data.h | 2 ++ arch/powerpc/lib/bdinfo.c | 1 - arch/riscv/lib/boot.c | 3 ++- arch/sandbox/include/asm/global_data.h | 1 + arch/sh/include/asm/global_data.h | 2 ++ arch/x86/cpu/coreboot/sdram.c | 1 - arch/x86/cpu/efi/payload.c | 1 - arch/x86/cpu/efi/sdram.c | 1 - arch/x86/cpu/ivybridge/sdram_nop.c | 1 - arch/x86/cpu/qemu/dram.c | 1 - arch/x86/cpu/quark/dram.c | 1 - arch/x86/cpu/tangier/sdram.c | 1 - arch/x86/include/asm/global_data.h
[PATCH 003/149] eeprom.h: Add missing
This file has many "Linux" style types in it, add Signed-off-by: Tom Rini --- include/eeprom.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/eeprom.h b/include/eeprom.h index f9c6542ba762..e223e4c76707 100644 --- a/include/eeprom.h +++ b/include/eeprom.h @@ -8,6 +8,8 @@ #define __EEPROM_LEGACY_H #if defined(CONFIG_CMD_EEPROM) || defined(CONFIG_ENV_IS_IN_EEPROM) +#include + void eeprom_init(int bus); int eeprom_read(uint dev_addr, uint offset, uchar *buffer, uint cnt); int eeprom_write(uint dev_addr, uint offset, uchar *buffer, uint cnt); -- 2.34.1
[PATCH 004/149] splash.h: Add missing
This file has many "Linux" style types in it, add
Signed-off-by: Tom Rini
---
include/splash.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/splash.h b/include/splash.h
index c3922375987d..83c6fa9767f0 100644
--- a/include/splash.h
+++ b/include/splash.h
@@ -23,6 +23,7 @@
#define _SPLASH_H_
#include
+#include
enum splash_storage {
SPLASH_STORAGE_NAND,
--
2.34.1
[PATCH 005/149] extension_board.h: Add missing
This file has "struct list" in one of the structures, so add
.
Signed-off-by: Tom Rini
---
include/extension_board.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/extension_board.h b/include/extension_board.h
index 3b75b5ba9f7c..87d404c00746 100644
--- a/include/extension_board.h
+++ b/include/extension_board.h
@@ -7,6 +7,8 @@
#ifndef __EXTENSION_SUPPORT_H
#define __EXTENSION_SUPPORT_H
+#include
+
struct extension {
struct list_head list;
char name[32];
--
2.34.1
[PATCH 006/149] board: BuR: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Wolfgang Wallner --- board/BuR/brppt1/board.c | 2 +- board/BuR/brppt1/mux.c | 1 - board/BuR/brppt2/board.c | 1 - board/BuR/brsmarc1/board.c | 1 - board/BuR/brsmarc1/mux.c | 1 - board/BuR/brxre1/board.c | 1 - board/BuR/brxre1/mux.c | 1 - board/BuR/common/br_resetc.c | 1 - board/BuR/common/common.c| 1 - 9 files changed, 1 insertion(+), 9 deletions(-) diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c index 36945bbdccf5..192a2fa6327b 100644 --- a/board/BuR/brppt1/board.c +++ b/board/BuR/brppt1/board.c @@ -9,7 +9,7 @@ * */ -#include +#include #include #include #include diff --git a/board/BuR/brppt1/mux.c b/board/BuR/brppt1/mux.c index 5d2c7a201ea0..8932b9ab3b1a 100644 --- a/board/BuR/brppt1/mux.c +++ b/board/BuR/brppt1/mux.c @@ -8,7 +8,6 @@ * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com */ -#include #include #include #include diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c index ee006f0196c6..105fac8912d0 100644 --- a/board/BuR/brppt2/board.c +++ b/board/BuR/brppt2/board.c @@ -6,7 +6,6 @@ * B&R Industrial Automation GmbH - http://www.br-automation.com/ * */ -#include #include #include #include diff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c index 738a5d2ff944..2d3f593d0ab0 100644 --- a/board/BuR/brsmarc1/board.c +++ b/board/BuR/brsmarc1/board.c @@ -8,7 +8,6 @@ * B&R Industrial Automation GmbH - http://www.br-automation.com * */ -#include #include #include #include diff --git a/board/BuR/brsmarc1/mux.c b/board/BuR/brsmarc1/mux.c index 33c214d6b2a7..b59d64f93ef3 100644 --- a/board/BuR/brsmarc1/mux.c +++ b/board/BuR/brsmarc1/mux.c @@ -9,7 +9,6 @@ * */ -#include #include #include #include diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c index a909104df4ac..b9b595cb156d 100644 --- a/board/BuR/brxre1/board.c +++ b/board/BuR/brxre1/board.c @@ -8,7 +8,6 @@ * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com * */ -#include #include #include #include diff --git a/board/BuR/brxre1/mux.c b/board/BuR/brxre1/mux.c index 6c5ad891ba91..e2e8ec57678f 100644 --- a/board/BuR/brxre1/mux.c +++ b/board/BuR/brxre1/mux.c @@ -8,7 +8,6 @@ * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com */ -#include #include #include #include diff --git a/board/BuR/common/br_resetc.c b/board/BuR/common/br_resetc.c index 32f32b65e9d8..f5d09fef3d34 100644 --- a/board/BuR/common/br_resetc.c +++ b/board/BuR/common/br_resetc.c @@ -5,7 +5,6 @@ * Copyright (C) 2019 Hannes Schmelzer * B&R Industrial Automation GmbH - http://www.br-automation.com/ * */ -#include #include #include #include diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c index 3c78020bf93c..8aff821cfe8a 100644 --- a/board/BuR/common/common.c +++ b/board/BuR/common/common.c @@ -10,7 +10,6 @@ */ #include #include -#include #include #include #include -- 2.34.1
[PATCH 007/149] board: BuS: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Jens Scharsig --- board/BuS/eb_cpu5282/eb_cpu5282.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c index ea49c7a99c0b..cf5610861b50 100644 --- a/board/BuS/eb_cpu5282/eb_cpu5282.c +++ b/board/BuS/eb_cpu5282/eb_cpu5282.c @@ -7,7 +7,7 @@ * Wolfgang Denk, DENX Software Engineering, w...@denx.de. */ -#include +#include #include #include #include "asm/m5282.h" -- 2.34.1
[PATCH 008/149] board: CZ.NIC: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: "Marek Behún" --- board/CZ.NIC/turris_mox/mox_sp.c | 2 +- board/CZ.NIC/turris_mox/turris_mox.c | 2 +- board/CZ.NIC/turris_omnia/turris_omnia.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/CZ.NIC/turris_mox/mox_sp.c b/board/CZ.NIC/turris_mox/mox_sp.c index 11d875647170..1591b40deee6 100644 --- a/board/CZ.NIC/turris_mox/mox_sp.c +++ b/board/CZ.NIC/turris_mox/mox_sp.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Marek Behún */ -#include +#include #include #include #include diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 00114e6d9156..e4ed7f258109 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Marek Behún */ -#include +#include #include #include #include diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index 3b7a71bdad25..4ee1a394b024 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -7,7 +7,7 @@ * Marvell/db-88f6820-gp by Stefan Roese */ -#include +#include #include #include #include -- 2.34.1
[PATCH 009/149] board: LaCie: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Simon Guinot --- board/LaCie/common/common.c | 1 - board/LaCie/net2big_v2/net2big_v2.c | 2 +- board/LaCie/netspace_v2/netspace_v2.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/board/LaCie/common/common.c b/board/LaCie/common/common.c index 52880a16fad3..e8a7830fc056 100644 --- a/board/LaCie/common/common.c +++ b/board/LaCie/common/common.c @@ -3,7 +3,6 @@ * Copyright (C) 2011 Simon Guinot */ -#include #include #include diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c index 917091340009..083d91b696a1 100644 --- a/board/LaCie/net2big_v2/net2big_v2.c +++ b/board/LaCie/net2big_v2/net2big_v2.c @@ -8,7 +8,7 @@ * Written-by: Prafulla Wadaskar */ -#include +#include #include #include #include diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c index 22bb008745e1..3a2fdb5c1546 100644 --- a/board/LaCie/netspace_v2/netspace_v2.c +++ b/board/LaCie/netspace_v2/netspace_v2.c @@ -8,7 +8,6 @@ * Written-by: Prafulla Wadaskar */ -#include #include #include #include -- 2.34.1
[PATCH 010/149] board: Marvell: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Stefan Roese Cc: Chris Packham Cc: Tony Dinh Cc: Jason Cooper Cc: Siddarth Gore Cc: Aaron Williams --- 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 + #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 */ -#include #include #include #include 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 */ -#include +#include #include #include #include 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 */ -#include +#include #include #include #include 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 */ -#include #include #include #include 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 */ -#include #include #include #include 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 */ -#include #include #include #include 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 */ -#include #include #include #include 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 +#include #include 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 */ -#include +#include #include #include #include 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 */ -#include +#include #include #include #include diff --git a/board/Marvell/octeontx2/soc-utils.c b/board/Marvell/oc
[PATCH 011/149] board: Seagate: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Tony Dinh Cc: Evgeni Dobrev --- board/Seagate/dockstar/dockstar.c | 1 - board/Seagate/goflexhome/goflexhome.c | 1 - board/Seagate/nas220/nas220.c | 1 - 3 files changed, 3 deletions(-) diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c index d72e3ef24ee6..e6ec00a9c6cc 100644 --- a/board/Seagate/dockstar/dockstar.c +++ b/board/Seagate/dockstar/dockstar.c @@ -9,7 +9,6 @@ * Marvell Semiconductor */ -#include #include #include #include diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c index caea89c10e07..b2d0ad8c3f22 100644 --- a/board/Seagate/goflexhome/goflexhome.c +++ b/board/Seagate/goflexhome/goflexhome.c @@ -12,7 +12,6 @@ * Marvell Semiconductor */ -#include #include #include #include diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c index cd2bbdad1cd6..fa7553250d1c 100644 --- a/board/Seagate/nas220/nas220.c +++ b/board/Seagate/nas220/nas220.c @@ -8,7 +8,6 @@ * Marvell Semiconductor */ -#include #include #include #include -- 2.34.1
[PATCH 012/149] board: Synology: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Walter Schweizer Cc: Phil Sutter --- board/Synology/ds109/ds109.c| 2 +- board/Synology/ds414/cmd_syno.c | 1 - board/Synology/ds414/ds414.c| 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c index 5c3f46e23f46..4f3975781823 100644 --- a/board/Synology/ds109/ds109.c +++ b/board/Synology/ds109/ds109.c @@ -5,7 +5,7 @@ * Luka Perkov */ -#include +#include #include #include #include diff --git a/board/Synology/ds414/cmd_syno.c b/board/Synology/ds414/cmd_syno.c index a62658a2eb6b..29ea35e5e910 100644 --- a/board/Synology/ds414/cmd_syno.c +++ b/board/Synology/ds414/cmd_syno.c @@ -5,7 +5,6 @@ * Copyright (C) 2015 Phil Sutter */ -#include #include #include #include diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c index abe6f9eb5e23..8db810ad3eba 100644 --- a/board/Synology/ds414/ds414.c +++ b/board/Synology/ds414/ds414.c @@ -4,7 +4,6 @@ * Copyright (C) 2015 Phil Sutter */ -#include #include #include #include -- 2.34.1
[PATCH 013/149] board: advantech: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: "Ying-Chun Liu (PaulLiu)" Cc: Oliver Graute Cc: George McCollister --- board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 1 - board/advantech/imx8mp_rsb3720a1/spl.c| 2 +- board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c | 1 - board/advantech/imx8qm_dmsse20_a1/spl.c | 2 +- board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c | 1 - board/advantech/imx8qm_rom7720_a1/spl.c | 2 +- board/advantech/som-db5800-som-6867/som-db5800-som-6867.c | 1 - 7 files changed, 3 insertions(+), 7 deletions(-) diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c index d87fe3606f6a..070933fb54b2 100644 --- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c +++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c @@ -4,7 +4,6 @@ * Copyright 2022 Linaro */ -#include #include #include #include diff --git a/board/advantech/imx8mp_rsb3720a1/spl.c b/board/advantech/imx8mp_rsb3720a1/spl.c index f4257bc993d6..1f7c1f25adcf 100644 --- a/board/advantech/imx8mp_rsb3720a1/spl.c +++ b/board/advantech/imx8mp_rsb3720a1/spl.c @@ -4,7 +4,7 @@ * Copyright 2022 Linaro */ -#include +#include #include #include #include diff --git a/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c b/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c index 56b7bdb57c94..50b35db5f6cf 100644 --- a/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c +++ b/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c @@ -4,7 +4,6 @@ * Copyright 2019-2023 Kococonnector GmbH */ -#include #include #include #include diff --git a/board/advantech/imx8qm_dmsse20_a1/spl.c b/board/advantech/imx8qm_dmsse20_a1/spl.c index e8959ede51d9..93cf07440026 100644 --- a/board/advantech/imx8qm_dmsse20_a1/spl.c +++ b/board/advantech/imx8qm_dmsse20_a1/spl.c @@ -3,7 +3,7 @@ * Copyright 2017-2018 NXP * Copyright 2019-2023 Kococonnector GmbH */ -#include +#include #include #include #include diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c index 7f766a688bb5..3def182f2967 100644 --- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c +++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c @@ -4,7 +4,6 @@ * Copyright (C) 2019 Oliver Graute */ -#include #include #include #include diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c index d32400101fc9..5863e335a8bc 100644 --- a/board/advantech/imx8qm_rom7720_a1/spl.c +++ b/board/advantech/imx8qm_rom7720_a1/spl.c @@ -2,7 +2,7 @@ /* * Copyright 2017-2018 NXP */ -#include +#include #include #include #include diff --git a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c index 8499fc541fa7..9bbd5fd291aa 100644 --- a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c +++ b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c @@ -4,7 +4,6 @@ * Copyright (C) 2016 George McCollister */ -#include #include #include -- 2.34.1
[PATCH 014/149] board: alliedtelesis: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Chris Packham --- board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c | 1 - board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c | 1 - board/alliedtelesis/common/gpio_hog.c | 1 - board/alliedtelesis/x240/x240.c | 2 +- board/alliedtelesis/x530/x530.c | 2 +- 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c index e0a7f3fa89f0..5e6d6c6234fb 100644 --- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c +++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c @@ -4,7 +4,6 @@ * Allied Telesis */ -#include #include #include #include diff --git a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c index 52b8eba92fc1..f30821c17963 100644 --- a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c +++ b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c @@ -4,7 +4,6 @@ * Allied Telesis */ -#include #include #include #include diff --git a/board/alliedtelesis/common/gpio_hog.c b/board/alliedtelesis/common/gpio_hog.c index 4aecf7e2cef7..7da70fb4f7d6 100644 --- a/board/alliedtelesis/common/gpio_hog.c +++ b/board/alliedtelesis/common/gpio_hog.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 Allied Telesis Labs */ -#include #include #include #include diff --git a/board/alliedtelesis/x240/x240.c b/board/alliedtelesis/x240/x240.c index 0c4f8e03b859..c1b7cc3b613c 100644 --- a/board/alliedtelesis/x240/x240.c +++ b/board/alliedtelesis/x240/x240.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c index 80ad62c2c665..65e6d48db0a6 100644 --- a/board/alliedtelesis/x530/x530.c +++ b/board/alliedtelesis/x530/x530.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Allied Telesis Labs */ -#include +#include #include #include #include -- 2.34.1
[PATCH 015/149] board: amarula: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Jagan Teki Cc: Simon Glass Cc: Philipp Tomsich Cc: Kever Yang --- board/amarula/vyasa-rk3288/vyasa-rk3288.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/amarula/vyasa-rk3288/vyasa-rk3288.c b/board/amarula/vyasa-rk3288/vyasa-rk3288.c index 92e0698c534b..b220256c67fa 100644 --- a/board/amarula/vyasa-rk3288/vyasa-rk3288.c +++ b/board/amarula/vyasa-rk3288/vyasa-rk3288.c @@ -3,7 +3,6 @@ * Copyright (C) 2017 Amarula Solutions */ -#include #include #ifndef CONFIG_TPL_BUILD -- 2.34.1
[PATCH 016/149] board: amlogic: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Christian Hewitt Cc: Viacheslav Bocharov Cc: Neil Armstrong Cc: Beniamino Galvani --- board/amlogic/beelink-s922x/beelink-s922x.c | 1 - board/amlogic/jethub-j100/jethub-j100.c | 1 - board/amlogic/jethub-j80/jethub-j80.c | 1 - board/amlogic/odroid-go-ultra/odroid-go-ultra.c | 2 +- board/amlogic/odroid-n2/odroid-n2.c | 1 - board/amlogic/p200/p200.c | 1 - board/amlogic/p201/p201.c | 1 - board/amlogic/p212/p212.c | 1 - board/amlogic/q200/q200.c | 1 - board/amlogic/s400/s400.c | 1 - board/amlogic/sei510/sei510.c | 1 - board/amlogic/sei610/sei610.c | 1 - board/amlogic/u200/u200.c | 1 - board/amlogic/vim3/vim3.c | 1 - board/amlogic/w400/w400.c | 1 - 15 files changed, 1 insertion(+), 15 deletions(-) diff --git a/board/amlogic/beelink-s922x/beelink-s922x.c b/board/amlogic/beelink-s922x/beelink-s922x.c index c2776310a3dc..ccb2f7d1bb19 100644 --- a/board/amlogic/beelink-s922x/beelink-s922x.c +++ b/board/amlogic/beelink-s922x/beelink-s922x.c @@ -4,7 +4,6 @@ * Author: Neil Armstrong */ -#include #include #include #include diff --git a/board/amlogic/jethub-j100/jethub-j100.c b/board/amlogic/jethub-j100/jethub-j100.c index 010fc0df7d18..b770a1f8c537 100644 --- a/board/amlogic/jethub-j100/jethub-j100.c +++ b/board/amlogic/jethub-j100/jethub-j100.c @@ -4,7 +4,6 @@ * Author: Vyacheslav Bocharov */ -#include #include #include #include diff --git a/board/amlogic/jethub-j80/jethub-j80.c b/board/amlogic/jethub-j80/jethub-j80.c index 0b781666e985..07a08dcd1700 100644 --- a/board/amlogic/jethub-j80/jethub-j80.c +++ b/board/amlogic/jethub-j80/jethub-j80.c @@ -6,7 +6,6 @@ * */ -#include #include #include #include diff --git a/board/amlogic/odroid-go-ultra/odroid-go-ultra.c b/board/amlogic/odroid-go-ultra/odroid-go-ultra.c index bbd23e20fcdd..8f3f2045d74d 100644 --- a/board/amlogic/odroid-go-ultra/odroid-go-ultra.c +++ b/board/amlogic/odroid-go-ultra/odroid-go-ultra.c @@ -3,7 +3,7 @@ * Copyright (C) 2023 Neil Armstrong */ -#include +#include #include #include diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c index a4bcc62174a0..ae953d0e4bab 100644 --- a/board/amlogic/odroid-n2/odroid-n2.c +++ b/board/amlogic/odroid-n2/odroid-n2.c @@ -4,7 +4,6 @@ * Author: Neil Armstrong */ -#include #include #include #include diff --git a/board/amlogic/p200/p200.c b/board/amlogic/p200/p200.c index 754242e4a9fa..3bede46b324c 100644 --- a/board/amlogic/p200/p200.c +++ b/board/amlogic/p200/p200.c @@ -3,7 +3,6 @@ * (C) Copyright 2016 Beniamino Galvani */ -#include #include #include #include diff --git a/board/amlogic/p201/p201.c b/board/amlogic/p201/p201.c index 769e2735d27e..d44ebae07dde 100644 --- a/board/amlogic/p201/p201.c +++ b/board/amlogic/p201/p201.c @@ -3,7 +3,6 @@ * (C) Copyright 2016 Beniamino Galvani */ -#include #include #include #include diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c index f6e60ae3af17..ae9834c0bf8d 100644 --- a/board/amlogic/p212/p212.c +++ b/board/amlogic/p212/p212.c @@ -4,7 +4,6 @@ * Author: Neil Armstrong */ -#include #include #include #include diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c index 47f1566a9d3d..0c0afccb38c2 100644 --- a/board/amlogic/q200/q200.c +++ b/board/amlogic/q200/q200.c @@ -4,7 +4,6 @@ * Author: Neil Armstrong */ -#include #include #include #include diff --git a/board/amlogic/s400/s400.c b/board/amlogic/s400/s400.c index 06a9044fd808..96244c9ccb11 100644 --- a/board/amlogic/s400/s400.c +++ b/board/amlogic/s400/s400.c @@ -4,7 +4,6 @@ * Author: Neil Armstrong */ -#include #include #include #include diff --git a/board/amlogic/sei510/sei510.c b/board/amlogic/sei510/sei510.c index bb188c21f75f..1a978d1290a5 100644 --- a/board/amlogic/sei510/sei510.c +++ b/board/amlogic/sei510/sei510.c @@ -4,7 +4,6 @@ * Author: Neil Armstrong */ -#include #include #include #include diff --git a/board/amlogic/sei610/sei610.c b/board/amlogic/sei610/sei610.c index 6490bac9eb55..8a096b15bfb2 100644 --- a/board/amlogic/sei610/sei610.c +++ b/board/amlogic/sei610/sei610.c @@ -4,7 +4,6 @@ * Author: Neil Armstrong */ -#include #include #include #include diff --git a/board/amlogic/u200/u200.c b/board/amlogic/u200/u200.c index 06a9044fd808..96244c9ccb11 100644 --- a/board/amlogic/u200/u200.c +++ b/board/amlogic/u200/u200.c @@ -4,7 +4,6 @@ * Author: Neil Armstrong */ -#include #include #include #include diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c index a4850364f4
[PATCH 017/149] board: aristainetos: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Heiko Schocher --- board/aristainetos/aristainetos.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c index 17f37badd746..8cfac9fbb342 100644 --- a/board/aristainetos/aristainetos.c +++ b/board/aristainetos/aristainetos.c @@ -9,7 +9,6 @@ * Author: Fabio Estevam */ -#include #include #include #include -- 2.34.1
[PATCH 018/149] board: armadeus: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: "Sébastien Szymanski" --- board/armadeus/opos6uldev/board.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/armadeus/opos6uldev/board.c b/board/armadeus/opos6uldev/board.c index 365fdca1b76f..5b25545cdb88 100644 --- a/board/armadeus/opos6uldev/board.c +++ b/board/armadeus/opos6uldev/board.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 Armadeus Systems */ -#include #include #include #include -- 2.34.1
[PATCH 019/149] board: armltd: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Abdellatif El Khlifi Cc: Xueliang Zhong Cc: Linus Walleij Cc: Usama Arif Cc: Kristian Amlie Cc: Liviu Dudau Cc: David Feng Cc: Peter Hoyes --- board/armltd/corstone1000/corstone1000.c | 1 - board/armltd/integrator/integrator.c | 2 +- board/armltd/integrator/timer.c| 2 +- board/armltd/total_compute/total_compute.c | 2 +- board/armltd/vexpress/vexpress_common.c| 2 +- board/armltd/vexpress64/pcie.c | 1 - board/armltd/vexpress64/vexpress64.c | 2 +- 7 files changed, 5 insertions(+), 7 deletions(-) diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c index 01c80aaf9d77..3ad77f51949f 100644 --- a/board/armltd/corstone1000/corstone1000.c +++ b/board/armltd/corstone1000/corstone1000.c @@ -6,7 +6,6 @@ */ #include -#include #include #include #include diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index ad02cf16da5e..eaf87e3bfe30 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -16,7 +16,7 @@ * Philippe Robin, */ -#include +#include #include #include #include diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c index 9db5135a8ffa..f4101b649e30 100644 --- a/board/armltd/integrator/timer.c +++ b/board/armltd/integrator/timer.c @@ -16,7 +16,7 @@ * Philippe Robin, */ -#include +#include #include #include #include diff --git a/board/armltd/total_compute/total_compute.c b/board/armltd/total_compute/total_compute.c index 53941b5f5f28..e1b4f49d044b 100644 --- a/board/armltd/total_compute/total_compute.c +++ b/board/armltd/total_compute/total_compute.c @@ -4,7 +4,7 @@ * Usama Arif */ -#include +#include #include #include #include diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c index 763131c217e5..6c374e25e32c 100644 --- a/board/armltd/vexpress/vexpress_common.c +++ b/board/armltd/vexpress/vexpress_common.c @@ -15,7 +15,7 @@ * ARM Ltd. * Philippe Robin, */ -#include +#include #include #include #include diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c index e553da86e0e0..1045c905f732 100644 --- a/board/armltd/vexpress64/pcie.c +++ b/board/armltd/vexpress64/pcie.c @@ -5,7 +5,6 @@ * Author: Liviu Dudau */ -#include #include #include #include diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index ee65a596838a..0119f54f0df8 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -4,7 +4,7 @@ * David Feng * Sharma Bhupesh */ -#include +#include #include #include #include -- 2.34.1
[PATCH 020/149] board: astro: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Wolfgang Wegner --- board/astro/mcf5373l/fpga.c | 1 - board/astro/mcf5373l/mcf5373l.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/astro/mcf5373l/fpga.c b/board/astro/mcf5373l/fpga.c index f85737432b31..6e505c630d12 100644 --- a/board/astro/mcf5373l/fpga.c +++ b/board/astro/mcf5373l/fpga.c @@ -13,7 +13,6 @@ /* Altera/Xilinx FPGA configuration support for the ASTRO "URMEL" board */ -#include #include #include #include diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c index 43563c412793..43fcbc65513d 100644 --- a/board/astro/mcf5373l/mcf5373l.c +++ b/board/astro/mcf5373l/mcf5373l.c @@ -5,9 +5,10 @@ * modified by Wolfgang Wegner for ASTRO 5373l */ -#include +#include #include #include +#include #include #include #include -- 2.34.1
[PATCH 021/149] board: atmel: Remove and add needed includes
Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Stelian Pop Cc: Eugen Hristev Cc: Durai Manickam KR Cc: Sandeep Sheriker M Cc: Nicolas Ferre Cc: Ludovic Desroches Cc: Tom Rini Cc: Mihai Sain --- board/atmel/at91sam9260ek/at91sam9260ek.c | 2 +- board/atmel/at91sam9261ek/at91sam9261ek.c | 2 +- board/atmel/at91sam9263ek/at91sam9263ek.c | 2 +- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 2 +- board/atmel/at91sam9n12ek/at91sam9n12ek.c | 2 +- board/atmel/at91sam9rlek/at91sam9rlek.c | 2 +- board/atmel/at91sam9x5ek/at91sam9x5ek.c | 2 +- board/atmel/common/board.c | 1 - board/atmel/common/mac-spi-nor.c| 1 - board/atmel/common/mac_eeprom.c | 1 - board/atmel/common/video_display.c | 1 - board/atmel/sam9x60_curiosity/sam9x60_curiosity.c | 1 - board/atmel/sam9x60ek/sam9x60ek.c | 2 +- board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 1 - board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c | 2 +- board/atmel/sama5d29_curiosity/sama5d29_curiosity.c | 1 - board/atmel/sama5d2_icp/sama5d2_icp.c | 2 +- board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c | 2 +- board/atmel/sama5d2_xplained/sama5d2_xplained.c | 1 - board/atmel/sama5d3_xplained/sama5d3_xplained.c | 2 +- board/atmel/sama5d3xek/sama5d3xek.c | 2 +- board/atmel/sama5d4_xplained/sama5d4_xplained.c | 2 +- board/atmel/sama5d4ek/sama5d4ek.c | 2 +- board/atmel/sama7g54_curiosity/sama7g54_curiosity.c | 1 - board/atmel/sama7g5ek/sama7g5ek.c | 2 +- 25 files changed, 16 insertions(+), 25 deletions(-) diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c index b8e02f459031..48aec652c4a4 100644 --- a/board/atmel/at91sam9260ek/at91sam9260ek.c +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c @@ -5,7 +5,7 @@ * Lead Tech Design */ -#include +#include #include #include #include diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c index eab3a1308195..5d7a18379fae 100644 --- a/board/atmel/at91sam9261ek/at91sam9261ek.c +++ b/board/atmel/at91sam9261ek/at91sam9261ek.c @@ -5,7 +5,7 @@ * Lead Tech Design */ -#include +#include #include #include #include diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index 15f20b62f672..2b0b01798eae 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -5,7 +5,7 @@ * Lead Tech Design */ -#include +#include #include #include #include diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c index f53c1cf612d5..3bd94d0889da 100644 --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c @@ -5,7 +5,7 @@ * Lead Tech Design */ -#include +#include #include #include #include diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c index a3e294c88fc8..afc0c0520e1f 100644 --- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c +++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c @@ -4,7 +4,7 @@ * Josh Wu */ -#include +#include #include #include #include diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c index 11725f778b7d..214e917381e7 100644 --- a/board/atmel/at91sam9rlek/at91sam9rlek.c +++ b/board/atmel/at91sam9rlek/at91sam9rlek.c @@ -5,7 +5,7 @@ * Lead Tech Design */ -#include +#include #include #include #include diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c index ab666b6be34f..e5688c6cf132 100644 --- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c +++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 Atmel Corporation */ -#include +#include #include #include #include diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c index c93c0e52e30d..55afd43d4f32 100644 --- a/board/atmel/common/board.c +++ b/board/atmel/common/board.c @@ -4,7 +4,6 @@ * Wenyou Yang */ -#include #include #include #include diff --git a/board/atmel/common/mac-spi-nor.c b/board/atmel/common/mac-spi-nor.c index ced27b65e63b..628f79581295 100644 --- a/board/atmel/common/mac-spi-nor.c +++ b/board/atmel/common/mac-spi-nor.c @@ -5,7 +5,6 @@ * Author: Tudor Ambarus */ -#include #include #include #include diff --git a/board/atmel/common/mac_eeprom.c b/board/atmel/common/mac_eeprom.c index e3ab78fb895b..97edb7a549d4 100644 --- a/board/atmel/common/mac_eeprom.c +++ b/board/atmel/common/mac_eeprom.c @@ -4,7 +4,6 @@ *
