[PATCH] ARM: Remove machine description macros

Remove the pointless machine description macros, favouring C99
initialisers instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-aaec2000/aaed2000.c b/arch/arm/mach-aaec2000/aaed2000.c
index 5417ca3..c9d8998 100644 (file)
--- a/arch/arm/mach-aaec2000/aaed2000.c
+++ b/arch/arm/mach-aaec2000/aaed2000.c
@@ -40,9 +40,11 @@ static void __init aaed2000_map_io(void)
 }
 
 MACHINE_START(AAED2000, "Agilent AAED-2000 Development Platform")
-       MAINTAINER("Nicolas Bellido Y Ortega")
-       BOOT_MEM(0xf0000000, PIO_BASE, VIO_BASE)
-       MAPIO(aaed2000_map_io)
-       INITIRQ(aaed2000_init_irq)
+       /* Maintainer: Nicolas Bellido Y Ortega */
+       .phys_ram       = 0xf0000000,
+       .phys_io        = PIO_BASE,
+       .io_pg_offst    = ((VIO_BASE) >> 18) & 0xfffc,
+       .map_io         = aaed2000_map_io,
+       .init_irq       = aaed2000_init_irq,
        .timer          = &aaec2000_timer,
 MACHINE_END

diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c
index c106704..dc73feb 100644 (file)
--- a/arch/arm/mach-clps711x/autcpu12.c
+++ b/arch/arm/mach-clps711x/autcpu12.c
@@ -59,11 +59,13 @@ void __init autcpu12_map_io(void)
 }
 
 MACHINE_START(AUTCPU12, "autronix autcpu12")
-       MAINTAINER("Thomas Gleixner")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
-       BOOT_PARAMS(0xc0020000)
-       MAPIO(autcpu12_map_io)
-       INITIRQ(clps711x_init_irq)
+       /* Maintainer: Thomas Gleixner */
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0020000,
+       .map_io         = autcpu12_map_io,
+       .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
 

diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c
index 7664f9c..a46c82c 100644 (file)
--- a/arch/arm/mach-clps711x/cdb89712.c
+++ b/arch/arm/mach-clps711x/cdb89712.c
@@ -49,10 +49,12 @@ static void __init cdb89712_map_io(void)
 }
 
 MACHINE_START(CDB89712, "Cirrus-CDB89712")
-       MAINTAINER("Ray Lehtiniemi")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
-       BOOT_PARAMS(0xc0000100)
-       MAPIO(cdb89712_map_io)
-       INITIRQ(clps711x_init_irq)
+       /* Maintainer: Ray Lehtiniemi */
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = cdb89712_map_io,
+       .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END

diff --git a/arch/arm/mach-clps711x/ceiva.c b/arch/arm/mach-clps711x/ceiva.c
index e4093be..780d918 100644 (file)
--- a/arch/arm/mach-clps711x/ceiva.c
+++ b/arch/arm/mach-clps711x/ceiva.c
@@ -53,10 +53,12 @@ static void __init ceiva_map_io(void)
 
 
 MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")
-       MAINTAINER("Rob Scott")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
-       BOOT_PARAMS(0xc0000100)
-       MAPIO(ceiva_map_io)
-       INITIRQ(clps711x_init_irq)
+       /* Maintainer: Rob Scott */
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = ceiva_map_io,
+       .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END

diff --git a/arch/arm/mach-clps711x/clep7312.c b/arch/arm/mach-clps711x/clep7312.c
index 9ca21cb..c83f3fd 100644 (file)
--- a/arch/arm/mach-clps711x/clep7312.c
+++ b/arch/arm/mach-clps711x/clep7312.c
@@ -37,12 +37,14 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags,
 
 
 MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
-       MAINTAINER("Nobody")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
-       BOOT_PARAMS(0xc0000100)
-       FIXUP(fixup_clep7312)
-       MAPIO(clps711x_map_io)
-       INITIRQ(clps711x_init_irq)
+       /* Maintainer: Nobody */
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .fixup          = fixup_clep7312,
+       .map_io         = clps711x_map_io,
+       .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
 

diff --git a/arch/arm/mach-clps711x/edb7211-arch.c b/arch/arm/mach-clps711x/edb7211-arch.c
index c6c4632..255c98b 100644 (file)
--- a/arch/arm/mach-clps711x/edb7211-arch.c
+++ b/arch/arm/mach-clps711x/edb7211-arch.c
@@ -51,11 +51,13 @@ fixup_edb7211(struct machine_desc *desc, struct tag *tags,
 }
 
 MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
-       MAINTAINER("Jon McClintock")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
-       BOOT_PARAMS(0xc0020100) /* 0xc0000000 - 0xc001ffff can be video RAM */
-       FIXUP(fixup_edb7211)
-       MAPIO(edb7211_map_io)
-       INITIRQ(clps711x_init_irq)
+       /* Maintainer: Jon McClintock */
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0020100,   /* 0xc0000000 - 0xc001ffff can be video RAM */
+       .fixup          = fixup_edb7211,
+       .map_io         = edb7211_map_io,
+       .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END

diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c
index c1c5b8e..f83a597 100644 (file)
--- a/arch/arm/mach-clps711x/fortunet.c
+++ b/arch/arm/mach-clps711x/fortunet.c
@@ -75,11 +75,13 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags,
 }
 
 MACHINE_START(FORTUNET, "ARM-FortuNet")
-       MAINTAINER("FortuNet Inc.")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf0000000)
-       BOOT_PARAMS(0x00000000)
-       FIXUP(fortunet_fixup)
-       MAPIO(clps711x_map_io)
-       INITIRQ(clps711x_init_irq)
+       /* Maintainer: FortuNet Inc. */
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000000,
+       .fixup          = fortunet_fixup,
+       .map_io         = clps711x_map_io,
+       .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END

diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c
index 29269df..5bdb90e 100644 (file)
--- a/arch/arm/mach-clps711x/p720t.c
+++ b/arch/arm/mach-clps711x/p720t.c
@@ -79,12 +79,14 @@ static void __init p720t_map_io(void)
 }
 
 MACHINE_START(P720T, "ARM-Prospector720T")
-       MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
-       BOOT_PARAMS(0xc0000100)
-       FIXUP(fixup_p720t)
-       MAPIO(p720t_map_io)
-       INITIRQ(clps711x_init_irq)
+       /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .fixup          = fixup_p720t,
+       .map_io         = p720t_map_io,
+       .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
 

diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c
index 90e85f4..112f1d6 100644 (file)
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
@@ -366,11 +366,13 @@ static void __init clps7500_init(void)
 }
 
 MACHINE_START(CLPS7500, "CL-PS7500")
-       MAINTAINER("Philip Blundell")
-       BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
-       MAPIO(clps7500_map_io)
-       INITIRQ(clps7500_init_irq)
-               .init_machine   = clps7500_init,
-               .timer          = &clps7500_timer,
+       /* Maintainer: Philip Blundell */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0x03000000,
+       .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
+       .map_io         = clps7500_map_io,
+       .init_irq       = clps7500_init_irq,
+       .init_machine   = clps7500_init,
+       .timer          = &clps7500_timer,
 MACHINE_END
 

diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c
index 86ffdbb..23c4da1 100644 (file)
--- a/arch/arm/mach-ebsa110/core.c
+++ b/arch/arm/mach-ebsa110/core.c
@@ -233,13 +233,15 @@ static int __init ebsa110_init(void)
 arch_initcall(ebsa110_init);
 
 MACHINE_START(EBSA110, "EBSA110")
-       MAINTAINER("Russell King")
-       BOOT_MEM(0x00000000, 0xe0000000, 0xe0000000)
-       BOOT_PARAMS(0x00000400)
-       DISABLE_PARPORT(0)
-       DISABLE_PARPORT(2)
-       SOFT_REBOOT
-       MAPIO(ebsa110_map_io)
-       INITIRQ(ebsa110_init_irq)
+       /* Maintainer: Russell King */
+       .phys_ram       = 0x00000000,
+       .phys_io        = 0xe0000000,
+       .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000400,
+       .reserve_lp0    = 1,
+       .reserve_lp2    = 1,
+       .soft_reboot    = 1,
+       .map_io         = ebsa110_map_io,
+       .init_irq       = ebsa110_init_irq,
        .timer          = &ebsa110_timer,
 MACHINE_END

diff --git a/arch/arm/mach-epxa10db/arch.c b/arch/arm/mach-epxa10db/arch.c
index 1b40340..7daa021 100644 (file)
--- a/arch/arm/mach-epxa10db/arch.c
+++ b/arch/arm/mach-epxa10db/arch.c
@@ -63,10 +63,12 @@ extern void epxa10db_init_irq(void);
 extern struct sys_timer epxa10db_timer;
 
 MACHINE_START(CAMELOT, "Altera Epxa10db")
-       MAINTAINER("Altera Corporation")
-       BOOT_MEM(0x00000000, 0x7fffc000, 0xffffc000)
-       MAPIO(epxa10db_map_io)
-       INITIRQ(epxa10db_init_irq)
+       /* Maintainer: Altera Corporation */
+       .phys_ram       = 0x00000000,
+       .phys_io        = 0x7fffc000,
+       .io_pg_offst    = ((0xffffc000) >> 18) & 0xfffc,
+       .map_io         = epxa10db_map_io,
+       .init_irq       = epxa10db_init_irq,
        .timer          = &epxa10db_timer,
 MACHINE_END
 

diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index d1ced86..49b898a 100644 (file)
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -84,12 +84,14 @@ fixup_cats(struct machine_desc *desc, struct tag *tags,
 }
 
 MACHINE_START(CATS, "Chalice-CATS")
-       MAINTAINER("Philip Blundell")
-       BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
-       BOOT_PARAMS(0x00000100)
-       SOFT_REBOOT
-       FIXUP(fixup_cats)
-       MAPIO(footbridge_map_io)
-       INITIRQ(footbridge_init_irq)
+       /* Maintainer: Philip Blundell */
+       .phys_ram       = 0x00000000,
+       .phys_io        = DC21285_ARMCSR_BASE,
+       .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .soft_reboot    = 1,
+       .fixup          = fixup_cats,
+       .map_io         = footbridge_map_io,
+       .init_irq       = footbridge_init_irq,
        .timer          = &isa_timer,
 MACHINE_END

diff --git a/arch/arm/mach-footbridge/co285.c b/arch/arm/mach-footbridge/co285.c
index e154191..548a790 100644 (file)
--- a/arch/arm/mach-footbridge/co285.c
+++ b/arch/arm/mach-footbridge/co285.c
@@ -28,11 +28,13 @@ fixup_coebsa285(struct machine_desc *desc, struct tag *tags,
 }
 
 MACHINE_START(CO285, "co-EBSA285")
-       MAINTAINER("Mark van Doesburg")
-       BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0x7cf00000)
-       FIXUP(fixup_coebsa285)
-       MAPIO(footbridge_map_io)
-       INITIRQ(footbridge_init_irq)
+       /* Maintainer: Mark van Doesburg */
+       .phys_ram       = 0x00000000,
+       .phys_io        = DC21285_ARMCSR_BASE,
+       .io_pg_offst    = ((0x7cf00000) >> 18) & 0xfffc,
+       .fixup          = fixup_coebsa285,
+       .map_io         = footbridge_map_io,
+       .init_irq       = footbridge_init_irq,
        .timer          = &footbridge_timer,
 MACHINE_END
 

diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c
index d0931f5..1c37605 100644 (file)
--- a/arch/arm/mach-footbridge/ebsa285.c
+++ b/arch/arm/mach-footbridge/ebsa285.c
@@ -13,12 +13,15 @@
 #include "common.h"
 
 MACHINE_START(EBSA285, "EBSA285")
-       MAINTAINER("Russell King")
-       BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
-       BOOT_PARAMS(0x00000100)
-       VIDEO(0x000a0000, 0x000bffff)
-       MAPIO(footbridge_map_io)
-       INITIRQ(footbridge_init_irq)
+       /* Maintainer: Russell King */
+       .phys_ram       = 0x00000000,
+       .phys_io        = DC21285_ARMCSR_BASE,
+       .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .video_start    = 0x000a0000,
+       .video_end      = 0x000bffff,
+       .map_io         = footbridge_map_io,
+       .init_irq       = footbridge_init_irq,
        .timer          = &footbridge_timer,
 MACHINE_END
 

diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c
index 1e1dfd7..775f85f 100644 (file)
--- a/arch/arm/mach-footbridge/netwinder-hw.c
+++ b/arch/arm/mach-footbridge/netwinder-hw.c
@@ -647,14 +647,17 @@ fixup_netwinder(struct machine_desc *desc, struct tag *tags,
 }
 
 MACHINE_START(NETWINDER, "Rebel-NetWinder")
-       MAINTAINER("Russell King/Rebel.com")
-       BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
-       BOOT_PARAMS(0x00000100)
-       VIDEO(0x000a0000, 0x000bffff)
-       DISABLE_PARPORT(0)
-       DISABLE_PARPORT(2)
-       FIXUP(fixup_netwinder)
-       MAPIO(footbridge_map_io)
-       INITIRQ(footbridge_init_irq)
+       /* Maintainer: Russell King/Rebel.com */
+       .phys_ram       = 0x00000000,
+       .phys_io        = DC21285_ARMCSR_BASE,
+       .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .video_start    = 0x000a0000,
+       .video_end      = 0x000bffff,
+       .reserve_lp0    = 1,
+       .reserve_lp2    = 1,
+       .fixup          = fixup_netwinder,
+       .map_io         = footbridge_map_io,
+       .init_irq       = footbridge_init_irq,
        .timer          = &isa_timer,
 MACHINE_END

diff --git a/arch/arm/mach-footbridge/personal.c b/arch/arm/mach-footbridge/personal.c
index 415086d..0146b8b 100644 (file)
--- a/arch/arm/mach-footbridge/personal.c
+++ b/arch/arm/mach-footbridge/personal.c
@@ -13,11 +13,13 @@
 #include "common.h"
 
 MACHINE_START(PERSONAL_SERVER, "Compaq-PersonalServer")
-       MAINTAINER("Jamey Hicks / George France")
-       BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(footbridge_map_io)
-       INITIRQ(footbridge_init_irq)
+       /* Maintainer: Jamey Hicks / George France */
+       .phys_ram       = 0x00000000,
+       .phys_io        = DC21285_ARMCSR_BASE,
+       .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = footbridge_map_io,
+       .init_irq       = footbridge_init_irq,
        .timer          = &footbridge_timer,
 MACHINE_END
 

diff --git a/arch/arm/mach-h720x/h7201-eval.c b/arch/arm/mach-h720x/h7201-eval.c
index 9b24b9b..fa59e9e 100644 (file)
--- a/arch/arm/mach-h720x/h7201-eval.c
+++ b/arch/arm/mach-h720x/h7201-eval.c
@@ -30,10 +30,12 @@
 #include "common.h"
 
 MACHINE_START(H7201, "Hynix GMS30C7201")
-       MAINTAINER("Robert Schwebel, Pengutronix")
-       BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
-       BOOT_PARAMS(0xc0001000)
-       MAPIO(h720x_map_io)
-       INITIRQ(h720x_init_irq)
-       .timer = &h7201_timer,
+       /* Maintainer: Robert Schwebel, Pengutronix */
+       .phys_ram       = 0x40000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0001000,
+       .map_io         = h720x_map_io,
+       .init_irq       = h720x_init_irq,
+       .timer          = &h7201_timer,
 MACHINE_END

diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c
index 3456a00..db9078a 100644 (file)
--- a/arch/arm/mach-h720x/h7202-eval.c
+++ b/arch/arm/mach-h720x/h7202-eval.c
@@ -71,11 +71,13 @@ static void __init init_eval_h7202(void)
 }
 
 MACHINE_START(H7202, "Hynix HMS30C7202")
-       MAINTAINER("Robert Schwebel, Pengutronix")
-       BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
-       BOOT_PARAMS(0x40000100)
-       MAPIO(h720x_map_io)
-       INITIRQ(h7202_init_irq)
-       .timer = &h7202_timer,
-       INIT_MACHINE(init_eval_h7202)
+       /* Maintainer: Robert Schwebel, Pengutronix */
+       .phys_ram       = 0x40000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
+       .boot_params    = 0x40000100,
+       .map_io         = h720x_map_io,
+       .init_irq       = h7202_init_irq,
+       .timer          = &h7202_timer,
+       .init_machine   = init_eval_h7202,
 MACHINE_END

diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c
index 625dd01..5d25434 100644 (file)
--- a/arch/arm/mach-imx/mx1ads.c
+++ b/arch/arm/mach-imx/mx1ads.c
@@ -78,11 +78,13 @@ mx1ads_map_io(void)
 }
 
 MACHINE_START(MX1ADS, "Motorola MX1ADS")
-       MAINTAINER("Sascha Hauer, Pengutronix")
-       BOOT_MEM(0x08000000, 0x00200000, 0xe0200000)
-       BOOT_PARAMS(0x08000100)
-       MAPIO(mx1ads_map_io)
-       INITIRQ(imx_init_irq)
+       /* Maintainer: Sascha Hauer, Pengutronix */
+       .phys_ram       = 0x08000000,
+       .phys_io        = 0x00200000,
+       .io_pg_offst    = ((0xe0200000) >> 18) & 0xfffc,
+       .boot_params    = 0x08000100,
+       .map_io         = mx1ads_map_io,
+       .init_irq       = imx_init_irq,
        .timer          = &imx_timer,
-       INIT_MACHINE(mx1ads_init)
+       .init_machine   = mx1ads_init,
 MACHINE_END

diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 91ba9fd..36e2b6e 100644 (file)
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -292,11 +292,13 @@ static struct sys_timer ap_timer = {
 };
 
 MACHINE_START(INTEGRATOR, "ARM-Integrator")
-       MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
-       BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(ap_map_io)
-       INITIRQ(ap_init_irq)
+       /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
+       .phys_ram       = 0x00000000,
+       .phys_io        = 0x16000000,
+       .io_pg_offst    = ((0xf1600000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = ap_map_io,
+       .init_irq       = ap_init_irq,
        .timer          = &ap_timer,
-       INIT_MACHINE(ap_init)
+       .init_machine   = ap_init,
 MACHINE_END

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index e0a01ee..569f328 100644 (file)
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -532,11 +532,13 @@ static struct sys_timer cp_timer = {
 };
 
 MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")
-       MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
-       BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(intcp_map_io)
-       INITIRQ(intcp_init_irq)
+       /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
+       .phys_ram       = 0x00000000,
+       .phys_io        = 0x16000000,
+       .io_pg_offst    = ((0xf1600000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = intcp_map_io,
+       .init_irq       = intcp_init_irq,
        .timer          = &cp_timer,
-       INIT_MACHINE(intcp_init)
+       .init_machine   = intcp_init,
 MACHINE_END

diff --git a/arch/arm/mach-iop3xx/iop321-setup.c b/arch/arm/mach-iop3xx/iop321-setup.c
index bf23e0f..0f921ba 100644 (file)
--- a/arch/arm/mach-iop3xx/iop321-setup.c
+++ b/arch/arm/mach-iop3xx/iop321-setup.c
@@ -146,23 +146,27 @@ extern void iop321_init_time(void);
 
 #if defined(CONFIG_ARCH_IQ80321)
 MACHINE_START(IQ80321, "Intel IQ80321")
-       MAINTAINER("Intel Corporation")
-       BOOT_MEM(PHYS_OFFSET, IQ80321_UART, IQ80321_UART)
-       MAPIO(iq80321_map_io)
-       INITIRQ(iop321_init_irq)
+       /* Maintainer: Intel Corporation */
+       .phys_ram       = PHYS_OFFSET,
+       .phys_io        = IQ80321_UART,
+       .io_pg_offst    = ((IQ80321_UART) >> 18) & 0xfffc,
+       .map_io         = iq80321_map_io,
+       .init_irq       = iop321_init_irq,
        .timer          = &iop321_timer,
-    BOOT_PARAMS(0xa0000100)
-       INIT_MACHINE(iop32x_init)
+       .boot_params    = 0xa0000100,
+       .init_machine   = iop32x_init,
 MACHINE_END
 #elif defined(CONFIG_ARCH_IQ31244)
 MACHINE_START(IQ31244, "Intel IQ31244")
-    MAINTAINER("Intel Corp.")
-    BOOT_MEM(PHYS_OFFSET, IQ31244_UART, IQ31244_UART)
-    MAPIO(iq31244_map_io)
-    INITIRQ(iop321_init_irq)
+       /* Maintainer: Intel Corp. */
+       .phys_ram       = PHYS_OFFSET,
+       .phys_io        = IQ31244_UART,
+       .io_pg_offst    = ((IQ31244_UART) >> 18) & 0xfffc,
+       .map_io         = iq31244_map_io,
+       .init_irq       = iop321_init_irq,
        .timer          = &iop321_timer,
-    BOOT_PARAMS(0xa0000100)
-       INIT_MACHINE(iop32x_init)
+       .boot_params    = 0xa0000100,
+       .init_machine   = iop32x_init,
 MACHINE_END
 #else
 #error No machine descriptor defined for this IOP3XX implementation

diff --git a/arch/arm/mach-iop3xx/iop331-setup.c b/arch/arm/mach-iop3xx/iop331-setup.c
index 622e791..fc74b72 100644 (file)
--- a/arch/arm/mach-iop3xx/iop331-setup.c
+++ b/arch/arm/mach-iop3xx/iop331-setup.c
@@ -148,26 +148,28 @@ extern void iq80332_map_io(void);
 
 #if defined(CONFIG_ARCH_IQ80331)
 MACHINE_START(IQ80331, "Intel IQ80331")
-    MAINTAINER("Intel Corp.")
-    BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical
-    //BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS)
-    MAPIO(iq80331_map_io)
-    INITIRQ(iop331_init_irq)
+       /* Maintainer: Intel Corp. */
+       .phys_ram       = PHYS_OFFSET,
+       .phys_io        = 0xfefff000,
+       .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
+       .map_io         = iq80331_map_io,
+       .init_irq       = iop331_init_irq,
        .timer          = &iop331_timer,
-    BOOT_PARAMS(0x0100)
-       INIT_MACHINE(iop33x_init)
+       .boot_params    = 0x0100,
+       .init_machine   = iop33x_init,
 MACHINE_END
 
 #elif defined(CONFIG_MACH_IQ80332)
 MACHINE_START(IQ80332, "Intel IQ80332")
-    MAINTAINER("Intel Corp.")
-    BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical
-    //BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS)
-    MAPIO(iq80332_map_io)
-    INITIRQ(iop331_init_irq)
+       /* Maintainer: Intel Corp. */
+       .phys_ram       = PHYS_OFFSET,
+       .phys_io        = 0xfefff000,
+       .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
+       .map_io         = iq80332_map_io,
+       .init_irq       = iop331_init_irq,
        .timer          = &iop331_timer,
-    BOOT_PARAMS(0x0100)
-       INIT_MACHINE(iop33x_init)
+       .boot_params    = 0x0100,
+       .init_machine   = iop33x_init,
 MACHINE_END
 
 #else

diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c
index f3a291b..b7ebf38 100644 (file)
--- a/arch/arm/mach-ixp2000/enp2611.c
+++ b/arch/arm/mach-ixp2000/enp2611.c
@@ -223,13 +223,15 @@ static void __init enp2611_init_machine(void)
 
 
 MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")
-       MAINTAINER("Lennert Buytenhek <buytenh@wantstofly.org>")
-       BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(ixp2000_map_io)
-       INITIRQ(ixp2000_init_irq)
+       /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
+       .phys_ram       = 0x00000000,
+       .phys_io        = IXP2000_UART_PHYS_BASE,
+       .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = ixp2000_map_io,
+       .init_irq       = ixp2000_init_irq,
        .timer          = &enp2611_timer,
-       INIT_MACHINE(enp2611_init_machine)
+       .init_machine   = enp2611_init_machine,
 MACHINE_END
 
 

diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c
index df3ff26..fd280a9 100644 (file)
--- a/arch/arm/mach-ixp2000/ixdp2400.c
+++ b/arch/arm/mach-ixp2000/ixdp2400.c
@@ -168,12 +168,14 @@ void ixdp2400_init_irq(void)
 }
 
 MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform")
-       MAINTAINER("MontaVista Software, Inc.")
-       BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(ixdp2x00_map_io)
-       INITIRQ(ixdp2400_init_irq)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = 0x00000000,
+       .phys_io        = IXP2000_UART_PHYS_BASE,
+       .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = ixdp2x00_map_io,
+       .init_irq       = ixdp2400_init_irq,
        .timer          = &ixdp2400_timer,
-       INIT_MACHINE(ixdp2x00_init_machine)
+       .init_machine   = ixdp2x00_init_machine,
 MACHINE_END
 

diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c
index 468a4bb..f9073aa 100644 (file)
--- a/arch/arm/mach-ixp2000/ixdp2800.c
+++ b/arch/arm/mach-ixp2000/ixdp2800.c
@@ -284,12 +284,14 @@ void ixdp2800_init_irq(void)
 }
 
 MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform")
-       MAINTAINER("MontaVista Software, Inc.")
-       BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(ixdp2x00_map_io)
-       INITIRQ(ixdp2800_init_irq)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = 0x00000000,
+       .phys_io        = IXP2000_UART_PHYS_BASE,
+       .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = ixdp2x00_map_io,
+       .init_irq       = ixdp2800_init_irq,
        .timer          = &ixdp2800_timer,
-       INIT_MACHINE(ixdp2x00_init_machine)
+       .init_machine   = ixdp2x00_init_machine,
 MACHINE_END
 

diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index e94dace..c735887 100644 (file)
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -375,25 +375,29 @@ static void __init ixdp2x01_init_machine(void)
 
 #ifdef CONFIG_ARCH_IXDP2401
 MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")
-       MAINTAINER("MontaVista Software, Inc.")
-       BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(ixdp2x01_map_io)
-       INITIRQ(ixdp2x01_init_irq)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = 0x00000000,
+       .phys_io        = IXP2000_UART_PHYS_BASE,
+       .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = ixdp2x01_map_io,
+       .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
-       INIT_MACHINE(ixdp2x01_init_machine)
+       .init_machine   = ixdp2x01_init_machine,
 MACHINE_END
 #endif
 
 #ifdef CONFIG_ARCH_IXDP2801
 MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")
-       MAINTAINER("MontaVista Software, Inc.")
-       BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(ixdp2x01_map_io)
-       INITIRQ(ixdp2x01_init_irq)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = 0x00000000,
+       .phys_io        = IXP2000_UART_PHYS_BASE,
+       .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = ixdp2x01_map_io,
+       .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
-       INIT_MACHINE(ixdp2x01_init_machine)
+       .init_machine   = ixdp2x01_init_machine,
 MACHINE_END
 #endif
 

diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c
index 8a05a12..c6335f5 100644 (file)
--- a/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -100,14 +100,15 @@ static void __init coyote_init(void)
 
 #ifdef CONFIG_ARCH_ADI_COYOTE
 MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote")
-        MAINTAINER("MontaVista Software, Inc.")
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
-        MAPIO(coyote_map_io)
-        INITIRQ(ixp4xx_init_irq)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = PHYS_OFFSET,
+       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
+       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
+       .map_io         = coyote_map_io,
+       .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
-       INIT_MACHINE(coyote_init)
+       .boot_params    = 0x0100,
+       .init_machine   = coyote_init,
 MACHINE_END
 #endif
 
@@ -117,14 +118,15 @@ MACHINE_END
  */
 #ifdef CONFIG_MACH_IXDPG425
 MACHINE_START(IXDPG425, "Intel IXDPG425")
-        MAINTAINER("MontaVista Software, Inc.")
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
-        MAPIO(coyote_map_io)
-        INITIRQ(ixp4xx_init_irq)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = PHYS_OFFSET,
+       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
+       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
+       .map_io         = coyote_map_io,
+       .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
-       INIT_MACHINE(coyote_init)
+       .boot_params    = 0x0100,
+       .init_machine   = coyote_init,
 MACHINE_END
 #endif
 

diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
index e77c86e..8ba1cd9 100644 (file)
--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
@@ -140,14 +140,15 @@ static void __init gtwx5715_init(void)
 
 
 MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)")
-        MAINTAINER("George Joseph")
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_UART2_BASE_PHYS,
-                IXP4XX_UART2_BASE_VIRT)
-        MAPIO(gtwx5715_map_io)
-        INITIRQ(ixp4xx_init_irq)
-                 .timer                = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
-        INIT_MACHINE(gtwx5715_init)
+       /* Maintainer: George Joseph */
+       .phys_ram       = PHYS_OFFSET,
+       .phys_io        = IXP4XX_UART2_BASE_PHYS,
+       .io_pg_offst    = ((IXP4XX_UART2_BASE_VIRT) >> 18) & 0xfffc,
+       .map_io         = gtwx5715_map_io,
+       .init_irq       = ixp4xx_init_irq,
+       .timer          = &ixp4xx_timer,
+       .boot_params    = 0x0100,
+       .init_machine   = gtwx5715_init,
 MACHINE_END
 
 

diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 77346c1..f2e9c0e 100644 (file)
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -128,36 +128,39 @@ static void __init ixdp425_init(void)
 }
 
 MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
-       MAINTAINER("MontaVista Software, Inc.")
-       BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
-               IXP4XX_PERIPHERAL_BASE_VIRT)
-       MAPIO(ixdp425_map_io)
-       INITIRQ(ixp4xx_init_irq)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = PHYS_OFFSET,
+       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
+       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
+       .map_io         = ixdp425_map_io,
+       .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-       BOOT_PARAMS(0x0100)
-       INIT_MACHINE(ixdp425_init)
+       .boot_params    = 0x0100,
+       .init_machine   = ixdp425_init,
 MACHINE_END
 
 MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")
-       MAINTAINER("MontaVista Software, Inc.")
-       BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
-               IXP4XX_PERIPHERAL_BASE_VIRT)
-       MAPIO(ixdp425_map_io)
-       INITIRQ(ixp4xx_init_irq)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = PHYS_OFFSET,
+       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
+       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
+       .map_io         = ixdp425_map_io,
+       .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-       BOOT_PARAMS(0x0100)
-       INIT_MACHINE(ixdp425_init)
+       .boot_params    = 0x0100,
+       .init_machine   = ixdp425_init,
 MACHINE_END
 
 MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
-       MAINTAINER("MontaVista Software, Inc.")
-       BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
-               IXP4XX_PERIPHERAL_BASE_VIRT)
-       MAPIO(ixdp425_map_io)
-       INITIRQ(ixp4xx_init_irq)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = PHYS_OFFSET,
+       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
+       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
+       .map_io         = ixdp425_map_io,
+       .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-       BOOT_PARAMS(0x0100)
-       INIT_MACHINE(ixdp425_init)
+       .boot_params    = 0x0100,
+       .init_machine   = ixdp425_init,
 MACHINE_END
 
 /*
@@ -168,14 +171,15 @@ MACHINE_END
  */
 #ifdef CONFIG_ARCH_AVILA
 MACHINE_START(AVILA, "Gateworks Avila Network Platform")
-       MAINTAINER("Deepak Saxena <dsaxena@plexity.net>")
-       BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
-               IXP4XX_PERIPHERAL_BASE_VIRT)
-       MAPIO(ixdp425_map_io)
-       INITIRQ(ixp4xx_init_irq)
+       /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */
+       .phys_ram       = PHYS_OFFSET,
+       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
+       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
+       .map_io         = ixdp425_map_io,
+       .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-       BOOT_PARAMS(0x0100)
-       INIT_MACHINE(ixdp425_init)
+       .boot_params    = 0x0100,
+       .init_machine   = ixdp425_init,
 MACHINE_END
 #endif
 

diff --git a/arch/arm/mach-l7200/core.c b/arch/arm/mach-l7200/core.c
index 606ca95..2a7fee2 100644 (file)
--- a/arch/arm/mach-l7200/core.c
+++ b/arch/arm/mach-l7200/core.c
@@ -81,9 +81,11 @@ static void __init l7200_map_io(void)
 }
 
 MACHINE_START(L7200, "LinkUp Systems L7200")
-       MAINTAINER("Steve Hill / Scott McConnell")
-       BOOT_MEM(0xf0000000, 0x80040000, 0xd0000000)
-       MAPIO(l7200_map_io)
-       INITIRQ(l7200_init_irq)
+       /* Maintainer: Steve Hill / Scott McConnell */
+       .phys_ram       = 0xf0000000,
+       .phys_io        = 0x80040000,
+       .io_pg_offst    = ((0xd0000000) >> 18) & 0xfffc,
+       .map_io         = l7200_map_io,
+       .init_irq       = l7200_init_irq,
 MACHINE_END
 

diff --git a/arch/arm/mach-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c
index be5d17f..cb3dcd3 100644 (file)
--- a/arch/arm/mach-lh7a40x/arch-kev7a400.c
+++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c
@@ -102,10 +102,12 @@ void __init lh7a40x_init_board_irq (void)
 }
 
 MACHINE_START (KEV7A400, "Sharp KEV7a400")
-       MAINTAINER ("Marc Singer")
-       BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000))
-       BOOT_PARAMS (0xc0000100)
-       MAPIO (kev7a400_map_io)
-       INITIRQ (lh7a400_init_irq)
+       /* Maintainer: Marc Singer */
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((io_p2v (0x80000000))>>18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = kev7a400_map_io,
+       .init_irq       = lh7a400_init_irq,
        .timer          = &lh7a40x_timer,
 MACHINE_END

diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
index c823447..6eb61a1 100644 (file)
--- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
@@ -260,13 +260,15 @@ lpd7a400_map_io(void)
 #ifdef CONFIG_MACH_LPD7A400
 
 MACHINE_START (LPD7A400, "Logic Product Development LPD7A400-10")
-       MAINTAINER ("Marc Singer")
-       BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000))
-       BOOT_PARAMS (0xc0000100)
-       MAPIO (lpd7a400_map_io)
-       INITIRQ (lh7a400_init_irq)
+       /* Maintainer: Marc Singer */
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((io_p2v (0x80000000))>>18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = lpd7a400_map_io,
+       .init_irq       = lh7a400_init_irq,
        .timer          = &lh7a40x_timer,
-       INIT_MACHINE (lpd7a40x_init)
+       .init_machine   = lpd7a40x_init,
 MACHINE_END
 
 #endif
@@ -274,13 +276,15 @@ MACHINE_END
 #ifdef CONFIG_MACH_LPD7A404
 
 MACHINE_START (LPD7A404, "Logic Product Development LPD7A404-10")
-       MAINTAINER ("Marc Singer")
-       BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000))
-       BOOT_PARAMS (0xc0000100)
-       MAPIO (lpd7a400_map_io)
-       INITIRQ (lh7a404_init_irq)
+       /* Maintainer: Marc Singer */
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((io_p2v (0x80000000))>>18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = lpd7a400_map_io,
+       .init_irq       = lh7a404_init_irq,
        .timer          = &lh7a40x_timer,
-       INIT_MACHINE (lpd7a40x_init)
+       .init_machine   = lpd7a40x_init,
 MACHINE_END
 
 #endif

diff --git a/arch/arm/mach-omap/board-generic.c b/arch/arm/mach-omap/board-generic.c
index 2102a2c..384bc7c 100644 (file)
--- a/arch/arm/mach-omap/board-generic.c
+++ b/arch/arm/mach-omap/board-generic.c
@@ -88,11 +88,13 @@ static void __init omap_generic_map_io(void)
 }
 
 MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
-       MAINTAINER("Tony Lindgren <tony@atomide.com>")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(omap_generic_map_io)
-       INITIRQ(omap_generic_init_irq)
-       INIT_MACHINE(omap_generic_init)
+       /* Maintainer: Tony Lindgren <tony@atomide.com> */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = omap_generic_map_io,
+       .init_irq       = omap_generic_init_irq,
+       .init_machine   = omap_generic_init,
        .timer          = &omap_timer,
 MACHINE_END

diff --git a/arch/arm/mach-omap/board-h2.c b/arch/arm/mach-omap/board-h2.c
index 1f06783..f37c76a 100644 (file)
--- a/arch/arm/mach-omap/board-h2.c
+++ b/arch/arm/mach-omap/board-h2.c
@@ -177,11 +177,13 @@ static void __init h2_map_io(void)
 }
 
 MACHINE_START(OMAP_H2, "TI-H2")
-       MAINTAINER("Imre Deak <imre.deak@nokia.com>")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(h2_map_io)
-       INITIRQ(h2_init_irq)
-       INIT_MACHINE(h2_init)
+       /* Maintainer: Imre Deak <imre.deak@nokia.com> */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = h2_map_io,
+       .init_irq       = h2_init_irq,
+       .init_machine   = h2_init,
        .timer          = &omap_timer,
 MACHINE_END

diff --git a/arch/arm/mach-omap/board-h3.c b/arch/arm/mach-omap/board-h3.c
index 486a5a0..705e485 100644 (file)
--- a/arch/arm/mach-omap/board-h3.c
+++ b/arch/arm/mach-omap/board-h3.c
@@ -195,11 +195,13 @@ static void __init h3_map_io(void)
 }
 
 MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
-       MAINTAINER("Texas Instruments, Inc.")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(h3_map_io)
-       INITIRQ(h3_init_irq)
-       INIT_MACHINE(h3_init)
+       /* Maintainer: Texas Instruments, Inc. */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = h3_map_io,
+       .init_irq       = h3_init_irq,
+       .init_machine   = h3_init,
        .timer          = &omap_timer,
 MACHINE_END

diff --git a/arch/arm/mach-omap/board-innovator.c b/arch/arm/mach-omap/board-innovator.c
index 57cf4da..523363f 100644 (file)
--- a/arch/arm/mach-omap/board-innovator.c
+++ b/arch/arm/mach-omap/board-innovator.c
@@ -270,11 +270,13 @@ static void __init innovator_map_io(void)
 }
 
 MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
-       MAINTAINER("MontaVista Software, Inc.")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(innovator_map_io)
-       INITIRQ(innovator_init_irq)
-       INIT_MACHINE(innovator_init)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = innovator_map_io,
+       .init_irq       = innovator_init_irq,
+       .init_machine   = innovator_init,
        .timer          = &omap_timer,
 MACHINE_END

diff --git a/arch/arm/mach-omap/board-netstar.c b/arch/arm/mach-omap/board-netstar.c
index 54acbd2..8c65373 100644 (file)
--- a/arch/arm/mach-omap/board-netstar.c
+++ b/arch/arm/mach-omap/board-netstar.c
@@ -141,11 +141,13 @@ static int __init netstar_late_init(void)
 postcore_initcall(netstar_late_init);
 
 MACHINE_START(NETSTAR, "NetStar OMAP5910")
-       MAINTAINER("Ladislav Michl <michl@2n.cz>")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(netstar_map_io)
-       INITIRQ(netstar_init_irq)
-       INIT_MACHINE(netstar_init)
-       .timer = &omap_timer,
+       /* Maintainer: Ladislav Michl <michl@2n.cz> */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = netstar_map_io,
+       .init_irq       = netstar_init_irq,
+       .init_machine   = netstar_init,
+       .timer          = &omap_timer,
 MACHINE_END

diff --git a/arch/arm/mach-omap/board-osk.c b/arch/arm/mach-omap/board-osk.c
index a951fc8..cb43343 100644 (file)
--- a/arch/arm/mach-omap/board-osk.c
+++ b/arch/arm/mach-omap/board-osk.c
@@ -159,11 +159,13 @@ static void __init osk_map_io(void)
 }
 
 MACHINE_START(OMAP_OSK, "TI-OSK")
-       MAINTAINER("Dirk Behme <dirk.behme@de.bosch.com>")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(osk_map_io)
-       INITIRQ(osk_init_irq)
-       INIT_MACHINE(osk_init)
+       /* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = osk_map_io,
+       .init_irq       = osk_init_irq,
+       .init_machine   = osk_init,
        .timer          = &omap_timer,
 MACHINE_END

diff --git a/arch/arm/mach-omap/board-perseus2.c b/arch/arm/mach-omap/board-perseus2.c
index 64515ae..d534204 100644 (file)
--- a/arch/arm/mach-omap/board-perseus2.c
+++ b/arch/arm/mach-omap/board-perseus2.c
@@ -179,11 +179,13 @@ static void __init omap_perseus2_map_io(void)
 }
 
 MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
-       MAINTAINER("Kevin Hilman <kjh@hilman.org>")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(omap_perseus2_map_io)
-       INITIRQ(omap_perseus2_init_irq)
-       INIT_MACHINE(omap_perseus2_init)
+       /* Maintainer: Kevin Hilman <kjh@hilman.org> */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = omap_perseus2_map_io,
+       .init_irq       = omap_perseus2_init_irq,
+       .init_machine   = omap_perseus2_init,
        .timer          = &omap_timer,
 MACHINE_END

diff --git a/arch/arm/mach-omap/board-voiceblue.c b/arch/arm/mach-omap/board-voiceblue.c
index f1a5bff..6b0c500 100644 (file)
--- a/arch/arm/mach-omap/board-voiceblue.c
+++ b/arch/arm/mach-omap/board-voiceblue.c
@@ -246,11 +246,13 @@ EXPORT_SYMBOL(voiceblue_wdt_disable);
 EXPORT_SYMBOL(voiceblue_wdt_ping);
 
 MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")
-       MAINTAINER("Ladislav Michl <michl@2n.cz>")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(voiceblue_map_io)
-       INITIRQ(voiceblue_init_irq)
-       INIT_MACHINE(voiceblue_init)
-       .timer = &omap_timer,
+       /* Maintainer: Ladislav Michl <michl@2n.cz> */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = voiceblue_map_io,
+       .init_irq       = voiceblue_init_irq,
+       .init_machine   = voiceblue_init,
+       .timer          = &omap_timer,
 MACHINE_END

diff --git a/arch/arm/mach-omap/usb.c b/arch/arm/mach-omap/usb.c
index 7f37857..fd483ff 100644 (file)
--- a/arch/arm/mach-omap/usb.c
+++ b/arch/arm/mach-omap/usb.c
@@ -41,7 +41,6 @@
 
 /* These routines should handle the standard chip-specific modes
  * for usb0/1/2 ports, covering basic mux and transceiver setup.
- * Call omap_usb_init() once, from INIT_MACHINE().
  *
  * Some board-*.c files will need to set up additional mux options,
  * like for suspend handling, vbus sensing, GPIOs, and the D+ pullup.

diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index f691cf7..276431b 100644 (file)
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -287,34 +287,40 @@ static void __init corgi_map_io(void)
 
 #ifdef CONFIG_MACH_CORGI
 MACHINE_START(CORGI, "SHARP Corgi")
-       BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
-       FIXUP(fixup_corgi)
-       MAPIO(corgi_map_io)
-       INITIRQ(corgi_init_irq)
-       .init_machine = corgi_init,
-       .timer = &pxa_timer,
+       .phys_ram       = 0xa0000000,
+       .phys_io        = 0x40000000,
+       .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+       .fixup          = fixup_corgi,
+       .map_io         = corgi_map_io,
+       .init_irq       = corgi_init_irq,
+       .init_machine   = corgi_init,
+       .timer          = &pxa_timer,
 MACHINE_END
 #endif
 
 #ifdef CONFIG_MACH_SHEPHERD
 MACHINE_START(SHEPHERD, "SHARP Shepherd")
-       BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
-       FIXUP(fixup_corgi)
-       MAPIO(corgi_map_io)
-       INITIRQ(corgi_init_irq)
-       .init_machine = corgi_init,
-       .timer = &pxa_timer,
+       .phys_ram       = 0xa0000000,
+       .phys_io        = 0x40000000,
+       .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+       .fixup          = fixup_corgi,
+       .map_io         = corgi_map_io,
+       .init_irq       = corgi_init_irq,
+       .init_machine   = corgi_init,
+       .timer          = &pxa_timer,
 MACHINE_END
 #endif
 
 #ifdef CONFIG_MACH_HUSKY
 MACHINE_START(HUSKY, "SHARP Husky")
-       BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
-       FIXUP(fixup_corgi)
-       MAPIO(corgi_map_io)
-       INITIRQ(corgi_init_irq)
-       .init_machine = corgi_init,
-       .timer = &pxa_timer,
+       .phys_ram       = 0xa0000000,
+       .phys_io        = 0x40000000,
+       .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+       .fixup          = fixup_corgi,
+       .map_io         = corgi_map_io,
+       .init_irq       = corgi_init_irq,
+       .init_machine   = corgi_init,
+       .timer          = &pxa_timer,
 MACHINE_END
 #endif
 

diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index c5a66bf..f82f5aa 100644 (file)
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -181,10 +181,12 @@ static void __init idp_map_io(void)
 
 
 MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
-       MAINTAINER("Vibren Technologies")
-       BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
-       MAPIO(idp_map_io)
-       INITIRQ(idp_init_irq)
+       /* Maintainer: Vibren Technologies */
+       .phys_ram       = 0xa0000000,
+       .phys_io        = 0x40000000,
+       .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+       .map_io         = idp_map_io,
+       .init_irq       = idp_init_irq,
        .timer          = &pxa_timer,
-       INIT_MACHINE(idp_init)
+       .init_machine   = idp_init,
 MACHINE_END

diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index f2c9e0d..e30b7c6 100644 (file)
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -268,10 +268,12 @@ static void __init lubbock_map_io(void)
 }
 
 MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
-       MAINTAINER("MontaVista Software Inc.")
-       BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
-       MAPIO(lubbock_map_io)
-       INITIRQ(lubbock_init_irq)
+       /* Maintainer: MontaVista Software Inc. */
+       .phys_ram       = 0xa0000000,
+       .phys_io        = 0x40000000,
+       .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+       .map_io         = lubbock_map_io,
+       .init_irq       = lubbock_init_irq,
        .timer          = &pxa_timer,
-       INIT_MACHINE(lubbock_init)
+       .init_machine   = lubbock_init,
 MACHINE_END

diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 9896afc..5d2f76b 100644 (file)
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -345,10 +345,12 @@ static void __init mainstone_map_io(void)
 }
 
 MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
-       MAINTAINER("MontaVista Software Inc.")
-       BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
-       MAPIO(mainstone_map_io)
-       INITIRQ(mainstone_init_irq)
+       /* Maintainer: MontaVista Software Inc. */
+       .phys_ram       = 0xa0000000,
+       .phys_io        = 0x40000000,
+       .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+       .map_io         = mainstone_map_io,
+       .init_irq       = mainstone_init_irq,
        .timer          = &pxa_timer,
-       INIT_MACHINE(mainstone_init)
+       .init_machine   = mainstone_init,
 MACHINE_END

diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index b6c746e..ebae969 100644 (file)
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -180,10 +180,12 @@ static void __init poodle_map_io(void)
 }
 
 MACHINE_START(POODLE, "SHARP Poodle")
-       BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
-       FIXUP(fixup_poodle)
-       MAPIO(poodle_map_io)
-       INITIRQ(pxa_init_irq)
-       .timer = &pxa_timer,
-       .init_machine = poodle_init,
+       .phys_ram       = 0xa0000000,
+       .phys_io        = 0x40000000,
+       .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+       .fixup          = fixup_poodle,
+       .map_io         = poodle_map_io,
+       .init_irq       = pxa_init_irq,
+       .timer          = &pxa_timer,
+       .init_machine   = poodle_init,
 MACHINE_END

diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c
index 4371068..a102686 100644 (file)
--- a/arch/arm/mach-rpc/riscpc.c
+++ b/arch/arm/mach-rpc/riscpc.c
@@ -163,12 +163,14 @@ arch_initcall(rpc_init);
 extern struct sys_timer ioc_timer;
 
 MACHINE_START(RISCPC, "Acorn-RiscPC")
-       MAINTAINER("Russell King")
-       BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
-       BOOT_PARAMS(0x10000100)
-       DISABLE_PARPORT(0)
-       DISABLE_PARPORT(1)
-       MAPIO(rpc_map_io)
-       INITIRQ(rpc_init_irq)
+       /* Maintainer: Russell King */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0x03000000,
+       .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .reserve_lp0    = 1,
+       .reserve_lp1    = 1,
+       .map_io         = rpc_map_io,
+       .init_irq       = rpc_init_irq,
        .timer          = &ioc_timer,
 MACHINE_END

diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 549bcb1..ccb6bce 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -407,10 +407,11 @@ void __init bast_map_io(void)
 
 
 MACHINE_START(BAST, "Simtec-BAST")
-     MAINTAINER("Ben Dooks <ben@simtec.co.uk>")
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
-
+       /* Maintainer: Ben Dooks <ben@simtec.co.uk> */
+       .phys_ram       = S3C2410_SDRAM_PA,
+       .phys_io        = S3C2410_PA_UART,
+       .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+       .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .map_io         = bast_map_io,
        .init_irq       = s3c24xx_init_irq,
        .timer          = &s3c24xx_timer,

diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index 2924afc..ea4fb1a 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -117,10 +117,12 @@ void __init h1940_init_irq(void)
 }
 
 MACHINE_START(H1940, "IPAQ-H1940")
-     MAINTAINER("Ben Dooks <ben@fluff.org>")
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
-     MAPIO(h1940_map_io)
-     INITIRQ(h1940_init_irq)
+       /* Maintainer: Ben Dooks <ben@fluff.org> */
+       .phys_ram       = S3C2410_SDRAM_PA,
+       .phys_io        = S3C2410_PA_UART,
+       .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+       .boot_params    = S3C2410_SDRAM_PA + 0x100,
+       .map_io         = h1940_map_io,
+       .init_irq       = h1940_init_irq,
        .timer          = &s3c24xx_timer,
 MACHINE_END

diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
index bd15998..79044d9 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-n30.c
+++ b/arch/arm/mach-s3c2410/mach-n30.c
@@ -137,10 +137,11 @@ void __init n30_init(void)
 }
 
 MACHINE_START(N30, "Acer-N30")
-     MAINTAINER("Christer Weinigel <christer@weinigel.se>, Ben Dooks <ben-linux@fluff.org>")
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
-
+       /* Maintainer: Christer Weinigel <christer@weinigel.se>, Ben Dooks <ben-linux@fluff.org> */
+       .phys_ram       = S3C2410_SDRAM_PA,
+       .phys_io        = S3C2410_PA_UART,
+       .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+       .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .timer          = &s3c24xx_timer,
        .init_machine   = n30_init,
        .init_irq       = n30_init_irq,

diff --git a/arch/arm/mach-s3c2410/mach-nexcoder.c b/arch/arm/mach-s3c2410/mach-nexcoder.c
index 70487bf..d24c242 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-nexcoder.c
+++ b/arch/arm/mach-s3c2410/mach-nexcoder.c
@@ -147,9 +147,11 @@ void __init nexcoder_map_io(void)
 
 
 MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440")
-     MAINTAINER("Guillaume GOURAT <guillaume.gourat@nexvision.tv>")
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+       /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */
+       .phys_ram       = S3C2410_SDRAM_PA,
+       .phys_io        = S3C2410_PA_UART,
+       .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+       .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .map_io         = nexcoder_map_io,
        .init_irq       = s3c24xx_init_irq,
        .timer          = &s3c24xx_timer,

diff --git a/arch/arm/mach-s3c2410/mach-otom.c b/arch/arm/mach-s3c2410/mach-otom.c
index 67d8ce8..d901ed4 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-otom.c
+++ b/arch/arm/mach-s3c2410/mach-otom.c
@@ -115,9 +115,11 @@ void __init otom11_map_io(void)
 
 
 MACHINE_START(OTOM, "Nex Vision - Otom 1.1")
-     MAINTAINER("Guillaume GOURAT <guillaume.gourat@nexvision.tv>")
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+       /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */
+       .phys_ram       = S3C2410_SDRAM_PA,
+       .phys_io        = S3C2410_PA_UART,
+       .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+       .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .map_io         = otom11_map_io,
        .init_irq       = s3c24xx_init_irq,
        .timer          = &s3c24xx_timer,

diff --git a/arch/arm/mach-s3c2410/mach-rx3715.c b/arch/arm/mach-s3c2410/mach-rx3715.c
index f8d3a97..a73d61c 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-rx3715.c
+++ b/arch/arm/mach-s3c2410/mach-rx3715.c
@@ -131,11 +131,13 @@ static void __init rx3715_init_machine(void)
 #endif
 
 MACHINE_START(RX3715, "IPAQ-RX3715")
-     MAINTAINER("Ben Dooks <ben@fluff.org>")
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
-     MAPIO(rx3715_map_io)
-     INITIRQ(rx3715_init_irq)
-     INIT_MACHINE(rx3715_init_machine)
+       /* Maintainer: Ben Dooks <ben@fluff.org> */
+       .phys_ram       = S3C2410_SDRAM_PA,
+       .phys_io        = S3C2410_PA_UART,
+       .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+       .boot_params    = S3C2410_SDRAM_PA + 0x100,
+       .map_io         = rx3715_map_io,
+       .init_irq       = rx3715_init_irq,
+       .init_machine   = rx3715_init_machine,
        .timer          = &s3c24xx_timer,
 MACHINE_END

diff --git a/arch/arm/mach-s3c2410/mach-smdk2410.c b/arch/arm/mach-s3c2410/mach-smdk2410.c
index c1a4a14..67e903a 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-smdk2410.c
+++ b/arch/arm/mach-s3c2410/mach-smdk2410.c
@@ -112,11 +112,13 @@ void __init smdk2410_init_irq(void)
 
 MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switch
                                    * to SMDK2410 */
-     MAINTAINER("Jonas Dietsche")
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
-     MAPIO(smdk2410_map_io)
-     INITIRQ(smdk2410_init_irq)
+       /* Maintainer: Jonas Dietsche */
+       .phys_ram       = S3C2410_SDRAM_PA,
+       .phys_io        = S3C2410_PA_UART,
+       .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+       .boot_params    = S3C2410_SDRAM_PA + 0x100,
+       .map_io         = smdk2410_map_io,
+       .init_irq       = smdk2410_init_irq,
        .timer          = &s3c24xx_timer,
 MACHINE_END
 

diff --git a/arch/arm/mach-s3c2410/mach-smdk2440.c b/arch/arm/mach-s3c2410/mach-smdk2440.c
index 7857176..3575221 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2410/mach-smdk2440.c
@@ -124,9 +124,11 @@ void __init smdk2440_machine_init(void)
 }
 
 MACHINE_START(S3C2440, "SMDK2440")
-       MAINTAINER("Ben Dooks <ben@fluff.org>")
-       BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
-       BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+       /* Maintainer: Ben Dooks <ben@fluff.org> */
+       .phys_ram       = S3C2410_SDRAM_PA,
+       .phys_io        = S3C2410_PA_UART,
+       .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+       .boot_params    = S3C2410_SDRAM_PA + 0x100,
 
        .init_irq       = s3c24xx_init_irq,
        .map_io         = smdk2440_map_io,

diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c
index 1db2855..924e846 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@ -373,9 +373,11 @@ void __init vr1000_map_io(void)
 
 
 MACHINE_START(VR1000, "Thorcom-VR1000")
-     MAINTAINER("Ben Dooks <ben@simtec.co.uk>")
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+       /* Maintainer: Ben Dooks <ben@simtec.co.uk> */
+       .phys_ram       = S3C2410_SDRAM_PA,
+       .phys_io        = S3C2410_PA_UART,
+       .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+       .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .map_io         = vr1000_map_io,
        .init_irq       = s3c24xx_init_irq,
        .timer          = &s3c24xx_timer,

diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index bedf88f..4d4d303 100644 (file)
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -431,11 +431,13 @@ static void __init assabet_map_io(void)
 
 
 MACHINE_START(ASSABET, "Intel-Assabet")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       BOOT_PARAMS(0xc0000100)
-       FIXUP(fixup_assabet)
-       MAPIO(assabet_map_io)
-       INITIRQ(sa1100_init_irq)
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .fixup          = fixup_assabet,
+       .map_io         = assabet_map_io,
+       .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = assabet_init,
 MACHINE_END

diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c
index 6a60b49..b6169cb 100644 (file)
--- a/arch/arm/mach-sa1100/badge4.c
+++ b/arch/arm/mach-sa1100/badge4.c
@@ -285,9 +285,11 @@ static void __init badge4_map_io(void)
 }
 
 MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       BOOT_PARAMS(0xc0000100)
-       MAPIO(badge4_map_io)
-       INITIRQ(sa1100_init_irq)
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = badge4_map_io,
+       .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
 MACHINE_END

diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index f8edde5..0aa918e 100644 (file)
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -123,10 +123,12 @@ static void __init cerf_init(void)
 }
 
 MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
-       MAINTAINER("support@intrinsyc.com")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       MAPIO(cerf_map_io)
-       INITIRQ(cerf_init_irq)
+       /* Maintainer: support@intrinsyc.com */
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .map_io         = cerf_map_io,
+       .init_irq       = cerf_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = cerf_init,
 MACHINE_END

diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index 9928789..8cb6911 100644 (file)
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -184,9 +184,11 @@ static void __init collie_map_io(void)
 }
 
 MACHINE_START(COLLIE, "Sharp-Collie")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       MAPIO(collie_map_io)
-       INITIRQ(sa1100_init_irq)
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .map_io         = collie_map_io,
+       .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = collie_init,
 MACHINE_END

diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 65dbe99..e7aa268 100644 (file)
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -380,10 +380,12 @@ static void __init h3100_map_io(void)
 }
 
 MACHINE_START(H3100, "Compaq iPAQ H3100")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       BOOT_PARAMS(0xc0000100)
-       MAPIO(h3100_map_io)
-       INITIRQ(sa1100_init_irq)
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = h3100_map_io,
+       .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = h3xxx_mach_init,
 MACHINE_END
@@ -496,10 +498,12 @@ static void __init h3600_map_io(void)
 }
 
 MACHINE_START(H3600, "Compaq iPAQ H3600")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       BOOT_PARAMS(0xc0000100)
-       MAPIO(h3600_map_io)
-       INITIRQ(sa1100_init_irq)
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = h3600_map_io,
+       .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = h3xxx_mach_init,
 MACHINE_END
@@ -881,10 +885,12 @@ static void __init h3800_map_io(void)
 }
 
 MACHINE_START(H3800, "Compaq iPAQ H3800")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       BOOT_PARAMS(0xc0000100)
-       MAPIO(h3800_map_io)
-       INITIRQ(h3800_init_irq)
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = h3800_map_io,
+       .init_irq       = h3800_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = h3xxx_mach_init,
 MACHINE_END

diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c
index 5708417..502d65c 100644 (file)
--- a/arch/arm/mach-sa1100/hackkit.c
+++ b/arch/arm/mach-sa1100/hackkit.c
@@ -191,10 +191,12 @@ static void __init hackkit_init(void)
  */
 
 MACHINE_START(HACKKIT, "HackKit Cpu Board")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       BOOT_PARAMS(0xc0000100)
-       MAPIO(hackkit_map_io)
-       INITIRQ(sa1100_init_irq)
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = hackkit_map_io,
+       .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = hackkit_init,
 MACHINE_END

diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 6be7829..eee3cbc 100644 (file)
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -97,9 +97,11 @@ static void __init jornada720_map_io(void)
 }
 
 MACHINE_START(JORNADA720, "HP Jornada 720")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       BOOT_PARAMS(0xc0000100)
-       MAPIO(jornada720_map_io)
-       INITIRQ(sa1100_init_irq)
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = jornada720_map_io,
+       .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
 MACHINE_END

diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c
index 51c08cc..870b488 100644 (file)
--- a/arch/arm/mach-sa1100/lart.c
+++ b/arch/arm/mach-sa1100/lart.c
@@ -41,9 +41,11 @@ static void __init lart_map_io(void)
 }
 
 MACHINE_START(LART, "LART")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       BOOT_PARAMS(0xc0000100)
-       MAPIO(lart_map_io)
-       INITIRQ(sa1100_init_irq)
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = lart_map_io,
+       .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
 MACHINE_END

diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c
index 5606bd7..e17b58f 100644 (file)
--- a/arch/arm/mach-sa1100/pleb.c
+++ b/arch/arm/mach-sa1100/pleb.c
@@ -146,9 +146,11 @@ static void __init pleb_map_io(void)
 }
 
 MACHINE_START(PLEB, "PLEB")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       MAPIO(pleb_map_io)
-       INITIRQ(sa1100_init_irq)
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .map_io         = pleb_map_io,
+       .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = pleb_init,
 MACHINE_END

diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c
index edddd55..43a0035 100644 (file)
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
@@ -76,10 +76,12 @@ static void __init shannon_map_io(void)
 }
 
 MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       BOOT_PARAMS(0xc0000100)
-       MAPIO(shannon_map_io)
-       INITIRQ(sa1100_init_irq)
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = shannon_map_io,
+       .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = shannon_init,
 MACHINE_END

diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index 8d113d6..7797858 100644 (file)
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -215,10 +215,12 @@ arch_initcall(simpad_init);
 
 
 MACHINE_START(SIMPAD, "Simpad")
-       MAINTAINER("Holger Freyther")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-        BOOT_PARAMS(0xc0000100)
-       MAPIO(simpad_map_io)
-       INITIRQ(sa1100_init_irq)
+       /* Maintainer: Holger Freyther */
+       .phys_ram       = 0xc0000000,
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = simpad_map_io,
+       .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
 MACHINE_END

diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index aa0e2f6..7264458 100644 (file)
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -105,10 +105,12 @@ static struct sys_timer shark_timer = {
 };
 
 MACHINE_START(SHARK, "Shark")
-       MAINTAINER("Alexander Schulz")
-       BOOT_MEM(0x08000000, 0x40000000, 0xe0000000)
-       BOOT_PARAMS(0x08003000)
-       MAPIO(shark_map_io)
-       INITIRQ(shark_init_irq)
+       /* Maintainer: Alexander Schulz */
+       .phys_ram       = 0x08000000,
+       .phys_io        = 0x40000000,
+       .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
+       .boot_params    = 0x08003000,
+       .map_io         = shark_map_io,
+       .init_irq       = shark_init_irq,
        .timer          = &shark_timer,
 MACHINE_END

diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c
index d332084..8b0b3be 100644 (file)
--- a/arch/arm/mach-versatile/versatile_ab.c
+++ b/arch/arm/mach-versatile/versatile_ab.c
@@ -35,11 +35,13 @@
 #include "core.h"
 
 MACHINE_START(VERSATILE_AB, "ARM-Versatile AB")
-       MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
-       BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(versatile_map_io)
-       INITIRQ(versatile_init_irq)
+       /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
+       .phys_ram       = 0x00000000,
+       .phys_io        = 0x101f1000,
+       .io_pg_offst    = ((0xf11f1000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = versatile_map_io,
+       .init_irq       = versatile_init_irq,
        .timer          = &versatile_timer,
-       INIT_MACHINE(versatile_init)
+       .init_machine   = versatile_init,
 MACHINE_END

diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c
index 2702099..7c3078c 100644 (file)
--- a/arch/arm/mach-versatile/versatile_pb.c
+++ b/arch/arm/mach-versatile/versatile_pb.c
@@ -99,11 +99,13 @@ static int __init versatile_pb_init(void)
 arch_initcall(versatile_pb_init);
 
 MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")
-       MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
-       BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(versatile_map_io)
-       INITIRQ(versatile_init_irq)
+       /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
+       .phys_ram       = 0x00000000,
+       .phys_io        = 0x101f1000,
+       .io_pg_offst    = ((0xf11f1000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = versatile_map_io,
+       .init_irq       = versatile_init_irq,
        .timer          = &versatile_timer,
-       INIT_MACHINE(versatile_init)
+       .init_machine   = versatile_init,
 MACHINE_END

diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index 3a32e92..a2fbb65 100644 (file)
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -54,38 +54,6 @@ const struct machine_desc __mach_desc_##_type        \
        .nr             = MACH_TYPE_##_type,    \
        .name           = _name,
 
-#define MAINTAINER(n)
-
-#define BOOT_MEM(_pram,_pio,_vio)              \
-       .phys_ram       = _pram,                \
-       .phys_io        = _pio,                 \
-       .io_pg_offst    = ((_vio)>>18)&0xfffc,
-
-#define BOOT_PARAMS(_params)                   \
-       .param_offset   = _params,
-
-#define VIDEO(_start,_end)                     \
-       .video_start    = _start,               \
-       .video_end      = _end,
-
-#define DISABLE_PARPORT(_n)                    \
-       .reserve_lp##_n = 1,
-
-#define SOFT_REBOOT                            \
-       .soft_reboot    = 1,
-
-#define FIXUP(_func)                           \
-       .fixup          = _func,
-
-#define MAPIO(_func)                           \
-       .map_io         = _func,
-
-#define INITIRQ(_func)                         \
-       .init_irq       = _func,
-
-#define INIT_MACHINE(_func)                    \
-       .init_machine   = _func,
-
 #define MACHINE_END                            \
 };