Discussion:
[U-Boot] Please pull u-boot-marvell/master
Chris Packham
2018-12-09 21:44:26 UTC
Permalink
Hi Tom, Stefan,
Hi Tom,
----------------------------------------------------------------
- Sync DDR training with Marvell code for Armada 38x by Chris
- Misc updates to Armada 38x Helios4 board by Aditya
----------------------------------------------------------------
Thanks,
Stefan
Merge branch '2018-12-06-master-imports' (2018-12-07 10:55:12 -0500)
git://www.denx.de/git/u-boot-marvell.git
arm: mvebu: helios4: Reset uSOM onboard phy during board init (2018-12-08 16:19:41 +0100)
----------------------------------------------------------------
arm: mvebu: helios4: mmc: move environment before 1M
arm: mvebu: helios4: Enable I2C and IO Expander
arm: mvebu: helios4: Enable mvebu GPIO
arm: mvebu: helios4: Reduce U-Boot image size
arm: mvebu: helios4: Enable SPI flash support
arm: mvebu: helios4: Reset uSOM onboard phy during board init
ARM: mvebu: a38x: sync ddr training code with mv_ddr-armada-18.09.02
I just noticed I managed to delete the license from 2 of the files.
I've just posted a patch to correct this [1]. I'm not sure if you want
Stefan to squash it into the original and re-submit or just apply it
directly to u-boot master. Sorry for the hassle.

[1] - http://patchwork.ozlabs.org/patch/1010175/
arch/arm/dts/armada-388-helios4-u-boot.dtsi | 22 +
board/CZ.NIC/turris_omnia/turris_omnia.c | 4 +-
board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 2 +-
board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 2 +-
board/gdsys/a38x/controlcenterdc.c | 2 +-
board/kobol/helios4/helios4.c | 34 +-
board/solidrun/clearfog/clearfog.c | 2 +-
configs/helios4_defconfig | 13 +-
drivers/ddr/marvell/a38x/ddr3_debug.c | 414 ++----------------
drivers/ddr/marvell/a38x/ddr3_init.c | 91 +---
drivers/ddr/marvell/a38x/ddr3_init.h | 43 +-
drivers/ddr/marvell/a38x/ddr3_topology_def.h | 78 ----
drivers/ddr/marvell/a38x/ddr3_training.c | 484 +++++++++++----------
drivers/ddr/marvell/a38x/ddr3_training_bist.c | 1 +
.../marvell/a38x/ddr3_training_centralization.c | 3 +
drivers/ddr/marvell/a38x/ddr3_training_db.c | 172 +++++---
drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c | 1 +
drivers/ddr/marvell/a38x/ddr3_training_ip.h | 38 --
drivers/ddr/marvell/a38x/ddr3_training_ip_def.h | 31 --
drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c | 2 +
drivers/ddr/marvell/a38x/ddr3_training_ip_engine.h | 1 +
drivers/ddr/marvell/a38x/ddr3_training_ip_flow.h | 91 +---
drivers/ddr/marvell/a38x/ddr3_training_ip_prv_if.h | 10 +-
drivers/ddr/marvell/a38x/ddr3_training_leveling.c | 75 ++--
drivers/ddr/marvell/a38x/ddr3_training_leveling.h | 1 -
drivers/ddr/marvell/a38x/ddr3_training_pbs.c | 7 +-
drivers/ddr/marvell/a38x/ddr_topology_def.h | 107 ++++-
drivers/ddr/marvell/a38x/ddr_training_ip_db.h | 2 -
drivers/ddr/marvell/a38x/dram_if.h | 13 +
drivers/ddr/marvell/a38x/mv_ddr_build_message.c | 2 +-
drivers/ddr/marvell/a38x/mv_ddr_common.h | 38 +-
drivers/ddr/marvell/a38x/mv_ddr_plat.c | 181 ++++----
drivers/ddr/marvell/a38x/mv_ddr_plat.h | 12 +-
drivers/ddr/marvell/a38x/mv_ddr_regs.h | 19 +
drivers/ddr/marvell/a38x/mv_ddr_spd.c | 16 +-
drivers/ddr/marvell/a38x/mv_ddr_topology.c | 215 +++++++--
drivers/ddr/marvell/a38x/mv_ddr_topology.h | 214 ++++++++-
drivers/ddr/marvell/a38x/mv_ddr_training_db.h | 40 ++
drivers/ddr/marvell/a38x/xor.c | 8 +-
include/configs/helios4.h | 48 +-
40 files changed, 1227 insertions(+), 1312 deletions(-)
create mode 100644 arch/arm/dts/armada-388-helios4-u-boot.dtsi
delete mode 100644 drivers/ddr/marvell/a38x/ddr3_topology_def.h
create mode 100644 drivers/ddr/marvell/a38x/dram_if.h
create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_training_db.h
_______________________________________________
U-Boot mailing list
https://lists.denx.de/listinfo/u-boot
Tom Rini
2018-12-09 22:11:01 UTC
Permalink
Post by Chris Packham
Hi Tom,
Applied to u-boot/master, thanks!
--
Tom
Loading...