Pull request: u-boot-rockchip-20200130

Kever Yang kever.yang at rock-chips.com
Sat Feb 1 06:16:12 CET 2020


Hi Tom,

Please pull the rockchip updates:
- Support redundant boot for rk3399
- Support binman for rockchip platform
- Update ram driver and add ddr4 support for rk3328

Travis:
https://travis-ci.org/keveryang/u-boot/builds/629913727

This PR remove the SF support in distro bootcmd.

Thanks,
- Kever

The following changes since commit e7ab1cb3f0421ad8e8435a8258790e238c623ea2:

  Merge tag 'for-v2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-i2c (2020-01-29 09:34:13 -0500)

are available in the Git repository at:

  https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200130

for you to fetch changes up to c8343e93220a487f332441cff780a702ca2ce3a9:

  configs: firefly-rk3399: Enable CONFIG_MISC_INIT_R and ROCKCHIP_EFUSE (2020-01-30 11:44:02 +0800)

----------------------------------------------------------------
Jagan Teki (18):
      rk3399: Check MMC env while defining it
      env: kconfig: Restrict rockchip env for MMC
      env: Enable SPI flash env for rockchip
      rockchip: dts: Sync ROC-RK3399-PC changes from Linux
      roc-pc-rk3399: Enable SPI Flash
      rockpro-rk3399: Enable SPI Flash
      rockchip: Add cpu-info
      rockchip: rk3399: Enable DISPLAY_CPUINFO
      arm: rockchip: Add common cru.h
      rockchip: Add common reset cause
      rockchip: rk3399: Add bootcount support
      Makefile: Add rockchip image type
      Makefile: rockchip: Suffix platform type with tpl name
      Makefile: rockchip: Support SPL-alone mkimage
      arm: dts: rk3036: Add rk3036-u-boot.dtsi
      arm: dts: rk3188: Add rk3188-u-boot.dtsi
      rockchip: Add Single boot image (with binman, pad_cat)
      doc: boards: Add rockchip documentation

Kever Yang (3):
      ram: rk3328: only do data traning for cs0
      rockchip: px30: remove CONFIG_OPTEE support
      rockchip: rk3308: add alias for emmc/sdmmc

Mark Kettenis (1):
      configs: firefly-rk3399: Enable CONFIG_MISC_INIT_R and ROCKCHIP_EFUSE

Thomas Hebb (1):
      ram: rk3399: don't assume phy_io_config() uses real regs

YouMin Chen (2):
      ram: rk3328: add support ddr4 init
      ram: rk3328: update lpddr3 setting

 Makefile                                        |  36 +-
 arch/arm/Kconfig                                |   1 +
 arch/arm/dts/rk3036-sdk-u-boot.dtsi             |   2 +
 arch/arm/dts/rk3036-u-boot.dtsi                 |   6 +
 arch/arm/dts/rk3188-radxarock-u-boot.dtsi       |   2 +
 arch/arm/dts/rk3188-u-boot.dtsi                 |   6 +
 arch/arm/dts/rk3288-u-boot.dtsi                 |   2 +
 arch/arm/dts/rk3308-u-boot.dtsi                 |   7 +
 arch/arm/dts/rk3328-sdram-ddr4-666.dtsi         | 216 +++++++
 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi       |   8 +-
 arch/arm/dts/rk3399-roc-pc-u-boot.dtsi          |   4 +
 arch/arm/dts/rk3399-roc-pc.dts                  | 673 +-------------------
 arch/arm/dts/rk3399-roc-pc.dtsi                 | 813 ++++++++++++++++++++++++
 arch/arm/dts/rk3399-rockpro64-u-boot.dtsi       |   4 +
 arch/arm/dts/rockchip-u-boot.dtsi               |  21 +
 arch/arm/include/asm/arch-rockchip/clock.h      |   4 +-
 arch/arm/include/asm/arch-rockchip/cru.h        |  30 +
 arch/arm/include/asm/arch-rockchip/cru_rk3288.h |  20 +-
 arch/arm/include/asm/arch-rockchip/cru_rk3399.h |  11 +-
 arch/arm/mach-rockchip/Kconfig                  |   2 +
 arch/arm/mach-rockchip/Makefile                 |   1 +
 arch/arm/mach-rockchip/cpu-info.c               |  65 ++
 arch/arm/mach-rockchip/rk3288/clk_rk3288.c      |   2 +-
 arch/arm/mach-rockchip/rk3288/rk3288.c          |  41 +-
 arch/arm/mach-rockchip/rk3399/Kconfig           |  10 +
 arch/arm/mach-rockchip/rk3399/clk_rk3399.c      |   2 +-
 arch/arm/mach-rockchip/rk3399/rk3399.c          |   2 +-
 configs/evb-px30_defconfig                      |   1 -
 configs/evb-rk3288_defconfig                    |   1 -
 configs/evb-rk3399_defconfig                    |   1 -
 configs/ficus-rk3399_defconfig                  |   1 -
 configs/firefly-px30_defconfig                  |   1 -
 configs/firefly-rk3288_defconfig                |   1 -
 configs/firefly-rk3399_defconfig                |   4 +-
 configs/khadas-edge-captain-rk3399_defconfig    |   1 -
 configs/khadas-edge-rk3399_defconfig            |   1 -
 configs/khadas-edge-v-rk3399_defconfig          |   1 -
 configs/leez-rk3399_defconfig                   |   1 -
 configs/miqi-rk3288_defconfig                   |   1 -
 configs/nanopc-t4-rk3399_defconfig              |   1 -
 configs/nanopi-m4-rk3399_defconfig              |   1 -
 configs/nanopi-neo4-rk3399_defconfig            |   1 -
 configs/orangepi-rk3399_defconfig               |   1 -
 configs/phycore-rk3288_defconfig                |   3 -
 configs/popmetal-rk3288_defconfig               |   1 -
 configs/puma-rk3399_defconfig                   |   1 -
 configs/roc-pc-rk3399_defconfig                 |   3 +-
 configs/rock-pi-4-rk3399_defconfig              |   1 -
 configs/rock960-rk3399_defconfig                |   1 -
 configs/rockpro64-rk3399_defconfig              |   3 +-
 configs/tinker-rk3288_defconfig                 |   1 -
 configs/tinker-s-rk3288_defconfig               |   1 -
 configs/vyasa-rk3288_defconfig                  |   1 -
 doc/board/rockchip/index.rst                    |  10 +
 doc/board/rockchip/rockchip.rst                 | 130 ++++
 drivers/clk/rockchip/clk_rk3288.c               |  42 +-
 drivers/clk/rockchip/clk_rk3399.c               |  36 +-
 drivers/ram/rockchip/sdram_rk3288.c             |  10 +-
 drivers/ram/rockchip/sdram_rk3328.c             |  10 +-
 drivers/ram/rockchip/sdram_rk3399.c             |  16 +-
 drivers/video/rockchip/rk3288_mipi.c            |   2 +-
 drivers/video/rockchip/rk3399_mipi.c            |   2 +-
 drivers/video/rockchip/rk_mipi.c                |   2 +-
 env/Kconfig                                     |   8 +-
 include/configs/evb_rk3399.h                    |   4 +-
 include/configs/rk3399_common.h                 |   5 +-
 include/configs/rockchip-common.h               |   3 +
 67 files changed, 1465 insertions(+), 841 deletions(-)
 create mode 100644 arch/arm/dts/rk3036-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3188-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3328-sdram-ddr4-666.dtsi
 create mode 100644 arch/arm/dts/rk3399-roc-pc.dtsi
 create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi
 create mode 100644 arch/arm/include/asm/arch-rockchip/cru.h
 create mode 100644 arch/arm/mach-rockchip/cpu-info.c
 create mode 100644 doc/board/rockchip/index.rst
 create mode 100644 doc/board/rockchip/rockchip.rst




More information about the U-Boot mailing list