Commit 66f30bf983bdc82a799d019401a88bfc720a5a05
Committed by
Albert ARIBAUD
Albert ARIBAUD
1 parent
e53232250b
Exists in
master
and in
53 other branches
arm: Remove deprecated and now unused NAND SPL
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Showing 3 changed files with 6 additions and 24 deletions Side-by-side Diff
arch/arm/config.mk
arch/arm/cpu/arm1176/start.S
| ... | ... | @@ -51,7 +51,7 @@ |
| 51 | 51 | |
| 52 | 52 | .globl _start |
| 53 | 53 | _start: b reset |
| 54 | -#ifndef CONFIG_NAND_SPL | |
| 54 | +#ifndef CONFIG_SPL_BUILD | |
| 55 | 55 | ldr pc, _undefined_instruction |
| 56 | 56 | ldr pc, _software_interrupt |
| 57 | 57 | ldr pc, _prefetch_abort |
| 58 | 58 | |
| ... | ... | @@ -98,15 +98,11 @@ |
| 98 | 98 | |
| 99 | 99 | .globl _TEXT_BASE |
| 100 | 100 | _TEXT_BASE: |
| 101 | -#ifdef CONFIG_NAND_SPL /* deprecated, use instead CONFIG_SPL_BUILD */ | |
| 102 | - .word CONFIG_SYS_TEXT_BASE | |
| 103 | -#else | |
| 104 | 101 | #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) |
| 105 | 102 | .word CONFIG_SPL_TEXT_BASE |
| 106 | 103 | #else |
| 107 | 104 | .word CONFIG_SYS_TEXT_BASE |
| 108 | 105 | #endif |
| 109 | -#endif | |
| 110 | 106 | |
| 111 | 107 | /* |
| 112 | 108 | * Below variable is very important because we use MMU in U-Boot. |
| ... | ... | @@ -176,7 +172,7 @@ |
| 176 | 172 | * When booting from NAND - it has definitely been a reset, so, no need |
| 177 | 173 | * to flush caches and disable the MMU |
| 178 | 174 | */ |
| 179 | -#ifndef CONFIG_NAND_SPL | |
| 175 | +#ifndef CONFIG_SPL_BUILD | |
| 180 | 176 | /* |
| 181 | 177 | * flush v4 I/D caches |
| 182 | 178 | */ |
| ... | ... | @@ -361,7 +357,7 @@ |
| 361 | 357 | |
| 362 | 358 | mov pc, lr |
| 363 | 359 | |
| 364 | -#ifndef CONFIG_NAND_SPL | |
| 360 | +#ifndef CONFIG_SPL_BUILD | |
| 365 | 361 | /* |
| 366 | 362 | * we assume that cache operation is done before. (eg. cleanup_before_linux()) |
| 367 | 363 | * actually, we don't need to do anything about cache if not use d-cache in |
| ... | ... | @@ -539,5 +535,5 @@ |
| 539 | 535 | get_bad_stack |
| 540 | 536 | bad_save_user_regs |
| 541 | 537 | bl do_fiq |
| 542 | -#endif /* CONFIG_NAND_SPL */ | |
| 538 | +#endif /* CONFIG_SPL_BUILD */ |
arch/arm/lib/crt0.S
| ... | ... | @@ -64,7 +64,7 @@ |
| 64 | 64 | * have some work left to do at this point regarding memory, so |
| 65 | 65 | * call c_runtime_cpu_setup. |
| 66 | 66 | * |
| 67 | - * 6. Branch to either nand_boot() or board_init_r(). | |
| 67 | + * 6. Branch to board_init_r(). | |
| 68 | 68 | */ |
| 69 | 69 | |
| 70 | 70 | /* |
| ... | ... | @@ -77,10 +77,7 @@ |
| 77 | 77 | * Set up initial C runtime environment and call board_init_f(0). |
| 78 | 78 | */ |
| 79 | 79 | |
| 80 | -#if defined(CONFIG_NAND_SPL) | |
| 81 | - /* deprecated, use instead CONFIG_SPL_BUILD */ | |
| 82 | - ldr sp, =(CONFIG_SYS_INIT_SP_ADDR) | |
| 83 | -#elif defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK) | |
| 80 | +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK) | |
| 84 | 81 | ldr sp, =(CONFIG_SPL_STACK) |
| 85 | 82 | #else |
| 86 | 83 | ldr sp, =(CONFIG_SYS_INIT_SP_ADDR) |
| 87 | 84 | |
| ... | ... | @@ -129,20 +126,11 @@ |
| 129 | 126 | bl coloured_LED_init |
| 130 | 127 | bl red_led_on |
| 131 | 128 | |
| 132 | -#if defined(CONFIG_NAND_SPL) | |
| 133 | - | |
| 134 | - /* call _nand_boot() */ | |
| 135 | - ldr pc, =nand_boot | |
| 136 | - | |
| 137 | -#else | |
| 138 | - | |
| 139 | 129 | /* call board_init_r(gd_t *id, ulong dest_addr) */ |
| 140 | 130 | mov r0, r8 /* gd_t */ |
| 141 | 131 | ldr r1, [r8, #GD_RELOCADDR] /* dest_addr */ |
| 142 | 132 | /* call board_init_r */ |
| 143 | 133 | ldr pc, =board_init_r /* this is auto-relocated! */ |
| 144 | - | |
| 145 | -#endif | |
| 146 | 134 | |
| 147 | 135 | /* we should not return here. */ |
| 148 | 136 |