diff options
author | Vineet Gupta <vgupta@synopsys.com> | 2015-01-23 07:40:26 -0500 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2015-10-28 06:43:42 -0400 |
commit | f759ee57b205223e98fdc97e26cbef305b8048e1 (patch) | |
tree | 1ceaee0601c6eac98954b1f62a57d69af51c43f3 | |
parent | 483bcc99c0a349570b30fc9cb20dea20c9387a4b (diff) |
ARC: Ensure DT mem base is same as what kernel is built with
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r-- | arch/arc/boot/dts/axc001.dtsi | 2 | ||||
-rw-r--r-- | arch/arc/boot/dts/axc003.dtsi | 2 | ||||
-rw-r--r-- | arch/arc/boot/dts/axc003_idu.dtsi | 2 | ||||
-rw-r--r-- | arch/arc/boot/dts/skeleton.dtsi | 2 | ||||
-rw-r--r-- | arch/arc/boot/dts/vdk_axc003.dtsi | 2 | ||||
-rw-r--r-- | arch/arc/boot/dts/vdk_axc003_idu.dtsi | 2 | ||||
-rw-r--r-- | arch/arc/mm/init.c | 2 |
7 files changed, 8 insertions, 6 deletions
diff --git a/arch/arc/boot/dts/axc001.dtsi b/arch/arc/boot/dts/axc001.dtsi index a5e2726a067e..420dcfde289f 100644 --- a/arch/arc/boot/dts/axc001.dtsi +++ b/arch/arc/boot/dts/axc001.dtsi | |||
@@ -95,6 +95,6 @@ | |||
95 | #size-cells = <1>; | 95 | #size-cells = <1>; |
96 | ranges = <0x00000000 0x80000000 0x40000000>; | 96 | ranges = <0x00000000 0x80000000 0x40000000>; |
97 | device_type = "memory"; | 97 | device_type = "memory"; |
98 | reg = <0x00000000 0x20000000>; /* 512MiB */ | 98 | reg = <0x80000000 0x20000000>; /* 512MiB */ |
99 | }; | 99 | }; |
100 | }; | 100 | }; |
diff --git a/arch/arc/boot/dts/axc003.dtsi b/arch/arc/boot/dts/axc003.dtsi index 846481f37eef..f90fadf7f94e 100644 --- a/arch/arc/boot/dts/axc003.dtsi +++ b/arch/arc/boot/dts/axc003.dtsi | |||
@@ -98,6 +98,6 @@ | |||
98 | #size-cells = <1>; | 98 | #size-cells = <1>; |
99 | ranges = <0x00000000 0x80000000 0x40000000>; | 99 | ranges = <0x00000000 0x80000000 0x40000000>; |
100 | device_type = "memory"; | 100 | device_type = "memory"; |
101 | reg = <0x00000000 0x20000000>; /* 512MiB */ | 101 | reg = <0x80000000 0x20000000>; /* 512MiB */ |
102 | }; | 102 | }; |
103 | }; | 103 | }; |
diff --git a/arch/arc/boot/dts/axc003_idu.dtsi b/arch/arc/boot/dts/axc003_idu.dtsi index 2f0b33257db2..06a9f294a2e6 100644 --- a/arch/arc/boot/dts/axc003_idu.dtsi +++ b/arch/arc/boot/dts/axc003_idu.dtsi | |||
@@ -121,6 +121,6 @@ | |||
121 | #size-cells = <1>; | 121 | #size-cells = <1>; |
122 | ranges = <0x00000000 0x80000000 0x40000000>; | 122 | ranges = <0x00000000 0x80000000 0x40000000>; |
123 | device_type = "memory"; | 123 | device_type = "memory"; |
124 | reg = <0x00000000 0x20000000>; /* 512MiB */ | 124 | reg = <0x80000000 0x20000000>; /* 512MiB */ |
125 | }; | 125 | }; |
126 | }; | 126 | }; |
diff --git a/arch/arc/boot/dts/skeleton.dtsi b/arch/arc/boot/dts/skeleton.dtsi index a870bdd5e404..296d371a335c 100644 --- a/arch/arc/boot/dts/skeleton.dtsi +++ b/arch/arc/boot/dts/skeleton.dtsi | |||
@@ -32,6 +32,6 @@ | |||
32 | 32 | ||
33 | memory { | 33 | memory { |
34 | device_type = "memory"; | 34 | device_type = "memory"; |
35 | reg = <0x00000000 0x10000000>; /* 256M */ | 35 | reg = <0x80000000 0x10000000>; /* 256M */ |
36 | }; | 36 | }; |
37 | }; | 37 | }; |
diff --git a/arch/arc/boot/dts/vdk_axc003.dtsi b/arch/arc/boot/dts/vdk_axc003.dtsi index 9393fd902f0d..84226bd48baf 100644 --- a/arch/arc/boot/dts/vdk_axc003.dtsi +++ b/arch/arc/boot/dts/vdk_axc003.dtsi | |||
@@ -56,6 +56,6 @@ | |||
56 | #size-cells = <1>; | 56 | #size-cells = <1>; |
57 | ranges = <0x00000000 0x80000000 0x40000000>; | 57 | ranges = <0x00000000 0x80000000 0x40000000>; |
58 | device_type = "memory"; | 58 | device_type = "memory"; |
59 | reg = <0x00000000 0x20000000>; /* 512MiB */ | 59 | reg = <0x80000000 0x20000000>; /* 512MiB */ |
60 | }; | 60 | }; |
61 | }; | 61 | }; |
diff --git a/arch/arc/boot/dts/vdk_axc003_idu.dtsi b/arch/arc/boot/dts/vdk_axc003_idu.dtsi index 9bee8ed09eb0..31f0fb5fc91d 100644 --- a/arch/arc/boot/dts/vdk_axc003_idu.dtsi +++ b/arch/arc/boot/dts/vdk_axc003_idu.dtsi | |||
@@ -71,6 +71,6 @@ | |||
71 | #size-cells = <1>; | 71 | #size-cells = <1>; |
72 | ranges = <0x00000000 0x80000000 0x40000000>; | 72 | ranges = <0x00000000 0x80000000 0x40000000>; |
73 | device_type = "memory"; | 73 | device_type = "memory"; |
74 | reg = <0x00000000 0x20000000>; /* 512MiB */ | 74 | reg = <0x80000000 0x20000000>; /* 512MiB */ |
75 | }; | 75 | }; |
76 | }; | 76 | }; |
diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c index d44eedd8c322..5121b9b16ba8 100644 --- a/arch/arc/mm/init.c +++ b/arch/arc/mm/init.c | |||
@@ -43,6 +43,8 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) | |||
43 | { | 43 | { |
44 | arc_mem_sz = size & PAGE_MASK; | 44 | arc_mem_sz = size & PAGE_MASK; |
45 | pr_info("Memory size set via devicetree %ldM\n", TO_MB(arc_mem_sz)); | 45 | pr_info("Memory size set via devicetree %ldM\n", TO_MB(arc_mem_sz)); |
46 | |||
47 | BUG_ON(base != CONFIG_LINUX_LINK_BASE); | ||
46 | } | 48 | } |
47 | 49 | ||
48 | #ifdef CONFIG_BLK_DEV_INITRD | 50 | #ifdef CONFIG_BLK_DEV_INITRD |