diff options
author | Lee Jones <lee.jones@linaro.org> | 2013-09-18 09:53:06 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-09-26 05:08:53 -0400 |
commit | 3ea3e63938ca3adbdb02db99bce89a71b802ebab (patch) | |
tree | 47577e6af1f64687d581e4e7d1b1888aa267e9be /arch/arm/mach-ux500/board-mop500.c | |
parent | 7585382ad5ca26134fffc860da9bfc1947895eb3 (diff) |
ARM: ux500: Purge UIB framework when booting with ATAGs
It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index b37bcbc1c7b7..d034e62e226f 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c | |||
@@ -105,8 +105,8 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform") | |||
105 | /* we re-use nomadik timer here */ | 105 | /* we re-use nomadik timer here */ |
106 | .init_time = ux500_timer_init, | 106 | .init_time = ux500_timer_init, |
107 | .init_machine = mop500_init_machine, | 107 | .init_machine = mop500_init_machine, |
108 | .init_late = ux500_init_late, | ||
109 | .restart = ux500_restart, | 108 | .restart = ux500_restart, |
109 | .init_late = NULL, | ||
110 | MACHINE_END | 110 | MACHINE_END |
111 | 111 | ||
112 | MACHINE_START(U8520, "ST-Ericsson U8520 Platform HREFP520") | 112 | MACHINE_START(U8520, "ST-Ericsson U8520 Platform HREFP520") |
@@ -115,8 +115,8 @@ MACHINE_START(U8520, "ST-Ericsson U8520 Platform HREFP520") | |||
115 | .init_irq = ux500_init_irq, | 115 | .init_irq = ux500_init_irq, |
116 | .init_time = ux500_timer_init, | 116 | .init_time = ux500_timer_init, |
117 | .init_machine = mop500_init_machine, | 117 | .init_machine = mop500_init_machine, |
118 | .init_late = ux500_init_late, | ||
119 | .restart = ux500_restart, | 118 | .restart = ux500_restart, |
119 | .init_late = NULL, | ||
120 | MACHINE_END | 120 | MACHINE_END |
121 | 121 | ||
122 | MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") | 122 | MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") |
@@ -126,8 +126,8 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") | |||
126 | .init_irq = ux500_init_irq, | 126 | .init_irq = ux500_init_irq, |
127 | .init_time = ux500_timer_init, | 127 | .init_time = ux500_timer_init, |
128 | .init_machine = hrefv60_init_machine, | 128 | .init_machine = hrefv60_init_machine, |
129 | .init_late = ux500_init_late, | ||
130 | .restart = ux500_restart, | 129 | .restart = ux500_restart, |
130 | .init_late = NULL, | ||
131 | MACHINE_END | 131 | MACHINE_END |
132 | 132 | ||
133 | MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") | 133 | MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") |
@@ -138,6 +138,6 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") | |||
138 | /* we re-use nomadik timer here */ | 138 | /* we re-use nomadik timer here */ |
139 | .init_time = ux500_timer_init, | 139 | .init_time = ux500_timer_init, |
140 | .init_machine = snowball_init_machine, | 140 | .init_machine = snowball_init_machine, |
141 | .init_late = NULL, | ||
142 | .restart = ux500_restart, | 141 | .restart = ux500_restart, |
142 | .init_late = NULL, | ||
143 | MACHINE_END | 143 | MACHINE_END |