diff options
| author | Tom Rini <[email protected]> | 2022-05-27 08:48:47 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-05-27 08:48:47 -0400 |
| commit | 0fdc468b069b09bf176fe0255f3ef88f88ef3be0 (patch) | |
| tree | 6d64f247c0585aab38adf27f6b164493f569cdef /arch | |
| parent | 661f5400754750df4104b6466942c8b62897340d (diff) | |
| parent | d64ac8549d97cfc37bd629a60f0d502bcd3ee9c7 (diff) | |
Merge branch '2022-05-26-assorted-fixes'
- Fixes for pytest timeout in CI, missing dependency on PCI for the
e1000 driver, fix for CVE-2022-30767 (NFS), TI K3 AM642 DTS bugfix,
MAINTAINERS updates, mksquashfs version check fix.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/k3-am642-evm-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/k3-am642-r5-sk.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/k3-am642-sk-u-boot.dtsi | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3-am642-evm-u-boot.dtsi index 0c2d9734091..055215cff8d 100644 --- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi @@ -8,6 +8,10 @@ stdout-path = "serial2:115200n8"; tick-timer = &timer1; }; + + memory@80000000 { + u-boot,dm-spl; + }; }; &cbass_main{ diff --git a/arch/arm/dts/k3-am642-r5-sk.dts b/arch/arm/dts/k3-am642-r5-sk.dts index 1f96e3fcacf..cf3ba0e209c 100644 --- a/arch/arm/dts/k3-am642-r5-sk.dts +++ b/arch/arm/dts/k3-am642-r5-sk.dts @@ -27,7 +27,7 @@ device_type = "memory"; /* 2G RAM */ reg = <0x00000000 0x80000000 0x00000000 0x80000000>; - + u-boot,dm-spl; }; a53_0: a53@0 { diff --git a/arch/arm/dts/k3-am642-sk-u-boot.dtsi b/arch/arm/dts/k3-am642-sk-u-boot.dtsi index 65042281363..dda2c5d18a7 100644 --- a/arch/arm/dts/k3-am642-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-sk-u-boot.dtsi @@ -12,6 +12,10 @@ aliases { mmc1 = &sdhci1; }; + + memory@80000000 { + u-boot,dm-spl; + }; }; &cbass_main{ |