From: Ian Campbell Date: Fri, 15 Feb 2013 13:32:08 +0000 (+0000) Subject: xen: arm: rename atag_paddr argument fdt_paddr X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7284 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3501bec5ec0fad72a78b5fad8d2d11f2e64842a3;p=xen.git xen: arm: rename atag_paddr argument fdt_paddr We don't support ATAGs and this is always actually an FDT address. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 92fc36c6d6..5ec46c3c56 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -73,7 +73,7 @@ past_zImage: /* Save the bootloader arguments in less-clobberable registers */ /* No need to save r1 == Unused ARM-linux machine type */ - mov r8, r2 /* r8 := ATAG base address */ + mov r8, r2 /* r8 := DTB base address */ /* Find out where we are */ ldr r0, =start @@ -334,7 +334,7 @@ launch: add sp, #STACK_SIZE /* (which grows down from the top). */ sub sp, #CPUINFO_sizeof /* Make room for CPU save record */ mov r0, r10 /* Marshal args: - phys_offset */ - mov r1, r8 /* - ATAG address */ + mov r1, r8 /* - DTB address */ movs r2, r12 /* - CPU ID */ beq start_xen /* and disappear into the land of C */ b start_secondary /* (to the appropriate entry point) */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 7e3586057a..0837db365e 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -329,7 +329,7 @@ void __init setup_cache(void) /* C entry point for boot CPU */ void __init start_xen(unsigned long boot_phys_offset, - unsigned long atag_paddr, + unsigned long fdt_paddr, unsigned long cpuid) { void *fdt; @@ -341,7 +341,7 @@ void __init start_xen(unsigned long boot_phys_offset, smp_clear_cpu_maps(); fdt = (void *)BOOT_MISC_VIRT_START - + (atag_paddr & ((1 << SECOND_SHIFT) - 1)); + + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = device_tree_early_init(fdt); cpus = smp_get_max_cpus(); @@ -365,7 +365,7 @@ void __init start_xen(unsigned long boot_phys_offset, set_current((struct vcpu *)0xfffff000); /* debug sanity */ idle_vcpu[0] = current; - setup_mm(atag_paddr, fdt_size); + setup_mm(fdt_paddr, fdt_size); /* Setup Hyp vector base */ WRITE_CP32((uint32_t) hyp_traps_vector, HVBAR); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index da4880c4c2..60be1a48c7 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -132,7 +132,7 @@ make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset) /* Boot the current CPU */ void __cpuinit start_secondary(unsigned long boot_phys_offset, - unsigned long atag_paddr, + unsigned long fdt_paddr, unsigned long cpuid) { memset(get_cpu_info(), 0, sizeof (struct cpu_info));