Tom,
Please pull from u-boot-rockchip/master.
The associated Travis run (prior to a final rebase) is at
https://travis-ci.org/ptomsich/u-boot-rockchip/builds/305523168.
Thanks,
Philipp.
The following changes since commit 16fa2eb95172e63820ee5f3d4052f3362a6de84e:
ARM: dra7: Kconfig: Add thermal configs for dra7xx and am57xx (2017-11-21
08:03:39 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-rockchip.git master
for you to fetch changes up to 08790230fe80d46ff6368e0dc1e1be500ca3c4bf:
rockchip: remove duplicate CONFIG_ENV_SIZE definitions (2017-11-21 23:57:24
+0100)
----------------------------------------------------------------
Andy Yan (3):
rockchip: make boot_mode related codes reused across all platforms
rockchip: add support for enter to bootrom download mode
rockchip: check download key before bootup
Heinrich Schuchardt (1):
rockchip: spi: the symbol for Hertz is Hz
Kever Yang (5):
rockchip: boot0: align to 0x20 for armv7 '_start'
rockchip: mkimage: use spl_boot0 for all Rockchip SoCs
rockchip: rk3288: use aligned address for SPL_TEXT_BASE
rockchip: sysreset: merge into one common driver
rockchip: clock: update sysreset driver binding
Philipp Tomsich (17):
arm: boot0 hook: move boot0 hook before '_start'
rockchip: enable boot0-hook for all Rockchip SoCs
rockchip: rk3036: use aligned address for SPL_TEXT_BASE
socfpga: boot0 hook: adjust to unified boot0 semantics
bcm235xx: boot0 hook: adjust to unified boot0 semantics
bcm281xx: boot0 hook: adjust to unified boot0 semantics
rockchip: boot0 hook: support early return for RK3188/RK3066-style BROM
arm: make save_boot_params_ret prototype visible for AArch64
arm: mark save_boot_params_ret as a function
arm: provide a PCS-compliant setjmp implementation
rockchip: back-to-bootrom: replace assembly-implementation with C-code
rockchip: rk3188: use boot0 hook to load up SPL in 2 steps
rockchip: back-to-bootrom: allow passing a cmd to the bootrom
rockchip: rk3188: move CONFIG_SPL_* entries from rk3188_common.h to
Kconfig
rockchip: mkimage: remove unused code-paths (spl_boot0 is now implied)
rockchip: sysreset: update Makefile to work with merged sysreset driver
rockchip: remove duplicate CONFIG_ENV_SIZE definitions
arch/arm/Kconfig | 1 +
arch/arm/cpu/armv7/start.S | 1 +
arch/arm/include/asm/arch-bcm235xx/boot0.h | 2 ++
arch/arm/include/asm/arch-bcm281xx/boot0.h | 2 ++
arch/arm/include/asm/arch-rockchip/boot0.h | 38
++++++++++++++++++++++++++++++--------
arch/arm/include/asm/arch-rockchip/boot_mode.h | 6 ++++++
arch/arm/include/asm/arch-rockchip/bootrom.h | 30
+++++++++++++++++++++++-------
arch/arm/include/asm/arch-rockchip/clock.h | 5 +++++
arch/arm/include/asm/setjmp.h | 94
+++++++++++++---------------------------------------------------------------------------------
arch/arm/include/asm/system.h | 62
+++++++++++++++++++++++++++++++-------------------------------
arch/arm/lib/Makefile | 6 ++++++
arch/arm/lib/setjmp.S | 37
+++++++++++++++++++++++++++++++++++++
arch/arm/lib/setjmp_aarch64.S | 42
++++++++++++++++++++++++++++++++++++++++++
arch/arm/lib/vectors.S | 54
+++++++++++++++++++++++++++++++++++-------------------
arch/arm/mach-rockchip/Kconfig | 55
+++++++++++++++++++++++++++++++++++++++++++++++++++----
arch/arm/mach-rockchip/Makefile | 11 ++++++++---
arch/arm/mach-rockchip/boot_mode.c | 76
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/arm/mach-rockchip/bootrom.c | 97
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
arch/arm/mach-rockchip/rk3036-board-spl.c | 2 +-
arch/arm/mach-rockchip/rk3036-board.c | 24 ------------------------
arch/arm/mach-rockchip/rk3188-board-spl.c | 14 ++------------
arch/arm/mach-rockchip/rk3188-board-tpl.c | 86
--------------------------------------------------------------------------------------
arch/arm/mach-rockchip/rk3188-board.c | 1 +
arch/arm/mach-rockchip/rk322x-board-spl.c | 2 +-
arch/arm/mach-rockchip/rk322x-board.c | 24 ------------------------
arch/arm/mach-rockchip/rk3288-board-spl.c | 4 ++--
arch/arm/mach-rockchip/rk3288-board-tpl.c | 2 +-
arch/arm/mach-rockchip/rk3288-board.c | 25 -------------------------
arch/arm/mach-rockchip/rk3368-board-tpl.c | 2 +-
arch/arm/mach-rockchip/rk3399-board-spl.c | 2 +-
arch/arm/mach-rockchip/rk3399-board.c | 14 ++++++++++++++
arch/arm/mach-rockchip/save_boot_param.S | 69
---------------------------------------------------------------------
arch/arm/mach-socfpga/include/mach/boot0.h | 3 +++
doc/README.rockchip | 10 +++++-----
drivers/clk/rockchip/clk_rk3036.c | 17 ++++++++++++++---
drivers/clk/rockchip/clk_rk3188.c | 17 ++++++++++++++---
drivers/clk/rockchip/clk_rk322x.c | 17 ++++++++++++++---
drivers/clk/rockchip/clk_rk3288.c | 17 ++++++++++++++---
drivers/clk/rockchip/clk_rk3328.c | 17 ++++++++++++++---
drivers/clk/rockchip/clk_rk3368.c | 17 ++++++++++++++---
drivers/clk/rockchip/clk_rk3399.c | 17 ++++++++++++++---
drivers/clk/rockchip/clk_rv1108.c | 17 ++++++++++++++---
drivers/spi/rk_spi.c | 2 +-
drivers/sysreset/Makefile | 11 +----------
drivers/sysreset/sysreset_rk3036.c | 45
---------------------------------------------
drivers/sysreset/sysreset_rk3188.c | 62
--------------------------------------------------------------
drivers/sysreset/sysreset_rk322x.c | 45
---------------------------------------------
drivers/sysreset/sysreset_rk3288.c | 47
-----------------------------------------------
drivers/sysreset/sysreset_rk3328.c | 45
---------------------------------------------
drivers/sysreset/sysreset_rk3368.c | 62
--------------------------------------------------------------
drivers/sysreset/sysreset_rk3399.c | 45
---------------------------------------------
drivers/sysreset/sysreset_rockchip.c | 47
+++++++++++++++++++++++++++++++++++++++++++++++
drivers/sysreset/sysreset_rv1108.c | 46
----------------------------------------------
include/configs/evb_px5.h | 2 --
include/configs/geekbox.h | 2 --
include/configs/rk3036_common.h | 2 +-
include/configs/rk3188_common.h | 18 +++---------------
include/configs/rk3288_common.h | 2 +-
include/configs/rv1108_common.h | 1 -
tools/rkcommon.c | 45
++++++++++++++-------------------------------
60 files changed, 676 insertions(+), 892 deletions(-)
create mode 100644 arch/arm/lib/setjmp.S
create mode 100644 arch/arm/lib/setjmp_aarch64.S
create mode 100644 arch/arm/mach-rockchip/boot_mode.c
delete mode 100644 arch/arm/mach-rockchip/rk3188-board-tpl.c
create mode 100644 arch/arm/mach-rockchip/rk3399-board.c
delete mode 100644 arch/arm/mach-rockchip/save_boot_param.S
delete mode 100644 drivers/sysreset/sysreset_rk3036.c
delete mode 100644 drivers/sysreset/sysreset_rk3188.c
delete mode 100644 drivers/sysreset/sysreset_rk322x.c
delete mode 100644 drivers/sysreset/sysreset_rk3288.c
delete mode 100644 drivers/sysreset/sysreset_rk3328.c
delete mode 100644 drivers/sysreset/sysreset_rk3368.c
delete mode 100644 drivers/sysreset/sysreset_rk3399.c
create mode 100644 drivers/sysreset/sysreset_rockchip.c
delete mode 100644 drivers/sysreset/sysreset_rv1108.c
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
