2 files changed, 17 insertions, 13 deletions
diff --git a/arch/arm/mach-h720x/h7201-eval.c b/arch/arm/mach-h720x/h7201-eval.c
index 9b24b9b0db15..fa59e9e2a5c8 100644
--- 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")
+        /* Maintainer: Robert Schwebel, Pengutronix */
-        BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
+        .phys_ram       = 0x40000000,
-        BOOT_PARAMS(0xc0001000)
+        .phys_io        = 0x80000000,
-        MAPIO(h720x_map_io)
+        .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
-        INITIRQ(h720x_init_irq)
+        .boot_params    = 0xc0001000,
-        .timer = &h7201_timer,
+        .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 3456a00d5f5c..db9078ad008c 100644
--- 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")
+        /* Maintainer: Robert Schwebel, Pengutronix */
-        BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
+        .phys_ram       = 0x40000000,
-        BOOT_PARAMS(0x40000100)
+        .phys_io        = 0x80000000,
-        MAPIO(h720x_map_io)
+        .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
-        INITIRQ(h7202_init_irq)
+        .boot_params    = 0x40000100,
-        .timer = &h7202_timer,
+        .map_io         = h720x_map_io,
-        INIT_MACHINE(init_eval_h7202)
+        .init_irq       = h7202_init_irq,
+        .timer          = &h7202_timer,
+        .init_machine   = init_eval_h7202,
 MACHINE_END

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


diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c index 3456a00d5f5c..db9078ad008c 100644 --- 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)
71	}	71	}
72		72
73	MACHINE_START(H7202, "Hynix HMS30C7202")	73	MACHINE_START(H7202, "Hynix HMS30C7202")
74	MAINTAINER("Robert Schwebel, Pengutronix")	74	/* Maintainer: Robert Schwebel, Pengutronix */
75	BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)	75	.phys_ram = 0x40000000,
76	BOOT_PARAMS(0x40000100)	76	.phys_io = 0x80000000,
77	MAPIO(h720x_map_io)	77	.io_pg_offst = ((0xf0000000) >> 18) & 0xfffc,
78	INITIRQ(h7202_init_irq)	78	.boot_params = 0x40000100,
79	.timer = &h7202_timer,	79	.map_io = h720x_map_io,
80	INIT_MACHINE(init_eval_h7202)	80	.init_irq = h7202_init_irq,
		81	.timer = &h7202_timer,
		82	.init_machine = init_eval_h7202,
81	MACHINE_END	83	MACHINE_END