Pull request: u-boot-rockchip-20200120
Hi Tom,
Please pull the rockchip updates: - Support SPI boot and 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/639069624
Thanks, - Kever
The following changes since commit d7bb6aceb2e99a832efbb96f9bf480bf95602192:
Merge tag 'mmc-1-16-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc (2020-01-16 13:20:51 -0500)
are available in the Git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200120
for you to fetch changes up to f9a0f5b83e9eabf4d064c7ec46fe2f9b9b694b4e:
configs: firefly-rk3399: Enable CONFIG_MISC_INIT_R and ROCKCHIP_EFUSE (2020-01-19 15:19:03 +0800)
---------------------------------------------------------------- Jagan Teki (21): distro_bootcmd: Add SF support rockchip: Include SF on distrocmd devices rk3399: Add boot flash script offet, size 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/config_distro_bootcmd.h | 35 + include/configs/evb_rk3399.h | 4 +- include/configs/rk3399_common.h | 7 +- include/configs/rockchip-common.h | 10 + 68 files changed, 1509 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
On Mon, Jan 20, 2020 at 10:30:07AM +0800, Kever Yang wrote:
Hi Tom,
Please pull the rockchip updates:
- Support SPI boot and 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/639069624
Thanks,
- Kever
The following changes since commit d7bb6aceb2e99a832efbb96f9bf480bf95602192:
Merge tag 'mmc-1-16-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc (2020-01-16 13:20:51 -0500)
are available in the Git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200120
for you to fetch changes up to f9a0f5b83e9eabf4d064c7ec46fe2f9b9b694b4e:
configs: firefly-rk3399: Enable CONFIG_MISC_INIT_R and ROCKCHIP_EFUSE (2020-01-19 15:19:03 +0800)
Per the details in the "distro_bootcmd: Add SF support" thread, I'm not taking this as the distro_bootcmd changes need to be dropped. Thanks!
Hi Tom,
On Thu, Jan 23, 2020 at 11:30 PM Tom Rini trini@konsulko.com wrote:
On Mon, Jan 20, 2020 at 10:30:07AM +0800, Kever Yang wrote:
Hi Tom,
Please pull the rockchip updates:
- Support SPI boot and 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/639069624
Thanks,
- Kever
The following changes since commit d7bb6aceb2e99a832efbb96f9bf480bf95602192:
Merge tag 'mmc-1-16-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc (2020-01-16 13:20:51 -0500)
are available in the Git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200120
for you to fetch changes up to f9a0f5b83e9eabf4d064c7ec46fe2f9b9b694b4e:
configs: firefly-rk3399: Enable CONFIG_MISC_INIT_R and ROCKCHIP_EFUSE (2020-01-19 15:19:03 +0800)
Per the details in the "distro_bootcmd: Add SF support" thread, I'm not taking this as the distro_bootcmd changes need to be dropped. Thanks!
Seems like Kever was Off for vacations or so, if possible maybe you can drop below 'sf distro changes from PR'
distro_bootcmd: Add SF support rockchip: Include SF on distrocmd devices rk3399: Add boot flash script offet, size
Jagan.
On Mon, Jan 27, 2020 at 11:25:16PM +0530, Jagan Teki wrote:
Hi Tom,
On Thu, Jan 23, 2020 at 11:30 PM Tom Rini trini@konsulko.com wrote:
On Mon, Jan 20, 2020 at 10:30:07AM +0800, Kever Yang wrote:
Hi Tom,
Please pull the rockchip updates:
- Support SPI boot and 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/639069624
Thanks,
- Kever
The following changes since commit d7bb6aceb2e99a832efbb96f9bf480bf95602192:
Merge tag 'mmc-1-16-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc (2020-01-16 13:20:51 -0500)
are available in the Git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200120
for you to fetch changes up to f9a0f5b83e9eabf4d064c7ec46fe2f9b9b694b4e:
configs: firefly-rk3399: Enable CONFIG_MISC_INIT_R and ROCKCHIP_EFUSE (2020-01-19 15:19:03 +0800)
Per the details in the "distro_bootcmd: Add SF support" thread, I'm not taking this as the distro_bootcmd changes need to be dropped. Thanks!
Seems like Kever was Off for vacations or so, if possible maybe you can drop below 'sf distro changes from PR'
distro_bootcmd: Add SF support rockchip: Include SF on distrocmd devices rk3399: Add boot flash script offet, size
I will just wait for a new PR early in the -rc2 cycle to take care of outstanding rockchip changes. Thanks.
On Tue, Jan 28, 2020 at 2:32 AM Tom Rini trini@konsulko.com wrote:
On Mon, Jan 27, 2020 at 11:25:16PM +0530, Jagan Teki wrote:
Hi Tom,
On Thu, Jan 23, 2020 at 11:30 PM Tom Rini trini@konsulko.com wrote:
On Mon, Jan 20, 2020 at 10:30:07AM +0800, Kever Yang wrote:
Hi Tom,
Please pull the rockchip updates:
- Support SPI boot and 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/639069624
Thanks,
- Kever
The following changes since commit d7bb6aceb2e99a832efbb96f9bf480bf95602192:
Merge tag 'mmc-1-16-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc (2020-01-16 13:20:51 -0500)
are available in the Git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200120
for you to fetch changes up to f9a0f5b83e9eabf4d064c7ec46fe2f9b9b694b4e:
configs: firefly-rk3399: Enable CONFIG_MISC_INIT_R and ROCKCHIP_EFUSE (2020-01-19 15:19:03 +0800)
Per the details in the "distro_bootcmd: Add SF support" thread, I'm not taking this as the distro_bootcmd changes need to be dropped. Thanks!
Seems like Kever was Off for vacations or so, if possible maybe you can drop below 'sf distro changes from PR'
distro_bootcmd: Add SF support rockchip: Include SF on distrocmd devices rk3399: Add boot flash script offet, sizeI will just wait for a new PR early in the -rc2 cycle to take care of outstanding rockchip changes. Thanks.
It's Chinese New Year, with an extended vacation in China till this Sunday, due to the coronavirus outbreak [1].
On Tue, Jan 28, 2020 at 10:46:41AM +0800, Chen-Yu Tsai wrote:
On Tue, Jan 28, 2020 at 2:32 AM Tom Rini trini@konsulko.com wrote:
On Mon, Jan 27, 2020 at 11:25:16PM +0530, Jagan Teki wrote:
Hi Tom,
On Thu, Jan 23, 2020 at 11:30 PM Tom Rini trini@konsulko.com wrote:
On Mon, Jan 20, 2020 at 10:30:07AM +0800, Kever Yang wrote:
Hi Tom,
Please pull the rockchip updates:
- Support SPI boot and 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/639069624
Thanks,
- Kever
The following changes since commit d7bb6aceb2e99a832efbb96f9bf480bf95602192:
Merge tag 'mmc-1-16-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc (2020-01-16 13:20:51 -0500)
are available in the Git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200120
for you to fetch changes up to f9a0f5b83e9eabf4d064c7ec46fe2f9b9b694b4e:
configs: firefly-rk3399: Enable CONFIG_MISC_INIT_R and ROCKCHIP_EFUSE (2020-01-19 15:19:03 +0800)
Per the details in the "distro_bootcmd: Add SF support" thread, I'm not taking this as the distro_bootcmd changes need to be dropped. Thanks!
Seems like Kever was Off for vacations or so, if possible maybe you can drop below 'sf distro changes from PR'
distro_bootcmd: Add SF support rockchip: Include SF on distrocmd devices rk3399: Add boot flash script offet, sizeI will just wait for a new PR early in the -rc2 cycle to take care of outstanding rockchip changes. Thanks.
It's Chinese New Year, with an extended vacation in China till this Sunday, due to the coronavirus outbreak [1].
Yes, thanks.
Hi Tom,
Sorry for not reply in time for the Chinese Spring Festival vocation.
I will make a new PR and send to mailing list.
Thanks,
- Kever
On 2020/1/28 上午2:32, Tom Rini wrote:
On Mon, Jan 27, 2020 at 11:25:16PM +0530, Jagan Teki wrote:
Hi Tom,
On Thu, Jan 23, 2020 at 11:30 PM Tom Rini trini@konsulko.com wrote:
On Mon, Jan 20, 2020 at 10:30:07AM +0800, Kever Yang wrote:
Hi Tom,
Please pull the rockchip updates:
- Support SPI boot and 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/639069624
Thanks,
- Kever
The following changes since commit d7bb6aceb2e99a832efbb96f9bf480bf95602192:
Merge tag 'mmc-1-16-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc (2020-01-16 13:20:51 -0500)
are available in the Git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200120
for you to fetch changes up to f9a0f5b83e9eabf4d064c7ec46fe2f9b9b694b4e:
configs: firefly-rk3399: Enable CONFIG_MISC_INIT_R and ROCKCHIP_EFUSE (2020-01-19 15:19:03 +0800)
Per the details in the "distro_bootcmd: Add SF support" thread, I'm not taking this as the distro_bootcmd changes need to be dropped. Thanks!
Seems like Kever was Off for vacations or so, if possible maybe you can drop below 'sf distro changes from PR'
distro_bootcmd: Add SF support rockchip: Include SF on distrocmd devices rk3399: Add boot flash script offet, sizeI will just wait for a new PR early in the -rc2 cycle to take care of outstanding rockchip changes. Thanks.
participants (4)
-
Chen-Yu Tsai -
Jagan Teki -
Kever Yang -
Tom Rini