[U-Boot] Pull request: u-boot-rockchip/tags/rockchip-for-v2019.07

Kever Yang kever.yang at rock-chips.com
Sun Jul 21 03:11:40 UTC 2019


Hi Tom,

Please pull rockchip the update:
- rk3399 lpddr4 support
- rk3399-rock960 board support improvement
- Eliminate pyelftools dependency by make_fit_atf.py
- clean up rockchip dts to use -u-boot.dtsi
- use ARM arch/generic timer instead of rk_timer
- clean up Kconfig options for board support

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

Thanks,
- Kever

The following changes since commit 0de815356474912ef5bef9a69f0327a5a93bb2c2:

  Merge branch '2019-07-17-master-imports' (2019-07-18 11:31:37 -0400)

are available in the Git repository at:

  https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/rockchip-for-v2019.07

for you to fetch changes up to 8b1ceb0ac1aa1746c6751d698ce7a012a236fa65:

  rockchip: Remove obsolete references to pyelftools (2019-07-20 23:59:44 +0800)

----------------------------------------------------------------
Andy Yan (2):
      rockchip: dts: rk3399: Add spl-boot-order for Rock PI 4
      rockchip: dts: rk3399: Add 'same-as-spl' for Rock PI 4

Chris Webb (2):
      rockchip: make_fit_atf.py: Eliminate pyelftools dependency
      rockchip: Remove obsolete references to pyelftools

Jagan Teki (78):
      ram: rk3399: Fix code warnings
      ram: rk3399: Some trivial code fixes
      ram: rk3399: s/sdram_params/params
      ram: rk3399: Handle pctl_cfg return type
      ram: rk3399: s/tsel_wr_select_n/tsel_wr_select_dq_n
      ram: rk3399: s/tsel_wr_select_p/tsel_wr_select_dq_p
      ram: rk3399: s/ca_tsel_wr_select_n/tsel_wr_select_ca_n
      ram: rk3399: s/ca_tsel_wr_select_p/tsel_wr_select_ca_p
      ram: rk3399: Order tsel variables
      ram: rockchip: rk3399: Add cap_info structure
      ram: rk3399: s/rk3399_base_params/sdram_base_params
      ram: rk3399: Move common sdram structures in common header
      arm: include: rockchip: Move dramtypes to common header
      arm: include: rockchip: Add DDR4 enum
      clk: rockchip: rk3399: Fix check patch warnings and checks
      ram: rk3399: Handle data training return types
      ram: rk3399: Clear PI_175 interrupts in data training
      ram: rk3399: Use rank mask in ca data training
      ram: rk3399: Use rank mask in wdql data training
      ram: rk3399: Add phy pctrl reset support
      ram: rk3399: Move pwrup_srefresh_exit to dram_info
      ram: rk3399: Add pctl start support
      ram: rockchip: Add initial Kconfig
      debug_uart: Add printdec
      ram: rockchip: Add debug sdram driver
      ram: rockchip: debug: Add sdram_print_ddr_info
      ram: rockchip: debug: Get the cs capacity
      ram: rk3399: debug: Add sdram_print_stride
      ram: rk3399: Compute stride for 2 channels
      ram: rk3399: Compute stride for 1 channel a
      ram: rk3399: Add rank detection support
      ram: rk3399: Enable sdram debug functions
      ram: rk3399: Simply existing dram enc macro
      ram: rk3399: Rename sys_reg with sys_reg2
      ram: rk3399: Introduce sys_reg3 for more capacity info
      ram: rk3399: Add ddr version enc macro
      ram: rk3399: Add ddrtimingC0
      ram: rk3399: Add DdrMode
      ram: rk3399: Configure phy IO in ds odt
      ram: rockchip: Kconfig: Add RK3399 LPDDR4 entry
      ram: rk3399: Add lpddr4 rank mask for ca training
      ram: rk3399: Add lpddr4 rank mask for wdql training
      ram: rk3399: Move mode_sel assignment
      ram: rk3399: Don't wait for PLL lock in lpddr4
      ram: rk3399: Avoid two channel ZQ Cal Start at the same time
      ram: rk3399: Configure PHY_898, PHY_919 for lpddr4
      ram: rk3399: Configure BOOSTP_EN, BOOSTN_EN for lpddr4
      ram: rk3399: Configure SLEWP_EN, SLEWN_EN for lpddr4
      ram: rk3399: Configure PHY RX_CM_INPUT for lpddr4
      ram: rk3399: Map chipselect for lpddr4
      ram: rk3399: Configure tsel write ca for lpddr4
      ram: rk3399: Don't disable dfi dram clk for lpddr4, rank 1
      ram: rk3399: Add IO settings
      ram: sdram: Configure lpddr4 tsel rd, wr based on IO settings
      ram: rk3399: Add tsel control clock drive
      ram: rk3399: Configure soc odt support
      ram: rk3399: Get lpddr4 tsel_rd_en from io settings
      ram: rk3399: Update lpddr4 vref based on io settings
      ram: rk3399: Update lpddr4 mode_sel based on io settings
      ram: rk3399: Update lpddr4 vref_mode_ac
      ram: rk3399: Simplify data training first argument
      ram: rk3399: Handle data training via ops
      ram: rk3399: Add LPPDR4 mr detection
      arm: include: rockchip: Add rk3399 pmu file
      rockchip: rk3399: syscon: Add pmu support
      rockchip: dts: rk3399: Add u-boot, dm-pre-reloc for pmu
      clk: rockchip: rk3399: Set 50MHz ddr clock
      clk: rockchip: rk3399: Set 400MHz ddr clock
      ram: rk3399: Add LPPDDR4-400 timings inc
      ram: rk3399: Add LPPDDR4-800 timings inc
      ram: rk3399: Add set_rate sdram rk3399 ops
      ram: rk3399: Add lpddr4 set rate support
      configs: rockpro64: Enable LPDDR4 support
      configs: rock-pi-4: Enable LPDDR4 support
      rockchip: dts: rk3399: Add LPDDR4-100 timings
      rockchip: dts: rk3399: rockpro64: Use LPDDR4-100 dtsi
      rockchip: dts: rk3399: nanopi-neo4: Use DDR3-1866 dtsi
      rockchip: dts: rk3399: rock-pi-4: Use LPDDR4-100 dtsi

Kever Yang (54):
      rockchip: rock960-rk3399: fix mail format in MAINTAINER file
      rockchip: rk3399: remove pinctrl init in spl_board_init
      rockchip: rk3188: remove pinctrl init in spl_board_init
      rockchip: rk3288: remove pinctrl init in spl_board_init
      rockchip: remove redundant pinctrl header including
      rockchip: fixup board choice in Kconfig
      rockchip: Kconfig: move rk322x config into its Kconfig
      rockchip: Kconfig: move rk3288 config into its Kconfig
      rockchip: Kconfig: move rk3368 config into its Kconfig
      rockchip: Kconfig: move rk3399 config into its Kconfig
      rockchip: Kconfig: move ROCKCHIP_BOOT_MODE_REG to soc Kconfig
      rockchip: rk322x: use defconfig for SYS_MALLOC_F_LEN
      rockchip: rk3288: use default value for SYS_MALLOC_F_LEN
      rockchip: rk3399: use default value for SYS_MALLOC_F_LEN
      rockchip: rk3328: use defaule value for SYS_MALLOC_F_LEN
      rockchip: rk3368: use defaule value for SYS_MALLOC_F_LEN
      rockchip: rk3399: default enable SPL LIBCOMMON and LIBGENERIC
      rockchip: rk3328: default enable SPL LIBCOMMON and LIBGENERIC
      rockchip: rk322x: default enable SPL LIBCOMMON and LIBGENERIC
      rockchip: rk3368: default enable SPL LIBCOMMON and LIBGENERIC
      rockchip: rk3288: add arch_cpu_init in spl
      rockchip: rk3288: move configure_l2ctlr back to rk3288
      rockchip: rk3288: add default TPL_LDSCRIPT value in Kconfig
      rockchip: rk3288: enable TPL for evb-rk3288
      rockchip: evb-rk3288: add -u-boot.dtsi
      rockchip: fennec-rk3288: add -u-boot.dtsi
      rockchip: rk3288: update u-boot raw image size for all boards
      rockchip: firefly-rk3288: add -u-boot.dtsi
      rockchip: rk3288-firefly: sync sdmmc pinctrl from mainline
      rockchip: miqi-rk3288: add -u-boot.dtsi
      rockchip: popmetal-rk3288: add -u-boot.dtsi
      rockchip: spl-boot-order: update dependency to OF_LIBFDT
      rockchip: rk3288: dts: enable spl-boot-order
      rockchip: board: rk3288: remove board_boot_order()
      rockchip: rk322x: sdram: use udelay instead of rockchip_udelay
      rockchip: rk322x: use ARM arch timer instead of rk_timer
      rockchip: rk3036: sdram: use udelay instead of rockchip_udelay
      rockchip: rk3036: use ARM arch timer instead of rk_timer
      rockchip: rk3288: use ARM arch timer instead of rk_timer
      rockchip: rk3128: use ARM arch timer instead of rk_timer
      rockchip: remove no use header file in board code
      rockchip: remove rk_timer
      rockchip: rk3368: move sgrf init to spl as arch_cpu_init()
      rockchip: rk3368: enable stimer for rk3368
      rockchip: rk3368-lion: switch to use ARM generic timer
      rockchip: evb-px5: switch to use ARM generic timer
      rockchip: add common tpl board file
      rockchip: rk322x: use common TPL board file
      rockchip: rk3288: use common TPL board file
      rockchip: rk3368: use common TPL board file
      rockchip: rk3399: use common secure_timer_init() for spl/tpl
      rockchip: rk3399: remove TPL_BOARD_INIT
      rockchip: rk3399: use common TPL board file
      rockchip: enable rk322x TPL_BOOTROM_SUPPORT in Kconfig

Mark Kettenis (4):
      rockchip: clk: rk3399: handle clk_enable requests for USB3
      usb: dwc3-of-simple: Add support for RK3399
      usb: xhci-dwc3: Add USB2 PHY configuration
      rockchip: xhci: Remove RK3399 support

Niklas Schulze (1):
      rockchip: video: rk3288_hdmi: Add missing call to dw_hdmi_enable()

Peter Robinson (6):
      arm64: rockchip: rock960: sync dts files from Linux 5.2-rc6
      configs: rockchip: rock960: drop options for non-existent HW
      configs: rockchip: rock960: enable pmic and regulator commands
      configs: rockchip: rock960: enable DMA for SDHCI controller
      configs: rockchip: rock960: Add support for USB ethernet adapters
      configs: rockchip: rock960: enable USB3 support

 arch/arm/dts/rk3288-evb-u-boot.dtsi               |   46 +
 arch/arm/dts/rk3288-evb.dts                       |   25 -
 arch/arm/dts/rk3288-fennec-u-boot.dtsi            |   54 +
 arch/arm/dts/rk3288-fennec.dts                    |   25 -
 arch/arm/dts/rk3288-firefly-u-boot.dtsi           |   50 +
 arch/arm/dts/rk3288-firefly.dts                   |   23 -
 arch/arm/dts/rk3288-firefly.dtsi                  |   26 +-
 arch/arm/dts/rk3288-miqi-u-boot.dtsi              |   38 +
 arch/arm/dts/rk3288-miqi.dts                      |   18 -
 arch/arm/dts/rk3288-popmetal-u-boot.dtsi          |   46 +
 arch/arm/dts/rk3288-popmetal.dts                  |   26 -
 arch/arm/dts/rk3288-u-boot.dtsi                   |    7 +
 arch/arm/dts/rk3368-lion-u-boot.dtsi              |    1 -
 arch/arm/dts/rk3368-px5-evb-u-boot.dtsi           |    1 -
 arch/arm/dts/rk3399-ficus.dts                     |   92 +-
 arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi       |    1 +
 arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi         |    7 +
 arch/arm/dts/rk3399-rock960.dts                   |   91 +-
 arch/arm/dts/rk3399-rock960.dtsi                  |  229 +-
 arch/arm/dts/rk3399-rockpro64-u-boot.dtsi         |    1 +
 arch/arm/dts/rk3399-sdram-lpddr4-100.dtsi         | 1537 ++++++++++++++
 arch/arm/dts/rk3399-u-boot.dtsi                   |    4 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3399.h   |   72 +
 arch/arm/include/asm/arch-rockchip/sdram.h        |    6 -
 arch/arm/include/asm/arch-rockchip/sdram_common.h |   90 +
 arch/arm/include/asm/arch-rockchip/sdram_rk322x.h |    7 -
 arch/arm/include/asm/arch-rockchip/sdram_rk3399.h |   65 +-
 arch/arm/include/asm/arch-rockchip/sys_proto.h    |   22 -
 arch/arm/include/asm/arch-rockchip/timer.h        |    3 -
 arch/arm/mach-rockchip/Kconfig                    |   78 +-
 arch/arm/mach-rockchip/Makefile                   |   14 +-
 arch/arm/mach-rockchip/make_fit_atf.py            |   75 +-
 arch/arm/mach-rockchip/rk3036-board-spl.c         |   29 +-
 arch/arm/mach-rockchip/rk3036-board.c             |    1 -
 arch/arm/mach-rockchip/rk3036/Kconfig             |    8 +
 arch/arm/mach-rockchip/rk3036/sdram_rk3036.c      |   19 +-
 arch/arm/mach-rockchip/rk3128-board.c             |    3 -
 arch/arm/mach-rockchip/rk3128/Kconfig             |    3 +
 arch/arm/mach-rockchip/rk3188-board-spl.c         |    2 -
 arch/arm/mach-rockchip/rk3188-board.c             |   31 -
 arch/arm/mach-rockchip/rk3188/Kconfig             |    3 +
 arch/arm/mach-rockchip/rk322x-board-spl.c         |   30 +
 arch/arm/mach-rockchip/rk322x-board-tpl.c         |   53 -
 arch/arm/mach-rockchip/rk322x/Kconfig             |   21 +-
 arch/arm/mach-rockchip/rk3288-board-spl.c         |   40 +-
 arch/arm/mach-rockchip/rk3288-board-tpl.c         |   70 -
 arch/arm/mach-rockchip/rk3288-board.c             |   27 -
 arch/arm/mach-rockchip/rk3288/Kconfig             |   23 +-
 arch/arm/mach-rockchip/rk3288/rk3288.c            |   26 +
 arch/arm/mach-rockchip/rk3328-board-spl.c         |    1 -
 arch/arm/mach-rockchip/rk3328/Kconfig             |   11 +-
 arch/arm/mach-rockchip/rk3368-board-spl.c         |   33 +
 arch/arm/mach-rockchip/rk3368-board-tpl.c         |  123 --
 arch/arm/mach-rockchip/rk3368/Kconfig             |   21 +
 arch/arm/mach-rockchip/rk3368/rk3368.c            |   75 +-
 arch/arm/mach-rockchip/rk3399-board-spl.c         |   29 +-
 arch/arm/mach-rockchip/rk3399-board-tpl.c         |   91 -
 arch/arm/mach-rockchip/rk3399/Kconfig             |   23 +-
 arch/arm/mach-rockchip/rk3399/rk3399.c            |   29 +
 arch/arm/mach-rockchip/rk3399/syscon_rk3399.c     |    8 +
 arch/arm/mach-rockchip/rk_timer.c                 |   40 -
 arch/arm/mach-rockchip/rv1108/Kconfig             |    8 +
 arch/arm/mach-rockchip/spl-boot-order.c           |    2 +-
 arch/arm/mach-rockchip/tpl.c                      |   86 +
 board/amarula/vyasa-rk3288/vyasa-rk3288.c         |    8 -
 board/chipspark/popmetal_rk3288/popmetal-rk3288.c |    8 -
 board/mqmaker/miqi_rk3288/miqi-rk3288.c           |    9 -
 board/rockchip/evb_rk3288/evb-rk3288.c            |    9 -
 board/rockchip/evb_rk3399/README                  |    6 -
 board/rockchip/fennec_rk3288/fennec-rk3288.c      |    9 -
 board/vamrs/rock960_rk3399/MAINTAINERS            |    4 +-
 configs/chromebit_mickey_defconfig                |    1 -
 configs/chromebook_bob_defconfig                  |    3 -
 configs/chromebook_jerry_defconfig                |    1 -
 configs/chromebook_minnie_defconfig               |    1 -
 configs/chromebook_speedy_defconfig               |    1 -
 configs/evb-px5_defconfig                         |    7 -
 configs/evb-rk3229_defconfig                      |    3 -
 configs/evb-rk3288_defconfig                      |   10 +-
 configs/evb-rk3328_defconfig                      |    2 -
 configs/evb-rk3399_defconfig                      |    3 -
 configs/fennec-rk3288_defconfig                   |    1 -
 configs/ficus-rk3399_defconfig                    |    3 -
 configs/firefly-rk3288_defconfig                  |    1 -
 configs/firefly-rk3399_defconfig                  |    3 -
 configs/lion-rk3368_defconfig                     |    7 -
 configs/miqi-rk3288_defconfig                     |    1 -
 configs/nanopc-t4-rk3399_defconfig                |    3 -
 configs/nanopi-m4-rk3399_defconfig                |    3 -
 configs/nanopi-neo4-rk3399_defconfig              |    3 -
 configs/orangepi-rk3399_defconfig                 |    3 -
 configs/phycore-rk3288_defconfig                  |    1 -
 configs/popmetal-rk3288_defconfig                 |    1 -
 configs/puma-rk3399_defconfig                     |    3 -
 configs/rock-pi-4-rk3399_defconfig                |    4 +-
 configs/rock64-rk3328_defconfig                   |    3 -
 configs/rock960-rk3399_defconfig                  |   18 +-
 configs/rockpro64-rk3399_defconfig                |    4 +-
 configs/sheep-rk3368_defconfig                    |    1 -
 configs/tinker-rk3288_defconfig                   |    2 -
 configs/vyasa-rk3288_defconfig                    |    1 -
 doc/README.rockchip                               |    4 -
 drivers/clk/rockchip/clk_rk3399.c                 |   88 +-
 drivers/ram/Kconfig                               |    1 +
 drivers/ram/rockchip/Kconfig                      |   33 +
 drivers/ram/rockchip/Makefile                     |    3 +-
 drivers/ram/rockchip/sdram-rk3399-lpddr4-400.inc  | 1570 ++++++++++++++
 drivers/ram/rockchip/sdram-rk3399-lpddr4-800.inc  | 1570 ++++++++++++++
 drivers/ram/rockchip/sdram_debug.c                |  147 ++
 drivers/ram/rockchip/sdram_rk322x.c               |   29 +-
 drivers/ram/rockchip/sdram_rk3399.c               | 2298 +++++++++++++++++----
 drivers/usb/host/Kconfig                          |    1 +
 drivers/usb/host/dwc3-of-simple.c                 |    1 +
 drivers/usb/host/xhci-dwc3.c                      |   20 +
 drivers/usb/host/xhci-rockchip.c                  |    2 -
 drivers/video/rockchip/rk3288_hdmi.c              |    2 +-
 include/configs/rk3036_common.h                   |    7 +-
 include/configs/rk3128_common.h                   |    7 +-
 include/configs/rk322x_common.h                   |    7 +-
 include/configs/rk3288_common.h                   |    9 +-
 include/configs/rk3368_common.h                   |    3 +-
 include/configs/rk3399_common.h                   |    1 +
 include/configs/tinker_rk3288.h                   |    1 -
 include/debug_uart.h                              |   19 +
 scripts/config_whitelist.txt                      |    1 +
 125 files changed, 8289 insertions(+), 1435 deletions(-)
 create mode 100644 arch/arm/dts/rk3288-evb-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-fennec-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-firefly-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-miqi-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-popmetal-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3399-sdram-lpddr4-100.dtsi
 create mode 100644 arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
 delete mode 100644 arch/arm/mach-rockchip/rk322x-board-tpl.c
 delete mode 100644 arch/arm/mach-rockchip/rk3288-board-tpl.c
 delete mode 100644 arch/arm/mach-rockchip/rk3368-board-tpl.c
 delete mode 100644 arch/arm/mach-rockchip/rk3399-board-tpl.c
 delete mode 100644 arch/arm/mach-rockchip/rk_timer.c
 create mode 100644 arch/arm/mach-rockchip/tpl.c
 create mode 100644 drivers/ram/rockchip/Kconfig
 create mode 100644 drivers/ram/rockchip/sdram-rk3399-lpddr4-400.inc
 create mode 100644 drivers/ram/rockchip/sdram-rk3399-lpddr4-800.inc
 create mode 100644 drivers/ram/rockchip/sdram_debug.c


More information about the U-Boot mailing list