5 files changed, 44 insertions, 32 deletions
diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index d1ced86c379c..49b898af0032 100644
--- 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")
+        /* Maintainer: Philip Blundell */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        SOFT_REBOOT
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
-        FIXUP(fixup_cats)
+        .boot_params    = 0x00000100,
-        MAPIO(footbridge_map_io)
+        .soft_reboot    = 1,
-        INITIRQ(footbridge_init_irq)
+        .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 e1541914fdcd..548a79081688 100644
--- 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")
+        /* Maintainer: Mark van Doesburg */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0x7cf00000)
+        .phys_ram       = 0x00000000,
-        FIXUP(fixup_coebsa285)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        MAPIO(footbridge_map_io)
+        .io_pg_offst    = ((0x7cf00000) >> 18) & 0xfffc,
-        INITIRQ(footbridge_init_irq)
+        .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 d0931f5a63c8..1c37605268d5 100644
--- 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")
+        /* Maintainer: Russell King */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        VIDEO(0x000a0000, 0x000bffff)
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
-        MAPIO(footbridge_map_io)
+        .boot_params    = 0x00000100,
-        INITIRQ(footbridge_init_irq)
+        .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 1e1dfd79f4fe..775f85fc8513 100644
--- 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")
+        /* Maintainer: Russell King/Rebel.com */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        VIDEO(0x000a0000, 0x000bffff)
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
-        DISABLE_PARPORT(0)
+        .boot_params    = 0x00000100,
-        DISABLE_PARPORT(2)
+        .video_start    = 0x000a0000,
-        FIXUP(fixup_netwinder)
+        .video_end      = 0x000bffff,
-        MAPIO(footbridge_map_io)
+        .reserve_lp0    = 1,
-        INITIRQ(footbridge_init_irq)
+        .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 415086d7bbee..0146b8bb59da 100644
--- 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")
+        /* Maintainer: Jamey Hicks / George France */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        MAPIO(footbridge_map_io)
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
-        INITIRQ(footbridge_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
        .timer          = &footbridge_timer,
 MACHINE_END

diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c index d1ced86c379c..49b898af0032 100644 --- 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,
84	}	84	}
85		85
86	MACHINE_START(CATS, "Chalice-CATS")	86	MACHINE_START(CATS, "Chalice-CATS")
87	MAINTAINER("Philip Blundell")	87	/* Maintainer: Philip Blundell */
88	BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)	88	.phys_ram = 0x00000000,
89	BOOT_PARAMS(0x00000100)	89	.phys_io = DC21285_ARMCSR_BASE,
90	SOFT_REBOOT	90	.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
91	FIXUP(fixup_cats)	91	.boot_params = 0x00000100,
92	MAPIO(footbridge_map_io)	92	.soft_reboot = 1,
93	INITIRQ(footbridge_init_irq)	93	.fixup = fixup_cats,
		94	.map_io = footbridge_map_io,
		95	.init_irq = footbridge_init_irq,
94	.timer = &isa_timer,	96	.timer = &isa_timer,
95	MACHINE_END	97	MACHINE_END


diff --git a/arch/arm/mach-footbridge/co285.c b/arch/arm/mach-footbridge/co285.c index e1541914fdcd..548a79081688 100644 --- 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,
28	}	28	}
29		29
30	MACHINE_START(CO285, "co-EBSA285")	30	MACHINE_START(CO285, "co-EBSA285")
31	MAINTAINER("Mark van Doesburg")	31	/* Maintainer: Mark van Doesburg */
32	BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0x7cf00000)	32	.phys_ram = 0x00000000,
33	FIXUP(fixup_coebsa285)	33	.phys_io = DC21285_ARMCSR_BASE,
34	MAPIO(footbridge_map_io)	34	.io_pg_offst = ((0x7cf00000) >> 18) & 0xfffc,
35	INITIRQ(footbridge_init_irq)	35	.fixup = fixup_coebsa285,
		36	.map_io = footbridge_map_io,
		37	.init_irq = footbridge_init_irq,
36	.timer = &footbridge_timer,	38	.timer = &footbridge_timer,
37	MACHINE_END	39	MACHINE_END
38		40


diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c index d0931f5a63c8..1c37605268d5 100644 --- a/arch/arm/mach-footbridge/ebsa285.c +++ b/arch/arm/mach-footbridge/ebsa285.c
@@ -13,12 +13,15 @@
13	#include "common.h"	13	#include "common.h"
14		14
15	MACHINE_START(EBSA285, "EBSA285")	15	MACHINE_START(EBSA285, "EBSA285")
16	MAINTAINER("Russell King")	16	/* Maintainer: Russell King */
17	BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)	17	.phys_ram = 0x00000000,
18	BOOT_PARAMS(0x00000100)	18	.phys_io = DC21285_ARMCSR_BASE,
19	VIDEO(0x000a0000, 0x000bffff)	19	.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
20	MAPIO(footbridge_map_io)	20	.boot_params = 0x00000100,
21	INITIRQ(footbridge_init_irq)	21	.video_start = 0x000a0000,
		22	.video_end = 0x000bffff,
		23	.map_io = footbridge_map_io,
		24	.init_irq = footbridge_init_irq,
22	.timer = &footbridge_timer,	25	.timer = &footbridge_timer,
23	MACHINE_END	26	MACHINE_END
24		27


diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c index 1e1dfd79f4fe..775f85fc8513 100644 --- 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,
647	}	647	}
648		648
649	MACHINE_START(NETWINDER, "Rebel-NetWinder")	649	MACHINE_START(NETWINDER, "Rebel-NetWinder")
650	MAINTAINER("Russell King/Rebel.com")	650	/* Maintainer: Russell King/Rebel.com */
651	BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)	651	.phys_ram = 0x00000000,
652	BOOT_PARAMS(0x00000100)	652	.phys_io = DC21285_ARMCSR_BASE,
653	VIDEO(0x000a0000, 0x000bffff)	653	.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
654	DISABLE_PARPORT(0)	654	.boot_params = 0x00000100,
655	DISABLE_PARPORT(2)	655	.video_start = 0x000a0000,
656	FIXUP(fixup_netwinder)	656	.video_end = 0x000bffff,
657	MAPIO(footbridge_map_io)	657	.reserve_lp0 = 1,
658	INITIRQ(footbridge_init_irq)	658	.reserve_lp2 = 1,
		659	.fixup = fixup_netwinder,
		660	.map_io = footbridge_map_io,
		661	.init_irq = footbridge_init_irq,
659	.timer = &isa_timer,	662	.timer = &isa_timer,
660	MACHINE_END	663	MACHINE_END


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