mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-03 01:50:43 +09:00
arm64: dts: uniphier: add reserved-memory for secure memory
[ Linux commit aa38571246c6ac279ebebd141157297bcb959d76 ] The memory regions specified by /memreserve/ are passed to early_init_dt_reserve_memory_arch() with nomap=false, so it is not suitable for reserving memory for Trusted Firmware-A etc. Use the more robust /reserved-memory node with the no-map property to prevent the kernel from mapping it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
9424ecd735
commit
47eb8add27
@ -8,8 +8,6 @@
|
|||||||
#include <dt-bindings/gpio/gpio.h>
|
#include <dt-bindings/gpio/gpio.h>
|
||||||
#include <dt-bindings/gpio/uniphier-gpio.h>
|
#include <dt-bindings/gpio/uniphier-gpio.h>
|
||||||
|
|
||||||
/memreserve/ 0x80000000 0x02000000;
|
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
compatible = "socionext,uniphier-ld11";
|
compatible = "socionext,uniphier-ld11";
|
||||||
#address-cells = <2>;
|
#address-cells = <2>;
|
||||||
@ -110,6 +108,17 @@
|
|||||||
<1 10 4>;
|
<1 10 4>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
reserved-memory {
|
||||||
|
#address-cells = <2>;
|
||||||
|
#size-cells = <2>;
|
||||||
|
ranges;
|
||||||
|
|
||||||
|
secure-memory@81000000 {
|
||||||
|
reg = <0x0 0x81000000 0x0 0x01000000>;
|
||||||
|
no-map;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
soc@0 {
|
soc@0 {
|
||||||
compatible = "simple-bus";
|
compatible = "simple-bus";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
|
@ -9,8 +9,6 @@
|
|||||||
#include <dt-bindings/gpio/uniphier-gpio.h>
|
#include <dt-bindings/gpio/uniphier-gpio.h>
|
||||||
#include <dt-bindings/thermal/thermal.h>
|
#include <dt-bindings/thermal/thermal.h>
|
||||||
|
|
||||||
/memreserve/ 0x80000000 0x02000000;
|
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
compatible = "socionext,uniphier-ld20";
|
compatible = "socionext,uniphier-ld20";
|
||||||
#address-cells = <2>;
|
#address-cells = <2>;
|
||||||
@ -215,6 +213,17 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
reserved-memory {
|
||||||
|
#address-cells = <2>;
|
||||||
|
#size-cells = <2>;
|
||||||
|
ranges;
|
||||||
|
|
||||||
|
secure-memory@81000000 {
|
||||||
|
reg = <0x0 0x81000000 0x0 0x01000000>;
|
||||||
|
no-map;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
soc@0 {
|
soc@0 {
|
||||||
compatible = "simple-bus";
|
compatible = "simple-bus";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
|
@ -8,8 +8,6 @@
|
|||||||
#include <dt-bindings/gpio/gpio.h>
|
#include <dt-bindings/gpio/gpio.h>
|
||||||
#include <dt-bindings/gpio/uniphier-gpio.h>
|
#include <dt-bindings/gpio/uniphier-gpio.h>
|
||||||
|
|
||||||
/memreserve/ 0x80000000 0x02000000;
|
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
compatible = "socionext,uniphier-pxs3";
|
compatible = "socionext,uniphier-pxs3";
|
||||||
#address-cells = <2>;
|
#address-cells = <2>;
|
||||||
@ -138,6 +136,17 @@
|
|||||||
<1 10 4>;
|
<1 10 4>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
reserved-memory {
|
||||||
|
#address-cells = <2>;
|
||||||
|
#size-cells = <2>;
|
||||||
|
ranges;
|
||||||
|
|
||||||
|
secure-memory@81000000 {
|
||||||
|
reg = <0x0 0x81000000 0x0 0x01000000>;
|
||||||
|
no-map;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
soc@0 {
|
soc@0 {
|
||||||
compatible = "simple-bus";
|
compatible = "simple-bus";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
|
Loading…
Reference in New Issue
Block a user