diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-11-05 15:17:05 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-05 15:17:05 -0800 |
| commit | cc4788a9632872d4e6f9f69242fdf3821c186e75 (patch) | |
| tree | 9018f0ab10c96245a311f2fd9b9c8f7ffdcea487 | |
| parent | 98061f63574215cb6dfe4bd8a3d66b4f30b6c7d0 (diff) | |
| parent | 90b3d87e40f3b8f326dbe5ad69bbf06fa80bc1ed (diff) | |
Merge "ABL: Carveout unmapped memory from ABL" into LA.AU.0.1.1_rb1.3LA.AU.0.1.1-01510-gen3meta.0
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sm6150.dtsi | 15 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sm8150.dtsi | 15 |
2 files changed, 30 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/qcom/sm6150.dtsi b/arch/arm64/boot/dts/qcom/sm6150.dtsi index 70a718f17cb1..ff1f96d344b4 100644 --- a/arch/arm64/boot/dts/qcom/sm6150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6150.dtsi @@ -516,6 +516,21 @@ reg = <0x0 0x85e00000 0x0 0x140000>; }; + abl_mem: abl_mem { + no-map; + reg = <0x0 0x88f00000 0x0 0x1C00000>; + }; + + abl_unmapped_mem: abl_unmapped_mem { + no-map; + reg = <0x0 0x85f40000 0x0 0xc0000>; + }; + + abl_unmapped_mem1: abl_unmapped_mem1 { + no-map; + reg = <0x0 0x85d00000 0x0 0x100000>; + }; + sec_apps_mem: sec_apps_region@85fff000 { compatible = "removed-dma-pool"; no-map; diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 92f319bbe0df..5987fced3875 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -614,6 +614,21 @@ reg = <0x0 0x85e00000 0x0 0x140000>; }; + abl_mem: abl_mem { + no-map; + reg = <0x0 0x88f00000 0x0 0x1C00000>; + }; + + abl_unmapped_mem: abl_unmapped_mem { + no-map; + reg = <0x0 0x85f40000 0x0 0xc0000>; + }; + + abl_unmapped_mem1: abl_unmapped_mem1 { + no-map; + reg = <0x0 0x85d00000 0x0 0x100000>; + }; + smem_region: smem { no-map; reg = <0x0 0x86000000 0x0 0x200000>; |