| Message ID | C8F048E6-4972-43BE-ABE3-FD2572D0947A@theobroma-systems.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,PULL] Please pull u-boot-rockchip/master | expand |
On Sun, Nov 26, 2017 at 09:42:21PM +0100, Dr. Philipp Tomsich wrote: > Tom, > > Please pull u-boot-rockchip/master. > > This finally merges the SPL-changes for improved ATF support that > had been in the works since 2 merge-windows ago. Plus, there’s a > few fixes to platform-support (e.g. pinctrl on the RK3399) and for > some recently merged patches that had unexpected side-effects. > > The matching travis run for this P/R is > https://travis-ci.org/ptomsich/u-boot-rockchip/builds/307490625 > > Thanks, > Philipp. > > > The following changes since commit 93a51d301ad051ec6f8c6016862c7719b8b434d3: > > Merge git://git.denx.de/u-boot-arc (2017-11-24 11:45:15 -0500) > > are available in the git repository at: > > git://git.denx.de/u-boot-rockchip.git master > > for you to fetch changes up to e5ee24dda20af5dc87971b497268f9fb1c83027e: > > rockchip: defconfig: puma-rk3399: bypass ADC-based boot_mode check (2017-11-26 14:59:38 +0100) > Applied to u-boot/master, thanks!
Tom, Please pull u-boot-rockchip/master. This finally merges the SPL-changes for improved ATF support that had been in the works since 2 merge-windows ago. Plus, there’s a few fixes to platform-support (e.g. pinctrl on the RK3399) and for some recently merged patches that had unexpected side-effects. The matching travis run for this P/R is https://travis-ci.org/ptomsich/u-boot-rockchip/builds/307490625 Thanks, Philipp. The following changes since commit 93a51d301ad051ec6f8c6016862c7719b8b434d3: Merge git://git.denx.de/u-boot-arc (2017-11-24 11:45:15 -0500) are available in the git repository at: git://git.denx.de/u-boot-rockchip.git master for you to fetch changes up to e5ee24dda20af5dc87971b497268f9fb1c83027e: rockchip: defconfig: puma-rk3399: bypass ADC-based boot_mode check (2017-11-26 14:59:38 +0100) ---------------------------------------------------------------- Philipp Tomsich (19): image: add IH_OS_ARM_TRUSTED_FIRMWARE for ARM Trusted Firmware spl: add a fdt_addr field to spl_image_info spl: change load_addr and entry_point to uintptr_t spl: fit: simplify logic for FDT loading for non-OS boots spl: fit: implement fdt_record_loadable spl: fit: implement recording of loadables into /fit-images spl: atf: introduce spl_invoke_atf and make bl31_entry private spl: rename config item SPL_ATF_SUPPORT to SPL_ATF spl: atf: drop the SPL_ATF_TEXT_BASE configuration item rockchip: defconfig: firefly-rk3399: sync up with SPL changes for ATF rockchip: board: puma-rk3399: update .its file to use new features rockchip: board: lion-rk3368: update .its file rockchip: defconfig: puma-rk3399: sync up with SPL changes for ATF rockchip: defconfig: lion-rk3368: sync up with SPL changes for ATF spl: fit: add SPL_FIT_IMAGE_TINY config to reduce code-size rockchip: clk: rk3399: change extract_bits to bitfield_extract rockchip: pinctrl: rk3399: add support for I2C8 rockchip: fix turning off boot-mode via Kconfig rockchip: defconfig: puma-rk3399: bypass ADC-based boot_mode check arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 7 +++- arch/arm/include/asm/arch-rockchip/periph.h | 3 ++ arch/arm/mach-rockchip/Makefile | 6 ++-- arch/arm/mach-rockchip/boot_mode.c | 11 ++++++ board/theobroma-systems/lion_rk3368/fit_spl_atf.its | 6 ++-- board/theobroma-systems/puma_rk3399/fit_spl_atf.its | 12 ++++--- common/fdt_support.c | 39 +++++++++++++++++++++ common/image.c | 1 + common/spl/Kconfig | 24 +++++++++---- common/spl/Makefile | 2 +- common/spl/spl.c | 11 +++--- common/spl/spl_atf.c | 84 ++++++++++++++++++++++++++++++++++++++++----- common/spl/spl_fit.c | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------- configs/firefly-rk3399_defconfig | 3 +- configs/lion-rk3368_defconfig | 3 +- configs/puma-rk3399_defconfig | 3 ++ drivers/clk/rockchip/clk_rk3399.c | 8 ++--- drivers/pinctrl/rockchip/pinctrl_rk3399.c | 19 +++++++++++ include/fdt_support.h | 18 ++++++++++ include/image.h | 1 + include/spl.h | 12 +++++-- 21 files changed, 379 insertions(+), 87 deletions(-)