diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:38:18 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-08-21 17:15:18 -0400 |
| commit | bc77b1aa0c1584d52ed1883825bc6e04ab1a6277 (patch) | |
| tree | 524156304cd10d4cc805bf09809afcaabbdc0781 | |
| parent | 4611b68922addef195c62f7dd86ef48aaf742989 (diff) | |
ARM: mach-ux500: convert boot-params to atag_offset
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index cd54abaccd96..2cc4876db212 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c | |||
| @@ -645,7 +645,7 @@ static void __init mop500_init_machine(void) | |||
| 645 | 645 | ||
| 646 | MACHINE_START(U8500, "ST-Ericsson MOP500 platform") | 646 | MACHINE_START(U8500, "ST-Ericsson MOP500 platform") |
| 647 | /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> */ | 647 | /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> */ |
| 648 | .boot_params = 0x100, | 648 | .atag_offset = 0x100, |
| 649 | .map_io = u8500_map_io, | 649 | .map_io = u8500_map_io, |
| 650 | .init_irq = ux500_init_irq, | 650 | .init_irq = ux500_init_irq, |
| 651 | /* we re-use nomadik timer here */ | 651 | /* we re-use nomadik timer here */ |
| @@ -654,7 +654,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform") | |||
| 654 | MACHINE_END | 654 | MACHINE_END |
| 655 | 655 | ||
| 656 | MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") | 656 | MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") |
| 657 | .boot_params = 0x100, | 657 | .atag_offset = 0x100, |
| 658 | .map_io = u8500_map_io, | 658 | .map_io = u8500_map_io, |
| 659 | .init_irq = ux500_init_irq, | 659 | .init_irq = ux500_init_irq, |
| 660 | .timer = &ux500_timer, | 660 | .timer = &ux500_timer, |
| @@ -662,7 +662,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") | |||
| 662 | MACHINE_END | 662 | MACHINE_END |
| 663 | 663 | ||
| 664 | MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") | 664 | MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") |
| 665 | .boot_params = 0x100, | 665 | .atag_offset = 0x100, |
| 666 | .map_io = u8500_map_io, | 666 | .map_io = u8500_map_io, |
| 667 | .init_irq = ux500_init_irq, | 667 | .init_irq = ux500_init_irq, |
| 668 | /* we re-use nomadik timer here */ | 668 | /* we re-use nomadik timer here */ |
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c index e58f0f562426..166d47a5f4f3 100644 --- a/arch/arm/mach-ux500/board-u5500.c +++ b/arch/arm/mach-ux500/board-u5500.c | |||
| @@ -118,7 +118,7 @@ static void __init u5500_init_machine(void) | |||
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | MACHINE_START(U5500, "ST-Ericsson U5500 Platform") | 120 | MACHINE_START(U5500, "ST-Ericsson U5500 Platform") |
| 121 | .boot_params = 0x00000100, | 121 | .atag_offset = 0x100, |
| 122 | .map_io = u5500_map_io, | 122 | .map_io = u5500_map_io, |
| 123 | .init_irq = ux500_init_irq, | 123 | .init_irq = ux500_init_irq, |
| 124 | .timer = &ux500_timer, | 124 | .timer = &ux500_timer, |
