diff options
author | Bill Gatliff <bgat@billgatliff.com> | 2007-05-31 17:02:22 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-12 06:13:33 -0400 |
commit | 9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a (patch) | |
tree | bc8520791f304ce297a52f575930c2797067521c /arch/arm/kernel/setup.c | |
parent | 7d09e85448dfa78e3e58186c934449aaf6d49b50 (diff) |
[ARM] 4423/1: add ATAGS support
Examines the ATAGS pointer (r2) at boot, and interprets
a nonzero value as a reference to an ATAGS structure. A
suitable ATAGS structure replaces the kernel's command line.
Signed-off-by: Bill Gatliff <bgat@billgatliff.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/setup.c')
-rw-r--r-- | arch/arm/kernel/setup.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 650eac1bc0a6..5be2e987b843 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -63,6 +63,8 @@ unsigned int processor_id; | |||
63 | unsigned int __machine_arch_type; | 63 | unsigned int __machine_arch_type; |
64 | EXPORT_SYMBOL(__machine_arch_type); | 64 | EXPORT_SYMBOL(__machine_arch_type); |
65 | 65 | ||
66 | unsigned int __atags_pointer __initdata; | ||
67 | |||
66 | unsigned int system_rev; | 68 | unsigned int system_rev; |
67 | EXPORT_SYMBOL(system_rev); | 69 | EXPORT_SYMBOL(system_rev); |
68 | 70 | ||
@@ -780,7 +782,9 @@ void __init setup_arch(char **cmdline_p) | |||
780 | if (mdesc->soft_reboot) | 782 | if (mdesc->soft_reboot) |
781 | reboot_setup("s"); | 783 | reboot_setup("s"); |
782 | 784 | ||
783 | if (mdesc->boot_params) | 785 | if (__atags_pointer) |
786 | tags = phys_to_virt(__atags_pointer); | ||
787 | else if (mdesc->boot_params) | ||
784 | tags = phys_to_virt(mdesc->boot_params); | 788 | tags = phys_to_virt(mdesc->boot_params); |
785 | 789 | ||
786 | /* | 790 | /* |