diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:38:13 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-08-21 17:14:57 -0400 |
commit | 1b7bd28cbb1c139147f7338648417e6332af1683 (patch) | |
tree | a3e3fc08bcc9035e3e063f33850ae89aa3eb13a1 | |
parent | e022c729da8d14e381c04264b07e11d9009d44ed (diff) |
ARM: mach-kirkwood: convert boot_params to atag_offset
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/dockstar-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/guruplug-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/openrd-setup.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/t5325-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/ts219-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/ts41x-setup.c | 2 |
14 files changed, 20 insertions, 20 deletions
diff --git a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c index 043cfd5e140b..f457e07a65f0 100644 --- a/arch/arm/mach-kirkwood/d2net_v2-setup.c +++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c | |||
@@ -221,7 +221,7 @@ static void __init d2net_v2_init(void) | |||
221 | } | 221 | } |
222 | 222 | ||
223 | MACHINE_START(D2NET_V2, "LaCie d2 Network v2") | 223 | MACHINE_START(D2NET_V2, "LaCie d2 Network v2") |
224 | .boot_params = 0x00000100, | 224 | .atag_offset = 0x100, |
225 | .init_machine = d2net_v2_init, | 225 | .init_machine = d2net_v2_init, |
226 | .map_io = kirkwood_map_io, | 226 | .map_io = kirkwood_map_io, |
227 | .init_early = kirkwood_init_early, | 227 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c index bff04e04d679..ff4c21c1f923 100644 --- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c +++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c | |||
@@ -97,7 +97,7 @@ subsys_initcall(db88f6281_pci_init); | |||
97 | 97 | ||
98 | MACHINE_START(DB88F6281_BP, "Marvell DB-88F6281-BP Development Board") | 98 | MACHINE_START(DB88F6281_BP, "Marvell DB-88F6281-BP Development Board") |
99 | /* Maintainer: Saeed Bishara <saeed@marvell.com> */ | 99 | /* Maintainer: Saeed Bishara <saeed@marvell.com> */ |
100 | .boot_params = 0x00000100, | 100 | .atag_offset = 0x100, |
101 | .init_machine = db88f6281_init, | 101 | .init_machine = db88f6281_init, |
102 | .map_io = kirkwood_map_io, | 102 | .map_io = kirkwood_map_io, |
103 | .init_early = kirkwood_init_early, | 103 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c index f14dfb8508c5..e4d199b2b1e8 100644 --- a/arch/arm/mach-kirkwood/dockstar-setup.c +++ b/arch/arm/mach-kirkwood/dockstar-setup.c | |||
@@ -102,7 +102,7 @@ static void __init dockstar_init(void) | |||
102 | } | 102 | } |
103 | 103 | ||
104 | MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar") | 104 | MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar") |
105 | .boot_params = 0x00000100, | 105 | .atag_offset = 0x100, |
106 | .init_machine = dockstar_init, | 106 | .init_machine = dockstar_init, |
107 | .map_io = kirkwood_map_io, | 107 | .map_io = kirkwood_map_io, |
108 | .init_early = kirkwood_init_early, | 108 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c index 41d1b40696a3..6c40f784b516 100644 --- a/arch/arm/mach-kirkwood/guruplug-setup.c +++ b/arch/arm/mach-kirkwood/guruplug-setup.c | |||
@@ -121,7 +121,7 @@ static void __init guruplug_init(void) | |||
121 | 121 | ||
122 | MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board") | 122 | MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board") |
123 | /* Maintainer: Siddarth Gore <gores@marvell.com> */ | 123 | /* Maintainer: Siddarth Gore <gores@marvell.com> */ |
124 | .boot_params = 0x00000100, | 124 | .atag_offset = 0x100, |
125 | .init_machine = guruplug_init, | 125 | .init_machine = guruplug_init, |
126 | .map_io = kirkwood_map_io, | 126 | .map_io = kirkwood_map_io, |
127 | .init_early = kirkwood_init_early, | 127 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c index 00cca22eca6f..9a1e917352f7 100644 --- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c +++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | |||
@@ -163,7 +163,7 @@ subsys_initcall(mv88f6281gtw_ge_pci_init); | |||
163 | 163 | ||
164 | MACHINE_START(MV88F6281GTW_GE, "Marvell 88F6281 GTW GE Board") | 164 | MACHINE_START(MV88F6281GTW_GE, "Marvell 88F6281 GTW GE Board") |
165 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ | 165 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ |
166 | .boot_params = 0x00000100, | 166 | .atag_offset = 0x100, |
167 | .init_machine = mv88f6281gtw_ge_init, | 167 | .init_machine = mv88f6281gtw_ge_init, |
168 | .map_io = kirkwood_map_io, | 168 | .map_io = kirkwood_map_io, |
169 | .init_early = kirkwood_init_early, | 169 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c index 7cdab5776452..8849bcc7328e 100644 --- a/arch/arm/mach-kirkwood/netspace_v2-setup.c +++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c | |||
@@ -258,7 +258,7 @@ static void __init netspace_v2_init(void) | |||
258 | 258 | ||
259 | #ifdef CONFIG_MACH_NETSPACE_V2 | 259 | #ifdef CONFIG_MACH_NETSPACE_V2 |
260 | MACHINE_START(NETSPACE_V2, "LaCie Network Space v2") | 260 | MACHINE_START(NETSPACE_V2, "LaCie Network Space v2") |
261 | .boot_params = 0x00000100, | 261 | .atag_offset = 0x100, |
262 | .init_machine = netspace_v2_init, | 262 | .init_machine = netspace_v2_init, |
263 | .map_io = kirkwood_map_io, | 263 | .map_io = kirkwood_map_io, |
264 | .init_early = kirkwood_init_early, | 264 | .init_early = kirkwood_init_early, |
@@ -269,7 +269,7 @@ MACHINE_END | |||
269 | 269 | ||
270 | #ifdef CONFIG_MACH_INETSPACE_V2 | 270 | #ifdef CONFIG_MACH_INETSPACE_V2 |
271 | MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2") | 271 | MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2") |
272 | .boot_params = 0x00000100, | 272 | .atag_offset = 0x100, |
273 | .init_machine = netspace_v2_init, | 273 | .init_machine = netspace_v2_init, |
274 | .map_io = kirkwood_map_io, | 274 | .map_io = kirkwood_map_io, |
275 | .init_early = kirkwood_init_early, | 275 | .init_early = kirkwood_init_early, |
@@ -280,7 +280,7 @@ MACHINE_END | |||
280 | 280 | ||
281 | #ifdef CONFIG_MACH_NETSPACE_MAX_V2 | 281 | #ifdef CONFIG_MACH_NETSPACE_MAX_V2 |
282 | MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2") | 282 | MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2") |
283 | .boot_params = 0x00000100, | 283 | .atag_offset = 0x100, |
284 | .init_machine = netspace_v2_init, | 284 | .init_machine = netspace_v2_init, |
285 | .map_io = kirkwood_map_io, | 285 | .map_io = kirkwood_map_io, |
286 | .init_early = kirkwood_init_early, | 286 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c index 6be627deb0fc..1ba12c4dff8f 100644 --- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c +++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c | |||
@@ -399,7 +399,7 @@ static void __init netxbig_v2_init(void) | |||
399 | 399 | ||
400 | #ifdef CONFIG_MACH_NET2BIG_V2 | 400 | #ifdef CONFIG_MACH_NET2BIG_V2 |
401 | MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2") | 401 | MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2") |
402 | .boot_params = 0x00000100, | 402 | .atag_offset = 0x100, |
403 | .init_machine = netxbig_v2_init, | 403 | .init_machine = netxbig_v2_init, |
404 | .map_io = kirkwood_map_io, | 404 | .map_io = kirkwood_map_io, |
405 | .init_early = kirkwood_init_early, | 405 | .init_early = kirkwood_init_early, |
@@ -410,7 +410,7 @@ MACHINE_END | |||
410 | 410 | ||
411 | #ifdef CONFIG_MACH_NET5BIG_V2 | 411 | #ifdef CONFIG_MACH_NET5BIG_V2 |
412 | MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2") | 412 | MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2") |
413 | .boot_params = 0x00000100, | 413 | .atag_offset = 0x100, |
414 | .init_machine = netxbig_v2_init, | 414 | .init_machine = netxbig_v2_init, |
415 | .map_io = kirkwood_map_io, | 415 | .map_io = kirkwood_map_io, |
416 | .init_early = kirkwood_init_early, | 416 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c index f69beeff4450..5660ca6c3d88 100644 --- a/arch/arm/mach-kirkwood/openrd-setup.c +++ b/arch/arm/mach-kirkwood/openrd-setup.c | |||
@@ -214,7 +214,7 @@ subsys_initcall(openrd_pci_init); | |||
214 | #ifdef CONFIG_MACH_OPENRD_BASE | 214 | #ifdef CONFIG_MACH_OPENRD_BASE |
215 | MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board") | 215 | MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board") |
216 | /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */ | 216 | /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */ |
217 | .boot_params = 0x00000100, | 217 | .atag_offset = 0x100, |
218 | .init_machine = openrd_init, | 218 | .init_machine = openrd_init, |
219 | .map_io = kirkwood_map_io, | 219 | .map_io = kirkwood_map_io, |
220 | .init_early = kirkwood_init_early, | 220 | .init_early = kirkwood_init_early, |
@@ -226,7 +226,7 @@ MACHINE_END | |||
226 | #ifdef CONFIG_MACH_OPENRD_CLIENT | 226 | #ifdef CONFIG_MACH_OPENRD_CLIENT |
227 | MACHINE_START(OPENRD_CLIENT, "Marvell OpenRD Client Board") | 227 | MACHINE_START(OPENRD_CLIENT, "Marvell OpenRD Client Board") |
228 | /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */ | 228 | /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */ |
229 | .boot_params = 0x00000100, | 229 | .atag_offset = 0x100, |
230 | .init_machine = openrd_init, | 230 | .init_machine = openrd_init, |
231 | .map_io = kirkwood_map_io, | 231 | .map_io = kirkwood_map_io, |
232 | .init_early = kirkwood_init_early, | 232 | .init_early = kirkwood_init_early, |
@@ -238,7 +238,7 @@ MACHINE_END | |||
238 | #ifdef CONFIG_MACH_OPENRD_ULTIMATE | 238 | #ifdef CONFIG_MACH_OPENRD_ULTIMATE |
239 | MACHINE_START(OPENRD_ULTIMATE, "Marvell OpenRD Ultimate Board") | 239 | MACHINE_START(OPENRD_ULTIMATE, "Marvell OpenRD Ultimate Board") |
240 | /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */ | 240 | /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */ |
241 | .boot_params = 0x00000100, | 241 | .atag_offset = 0x100, |
242 | .init_machine = openrd_init, | 242 | .init_machine = openrd_init, |
243 | .map_io = kirkwood_map_io, | 243 | .map_io = kirkwood_map_io, |
244 | .init_early = kirkwood_init_early, | 244 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c index 75c6601b8d87..6663869773ab 100644 --- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | |||
@@ -79,7 +79,7 @@ subsys_initcall(rd88f6192_pci_init); | |||
79 | 79 | ||
80 | MACHINE_START(RD88F6192_NAS, "Marvell RD-88F6192-NAS Development Board") | 80 | MACHINE_START(RD88F6192_NAS, "Marvell RD-88F6192-NAS Development Board") |
81 | /* Maintainer: Saeed Bishara <saeed@marvell.com> */ | 81 | /* Maintainer: Saeed Bishara <saeed@marvell.com> */ |
82 | .boot_params = 0x00000100, | 82 | .atag_offset = 0x100, |
83 | .init_machine = rd88f6192_init, | 83 | .init_machine = rd88f6192_init, |
84 | .map_io = kirkwood_map_io, | 84 | .map_io = kirkwood_map_io, |
85 | .init_early = kirkwood_init_early, | 85 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c index 0f75494d5902..66b3c05e37a6 100644 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c | |||
@@ -115,7 +115,7 @@ subsys_initcall(rd88f6281_pci_init); | |||
115 | 115 | ||
116 | MACHINE_START(RD88F6281, "Marvell RD-88F6281 Reference Board") | 116 | MACHINE_START(RD88F6281, "Marvell RD-88F6281 Reference Board") |
117 | /* Maintainer: Saeed Bishara <saeed@marvell.com> */ | 117 | /* Maintainer: Saeed Bishara <saeed@marvell.com> */ |
118 | .boot_params = 0x00000100, | 118 | .atag_offset = 0x100, |
119 | .init_machine = rd88f6281_init, | 119 | .init_machine = rd88f6281_init, |
120 | .map_io = kirkwood_map_io, | 120 | .map_io = kirkwood_map_io, |
121 | .init_early = kirkwood_init_early, | 121 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c index 17de0bf53c08..8b102d62e82c 100644 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c | |||
@@ -138,7 +138,7 @@ static void __init sheevaplug_init(void) | |||
138 | #ifdef CONFIG_MACH_SHEEVAPLUG | 138 | #ifdef CONFIG_MACH_SHEEVAPLUG |
139 | MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board") | 139 | MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board") |
140 | /* Maintainer: shadi Ammouri <shadi@marvell.com> */ | 140 | /* Maintainer: shadi Ammouri <shadi@marvell.com> */ |
141 | .boot_params = 0x00000100, | 141 | .atag_offset = 0x100, |
142 | .init_machine = sheevaplug_init, | 142 | .init_machine = sheevaplug_init, |
143 | .map_io = kirkwood_map_io, | 143 | .map_io = kirkwood_map_io, |
144 | .init_early = kirkwood_init_early, | 144 | .init_early = kirkwood_init_early, |
@@ -149,7 +149,7 @@ MACHINE_END | |||
149 | 149 | ||
150 | #ifdef CONFIG_MACH_ESATA_SHEEVAPLUG | 150 | #ifdef CONFIG_MACH_ESATA_SHEEVAPLUG |
151 | MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board") | 151 | MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board") |
152 | .boot_params = 0x00000100, | 152 | .atag_offset = 0x100, |
153 | .init_machine = sheevaplug_init, | 153 | .init_machine = sheevaplug_init, |
154 | .map_io = kirkwood_map_io, | 154 | .map_io = kirkwood_map_io, |
155 | .init_early = kirkwood_init_early, | 155 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-setup.c index e6b9b1b22a35..ea104fb5ec3d 100644 --- a/arch/arm/mach-kirkwood/t5325-setup.c +++ b/arch/arm/mach-kirkwood/t5325-setup.c | |||
@@ -201,7 +201,7 @@ subsys_initcall(hp_t5325_pci_init); | |||
201 | 201 | ||
202 | MACHINE_START(T5325, "HP t5325 Thin Client") | 202 | MACHINE_START(T5325, "HP t5325 Thin Client") |
203 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ | 203 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ |
204 | .boot_params = 0x00000100, | 204 | .atag_offset = 0x100, |
205 | .init_machine = hp_t5325_init, | 205 | .init_machine = hp_t5325_init, |
206 | .map_io = kirkwood_map_io, | 206 | .map_io = kirkwood_map_io, |
207 | .init_early = kirkwood_init_early, | 207 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c index 68f32f2bf552..262c034836d4 100644 --- a/arch/arm/mach-kirkwood/ts219-setup.c +++ b/arch/arm/mach-kirkwood/ts219-setup.c | |||
@@ -132,7 +132,7 @@ subsys_initcall(ts219_pci_init); | |||
132 | 132 | ||
133 | MACHINE_START(TS219, "QNAP TS-119/TS-219") | 133 | MACHINE_START(TS219, "QNAP TS-119/TS-219") |
134 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ | 134 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ |
135 | .boot_params = 0x00000100, | 135 | .atag_offset = 0x100, |
136 | .init_machine = qnap_ts219_init, | 136 | .init_machine = qnap_ts219_init, |
137 | .map_io = kirkwood_map_io, | 137 | .map_io = kirkwood_map_io, |
138 | .init_early = kirkwood_init_early, | 138 | .init_early = kirkwood_init_early, |
diff --git a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c index d5d009970705..b68f5b4a9ec8 100644 --- a/arch/arm/mach-kirkwood/ts41x-setup.c +++ b/arch/arm/mach-kirkwood/ts41x-setup.c | |||
@@ -176,7 +176,7 @@ subsys_initcall(ts41x_pci_init); | |||
176 | 176 | ||
177 | MACHINE_START(TS41X, "QNAP TS-41x") | 177 | MACHINE_START(TS41X, "QNAP TS-41x") |
178 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ | 178 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ |
179 | .boot_params = 0x00000100, | 179 | .atag_offset = 0x100, |
180 | .init_machine = qnap_ts41x_init, | 180 | .init_machine = qnap_ts41x_init, |
181 | .map_io = kirkwood_map_io, | 181 | .map_io = kirkwood_map_io, |
182 | .init_early = kirkwood_init_early, | 182 | .init_early = kirkwood_init_early, |