aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/arm/setup.c
diff options
context:
space:
mode:
authorJulien Grall <julien.grall@linaro.org>2013-09-13 13:49:08 +0100
committerIan Campbell <ian.campbell@citrix.com>2013-09-17 15:27:15 +0100
commit9fe65ea7397b114c1d90e4a445395955220f099c (patch)
treea6c7f29902197485139ea384b8f85ea93782ec26 /xen/arch/arm/setup.c
parentf3f5f1927f0d3aef9e3d2ce554dbfa0de73487d5 (diff)
downloadxen-9fe65ea7397b114c1d90e4a445395955220f099c.tar.gz
xen-9fe65ea7397b114c1d90e4a445395955220f099c.tar.bz2
xen-9fe65ea7397b114c1d90e4a445395955220f099c.zip
xen/dts: Constify device_tree_flattened
The Flat Device Tree is given by the bootloader. Xen doesn't need to modify it. Signed-off-by: Julien Grall <julien.grall@linaro.org> Acked-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'xen/arch/arm/setup.c')
-rw-r--r--xen/arch/arm/setup.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 4b31623add..aa87fb1779 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -289,6 +289,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size)
unsigned long dtb_pages;
unsigned long boot_mfn_start, boot_mfn_end;
int i = 0;
+ void *fdt;
/* TODO: Handle non-contiguous memory bank */
if ( !early_info.mem.nr_banks )
@@ -363,8 +364,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size)
*
* TODO: handle other payloads too.
*/
- device_tree_flattened = mfn_to_virt(alloc_boot_pages(dtb_pages, 1));
- copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size, BUFFERABLE);
+ fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1));
+ copy_from_paddr(fdt, dtb_paddr, dtb_size, BUFFERABLE);
+ device_tree_flattened = fdt;
/* Add non-xenheap memory */
s = ram_start;
@@ -410,6 +412,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size)
int bank;
unsigned long xenheap_pages = 0;
unsigned long dtb_pages;
+ void *fdt;
total_pages = 0;
for ( bank = 0 ; bank < early_info.mem.nr_banks; bank++ )
@@ -469,8 +472,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size)
*
* TODO: handle other payloads too.
*/
- device_tree_flattened = mfn_to_virt(alloc_boot_pages(dtb_pages, 1));
- copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size, BUFFERABLE);
+ fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1));
+ copy_from_paddr(fdt, dtb_paddr, dtb_size, BUFFERABLE);
+ device_tree_flattened = fdt;
setup_frametable_mappings(ram_start, ram_end);
max_page = PFN_DOWN(ram_end);