diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:38:17 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-08-21 17:15:13 -0400 |
commit | 17f4425d5b6819dd53a5c22577844a1d16bf6ccb (patch) | |
tree | a3b42e23ad21f9a7f925a8739b6eba468bed965a | |
parent | 02350a1f8b89045e4d32c45e97c2c04b1d6c7546 (diff) |
ARM: mach-sa1100: 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-sa1100/assabet.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/badge4.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/h3100.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/hackkit.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/jornada720.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/lart.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/nanoengine.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/shannon.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/simpad.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index 26257df19b63..d40da5f1f37b 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c | |||
@@ -447,7 +447,7 @@ static void __init assabet_map_io(void) | |||
447 | 447 | ||
448 | 448 | ||
449 | MACHINE_START(ASSABET, "Intel-Assabet") | 449 | MACHINE_START(ASSABET, "Intel-Assabet") |
450 | .boot_params = 0xc0000100, | 450 | .atag_offset = 0x100, |
451 | .fixup = fixup_assabet, | 451 | .fixup = fixup_assabet, |
452 | .map_io = assabet_map_io, | 452 | .map_io = assabet_map_io, |
453 | .init_irq = sa1100_init_irq, | 453 | .init_irq = sa1100_init_irq, |
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c index b4311b0a4395..bda83e1ab078 100644 --- a/arch/arm/mach-sa1100/badge4.c +++ b/arch/arm/mach-sa1100/badge4.c | |||
@@ -302,7 +302,7 @@ static void __init badge4_map_io(void) | |||
302 | } | 302 | } |
303 | 303 | ||
304 | MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4") | 304 | MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4") |
305 | .boot_params = 0xc0000100, | 305 | .atag_offset = 0x100, |
306 | .map_io = badge4_map_io, | 306 | .map_io = badge4_map_io, |
307 | .init_irq = sa1100_init_irq, | 307 | .init_irq = sa1100_init_irq, |
308 | .timer = &sa1100_timer, | 308 | .timer = &sa1100_timer, |
diff --git a/arch/arm/mach-sa1100/h3100.c b/arch/arm/mach-sa1100/h3100.c index 03d7376cf8a0..b30733a2b82e 100644 --- a/arch/arm/mach-sa1100/h3100.c +++ b/arch/arm/mach-sa1100/h3100.c | |||
@@ -84,7 +84,7 @@ static void __init h3100_mach_init(void) | |||
84 | } | 84 | } |
85 | 85 | ||
86 | MACHINE_START(H3100, "Compaq iPAQ H3100") | 86 | MACHINE_START(H3100, "Compaq iPAQ H3100") |
87 | .boot_params = 0xc0000100, | 87 | .atag_offset = 0x100, |
88 | .map_io = h3100_map_io, | 88 | .map_io = h3100_map_io, |
89 | .init_irq = sa1100_init_irq, | 89 | .init_irq = sa1100_init_irq, |
90 | .timer = &sa1100_timer, | 90 | .timer = &sa1100_timer, |
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index 965f64a836f8..6fd324d92389 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
@@ -125,7 +125,7 @@ static void __init h3600_mach_init(void) | |||
125 | } | 125 | } |
126 | 126 | ||
127 | MACHINE_START(H3600, "Compaq iPAQ H3600") | 127 | MACHINE_START(H3600, "Compaq iPAQ H3600") |
128 | .boot_params = 0xc0000100, | 128 | .atag_offset = 0x100, |
129 | .map_io = h3600_map_io, | 129 | .map_io = h3600_map_io, |
130 | .init_irq = sa1100_init_irq, | 130 | .init_irq = sa1100_init_irq, |
131 | .timer = &sa1100_timer, | 131 | .timer = &sa1100_timer, |
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c index db5e434a17db..30f4a551b8e5 100644 --- a/arch/arm/mach-sa1100/hackkit.c +++ b/arch/arm/mach-sa1100/hackkit.c | |||
@@ -195,7 +195,7 @@ static void __init hackkit_init(void) | |||
195 | */ | 195 | */ |
196 | 196 | ||
197 | MACHINE_START(HACKKIT, "HackKit Cpu Board") | 197 | MACHINE_START(HACKKIT, "HackKit Cpu Board") |
198 | .boot_params = 0xc0000100, | 198 | .atag_offset = 0x100, |
199 | .map_io = hackkit_map_io, | 199 | .map_io = hackkit_map_io, |
200 | .init_irq = sa1100_init_irq, | 200 | .init_irq = sa1100_init_irq, |
201 | .timer = &sa1100_timer, | 201 | .timer = &sa1100_timer, |
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index 176c066aec7e..0bb520d48ed0 100644 --- a/arch/arm/mach-sa1100/jornada720.c +++ b/arch/arm/mach-sa1100/jornada720.c | |||
@@ -364,7 +364,7 @@ static void __init jornada720_mach_init(void) | |||
364 | 364 | ||
365 | MACHINE_START(JORNADA720, "HP Jornada 720") | 365 | MACHINE_START(JORNADA720, "HP Jornada 720") |
366 | /* Maintainer: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> */ | 366 | /* Maintainer: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> */ |
367 | .boot_params = 0xc0000100, | 367 | .atag_offset = 0x100, |
368 | .map_io = jornada720_map_io, | 368 | .map_io = jornada720_map_io, |
369 | .init_irq = sa1100_init_irq, | 369 | .init_irq = sa1100_init_irq, |
370 | .timer = &sa1100_timer, | 370 | .timer = &sa1100_timer, |
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c index 7b9556b59057..5bc59d0947ba 100644 --- a/arch/arm/mach-sa1100/lart.c +++ b/arch/arm/mach-sa1100/lart.c | |||
@@ -61,7 +61,7 @@ static void __init lart_map_io(void) | |||
61 | } | 61 | } |
62 | 62 | ||
63 | MACHINE_START(LART, "LART") | 63 | MACHINE_START(LART, "LART") |
64 | .boot_params = 0xc0000100, | 64 | .atag_offset = 0x100, |
65 | .map_io = lart_map_io, | 65 | .map_io = lart_map_io, |
66 | .init_irq = sa1100_init_irq, | 66 | .init_irq = sa1100_init_irq, |
67 | .init_machine = lart_init, | 67 | .init_machine = lart_init, |
diff --git a/arch/arm/mach-sa1100/nanoengine.c b/arch/arm/mach-sa1100/nanoengine.c index 72087f0658b7..032f3881d145 100644 --- a/arch/arm/mach-sa1100/nanoengine.c +++ b/arch/arm/mach-sa1100/nanoengine.c | |||
@@ -111,7 +111,7 @@ static void __init nanoengine_init(void) | |||
111 | } | 111 | } |
112 | 112 | ||
113 | MACHINE_START(NANOENGINE, "BSE nanoEngine") | 113 | MACHINE_START(NANOENGINE, "BSE nanoEngine") |
114 | .boot_params = 0xc0000000, | 114 | .atag_offset = 0x100, |
115 | .map_io = nanoengine_map_io, | 115 | .map_io = nanoengine_map_io, |
116 | .init_irq = sa1100_init_irq, | 116 | .init_irq = sa1100_init_irq, |
117 | .timer = &sa1100_timer, | 117 | .timer = &sa1100_timer, |
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c index 7917b2405579..1cccbf5b9e9a 100644 --- a/arch/arm/mach-sa1100/shannon.c +++ b/arch/arm/mach-sa1100/shannon.c | |||
@@ -82,7 +82,7 @@ static void __init shannon_map_io(void) | |||
82 | } | 82 | } |
83 | 83 | ||
84 | MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)") | 84 | MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)") |
85 | .boot_params = 0xc0000100, | 85 | .atag_offset = 0x100, |
86 | .map_io = shannon_map_io, | 86 | .map_io = shannon_map_io, |
87 | .init_irq = sa1100_init_irq, | 87 | .init_irq = sa1100_init_irq, |
88 | .timer = &sa1100_timer, | 88 | .timer = &sa1100_timer, |
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index cfb76077bd25..a1c2427655da 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c | |||
@@ -229,7 +229,7 @@ arch_initcall(simpad_init); | |||
229 | 229 | ||
230 | MACHINE_START(SIMPAD, "Simpad") | 230 | MACHINE_START(SIMPAD, "Simpad") |
231 | /* Maintainer: Holger Freyther */ | 231 | /* Maintainer: Holger Freyther */ |
232 | .boot_params = 0xc0000100, | 232 | .atag_offset = 0x100, |
233 | .map_io = simpad_map_io, | 233 | .map_io = simpad_map_io, |
234 | .init_irq = sa1100_init_irq, | 234 | .init_irq = sa1100_init_irq, |
235 | .timer = &sa1100_timer, | 235 | .timer = &sa1100_timer, |