diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:38:11 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-08-21 17:14:42 -0400 |
commit | 6244fa9cbd078f598f8f4dcb2017d37b45ac3cee (patch) | |
tree | 1a04f7dfe698231285ba42ae5207d06c015d5929 /arch/arm/mach-clps711x | |
parent | 2bb9839e312ed55a6d5824ffa6077ce3d7d63b1e (diff) |
ARM: mach-clps711x: convert boot_params to atag_offset
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-clps711x')
-rw-r--r-- | arch/arm/mach-clps711x/autcpu12.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/cdb89712.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/ceiva.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/clep7312.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/edb7211-arch.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/fortunet.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/p720t.c | 2 |
7 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c index 4a74b2c959bd..0276091b7f86 100644 --- a/arch/arm/mach-clps711x/autcpu12.c +++ b/arch/arm/mach-clps711x/autcpu12.c | |||
@@ -64,7 +64,7 @@ void __init autcpu12_map_io(void) | |||
64 | 64 | ||
65 | MACHINE_START(AUTCPU12, "autronix autcpu12") | 65 | MACHINE_START(AUTCPU12, "autronix autcpu12") |
66 | /* Maintainer: Thomas Gleixner */ | 66 | /* Maintainer: Thomas Gleixner */ |
67 | .boot_params = 0xc0020000, | 67 | .atag_offset = 0x20000, |
68 | .map_io = autcpu12_map_io, | 68 | .map_io = autcpu12_map_io, |
69 | .init_irq = clps711x_init_irq, | 69 | .init_irq = clps711x_init_irq, |
70 | .timer = &clps711x_timer, | 70 | .timer = &clps711x_timer, |
diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c index 5a1689d48793..25b3bfd0e85a 100644 --- a/arch/arm/mach-clps711x/cdb89712.c +++ b/arch/arm/mach-clps711x/cdb89712.c | |||
@@ -55,7 +55,7 @@ static void __init cdb89712_map_io(void) | |||
55 | 55 | ||
56 | MACHINE_START(CDB89712, "Cirrus-CDB89712") | 56 | MACHINE_START(CDB89712, "Cirrus-CDB89712") |
57 | /* Maintainer: Ray Lehtiniemi */ | 57 | /* Maintainer: Ray Lehtiniemi */ |
58 | .boot_params = 0xc0000100, | 58 | .atag_offset = 0x100, |
59 | .map_io = cdb89712_map_io, | 59 | .map_io = cdb89712_map_io, |
60 | .init_irq = clps711x_init_irq, | 60 | .init_irq = clps711x_init_irq, |
61 | .timer = &clps711x_timer, | 61 | .timer = &clps711x_timer, |
diff --git a/arch/arm/mach-clps711x/ceiva.c b/arch/arm/mach-clps711x/ceiva.c index 16481cf3e931..1df9ec67aa92 100644 --- a/arch/arm/mach-clps711x/ceiva.c +++ b/arch/arm/mach-clps711x/ceiva.c | |||
@@ -56,7 +56,7 @@ static void __init ceiva_map_io(void) | |||
56 | 56 | ||
57 | MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame") | 57 | MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame") |
58 | /* Maintainer: Rob Scott */ | 58 | /* Maintainer: Rob Scott */ |
59 | .boot_params = 0xc0000100, | 59 | .atag_offset = 0x100, |
60 | .map_io = ceiva_map_io, | 60 | .map_io = ceiva_map_io, |
61 | .init_irq = clps711x_init_irq, | 61 | .init_irq = clps711x_init_irq, |
62 | .timer = &clps711x_timer, | 62 | .timer = &clps711x_timer, |
diff --git a/arch/arm/mach-clps711x/clep7312.c b/arch/arm/mach-clps711x/clep7312.c index 67b5abb4a60a..06c8abd9371f 100644 --- a/arch/arm/mach-clps711x/clep7312.c +++ b/arch/arm/mach-clps711x/clep7312.c | |||
@@ -37,7 +37,7 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags, | |||
37 | 37 | ||
38 | MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312") | 38 | MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312") |
39 | /* Maintainer: Nobody */ | 39 | /* Maintainer: Nobody */ |
40 | .boot_params = 0xc0000100, | 40 | .atag_offset = 0x0100, |
41 | .fixup = fixup_clep7312, | 41 | .fixup = fixup_clep7312, |
42 | .map_io = clps711x_map_io, | 42 | .map_io = clps711x_map_io, |
43 | .init_irq = clps711x_init_irq, | 43 | .init_irq = clps711x_init_irq, |
diff --git a/arch/arm/mach-clps711x/edb7211-arch.c b/arch/arm/mach-clps711x/edb7211-arch.c index 98ca5b2e940d..abf522d1ec9b 100644 --- a/arch/arm/mach-clps711x/edb7211-arch.c +++ b/arch/arm/mach-clps711x/edb7211-arch.c | |||
@@ -57,7 +57,7 @@ fixup_edb7211(struct machine_desc *desc, struct tag *tags, | |||
57 | 57 | ||
58 | MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") | 58 | MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") |
59 | /* Maintainer: Jon McClintock */ | 59 | /* Maintainer: Jon McClintock */ |
60 | .boot_params = 0xc0020100, /* 0xc0000000 - 0xc001ffff can be video RAM */ | 60 | .atag_offset = 0x20100, /* 0xc0000000 - 0xc001ffff can be video RAM */ |
61 | .fixup = fixup_edb7211, | 61 | .fixup = fixup_edb7211, |
62 | .map_io = edb7211_map_io, | 62 | .map_io = edb7211_map_io, |
63 | .reserve = edb7211_reserve, | 63 | .reserve = edb7211_reserve, |
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c index b1cb479e71e9..b6f7d86bb1c9 100644 --- a/arch/arm/mach-clps711x/fortunet.c +++ b/arch/arm/mach-clps711x/fortunet.c | |||
@@ -75,7 +75,6 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags, | |||
75 | 75 | ||
76 | MACHINE_START(FORTUNET, "ARM-FortuNet") | 76 | MACHINE_START(FORTUNET, "ARM-FortuNet") |
77 | /* Maintainer: FortuNet Inc. */ | 77 | /* Maintainer: FortuNet Inc. */ |
78 | .boot_params = 0x00000000, | ||
79 | .fixup = fortunet_fixup, | 78 | .fixup = fortunet_fixup, |
80 | .map_io = clps711x_map_io, | 79 | .map_io = clps711x_map_io, |
81 | .init_irq = clps711x_init_irq, | 80 | .init_irq = clps711x_init_irq, |
diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c index cefbce0480b9..e7f75aeb1e5b 100644 --- a/arch/arm/mach-clps711x/p720t.c +++ b/arch/arm/mach-clps711x/p720t.c | |||
@@ -89,7 +89,7 @@ static void __init p720t_map_io(void) | |||
89 | 89 | ||
90 | MACHINE_START(P720T, "ARM-Prospector720T") | 90 | MACHINE_START(P720T, "ARM-Prospector720T") |
91 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 91 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
92 | .boot_params = 0xc0000100, | 92 | .atag_offset = 0x100, |
93 | .fixup = fixup_p720t, | 93 | .fixup = fixup_p720t, |
94 | .map_io = p720t_map_io, | 94 | .map_io = p720t_map_io, |
95 | .init_irq = clps711x_init_irq, | 95 | .init_irq = clps711x_init_irq, |