This is based on a merge of top-of-tree plus the 85xx tree and the spl framework branch (it doesn't use the SPL framework code because of size constraints, but I wanted to make sure there were no conflicts with it).
Tested on P2020RDB-PC_NAND and P1021RDB-PC_36BIT_NAND.
José Miguel Gonçalves (1): Add u-boot-pad.bin target to the Makefile
Scott Wood (16): spl: rename u-boot-pad.bin to u-boot-with-spl.bin powerpc: remove .fixup test powerpc/mpc85xx: fix TLB alignment powerpc/mpc8xxx: move LAW code into arch/powerpc/cpu/mpc8xxx spl/mpc85xx: move udelay to cpu code spl: include resetvec and lib8xxx spl/powerpc: introduce CONFIG_SPL_INIT_MINIMAL spl/85xx: new SPL support powerpc/p1_p2_rdb_pc: new SPL support spl/nand: introduce CONFIG_SPL_NAND_MINIMAL spl/nand: config symbol documentation spl/nand: Add minimal-spl driver for Freescale eLBC NAND spl: introduce CONFIG_SPL_TARGET p1_p2_rdb_pc: convert from nand_spl to new spl powerpc/mpc85xx/p2020rdb-pc: fix SPL DDR config ns16550: wait for TENT before initializing
Makefile | 24 ++- README | 32 +++- arch/powerpc/cpu/mpc85xx/Makefile | 39 +++-- arch/powerpc/cpu/mpc85xx/cpu.c | 3 +- arch/powerpc/cpu/mpc85xx/cpu_init_nand.c | 19 ++- arch/powerpc/cpu/mpc85xx/start.S | 58 ++++--- arch/powerpc/cpu/mpc85xx/tlb.c | 4 +- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 81 ++++++++++ arch/powerpc/cpu/mpc8xxx/Makefile | 17 ++ .../fsl_law.c => arch/powerpc/cpu/mpc8xxx/law.c | 11 +- arch/powerpc/lib/Makefile | 23 ++- board/freescale/p1_p2_rdb_pc/Makefile | 16 ++ board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- .../freescale/p1_p2_rdb_pc/spl_minimal.c | 3 +- board/freescale/p1_p2_rdb_pc/tlb.c | 7 +- doc/README.mpc85xx | 2 +- drivers/misc/Makefile | 1 - drivers/mtd/nand/Makefile | 41 +++-- drivers/mtd/nand/fsl_elbc_spl.c | 168 ++++++++++++++++++++ drivers/serial/ns16550.c | 3 + include/configs/p1_p2_rdb_pc.h | 74 ++++----- nand_spl/board/freescale/common.c | 40 ----- nand_spl/board/freescale/mpc8536ds/Makefile | 2 +- nand_spl/board/freescale/mpc8569mds/Makefile | 2 +- nand_spl/board/freescale/mpc8572ds/Makefile | 2 +- nand_spl/board/freescale/p1010rdb/Makefile | 8 +- nand_spl/board/freescale/p1023rds/Makefile | 8 +- nand_spl/board/freescale/p1_p2_rdb/Makefile | 2 +- nand_spl/board/freescale/p1_p2_rdb_pc/Makefile | 141 ---------------- spl/Makefile | 21 +++ 30 files changed, 542 insertions(+), 312 deletions(-) create mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds rename drivers/misc/fsl_law.c => arch/powerpc/cpu/mpc8xxx/law.c (95%) rename nand_spl/board/freescale/p1_p2_rdb_pc/nand_boot.c => board/freescale/p1_p2_rdb_pc/spl_minimal.c (97%) create mode 100644 drivers/mtd/nand/fsl_elbc_spl.c delete mode 100644 nand_spl/board/freescale/common.c delete mode 100644 nand_spl/board/freescale/p1_p2_rdb_pc/Makefile