Hi Tom,
Please ignore this pull and I'm going to send v2 of PULL with drop some board support for it does not have available SPL now.
Thanks, - Kever On 05/09/2019 09:17 AM, Kever Yang wrote:
Hi Tom,
Here is the second batch of changes for the Rockchip side of the repository.
Clean bill-of-health in Travis-CI at
https://travis-ci.org/keveryang/u-boot/builds/529695743
And I have test on all evb of Rockchip SoCs.
Thanks,
- Kever
The following changes since commit 8d7f06bbbef16f172cd5e9c4923cdcebe16b8980:
Merge branch 'master' of git://git.denx.de/u-boot-sh (2019-05-07 09:38:00 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-rockchip.git tags/rockchip-for-v2019.07-rc1
for you to fetch changes up to 53fc7795e2310a5c52cdc240d84fed8d33777773:
doc: rockchip: Add global doc for rk3399 build/flash (2019-05-08 17:34:14 +0800)
Improvements and new features:
- split more rockchip pinctrl_core feature into per SoC
- enable TPL for evb-rk3399 board
- enable TPL/SPL for evb-px5 board
- enable TPL and OP-TEE support for evb-rk3229
- update fix in arm common assembly start code for rockchip header file
- update default SPL_FIT_GENERATOR for rockchip
- rk3399 boards update to use '-u-boot.dtsi'
- add new rk3399 boards: Nanopi M4/NEO4, Nanopc T4, RockPro64, Rock PI 4
- enable sound for chromebook_minnie
David Wu (10): pinctrl: rockchip: Add pull-pin-default param and remove unused param pinctrl: rockchip: Remove redundant spaces pinctrl: rockchip: Split the common set_mux() into per Soc pinctrl: rockchip: Special treatment for RK3288 gpio0 pins' iomux pinctrl: rockchip: Split the common set_drive() func into per Soc pinctrl: rockchip: Special treatment for RK3288 gpio0 pins' drive strength pinctrl: rockchip: Split the common set_pull() func into per Soc pinctrl: rockchip: Special treatment for RK3288 gpio0 pins' pull pinctrl: rockchip: Clean the unused type and label pinctrl: rockchip: Also move common set_schmitter func into per Soc file
Jagan Teki (16): dts: Makefile: Build rockchip dtbs based on SoC types arm64: rockchip: dts: rk3399: Add board -u-boot.dtsi files rockchip: dts: rk3399-u-boot: Add u-boot, dm-pre-reloc for spi1 arm64: rockchip: dts: rk3399: Use rk3399-u-boot.dtsi rockchip: rk3399: orangepi: Add SPL_TEXT_BASE rockchip: dts: rk3399: Sync pwm2_pin_pull_down from Linux 5.1-rc2 Kconfig: Add default SPL_FIT_GENERATOR for rockchip arm: rockchip: rk3399: Move common configs in Kconfig rockchip: dts: rk3399: Sync rk3399-nanopi4.dtsi from Linux rockchip: dts: rk3399: nanopi4: Use CD pin as RK_FUNC_1 rockchip: rk3399: Add Nanopi M4 board support rockchip: rk3399: Add Nanopc T4 board support rockchip: rk3399: Add Nanopi NEO4 board support rockchip: rk3399: Add Rockpro64 board support rockchip: rk3399: Add Rock PI 4 support doc: rockchip: Add global doc for rk3399 build/flash
Kever Yang (26): rockchip: add common header boot0.h and gpio.h for soc arm: remove ARCH_ROCKCHIP macro in common code Revert "rockchip: rk322x: ram: enable DRAM init in SPL instead of TPL" arm: add option for TPL support in arm 32bit arm: add a separate stack for TPL rockchip: rk322x: add CLK_EMMC_SAMPLE clock support rockchip: clk: rk322x: fix assert clock value rockchip: rk322x: add tpl support sysreset: enable driver support in SPL/TPL rockchip: rk322x: dts: enable uart2 for SPL/TPL rockchip: evb-rk3229: remove unnecessary defines rockchip: evb-rk3229: add README file for OP-TEE support rockchip: evb-rk322x: update defconfig with tpl and optee support rockchip: rk3368: support UART2/4 in board_debug_uart_init() rockchip: px5 update dts for spl/tpl rockchip: px5: update SPL size for spl/tpl rockchip: px5: update defconfig for TPL/SPL rockchip: boot0: update CONFIG_ROCKCHIP_SPL_RESERVE_IRAM for SPL only rockchip: dmc: rk3368: update rank number for evb-px5 rockchip: rk3368: remove uart iomux init in SPL rockchip: px5: add timer0 dts node as tick timer rockchip: add u-boot-tpl-v8.lds rockchip: rk3399: add tpl support rockchip: ram: rk3399: update for TPL rockchip: rk3399: update defconfig for TPL Revert "pinctrl: rockchip: Add 32bit writing function for rk3288 gpio0 pinctrl"
Simon Glass (1): rockchip: chromebook_minnie: Enable sound
Kconfig | 1 + arch/Kconfig | 1 + arch/arm/Kconfig | 30 + arch/arm/cpu/armv8/start.S | 4 - arch/arm/dts/Makefile | 40 +- arch/arm/dts/rk3229-evb.dts | 1 + arch/arm/dts/rk3288-veyron-minnie.dts | 12 + arch/arm/dts/rk3368-px5-evb-u-boot.dtsi | 36 ++ arch/arm/dts/rk3399-evb-u-boot.dtsi | 7 + arch/arm/dts/rk3399-evb.dts | 1 - arch/arm/dts/rk3399-ficus-u-boot.dtsi | 6 + arch/arm/dts/rk3399-ficus.dts | 1 - arch/arm/dts/rk3399-firefly-u-boot.dtsi | 7 + arch/arm/dts/rk3399-firefly.dts | 1 - arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 7 + arch/arm/dts/rk3399-gru-bob.dts | 1 - arch/arm/dts/rk3399-gru-u-boot.dtsi | 6 + arch/arm/dts/rk3399-gru.dtsi | 1 - arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi | 7 + arch/arm/dts/rk3399-nanopc-t4.dts | 91 +++ arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi | 7 + arch/arm/dts/rk3399-nanopi-m4.dts | 66 +++ arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi | 6 + arch/arm/dts/rk3399-nanopi-neo4.dts | 50 ++ arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 11 + arch/arm/dts/rk3399-nanopi4.dtsi | 703 ++++++++++++++++++++++ arch/arm/dts/rk3399-puma-ddr1600.dts | 1 + arch/arm/dts/rk3399-puma.dtsi | 2 - arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi | 6 + arch/arm/dts/rk3399-rock-pi-4.dts | 606 +++++++++++++++++++ arch/arm/dts/rk3399-rock960-u-boot.dtsi | 6 + arch/arm/dts/rk3399-rock960.dts | 1 - arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 6 + arch/arm/dts/rk3399-rockpro64.dts | 712 +++++++++++++++++++++++ arch/arm/dts/rk3399-u-boot.dtsi | 4 + arch/arm/dts/rk3399.dtsi | 5 + arch/arm/include/asm/arch-rk3036/boot0.h | 11 + arch/arm/include/asm/arch-rk3036/gpio.h | 11 + arch/arm/include/asm/arch-rk3128/boot0.h | 11 + arch/arm/include/asm/arch-rk3128/gpio.h | 11 + arch/arm/include/asm/arch-rk3188/boot0.h | 11 + arch/arm/include/asm/arch-rk3188/gpio.h | 11 + arch/arm/include/asm/arch-rk322x/boot0.h | 11 + arch/arm/include/asm/arch-rk322x/gpio.h | 11 + arch/arm/include/asm/arch-rk3288/boot0.h | 11 + arch/arm/include/asm/arch-rk3288/gpio.h | 11 + arch/arm/include/asm/arch-rk3328/boot0.h | 11 + arch/arm/include/asm/arch-rk3328/gpio.h | 11 + arch/arm/include/asm/arch-rk3368/boot0.h | 11 + arch/arm/include/asm/arch-rk3368/gpio.h | 11 + arch/arm/include/asm/arch-rk3399/boot0.h | 11 + arch/arm/include/asm/arch-rk3399/gpio.h | 11 + arch/arm/include/asm/arch-rockchip/boot0.h | 3 +- arch/arm/include/asm/arch-rv1108/boot0.h | 11 + arch/arm/include/asm/arch-rv1108/gpio.h | 11 + arch/arm/lib/crt0.S | 4 +- arch/arm/lib/vectors.S | 4 - arch/arm/mach-rockchip/Kconfig | 76 ++- arch/arm/mach-rockchip/Makefile | 4 +- arch/arm/mach-rockchip/rk322x-board-spl.c | 46 +- arch/arm/mach-rockchip/rk322x-board-tpl.c | 53 ++ arch/arm/mach-rockchip/rk3368-board-spl.c | 15 - arch/arm/mach-rockchip/rk3368/rk3368.c | 40 ++ arch/arm/mach-rockchip/rk3399-board-tpl.c | 84 +++ arch/arm/mach-rockchip/u-boot-tpl-v8.lds | 94 +++ arch/arm/mach-rockchip/u-boot-tpl.lds | 12 + board/rockchip/evb_rk3229/README | 72 +++ board/rockchip/evb_rk3399/MAINTAINERS | 32 + configs/am65x_evm_a53_defconfig | 1 + configs/am65x_evm_r5_defconfig | 1 + configs/am65x_hs_evm_a53_defconfig | 1 + configs/am65x_hs_evm_r5_defconfig | 1 + configs/chromebook_bob_defconfig | 17 - configs/chromebook_minnie_defconfig | 5 + configs/evb-px5_defconfig | 56 +- configs/evb-rk3229_defconfig | 27 +- configs/evb-rk3399_defconfig | 24 +- configs/ficus-rk3399_defconfig | 17 - configs/firefly-rk3399_defconfig | 24 +- configs/mt7629_rfb_defconfig | 1 + configs/nanopc-t4-rk3399_defconfig | 59 ++ configs/nanopi-m4-rk3399_defconfig | 59 ++ configs/nanopi-neo4-rk3399_defconfig | 59 ++ configs/orangepi-rk3399_defconfig | 18 +- configs/puma-rk3399_defconfig | 16 - configs/rock-pi-4-rk3399_defconfig | 59 ++ configs/rock960-rk3399_defconfig | 17 - configs/rockpro64-rk3399_defconfig | 59 ++ configs/sandbox_spl_defconfig | 1 + doc/README.rockchip | 233 +++++++- drivers/clk/rockchip/clk_rk322x.c | 6 +- drivers/pinctrl/rockchip/pinctrl-rk3036.c | 56 +- drivers/pinctrl/rockchip/pinctrl-rk3128.c | 62 +- drivers/pinctrl/rockchip/pinctrl-rk3188.c | 62 +- drivers/pinctrl/rockchip/pinctrl-rk322x.c | 100 +++- drivers/pinctrl/rockchip/pinctrl-rk3288.c | 163 ++++-- drivers/pinctrl/rockchip/pinctrl-rk3328.c | 125 +++- drivers/pinctrl/rockchip/pinctrl-rk3368.c | 111 +++- drivers/pinctrl/rockchip/pinctrl-rk3399.c | 167 +++++- drivers/pinctrl/rockchip/pinctrl-rockchip-core.c | 276 ++------- drivers/pinctrl/rockchip/pinctrl-rockchip.h | 69 +-- drivers/pinctrl/rockchip/pinctrl-rv1108.c | 103 +++- drivers/ram/rockchip/dmc-rk3368.c | 4 + drivers/ram/rockchip/sdram_rk322x.c | 12 +- drivers/ram/rockchip/sdram_rk3399.c | 15 +- drivers/sysreset/Kconfig | 18 + drivers/sysreset/Makefile | 2 +- include/configs/evb_px5.h | 1 + include/configs/evb_rk3229.h | 44 +- include/configs/rk322x_common.h | 6 +- include/configs/rk3368_common.h | 3 +- include/configs/rk3399_common.h | 8 + 112 files changed, 4693 insertions(+), 665 deletions(-) create mode 100644 arch/arm/dts/rk3399-evb-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-ficus-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-firefly-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-gru-bob-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-gru-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopc-t4.dts create mode 100644 arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopi-m4.dts create mode 100644 arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopi-neo4.dts create mode 100644 arch/arm/dts/rk3399-nanopi4-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopi4.dtsi create mode 100644 arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-rock-pi-4.dts create mode 100644 arch/arm/dts/rk3399-rock960-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-rockpro64-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-rockpro64.dts create mode 100644 arch/arm/include/asm/arch-rk3036/boot0.h create mode 100644 arch/arm/include/asm/arch-rk3036/gpio.h create mode 100644 arch/arm/include/asm/arch-rk3128/boot0.h create mode 100644 arch/arm/include/asm/arch-rk3128/gpio.h create mode 100644 arch/arm/include/asm/arch-rk3188/boot0.h create mode 100644 arch/arm/include/asm/arch-rk3188/gpio.h create mode 100644 arch/arm/include/asm/arch-rk322x/boot0.h create mode 100644 arch/arm/include/asm/arch-rk322x/gpio.h create mode 100644 arch/arm/include/asm/arch-rk3288/boot0.h create mode 100644 arch/arm/include/asm/arch-rk3288/gpio.h create mode 100644 arch/arm/include/asm/arch-rk3328/boot0.h create mode 100644 arch/arm/include/asm/arch-rk3328/gpio.h create mode 100644 arch/arm/include/asm/arch-rk3368/boot0.h create mode 100644 arch/arm/include/asm/arch-rk3368/gpio.h create mode 100644 arch/arm/include/asm/arch-rk3399/boot0.h create mode 100644 arch/arm/include/asm/arch-rk3399/gpio.h create mode 100644 arch/arm/include/asm/arch-rv1108/boot0.h create mode 100644 arch/arm/include/asm/arch-rv1108/gpio.h create mode 100644 arch/arm/mach-rockchip/rk322x-board-tpl.c create mode 100644 arch/arm/mach-rockchip/rk3399-board-tpl.c create mode 100644 arch/arm/mach-rockchip/u-boot-tpl-v8.lds create mode 100644 arch/arm/mach-rockchip/u-boot-tpl.lds create mode 100644 board/rockchip/evb_rk3229/README create mode 100644 configs/nanopc-t4-rk3399_defconfig create mode 100644 configs/nanopi-m4-rk3399_defconfig create mode 100644 configs/nanopi-neo4-rk3399_defconfig create mode 100644 configs/rock-pi-4-rk3399_defconfig create mode 100644 configs/rockpro64-rk3399_defconfig
U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot