On 08/13/2018 09:33 AM, Simon Goldschmidt wrote:
Socfpga gen5 SPL has been broken since moving to DM serial with v2018.07. Also, U-Boot console output has been broken since then. This series fixes this and makes some related small improvements.
Changes in v3:
- moved uart0's "u-boot,dm-pre-reloc;" from socfpga.dtsi to board specific dts files since this can change per board
- added patches 5-7 to boot SPL and U-Boot from fpga OnChip RAM
- dropped Patch 5/6 "serial: ns16550: fix debug uart putc called before init" (this needs a more generic fix)
Changes in v2:
- Improved comment on patch 1
- Removing gd->malloc_base assignment at the end of board_init_f() moved to an extra patch
- don't change printf() to debug() in reset_manager_gen5.c socfpga_bridges_reset() (instead make debug uart handle this)
- make ns16550 debug uart handle putc being called before init
- removed the assignment of gd->malloc_limit from board_init()
Simon Goldschmidt (8): arm: socfpga: fix SPL on gen5 after moving to DM serial arm: socfpga: fix device trees to work with DM serial arm: socfpga: spl_gen5: clean up malloc_base assignment arm: socfpga: cyclone5: handle debug uart arm: socfpga: fix U-Boot running from fpga OnChip RAM arm: socfpga: gen5: combine some init code for SPL and U-Boot arm: socfpga: fix SPL booting from fpga OnChip RAM malloc_simple: calloc: don't call memset if malloc failed
arch/arm/dts/socfpga_arria5_socdk.dts | 5 ++ arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts | 5 ++ .../arm/dts/socfpga_cyclone5_de0_nano_soc.dts | 5 ++ arch/arm/dts/socfpga_cyclone5_de10_nano.dts | 5 ++ arch/arm/dts/socfpga_cyclone5_de1_soc.dts | 5 ++ arch/arm/dts/socfpga_cyclone5_is1.dts | 5 ++ arch/arm/dts/socfpga_cyclone5_socdk.dts | 5 ++ arch/arm/dts/socfpga_cyclone5_sockit.dts | 5 ++ arch/arm/dts/socfpga_cyclone5_socrates.dts | 5 ++ arch/arm/dts/socfpga_cyclone5_sr1500.dts | 2 + arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 5 ++ arch/arm/mach-socfpga/Kconfig | 12 +++++ arch/arm/mach-socfpga/include/mach/misc.h | 4 ++ arch/arm/mach-socfpga/misc_gen5.c | 40 +++++++++------ arch/arm/mach-socfpga/spl_gen5.c | 49 ++++++------------- common/malloc_simple.c | 3 +- include/configs/socfpga_common.h | 13 +++++ 17 files changed, 125 insertions(+), 48 deletions(-)
I applied some of this to u-boot-socfpga/master , so you dont have to repost those.