mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-17 02:08:38 +00:00
0bd7811ca9
When the imx8mn.dtsi file was pulled in from Linux, the UARTs
were moved into an spba sub-node which wasn't being included
in the SPL device tree. This meant the references to the UART
weren't being handled properly and when booting the system would
constantly reboot. Fix this by adding the spba node to the spl
device tree to restore normal booting.
Based on the patch from Adam Ford for the imx8mn-beacon-kit-u-boot
board.
Fixes: 4e5114daf9
("imx8mn: synchronise device tree with linux")
Signed-off-by: Fabio Estevam <festevam@denx.de>
272 lines
3.5 KiB
Text
272 lines
3.5 KiB
Text
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright 2019, 2021 NXP
|
|
*/
|
|
|
|
/ {
|
|
binman: binman {
|
|
multiple-images;
|
|
};
|
|
|
|
wdt-reboot {
|
|
compatible = "wdt-reboot";
|
|
wdt = <&wdog1>;
|
|
u-boot,dm-spl;
|
|
};
|
|
firmware {
|
|
optee {
|
|
compatible = "linaro,optee-tz";
|
|
method = "smc";
|
|
};
|
|
};
|
|
};
|
|
|
|
&{/soc@0} {
|
|
u-boot,dm-pre-reloc;
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&spba1 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&clk {
|
|
u-boot,dm-spl;
|
|
u-boot,dm-pre-reloc;
|
|
/delete-property/ assigned-clocks;
|
|
/delete-property/ assigned-clock-parents;
|
|
/delete-property/ assigned-clock-rates;
|
|
};
|
|
|
|
&osc_24m {
|
|
u-boot,dm-spl;
|
|
u-boot,dm-pre-reloc;
|
|
};
|
|
|
|
&aips1 {
|
|
u-boot,dm-spl;
|
|
u-boot,dm-pre-reloc;
|
|
};
|
|
|
|
&aips2 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&aips3 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&iomuxc {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&pinctrl_reg_usdhc2_vmmc {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
®_usdhc2_vmmc {
|
|
u-boot,off-on-delay-us = <20000>;
|
|
};
|
|
|
|
&pinctrl_uart2 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&pinctrl_usdhc2_gpio {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&pinctrl_usdhc2 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&pinctrl_usdhc3 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&pinctrl_wdog {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&gpio1 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&gpio2 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&gpio3 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&gpio4 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&gpio5 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&uart2 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&crypto {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&sec_jr0 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&sec_jr1 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&sec_jr2 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&usdhc1 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&usdhc2 {
|
|
u-boot,dm-spl;
|
|
sd-uhs-sdr104;
|
|
sd-uhs-ddr50;
|
|
};
|
|
|
|
&usdhc3 {
|
|
u-boot,dm-spl;
|
|
mmc-hs400-1_8v;
|
|
mmc-hs400-enhanced-strobe;
|
|
};
|
|
|
|
&wdog1 {
|
|
u-boot,dm-spl;
|
|
};
|
|
|
|
&binman {
|
|
u-boot-spl-ddr {
|
|
filename = "u-boot-spl-ddr.bin";
|
|
pad-byte = <0xff>;
|
|
align-size = <4>;
|
|
align = <4>;
|
|
|
|
u-boot-spl {
|
|
align-end = <4>;
|
|
};
|
|
|
|
ddr-1d-imem-fw {
|
|
filename = "ddr4_imem_1d_201810.bin";
|
|
type = "blob-ext";
|
|
align-end = <4>;
|
|
};
|
|
|
|
ddr-1d-dmem-fw {
|
|
filename = "ddr4_dmem_1d_201810.bin";
|
|
type = "blob-ext";
|
|
align-end = <4>;
|
|
};
|
|
|
|
ddr-2d-imem-fw {
|
|
filename = "ddr4_imem_2d_201810.bin";
|
|
type = "blob-ext";
|
|
align-end = <4>;
|
|
};
|
|
|
|
ddr-2d-dmem-fw {
|
|
filename = "ddr4_dmem_2d_201810.bin";
|
|
type = "blob-ext";
|
|
align-end = <4>;
|
|
};
|
|
};
|
|
|
|
|
|
spl {
|
|
filename = "spl.bin";
|
|
|
|
mkimage {
|
|
args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
|
|
|
|
blob {
|
|
filename = "u-boot-spl-ddr.bin";
|
|
};
|
|
};
|
|
};
|
|
|
|
itb {
|
|
filename = "u-boot.itb";
|
|
|
|
fit {
|
|
description = "Configuration to load ATF before U-Boot";
|
|
#address-cells = <1>;
|
|
fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
|
|
|
|
images {
|
|
uboot {
|
|
description = "U-Boot (64-bit)";
|
|
type = "standalone";
|
|
arch = "arm64";
|
|
compression = "none";
|
|
load = <CONFIG_SYS_TEXT_BASE>;
|
|
|
|
uboot_blob: blob-ext {
|
|
filename = "u-boot-nodtb.bin";
|
|
};
|
|
};
|
|
|
|
atf {
|
|
description = "ARM Trusted Firmware";
|
|
type = "firmware";
|
|
arch = "arm64";
|
|
compression = "none";
|
|
load = <0x960000>;
|
|
entry = <0x960000>;
|
|
|
|
atf_blob: blob-ext {
|
|
filename = "bl31.bin";
|
|
};
|
|
};
|
|
|
|
fdt {
|
|
description = "NAME";
|
|
type = "flat_dt";
|
|
compression = "none";
|
|
|
|
uboot_fdt_blob: blob-ext {
|
|
filename = "u-boot.dtb";
|
|
};
|
|
};
|
|
};
|
|
|
|
configurations {
|
|
default = "conf";
|
|
|
|
conf {
|
|
description = "NAME";
|
|
firmware = "uboot";
|
|
loadables = "atf";
|
|
fdt = "fdt";
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
imx-boot {
|
|
filename = "flash.bin";
|
|
pad-byte = <0x00>;
|
|
|
|
spl: blob-ext@1 {
|
|
offset = <0x0>;
|
|
filename = "spl.bin";
|
|
};
|
|
|
|
uboot: blob-ext@2 {
|
|
offset = <0x58000>;
|
|
filename = "u-boot.itb";
|
|
};
|
|
};
|
|
};
|