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:43 -0400 |
commit | e7e5601458a49fdcb1b49b4696e7530c25f86f25 (patch) | |
tree | 958bd2fa6afefce42a060bc2bfcb9eceed8bcd88 /arch/arm | |
parent | 03e672022b92de35a60bec1437ccbdb73986ac9c (diff) |
ARM: mach-davinci: 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')
-rw-r--r-- | arch/arm/mach-davinci/board-da830-evm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-dm355-evm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-dm355-leopard.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-dm365-evm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-dm644x-evm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-dm646x-evm.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-mityomapl138.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-neuros-osd2.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-omapl138-hawk.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-sffsdr.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 84fd78684868..26d94c0b555c 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c | |||
@@ -676,7 +676,7 @@ static void __init da830_evm_map_io(void) | |||
676 | } | 676 | } |
677 | 677 | ||
678 | MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM") | 678 | MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM") |
679 | .boot_params = (DA8XX_DDR_BASE + 0x100), | 679 | .atag_offset = 0x100, |
680 | .map_io = da830_evm_map_io, | 680 | .map_io = da830_evm_map_io, |
681 | .init_irq = cp_intc_init, | 681 | .init_irq = cp_intc_init, |
682 | .timer = &davinci_timer, | 682 | .timer = &davinci_timer, |
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index bd5394537c88..85a2c7e1e684 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c | |||
@@ -1263,7 +1263,7 @@ static void __init da850_evm_map_io(void) | |||
1263 | } | 1263 | } |
1264 | 1264 | ||
1265 | MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM") | 1265 | MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM") |
1266 | .boot_params = (DA8XX_DDR_BASE + 0x100), | 1266 | .atag_offset = 0x100, |
1267 | .map_io = da850_evm_map_io, | 1267 | .map_io = da850_evm_map_io, |
1268 | .init_irq = cp_intc_init, | 1268 | .init_irq = cp_intc_init, |
1269 | .timer = &davinci_timer, | 1269 | .timer = &davinci_timer, |
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index 241a6bd67408..65566280b7c9 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c | |||
@@ -351,7 +351,7 @@ static __init void dm355_evm_init(void) | |||
351 | } | 351 | } |
352 | 352 | ||
353 | MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM") | 353 | MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM") |
354 | .boot_params = (0x80000100), | 354 | .atag_offset = 0x100, |
355 | .map_io = dm355_evm_map_io, | 355 | .map_io = dm355_evm_map_io, |
356 | .init_irq = davinci_irq_init, | 356 | .init_irq = davinci_irq_init, |
357 | .timer = &davinci_timer, | 357 | .timer = &davinci_timer, |
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c index bee284ca7fd6..b307470b071d 100644 --- a/arch/arm/mach-davinci/board-dm355-leopard.c +++ b/arch/arm/mach-davinci/board-dm355-leopard.c | |||
@@ -270,7 +270,7 @@ static __init void dm355_leopard_init(void) | |||
270 | } | 270 | } |
271 | 271 | ||
272 | MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard") | 272 | MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard") |
273 | .boot_params = (0x80000100), | 273 | .atag_offset = 0x100, |
274 | .map_io = dm355_leopard_map_io, | 274 | .map_io = dm355_leopard_map_io, |
275 | .init_irq = davinci_irq_init, | 275 | .init_irq = davinci_irq_init, |
276 | .timer = &davinci_timer, | 276 | .timer = &davinci_timer, |
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index 9818f214d4f0..04c43abcca66 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c | |||
@@ -612,7 +612,7 @@ static __init void dm365_evm_init(void) | |||
612 | } | 612 | } |
613 | 613 | ||
614 | MACHINE_START(DAVINCI_DM365_EVM, "DaVinci DM365 EVM") | 614 | MACHINE_START(DAVINCI_DM365_EVM, "DaVinci DM365 EVM") |
615 | .boot_params = (0x80000100), | 615 | .atag_offset = 0x100, |
616 | .map_io = dm365_evm_map_io, | 616 | .map_io = dm365_evm_map_io, |
617 | .init_irq = davinci_irq_init, | 617 | .init_irq = davinci_irq_init, |
618 | .timer = &davinci_timer, | 618 | .timer = &davinci_timer, |
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 95607a191e03..a005e7691ddd 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c | |||
@@ -712,7 +712,7 @@ static __init void davinci_evm_init(void) | |||
712 | 712 | ||
713 | MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM") | 713 | MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM") |
714 | /* Maintainer: MontaVista Software <source@mvista.com> */ | 714 | /* Maintainer: MontaVista Software <source@mvista.com> */ |
715 | .boot_params = (DAVINCI_DDR_BASE + 0x100), | 715 | .atag_offset = 0x100, |
716 | .map_io = davinci_evm_map_io, | 716 | .map_io = davinci_evm_map_io, |
717 | .init_irq = davinci_irq_init, | 717 | .init_irq = davinci_irq_init, |
718 | .timer = &davinci_timer, | 718 | .timer = &davinci_timer, |
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 993a3146fd35..337c45e3e44d 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c | |||
@@ -792,7 +792,7 @@ static __init void evm_init(void) | |||
792 | } | 792 | } |
793 | 793 | ||
794 | MACHINE_START(DAVINCI_DM6467_EVM, "DaVinci DM646x EVM") | 794 | MACHINE_START(DAVINCI_DM6467_EVM, "DaVinci DM646x EVM") |
795 | .boot_params = (0x80000100), | 795 | .atag_offset = 0x100, |
796 | .map_io = davinci_map_io, | 796 | .map_io = davinci_map_io, |
797 | .init_irq = davinci_irq_init, | 797 | .init_irq = davinci_irq_init, |
798 | .timer = &davinci_timer, | 798 | .timer = &davinci_timer, |
@@ -801,7 +801,7 @@ MACHINE_START(DAVINCI_DM6467_EVM, "DaVinci DM646x EVM") | |||
801 | MACHINE_END | 801 | MACHINE_END |
802 | 802 | ||
803 | MACHINE_START(DAVINCI_DM6467TEVM, "DaVinci DM6467T EVM") | 803 | MACHINE_START(DAVINCI_DM6467TEVM, "DaVinci DM6467T EVM") |
804 | .boot_params = (0x80000100), | 804 | .atag_offset = 0x100, |
805 | .map_io = davinci_map_io, | 805 | .map_io = davinci_map_io, |
806 | .init_irq = davinci_irq_init, | 806 | .init_irq = davinci_irq_init, |
807 | .timer = &davinci_timer, | 807 | .timer = &davinci_timer, |
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index c278226627ad..6efc84cceca0 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c | |||
@@ -566,7 +566,7 @@ static void __init mityomapl138_map_io(void) | |||
566 | } | 566 | } |
567 | 567 | ||
568 | MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808") | 568 | MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808") |
569 | .boot_params = (DA8XX_DDR_BASE + 0x100), | 569 | .atag_offset = 0x100, |
570 | .map_io = mityomapl138_map_io, | 570 | .map_io = mityomapl138_map_io, |
571 | .init_irq = cp_intc_init, | 571 | .init_irq = cp_intc_init, |
572 | .timer = &davinci_timer, | 572 | .timer = &davinci_timer, |
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c index d60a80028ba3..38d6f644d8b9 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c | |||
@@ -272,7 +272,7 @@ static __init void davinci_ntosd2_init(void) | |||
272 | 272 | ||
273 | MACHINE_START(NEUROS_OSD2, "Neuros OSD2") | 273 | MACHINE_START(NEUROS_OSD2, "Neuros OSD2") |
274 | /* Maintainer: Neuros Technologies <neuros@groups.google.com> */ | 274 | /* Maintainer: Neuros Technologies <neuros@groups.google.com> */ |
275 | .boot_params = (DAVINCI_DDR_BASE + 0x100), | 275 | .atag_offset = 0x100, |
276 | .map_io = davinci_ntosd2_map_io, | 276 | .map_io = davinci_ntosd2_map_io, |
277 | .init_irq = davinci_irq_init, | 277 | .init_irq = davinci_irq_init, |
278 | .timer = &davinci_timer, | 278 | .timer = &davinci_timer, |
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 237332a11421..c6701e4a795c 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c | |||
@@ -338,7 +338,7 @@ static void __init omapl138_hawk_map_io(void) | |||
338 | } | 338 | } |
339 | 339 | ||
340 | MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard") | 340 | MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard") |
341 | .boot_params = (DA8XX_DDR_BASE + 0x100), | 341 | .atag_offset = 0x100, |
342 | .map_io = omapl138_hawk_map_io, | 342 | .map_io = omapl138_hawk_map_io, |
343 | .init_irq = cp_intc_init, | 343 | .init_irq = cp_intc_init, |
344 | .timer = &davinci_timer, | 344 | .timer = &davinci_timer, |
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c index 5f4385c0a089..5dd4da9d2308 100644 --- a/arch/arm/mach-davinci/board-sffsdr.c +++ b/arch/arm/mach-davinci/board-sffsdr.c | |||
@@ -151,7 +151,7 @@ static __init void davinci_sffsdr_init(void) | |||
151 | 151 | ||
152 | MACHINE_START(SFFSDR, "Lyrtech SFFSDR") | 152 | MACHINE_START(SFFSDR, "Lyrtech SFFSDR") |
153 | /* Maintainer: Hugo Villeneuve hugo.villeneuve@lyrtech.com */ | 153 | /* Maintainer: Hugo Villeneuve hugo.villeneuve@lyrtech.com */ |
154 | .boot_params = (DAVINCI_DDR_BASE + 0x100), | 154 | .atag_offset = 0x100, |
155 | .map_io = davinci_sffsdr_map_io, | 155 | .map_io = davinci_sffsdr_map_io, |
156 | .init_irq = davinci_irq_init, | 156 | .init_irq = davinci_irq_init, |
157 | .timer = &davinci_timer, | 157 | .timer = &davinci_timer, |
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c index 782892065682..90ee7b5aabdc 100644 --- a/arch/arm/mach-davinci/board-tnetv107x-evm.c +++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c | |||
@@ -277,7 +277,7 @@ console_initcall(tnetv107x_evm_console_init); | |||
277 | #endif | 277 | #endif |
278 | 278 | ||
279 | MACHINE_START(TNETV107X, "TNETV107X EVM") | 279 | MACHINE_START(TNETV107X, "TNETV107X EVM") |
280 | .boot_params = (TNETV107X_DDR_BASE + 0x100), | 280 | .atag_offset = 0x100, |
281 | .map_io = tnetv107x_init, | 281 | .map_io = tnetv107x_init, |
282 | .init_irq = cp_intc_init, | 282 | .init_irq = cp_intc_init, |
283 | .timer = &davinci_timer, | 283 | .timer = &davinci_timer, |