> diff --git a/cpu/mpc83xx/start.S b/cpu/mpc83xx/start.S
> index 309eb30..39bcaa8 100644
> --- a/cpu/mpc83xx/start.S
> +++ b/cpu/mpc83xx/start.S
> @@ -63,6 +63,9 @@
>   * Use r14 to access the GOT
>   */
>       START_GOT
> +#if defined(CONFIG_NAND_SPL)
> +     GOT_ENTRY(_GOT_TABLE_)
> +#else
>       GOT_ENTRY(_GOT2_TABLE_)
>       GOT_ENTRY(_FIXUP_TABLE_)
> 
> @@ -74,6 +77,7 @@
>       GOT_ENTRY(__init_end)
>       GOT_ENTRY(_end)
>       GOT_ENTRY(__bss_start)
> +#endif /* CONFIG_NAND_SPL */
>       END_GOT
> 
> [Dave] I strongly suggest we create one lite new start.S for the NAND boot,
>        not modify the original start.S

I'd prefer otherwise, if we can keep the #ifdeffing to a minimum.

[Dave] The new start.S for NAND boot should be very lite. same things
for 85xx/86xx, creating new start.S for e500/e600 for NAND boot.
I don't like some much #ifdefine n the start.S which has not good readable.