[U-Boot] Pull request: u-boot-rockchip-20191026
Kever Yang
kever.yang at rock-chips.com
Mon Nov 18 00:48:46 UTC 2019
Hi Tom,
Please pull the rockchip update:
- Add support for rockchip SoC: PX30, RK3308
- Add and migrate to use common dram driver: PX30, RK3328, RK3399
- Add rk3399 board Tinker-s support
- Board config update for Rock960, Rockpro64
These patches are send during merge window, and reviewed for weeks before
they are ready, most of the feature update for Rockchip has been merged in
this PR.
Travis:
https://travis-ci.org/keveryang/u-boot/builds/613058035
Thanks,
- Kever
The following changes since commit 3ff1ff3ff76c15efe0451309af084ee6c096c583:
Merge branch '2019-11-12-migrate-SYS_REDUNDAND_ENVIRONMENT' (2019-11-12 13:40:58 -0500)
are available in the Git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20191118
for you to fetch changes up to 59b01eb7a17a7c0915fd8aff8f818699b4624137:
rockchip: dts: tinker: Add tinker-s board support (2019-11-17 18:51:25 +0800)
----------------------------------------------------------------
Andy Yan (8):
arm: rockchip: Add RK3308 SOC support
arm: dts: rockchip: Add dts for rk3308 evb
board: rockchip: Add rk3308 evb support
rockchip: rk3308: Add sdram driver
rockchip: mkimage: add support for RK3308
rockchip: rk3308: Add dts for ROC-RK3308-CC
rockchip: rk3308: Add support for ROC-RK3308-CC board
doc: rockchip: Add documentation for rk3308 based boards
David Wu (1):
pinctrl: rockchip: add px30 pinctrl driver
Elaine Zhang (1):
rockchip: clk: pll: add common pll setting funcs
Finley Xiao (2):
misc: add driver for the Rockchip otp controller
rockchip: clk: Add clk driver for rk3308
Heiko Stuebner (9):
spl: separate SPL_FRAMEWORK config for spl and tpl
rockchip: add core px30 headers
net: gmac_rockchip: add support for px30
rockchip: misc: read cpuid either from efuse or otp
rockchip: add px30 devicetrees
rockchip: add px30 architecture core
rockchip: add px30-evb board
rockchip: clk: rv1108: remove duplicate reset init
rockchip: clk: fix wrong CONFIG_IS_ENABLED handling
Jagan Teki (2):
arm: dts: rk3399-roc-pc: Sync latest dts changes from Linux
configs: Rename roc-rk3399-pc -> roc-pc-rk3399 defconfig
Kever Yang (22):
ram: rockchip: rename sdram.h to sdram_rk3288.h
ram: rockchip: rename sdram_common.c/h to sdram.c
rockchip: sdram: move cap structure and debug function to sdram_common.h
rockchip: sdram: extend to use sys_reg3 for capacity info
rockchip: sdram: update the sys_reg to sys_reg2
ram: rockchip: add common code for sdram driver
ram: rockchip: move sdram_debug function into sdram_common
ram: rockchip: Default enable DRAM debug info
ram: rockchip: add controller code for PX30
ram: rockchip: add phy driver code for PX30
ram: rockchip: add common msch reg definition
ram: rockchip: update lpddr4 timing for rk3399
ram: rk3399: Sync the io setting from Rockchip vendor code
ram: rk3399: update calculate_stride
rockchip: clk: add px30 clock driver
rockchip: mkimage: add support for px30
rockchip: usb: Migrate to use ofnode
rockchip: Init driver otg_data for rk3288 usb phy
arm64: dts: rk3399-rock960: add vdd_log and its init value
rockchip: rk3399: rock-pi4: Add init value for vdd_log
rockchip: rk3399: khadas-edge: Add init value for vdd_log
rockchip: rk3399: orangepi: Add init value for vdd_log
Michael Trimarchi (2):
rockchip: dts: tinker: Move u-boot dmc initialization to specific section
rockchip: dts: tinker: Add tinker-s board support
Peter Robinson (4):
rockchip: rk3399: rock960: Update config for TPL
rockchip: dts: rk3399: move the u-boot, dm-pre-reloc to the u-boot.dtsi
rockchip: dts: rk3399-evb: move u-boot, spl-boot-order to to the u-boot.dtsi
rockchip: dts: rk3399-firefly: move u-boot, spl-boot-order to to the u-boot.dtsi
Soeren Moch (2):
arm: dts: rk3399-rockpro64: sync dts from linux kernel
arm: dts: rk3399-rockpro64: slightly increase center voltage
Thomas Hebb (3):
rockchip: SPL: fix ordering of DRAM init
rockchip: allow DRAM init in SPL
rockchip: imply instead of selecting SPL_SYS_MALLOC_SIMPLE
Vasily Khoruzhick (1):
rockchip: rk3399: split rockpro64 out of evb_rk3399
YouMin Chen (8):
ram: px30: add sdram driver
ram: rk3328: use common sdram driver
ram: rk3399: migrate to use common code
ram: rk3399: Clean up code
ram: rk3399: fix error about get_ddrc0_con reg addr
ram: rk3399: update the function of sdram_init
ram: rk3399: add support detect capacity
ram: rk3399: Fix dram setting to make dram more stable
arch/arm/Kconfig | 2 +-
arch/arm/dts/Makefile | 8 +
arch/arm/dts/px30-evb-u-boot.dtsi | 81 +
arch/arm/dts/px30-evb.dts | 530 +++++
arch/arm/dts/px30.dtsi | 2068 ++++++++++++++++++++
arch/arm/dts/rk3288-tinker-s-u-boot.dtsi | 34 +
arch/arm/dts/rk3288-tinker-s.dts | 29 +
arch/arm/dts/rk3288-tinker-u-boot.dtsi | 12 +
arch/arm/dts/rk3288-tinker.dts | 12 -
arch/arm/dts/rk3308-evb-u-boot.dtsi | 17 +
arch/arm/dts/rk3308-evb.dts | 230 +++
arch/arm/dts/rk3308-roc-cc-u-boot.dtsi | 17 +
arch/arm/dts/rk3308-roc-cc.dts | 190 ++
arch/arm/dts/rk3308-u-boot.dtsi | 25 +
arch/arm/dts/rk3308.dtsi | 1829 +++++++++++++++++
arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 4 +
arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 4 +
arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 4 +
arch/arm/dts/rk3399-evb-u-boot.dtsi | 6 +
arch/arm/dts/rk3399-evb.dts | 2 -
arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 +
arch/arm/dts/rk3399-firefly.dts | 1 -
arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi | 4 +
arch/arm/dts/rk3399-orangepi-u-boot.dtsi | 4 +
arch/arm/dts/rk3399-roc-pc.dts | 32 +-
arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi | 4 +
arch/arm/dts/rk3399-rock960-u-boot.dtsi | 13 +
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 5 +
arch/arm/dts/rk3399-rockpro64.dts | 57 +-
arch/arm/dts/rk3399-sdram-ddr3-1333.dtsi | 4 +
arch/arm/dts/rk3399-sdram-ddr3-1600.dtsi | 4 +
arch/arm/dts/rk3399-sdram-ddr3-1866.dtsi | 4 +
arch/arm/dts/rk3399-sdram-lpddr3-2GB-1600.dtsi | 4 +
arch/arm/dts/rk3399-sdram-lpddr3-4GB-1600.dtsi | 4 +
.../dts/rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi | 4 +
arch/arm/dts/rk3399-sdram-lpddr4-100.dtsi | 4 +
arch/arm/dts/rk3399-u-boot.dtsi | 48 +
arch/arm/dts/rk3399.dtsi | 11 -
arch/arm/include/asm/arch-px30/boot0.h | 11 +
arch/arm/include/asm/arch-px30/gpio.h | 11 +
arch/arm/include/asm/arch-rk3308/boot0.h | 11 +
arch/arm/include/asm/arch-rk3308/cru_rk3308.h | 290 +++
arch/arm/include/asm/arch-rk3308/gpio.h | 11 +
arch/arm/include/asm/arch-rk3308/grf_rk3308.h | 197 ++
arch/arm/include/asm/arch-rockchip/clock.h | 82 +-
arch/arm/include/asm/arch-rockchip/cru_px30.h | 432 ++++
arch/arm/include/asm/arch-rockchip/grf_px30.h | 144 ++
arch/arm/include/asm/arch-rockchip/sdram.h | 168 +-
arch/arm/include/asm/arch-rockchip/sdram_common.h | 116 +-
arch/arm/include/asm/arch-rockchip/sdram_msch.h | 85 +
.../include/asm/arch-rockchip/sdram_pctl_px30.h | 139 ++
.../arm/include/asm/arch-rockchip/sdram_phy_px30.h | 62 +
.../asm/arch-rockchip/sdram_phy_ron_rtt_px30.h | 59 +
arch/arm/include/asm/arch-rockchip/sdram_px30.h | 134 ++
arch/arm/include/asm/arch-rockchip/sdram_rk3288.h | 102 +
arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 420 ++--
arch/arm/include/asm/arch-rockchip/sdram_rk3399.h | 98 +-
arch/arm/lib/Makefile | 2 +-
arch/arm/lib/crt0.S | 2 +-
arch/arm/lib/crt0_64.S | 2 +
arch/arm/mach-rockchip/Kconfig | 49 +
arch/arm/mach-rockchip/Makefile | 5 +-
arch/arm/mach-rockchip/board.c | 42 +-
arch/arm/mach-rockchip/misc.c | 7 +-
arch/arm/mach-rockchip/px30-board-tpl.c | 59 +
arch/arm/mach-rockchip/px30/Kconfig | 41 +
arch/arm/mach-rockchip/px30/Makefile | 13 +
arch/arm/mach-rockchip/px30/clk_px30.c | 31 +
arch/arm/mach-rockchip/px30/px30.c | 248 +++
arch/arm/mach-rockchip/px30/syscon_px30.c | 53 +
arch/arm/mach-rockchip/rk3036/rk3036.c | 2 +-
arch/arm/mach-rockchip/rk3288/rk3288.c | 2 +-
arch/arm/mach-rockchip/rk3308/Kconfig | 27 +
arch/arm/mach-rockchip/rk3308/Makefile | 9 +
arch/arm/mach-rockchip/rk3308/clk_rk3308.c | 31 +
arch/arm/mach-rockchip/rk3308/rk3308.c | 175 ++
arch/arm/mach-rockchip/rk3308/syscon_rk3308.c | 20 +
arch/arm/mach-rockchip/rk3399/Kconfig | 20 +
arch/arm/mach-rockchip/{sdram_common.c => sdram.c} | 85 +-
arch/arm/mach-rockchip/spl.c | 19 +-
arch/powerpc/lib/Makefile | 2 +-
board/firefly/firefly-rk3308/Kconfig | 15 +
board/firefly/firefly-rk3308/MAINTAINERS | 5 +
board/firefly/firefly-rk3308/Makefile | 7 +
board/firefly/firefly-rk3308/roc_cc_rk3308.c | 81 +
board/pine64/rockpro64_rk3399/Kconfig | 15 +
board/pine64/rockpro64_rk3399/MAINTAINERS | 8 +
board/pine64/rockpro64_rk3399/Makefile | 7 +
board/pine64/rockpro64_rk3399/rockpro64-rk3399.c | 55 +
board/rockchip/evb_px30/Kconfig | 15 +
board/rockchip/evb_px30/MAINTAINERS | 6 +
board/rockchip/evb_px30/Makefile | 7 +
board/rockchip/evb_px30/evb_px30.c | 4 +
board/rockchip/evb_rk3308/Kconfig | 15 +
board/rockchip/evb_rk3308/MAINTAINERS | 6 +
board/rockchip/evb_rk3308/Makefile | 7 +
board/rockchip/evb_rk3308/evb_rk3308.c | 44 +
board/rockchip/evb_rk3399/MAINTAINERS | 9 +-
board/rockchip/tinker_rk3288/MAINTAINERS | 7 +
board/rockchip/tinker_rk3288/tinker-rk3288.c | 12 +
common/spl/Kconfig | 8 +
common/spl/Makefile | 2 +-
configs/evb-px30_defconfig | 111 ++
configs/evb-rk3308_defconfig | 77 +
configs/evb-rk3328_defconfig | 2 +-
configs/roc-cc-rk3308_defconfig | 77 +
...rk3399-pc_defconfig => roc-pc-rk3399_defconfig} | 0
configs/rock64-rk3328_defconfig | 2 +-
configs/rock960-rk3399_defconfig | 8 +-
configs/rockpro64-rk3399_defconfig | 1 +
configs/tinker-s-rk3288_defconfig | 99 +
doc/README.rockchip | 92 +-
drivers/clk/rockchip/Makefile | 3 +
drivers/clk/rockchip/clk_pll.c | 360 ++++
drivers/clk/rockchip/clk_px30.c | 1630 +++++++++++++++
drivers/clk/rockchip/clk_rk3036.c | 2 +-
drivers/clk/rockchip/clk_rk3188.c | 2 +-
drivers/clk/rockchip/clk_rk322x.c | 2 +-
drivers/clk/rockchip/clk_rk3288.c | 2 +-
drivers/clk/rockchip/clk_rk3308.c | 1072 ++++++++++
drivers/clk/rockchip/clk_rk3328.c | 2 +-
drivers/clk/rockchip/clk_rk3368.c | 2 +-
drivers/clk/rockchip/clk_rk3399.c | 2 +-
drivers/clk/rockchip/clk_rv1108.c | 18 +-
drivers/misc/Kconfig | 9 +
drivers/misc/Makefile | 1 +
drivers/misc/rockchip-otp.c | 176 ++
drivers/net/gmac_rockchip.c | 69 +
drivers/pinctrl/rockchip/Makefile | 1 +
drivers/pinctrl/rockchip/pinctrl-px30.c | 368 ++++
drivers/ram/Kconfig | 2 +-
drivers/ram/rockchip/Kconfig | 17 +-
drivers/ram/rockchip/Makefile | 8 +-
drivers/ram/rockchip/dmc-rk3368.c | 2 +-
.../ram/rockchip/sdram-px30-ddr3-detect-333.inc | 72 +
.../ram/rockchip/sdram-px30-ddr4-detect-333.inc | 75 +
drivers/ram/rockchip/sdram-px30-ddr_skew.inc | 121 ++
.../ram/rockchip/sdram-px30-lpddr2-detect-333.inc | 73 +
.../ram/rockchip/sdram-px30-lpddr3-detect-333.inc | 74 +
drivers/ram/rockchip/sdram-rk3399-lpddr4-400.inc | 28 +-
drivers/ram/rockchip/sdram-rk3399-lpddr4-800.inc | 28 +-
drivers/ram/rockchip/sdram_common.c | 429 ++++
drivers/ram/rockchip/sdram_debug.c | 147 --
drivers/ram/rockchip/sdram_pctl_px30.c | 205 ++
drivers/ram/rockchip/sdram_phy_px30.c | 205 ++
drivers/ram/rockchip/sdram_px30.c | 751 +++++++
drivers/ram/rockchip/sdram_rk3128.c | 2 +-
drivers/ram/rockchip/sdram_rk3188.c | 2 +-
drivers/ram/rockchip/sdram_rk322x.c | 2 +-
drivers/ram/rockchip/sdram_rk3288.c | 2 +-
drivers/ram/rockchip/sdram_rk3308.c | 55 +
drivers/ram/rockchip/sdram_rk3328.c | 765 ++------
drivers/ram/rockchip/sdram_rk3399.c | 1201 ++++++++----
drivers/usb/phy/rockchip_usb2_phy.c | 5 +-
include/configs/evb_px30.h | 19 +
include/configs/evb_rk3308.h | 20 +
include/configs/firefly_rk3308.h | 20 +
include/configs/px30_common.h | 62 +
include/configs/rk3308_common.h | 58 +
include/configs/rockpro64_rk3399.h | 15 +
include/configs/tinker_rk3288.h | 1 +
include/dt-bindings/clock/px30-cru.h | 389 ++++
include/dt-bindings/clock/rk3308-cru.h | 387 ++++
include/dt-bindings/power/px30-power.h | 27 +
include/dt-bindings/soc/rockchip,boot-mode.h | 16 +
include/usb/dwc2_udc.h | 4 +-
scripts/Makefile.spl | 4 +
tools/rkcommon.c | 2 +
168 files changed, 16843 insertions(+), 1812 deletions(-)
create mode 100644 arch/arm/dts/px30-evb-u-boot.dtsi
create mode 100644 arch/arm/dts/px30-evb.dts
create mode 100644 arch/arm/dts/px30.dtsi
create mode 100644 arch/arm/dts/rk3288-tinker-s-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3288-tinker-s.dts
create mode 100644 arch/arm/dts/rk3308-evb-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3308-evb.dts
create mode 100644 arch/arm/dts/rk3308-roc-cc-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3308-roc-cc.dts
create mode 100644 arch/arm/dts/rk3308-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3308.dtsi
create mode 100644 arch/arm/include/asm/arch-px30/boot0.h
create mode 100644 arch/arm/include/asm/arch-px30/gpio.h
create mode 100644 arch/arm/include/asm/arch-rk3308/boot0.h
create mode 100644 arch/arm/include/asm/arch-rk3308/cru_rk3308.h
create mode 100644 arch/arm/include/asm/arch-rk3308/gpio.h
create mode 100644 arch/arm/include/asm/arch-rk3308/grf_rk3308.h
create mode 100644 arch/arm/include/asm/arch-rockchip/cru_px30.h
create mode 100644 arch/arm/include/asm/arch-rockchip/grf_px30.h
create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_msch.h
create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h
create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h
create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_phy_ron_rtt_px30.h
create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_px30.h
create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
create mode 100644 arch/arm/mach-rockchip/px30-board-tpl.c
create mode 100644 arch/arm/mach-rockchip/px30/Kconfig
create mode 100644 arch/arm/mach-rockchip/px30/Makefile
create mode 100644 arch/arm/mach-rockchip/px30/clk_px30.c
create mode 100644 arch/arm/mach-rockchip/px30/px30.c
create mode 100644 arch/arm/mach-rockchip/px30/syscon_px30.c
create mode 100644 arch/arm/mach-rockchip/rk3308/Kconfig
create mode 100644 arch/arm/mach-rockchip/rk3308/Makefile
create mode 100644 arch/arm/mach-rockchip/rk3308/clk_rk3308.c
create mode 100644 arch/arm/mach-rockchip/rk3308/rk3308.c
create mode 100644 arch/arm/mach-rockchip/rk3308/syscon_rk3308.c
rename arch/arm/mach-rockchip/{sdram_common.c => sdram.c} (60%)
create mode 100644 board/firefly/firefly-rk3308/Kconfig
create mode 100644 board/firefly/firefly-rk3308/MAINTAINERS
create mode 100644 board/firefly/firefly-rk3308/Makefile
create mode 100644 board/firefly/firefly-rk3308/roc_cc_rk3308.c
create mode 100644 board/pine64/rockpro64_rk3399/Kconfig
create mode 100644 board/pine64/rockpro64_rk3399/MAINTAINERS
create mode 100644 board/pine64/rockpro64_rk3399/Makefile
create mode 100644 board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
create mode 100644 board/rockchip/evb_px30/Kconfig
create mode 100644 board/rockchip/evb_px30/MAINTAINERS
create mode 100644 board/rockchip/evb_px30/Makefile
create mode 100644 board/rockchip/evb_px30/evb_px30.c
create mode 100644 board/rockchip/evb_rk3308/Kconfig
create mode 100644 board/rockchip/evb_rk3308/MAINTAINERS
create mode 100644 board/rockchip/evb_rk3308/Makefile
create mode 100644 board/rockchip/evb_rk3308/evb_rk3308.c
create mode 100644 configs/evb-px30_defconfig
create mode 100644 configs/evb-rk3308_defconfig
create mode 100644 configs/roc-cc-rk3308_defconfig
rename configs/{roc-rk3399-pc_defconfig => roc-pc-rk3399_defconfig} (100%)
create mode 100644 configs/tinker-s-rk3288_defconfig
create mode 100644 drivers/clk/rockchip/clk_pll.c
create mode 100644 drivers/clk/rockchip/clk_px30.c
create mode 100644 drivers/clk/rockchip/clk_rk3308.c
create mode 100644 drivers/misc/rockchip-otp.c
create mode 100644 drivers/pinctrl/rockchip/pinctrl-px30.c
create mode 100644 drivers/ram/rockchip/sdram-px30-ddr3-detect-333.inc
create mode 100644 drivers/ram/rockchip/sdram-px30-ddr4-detect-333.inc
create mode 100644 drivers/ram/rockchip/sdram-px30-ddr_skew.inc
create mode 100644 drivers/ram/rockchip/sdram-px30-lpddr2-detect-333.inc
create mode 100644 drivers/ram/rockchip/sdram-px30-lpddr3-detect-333.inc
create mode 100644 drivers/ram/rockchip/sdram_common.c
delete mode 100644 drivers/ram/rockchip/sdram_debug.c
create mode 100644 drivers/ram/rockchip/sdram_pctl_px30.c
create mode 100644 drivers/ram/rockchip/sdram_phy_px30.c
create mode 100644 drivers/ram/rockchip/sdram_px30.c
create mode 100644 drivers/ram/rockchip/sdram_rk3308.c
create mode 100644 include/configs/evb_px30.h
create mode 100644 include/configs/evb_rk3308.h
create mode 100644 include/configs/firefly_rk3308.h
create mode 100644 include/configs/px30_common.h
create mode 100644 include/configs/rk3308_common.h
create mode 100644 include/configs/rockpro64_rk3399.h
create mode 100644 include/dt-bindings/clock/px30-cru.h
create mode 100644 include/dt-bindings/clock/rk3308-cru.h
create mode 100644 include/dt-bindings/power/px30-power.h
create mode 100644 include/dt-bindings/soc/rockchip,boot-mode.h
More information about the U-Boot
mailing list