Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 52ebd9c1e5db30c0392c0c6761c98252918dd624

Authored by Peter Tyser
Committed by Wolfgang Denk
1 parent 3792d7436e
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

powerpc: Remove warm reset entry point 

No boards utilize the warm reset entry point, so remove it.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

Showing 12 changed files with 25 additions and 137 deletions Side-by-side Diff

arch/powerpc/cpu/74xx_7xx/start.S
Diff comments   View file @ 52ebd9c
... ... @@ -94,18 +94,8 @@
94 94 . = EXC_OFF_SYS_RESET
95 95 .globl _start
96 96 _start:
97   - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
98 97 b boot_cold
99   - sync
100 98  
101   - . = EXC_OFF_SYS_RESET + 0x10
102   -
103   - .globl _start_warm
104   -_start_warm:
105   - li r21, BOOTFLAG_WARM /* Software reboot */
106   - b boot_warm
107   - sync
108   -
109 99 /* the boot code is located below the exception table */
110 100  
111 101 .globl _start_of_vectors
... ... @@ -188,7 +178,6 @@
188 178 . = 0x2000
189 179  
190 180 boot_cold:
191   -boot_warm:
192 181 /* disable everything */
193 182 li r0, 0
194 183 mtspr HID0, r0
195 184  
... ... @@ -288,14 +277,11 @@
288 277 bl cpu_init_f
289 278 sync
290 279  
291   - mr r3, r21
292   -
293   - /* r3: BOOTFLAG */
294 280 /* run 1st part of board init code (from Flash) */
295 281 bl board_init_f
296 282 sync
297 283  
298   - /* NOTREACHED */
  284 + /* NOTREACHED - board_init_f() does not return */
299 285  
300 286 .globl invalidate_bats
301 287 invalidate_bats:
arch/powerpc/cpu/mpc512x/start.S
Diff comments   View file @ 52ebd9c
... ... @@ -100,7 +100,6 @@
100 100 .globl _start
101 101 /* Start from here after reset/power on */
102 102 _start:
103   - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
104 103 b boot_cold
105 104  
106 105 .globl _start_of_vectors
... ... @@ -260,8 +259,6 @@
260 259 /* run low-level CPU init code (in Flash) */
261 260 bl cpu_init_f
262 261  
263   - /* r3: BOOTFLAG */
264   - mr r3, r21
265 262 /* run 1st part of board init code (in Flash) */
266 263 bl board_init_f
267 264  
arch/powerpc/cpu/mpc5xx/start.S
Diff comments   View file @ 52ebd9c
... ... @@ -91,19 +91,7 @@
91 91 li r4, CONFIG_SYS_ISB /* Set ISB bit */
92 92 or r3, r3, r4
93 93 mtspr 638, r3
94   - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
95   - b boot_cold
96 94  
97   - . = EXC_OFF_SYS_RESET + 0x20
98   -
99   - .globl _start_warm
100   -_start_warm:
101   - li r21, BOOTFLAG_WARM /* Software reboot */
102   - b boot_warm
103   -
104   -boot_cold:
105   -boot_warm:
106   -
107 95 /* Initialize machine status; enable machine check interrupt */
108 96 /*----------------------------------------------------------------------*/
109 97 li r3, MSR_KERNEL /* Set ME, RI flags */
110 98  
... ... @@ -188,9 +176,9 @@
188 176 /* r3: IMMR */
189 177 bl cpu_init_f /* run low-level CPU init code (from Flash) */
190 178  
191   - mr r3, r21
192   - /* r3: BOOTFLAG */
193 179 bl board_init_f /* run 1st part of board init code (from Flash) */
  180 +
  181 + /* NOTREACHED - board_init_f() does not return */
194 182  
195 183  
196 184 .globl _start_of_vectors
arch/powerpc/cpu/mpc5xxx/start.S
Diff comments   View file @ 52ebd9c
... ... @@ -89,19 +89,6 @@
89 89 . = EXC_OFF_SYS_RESET
90 90 .globl _start
91 91 _start:
92   - li r21, BOOTFLAG_COLD /* Normal Power-On */
93   - nop
94   - b boot_cold
95   -
96   - . = EXC_OFF_SYS_RESET + 0x10
97   -
98   - .globl _start_warm
99   -_start_warm:
100   - li r21, BOOTFLAG_WARM /* Software reboot */
101   - b boot_warm
102   -
103   -boot_cold:
104   -boot_warm:
105 92 mfmsr r5 /* save msr contents */
106 93  
107 94 /* Move CSBoot and adjust instruction pointer */
108 95  
... ... @@ -175,9 +162,9 @@
175 162 /* r3: IMMR */
176 163 bl cpu_init_f /* run low-level CPU init code (in Flash)*/
177 164  
178   - mr r3, r21
179   - /* r3: BOOTFLAG */
180 165 bl board_init_f /* run 1st part of board init code (in Flash)*/
  166 +
  167 + /* NOTREACHED - board_init_f() does not return */
181 168  
182 169 /*
183 170 * Vector Table
arch/powerpc/cpu/mpc8220/start.S
Diff comments   View file @ 52ebd9c
... ... @@ -88,19 +88,6 @@
88 88 . = EXC_OFF_SYS_RESET
89 89 .globl _start
90 90 _start:
91   - li r21, BOOTFLAG_COLD /* Normal Power-On */
92   - nop
93   - b boot_cold
94   -
95   - . = EXC_OFF_SYS_RESET + 0x10
96   -
97   - .globl _start_warm
98   -_start_warm:
99   - li r21, BOOTFLAG_WARM /* Software reboot */
100   - b boot_warm
101   -
102   -boot_cold:
103   -boot_warm:
104 91 mfmsr r5 /* save msr contents */
105 92  
106 93 /* replace default MBAR base address from 0x80000000
107 94  
... ... @@ -144,9 +131,9 @@
144 131 /* r3: IMMR */
145 132 bl cpu_init_f /* run low-level CPU init code (in Flash)*/
146 133  
147   - mr r3, r21
148   - /* r3: BOOTFLAG */
149 134 bl board_init_f /* run 1st part of board init code (in Flash)*/
  135 +
  136 + /* NOTREACHED - board_init_f() does not return */
150 137  
151 138 /*
152 139 * Vector Table
arch/powerpc/cpu/mpc824x/start.S
Diff comments   View file @ 52ebd9c
... ... @@ -97,19 +97,6 @@
97 97 . = EXC_OFF_SYS_RESET
98 98 .globl _start
99 99 _start:
100   - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
101   - b boot_cold
102   -
103   - . = EXC_OFF_SYS_RESET + 0x10
104   -
105   - .globl _start_warm
106   -_start_warm:
107   - li r21, BOOTFLAG_WARM /* Software reboot */
108   - b boot_warm
109   -
110   -boot_cold:
111   -boot_warm:
112   -
113 100 /* Initialize machine status; enable machine check interrupt */
114 101 /*----------------------------------------------------------------------*/
115 102 li r3, MSR_KERNEL /* Set FP, ME, RI flags */
116 103  
... ... @@ -198,9 +185,9 @@
198 185 /* r3: IMMR */
199 186 bl cpu_init_f /* run low-level CPU init code (from Flash) */
200 187  
201   - mr r3, r21
202   - /* r3: BOOTFLAG */
203 188 bl board_init_f /* run 1st part of board init code (from Flash) */
  189 +
  190 + /* NOTREACHED - board_init_f() does not return */
204 191  
205 192  
206 193 .globl _start_of_vectors
arch/powerpc/cpu/mpc8260/start.S
Diff comments   View file @ 52ebd9c
... ... @@ -161,18 +161,6 @@
161 161  
162 162 .globl _start
163 163 _start:
164   - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH*/
165   - nop
166   - b boot_cold
167   -
168   - . = EXC_OFF_SYS_RESET + 0x10
169   -
170   - .globl _start_warm
171   -_start_warm:
172   - li r21, BOOTFLAG_WARM /* Software reboot */
173   - b boot_warm
174   -
175   -boot_cold:
176 164 #if defined(CONFIG_MPC8260ADS) && defined(CONFIG_SYS_DEFAULT_IMMR)
177 165 lis r3, CONFIG_SYS_DEFAULT_IMMR@h
178 166 nop
... ... @@ -185,7 +173,7 @@
185 173 stw r4, 0(r3)
186 174 nop
187 175 #endif /* CONFIG_MPC8260ADS && CONFIG_SYS_DEFAULT_IMMR */
188   -boot_warm:
  176 +
189 177 mfmsr r5 /* save msr contents */
190 178  
191 179 #if defined(CONFIG_COGENT)
192 180  
... ... @@ -254,9 +242,9 @@
254 242 bl init_debug /* set up debugging stuff */
255 243 #endif
256 244  
257   - mr r3, r21
258   - /* r3: BOOTFLAG */
259 245 bl board_init_f /* run 1st part of board init code (in Flash)*/
  246 +
  247 + /* NOTREACHED - board_init_f() does not return */
260 248  
261 249 /*
262 250 * Vector Table
arch/powerpc/cpu/mpc83xx/start.S
Diff comments   View file @ 52ebd9c
... ... @@ -183,22 +183,9 @@
183 183  
184 184 .globl _start
185 185 _start: /* time t 0 */
186   - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH*/
187   - nop
188   - b boot_cold
189   -
190   - . = EXC_OFF_SYS_RESET + 0x10
191   -
192   - .globl _start_warm
193   -_start_warm:
194   - li r21, BOOTFLAG_WARM /* Software reboot */
195   - b boot_warm
196   -
197   -
198   -boot_cold: /* time t 3 */
199 186 lis r4, CONFIG_DEFAULT_IMMR@h
200 187 nop
201   -boot_warm: /* time t 5 */
  188 +
202 189 mfmsr r5 /* save msr contents */
203 190  
204 191 /* 83xx manuals prescribe a specific sequence for updating IMMRBAR. */
205 192  
... ... @@ -302,10 +289,10 @@
302 289 /* run low-level CPU init code (in Flash)*/
303 290 bl cpu_init_f
304 291  
305   - /* r3: BOOTFLAG */
306   - mr r3, r21
307 292 /* run 1st part of board init code (in Flash)*/
308 293 bl board_init_f
  294 +
  295 + /* NOTREACHED - board_init_f() does not return */
309 296  
310 297 #ifndef CONFIG_NAND_SPL
311 298 /*
arch/powerpc/cpu/mpc85xx/start.S
Diff comments   View file @ 52ebd9c
... ... @@ -432,6 +432,8 @@
432 432 bl board_init_f
433 433 isync
434 434  
  435 + /* NOTREACHED - board_init_f() does not return */
  436 +
435 437 #ifndef CONFIG_NAND_SPL
436 438 . = EXC_OFF_SYS_RESET
437 439 .globl _start_of_vectors
arch/powerpc/cpu/mpc86xx/start.S
Diff comments   View file @ 52ebd9c
... ... @@ -83,18 +83,8 @@
83 83 . = EXC_OFF_SYS_RESET
84 84 .globl _start
85 85 _start:
86   - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
87 86 b boot_cold
88   - sync
89 87  
90   - . = EXC_OFF_SYS_RESET + 0x10
91   -
92   - .globl _start_warm
93   -_start_warm:
94   - li r21, BOOTFLAG_WARM /* Software reboot */
95   - b boot_warm
96   - sync
97   -
98 88 /* the boot code is located below the exception table */
99 89  
100 90 .globl _start_of_vectors
... ... @@ -166,7 +156,6 @@
166 156 . = 0x2000
167 157  
168 158 boot_cold:
169   -boot_warm:
170 159 /*
171 160 * NOTE: Only Cpu 0 will ever come here. Other cores go to an
172 161 * address specified by the BPTR
173 162  
174 163  
... ... @@ -303,14 +292,12 @@
303 292 #endif
304 293  
305 294 /* bl l2cache_enable */
306   - mr r3, r21
307 295  
308   - /* r3: BOOTFLAG */
309 296 /* run 1st part of board init code (from Flash) */
310 297 bl board_init_f
311 298 sync
312 299  
313   - /* NOTREACHED */
  300 + /* NOTREACHED - board_init_f() does not return */
314 301  
315 302 .globl invalidate_bats
316 303 invalidate_bats:
arch/powerpc/cpu/mpc8xx/start.S
Diff comments   View file @ 52ebd9c
... ... @@ -96,19 +96,7 @@
96 96 _start:
97 97 lis r3, CONFIG_SYS_IMMR@h /* position IMMR */
98 98 mtspr 638, r3
99   - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
100   - b boot_cold
101 99  
102   - . = EXC_OFF_SYS_RESET + 0x10
103   -
104   - .globl _start_warm
105   -_start_warm:
106   - li r21, BOOTFLAG_WARM /* Software reboot */
107   - b boot_warm
108   -
109   -boot_cold:
110   -boot_warm:
111   -
112 100 /* Initialize machine status; enable machine check interrupt */
113 101 /*----------------------------------------------------------------------*/
114 102 li r3, MSR_KERNEL /* Set ME, RI flags */
115 103  
... ... @@ -202,9 +190,9 @@
202 190 /* r3: IMMR */
203 191 bl cpu_init_f /* run low-level CPU init code (from Flash) */
204 192  
205   - mr r3, r21
206   - /* r3: BOOTFLAG */
207 193 bl board_init_f /* run 1st part of board init code (from Flash) */
  194 +
  195 + /* NOTREACHED - board_init_f() does not return */
208 196  
209 197  
210 198 .globl _start_of_vectors
arch/powerpc/cpu/ppc4xx/start.S
Diff comments   View file @ 52ebd9c
... ... @@ -261,6 +261,7 @@
261 261 GET_GOT
262 262 bl cpu_init_f /* run low-level CPU init code (from Flash) */
263 263 bl board_init_f
  264 + /* NOTREACHED - board_init_f() does not return */
264 265 #endif
265 266  
266 267 #if defined(CONFIG_SYS_RAMBOOT)
... ... @@ -803,6 +804,7 @@
803 804  
804 805 bl cpu_init_f /* run low-level CPU init code (from Flash) */
805 806 bl board_init_f
  807 + /* NOTREACHED - board_init_f() does not return */
806 808 #endif
807 809  
808 810 #endif /* CONFIG_440 */
... ... @@ -911,6 +913,7 @@
911 913 GET_GOT /* initialize GOT access */
912 914  
913 915 bl board_init_f /* run first part of init code (from Flash) */
  916 + /* NOTREACHED - board_init_f() does not return */
914 917  
915 918 #endif /* CONFIG_IOP480 */
916 919  
917 920  
... ... @@ -1180,8 +1183,9 @@
1180 1183  
1181 1184 bl cpu_init_f /* run low-level CPU init code (from Flash) */
1182 1185  
1183   - /* NEVER RETURNS! */
1184 1186 bl board_init_f /* run first part of init code (from Flash) */
  1187 + /* NOTREACHED - board_init_f() does not return */
  1188 +
1185 1189 #endif /* CONFIG_NAND_SPL */
1186 1190  
1187 1191 #endif /* CONFIG_405GP || CONFIG_405CR || CONFIG_405 || CONFIG_405EP */