diff options
author | Peng Fan <peng.fan@nxp.com> | 2019-12-17 17:40:42 +0800 |
---|---|---|
committer | Peng Fan <peng.fan@nxp.com> | 2019-12-18 11:50:16 +0800 |
commit | 2f1bdd071f81983e7366455ecbfedc088e8ce5f2 (patch) | |
tree | aa09b42e15510e12327d33f03a699df0b724cb9a /arch/arm64 | |
parent | 134dea76852644ec0337bdefc83673ceee735c23 (diff) |
LF-514-3 arm64: dts: imx8m: fix inmate linux boot
The security related node in dtsi are default status okay, so we need
remove them from inmate linux, otherwise inmate crash.
Also remove other nodes that might break boot, such as busfreq and etc
to make it align with 4.19 kernel.
Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-evk-inmate.dts | 8 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-inmate.dts | 11 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mq-evk-inmate.dts | 10 |
3 files changed, 17 insertions, 12 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8mm-evk-inmate.dts b/arch/arm64/boot/dts/freescale/imx8mm-evk-inmate.dts index 9668dc0bf678..1896f9b6d76e 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-evk-inmate.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-evk-inmate.dts @@ -179,9 +179,11 @@ /*/delete-node/ &{/imx_ion};*/ /delete-node/ &pcie0; /delete-node/ &crypto; -/*/delete-node/ &caam_sm;*/ -/*/delete-node/ &caam_snvs;*/ -/*/delete-node/ &irq_sec_vio;*/ +/delete-node/ &caam_sm; +/delete-node/ &caam_snvs; +/delete-node/ &irq_sec_vio; +/delete-node/ &dma_apbh; +/delete-node/ &gpmi; /delete-node/ &{/cpus/cpu@0}; /delete-node/ &{/cpus/cpu@1}; diff --git a/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-inmate.dts b/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-inmate.dts index 72336626b368..098ff824d78e 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-inmate.dts +++ b/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-inmate.dts @@ -63,7 +63,7 @@ /delete-node/ &{/memory@40000000}; /*/delete-node/ &{/reserved-memory};*/ -/*/delete-node/ &{/busfreq};*/ +/delete-node/ &{/busfreq}; /*/delete-node/ &ddr_pmu0;*/ &hsiomix_pd { @@ -123,7 +123,8 @@ /delete-property/ compatible; }; -/*/delete-node/ &rpmsg;*/ +/delete-node/ &system_counter; +/delete-node/ &rpmsg; &ocotp { /delete-property/ compatible; status = "disabled"; @@ -149,9 +150,11 @@ /*/delete-node/ &{/imx_ion};*/ /delete-node/ &crypto; -/*/delete-node/ &caam_sm; +/delete-node/ &caam_sm; /delete-node/ &caam_snvs; -/delete-node/ &irq_sec_vio;*/ +/delete-node/ &irq_sec_vio; +/delete-node/ &dma_apbh; +/delete-node/ &gpmi; /delete-node/ &{/cpus/cpu@0}; /delete-node/ &{/cpus/cpu@1}; diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk-inmate.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk-inmate.dts index f6e069473c00..18641366beeb 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq-evk-inmate.dts +++ b/arch/arm64/boot/dts/freescale/imx8mq-evk-inmate.dts @@ -171,11 +171,11 @@ /delete-node/ &{/soc@0/ddr-pmu@3d800000}; /delete-node/ &rpmsg; /delete-node/ &crypto; -/*/delete-node/ &caam_sm;*/ -/*/delete-node/ &caam_snvs;*/ -/*/delete-node/ &irq_sec_vio;*/ -/*/delete-node/ &dma_apbh;*/ -/*/delete-node/ &gpmi;*/ +/delete-node/ &caam_sm; +/delete-node/ &caam_snvs; +/delete-node/ &irq_sec_vio; +/delete-node/ &dma_apbh; +/delete-node/ &gpmi; &iomuxc { status = "disabled"; |