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 <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
Ian Campbell committed 2013-02-15 13:32:08 +00:00
1 parent 107b7c0bad
commit 3501bec5ec
3 files changed
+6 -6

No files matched your search

+2 -2
View File
@@ -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) */
+3 -3
View File
@@ -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);
+1 -1
View File
@@ -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));
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.