aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-04-28 16:27:21 -0400
committerGrant Likely <grant.likely@secretlab.ca>2011-05-23 11:30:20 -0400
commit6291319d4864848efc7b5d81389e2404fb478cb9 (patch)
tree10f53e79940139a60a3d96f3b013ed849f4a176c /arch/arm/include
parent9eb8f6743b076b67f00776cda4330c802e157b41 (diff)
arm/dt: consolidate atags setup into setup_machine_atags
In preparation for adding device tree support, this patch consolidates all of the atag-specific setup into a single function. v5: - drop double printk("Machine; %s\n", ...); call. - leave copying boot_command_line in setup_arch() since it isn't atags specific. v4: - adapt to the removal of lookup_machine_type() - break out dump of machine_desc table into dump_machine_table() because the device tree probe code will use it. - Add for_each_machine_desc() macro Tested-by: Tony Lindgren <tony@atomide.com> Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/mach/arch.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index bf13b814c1b8..4764e67fb93d 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -48,6 +48,13 @@ struct machine_desc {
48extern struct machine_desc *machine_desc; 48extern struct machine_desc *machine_desc;
49 49
50/* 50/*
51 * Machine type table - also only accessible during boot
52 */
53extern struct machine_desc __arch_info_begin[], __arch_info_end[];
54#define for_each_machine_desc(p) \
55 for (p = __arch_info_begin; p < __arch_info_end; p++)
56
57/*
51 * Set of macros to define architecture features. This is built into 58 * Set of macros to define architecture features. This is built into
52 * a table by the linker. 59 * a table by the linker.
53 */ 60 */