---
 cpu/mpc83xx/start.S |  310
++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 220 insertions(+), 90 deletions(-)

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