Merge tag 'rockchip-for-2019.07' of git://git.denx.de/u-boot-rockchip
authorTom Rini <trini@konsulko.com>
Wed, 1 May 2019 15:52:04 +0000 (11:52 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 1 May 2019 15:52:04 +0000 (11:52 -0400)
Improvements and new features:
- improved SPI driver for better read throughput
- refactors initialisation of debug UART init
- restructures header file paths
- adds pinctrl improvements

Adds Kever as a co-custodian.

1  2 
arch/arm/Kconfig
arch/arm/dts/Makefile

diff --combined arch/arm/Kconfig
index e84f3d7debf13749d1cec82b50fc45b4eacab984,50daec709d9fd8c0afcc0f79d2e699a9fe75b54a..49f01f1ff17ddbc331525a3af441d888aefecf28
@@@ -1439,6 -1439,7 +1439,7 @@@ config ARCH_ROCKCHI
        select SYS_THUMB_BUILD if !ARM64
        imply ADC
        imply CMD_DM
+       imply DEBUG_UART_BOARD_INIT
        imply DISTRO_DEFAULTS
        imply FAT_WRITE
        imply SARADC_ROCKCHIP
@@@ -1639,7 -1640,6 +1640,7 @@@ source "board/tcl/sl50/Kconfig
  source "board/ucRobotics/bubblegum_96/Kconfig"
  source "board/birdland/bav335x/Kconfig"
  source "board/toradex/colibri_pxa270/Kconfig"
 +source "board/variscite/dart_6ul/Kconfig"
  source "board/vscom/baltos/Kconfig"
  source "board/woodburn/Kconfig"
  source "board/xilinx/Kconfig"
diff --combined arch/arm/dts/Makefile
index dfa5b02958779edc891f4a376c2b7d3d70cd6b8f,8c0ff5f546e0c2dc9396c0afa64c485a7fcbc8e1..b69b154deeba849265c308fe2944af050911f758
@@@ -74,6 -74,7 +74,7 @@@ dtb-$(CONFIG_ARCH_ROCKCHIP) += 
        rk3288-fennec.dtb \
        rk3288-firefly.dtb \
        rk3288-miqi.dtb \
+       rk3399-orangepi.dtb \
        rk3288-phycore-rdk.dtb \
        rk3288-popmetal.dtb \
        rk3288-rock2-square.dtb \
@@@ -558,7 -559,6 +559,7 @@@ dtb-$(CONFIG_MX6UL) += 
  dtb-$(CONFIG_MX6ULL) += \
        imx6ull-14x14-evk.dtb \
        imx6ull-colibri.dtb \
 +      imx6ull-dart-6ul.dtb
  
  dtb-$(CONFIG_ARCH_MX6) += \
        imx6-colibri.dtb
@@@ -567,16 -567,11 +568,16 @@@ dtb-$(CONFIG_MX7) += imx7d-sdb.dtb 
        imx7d-sdb-qspi.dtb \
        imx7-colibri-emmc.dtb \
        imx7-colibri-rawnand.dtb \
 -      imx7s-warp.dtb
 +      imx7s-warp.dtb \
 +      imx7d-pico-pi.dtb \
 +      imx7d-pico-hobbit.dtb
 +
  
  dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb
  
 -dtb-$(CONFIG_ARCH_IMX8) += fsl-imx8qxp-mek.dtb
 +dtb-$(CONFIG_ARCH_IMX8) += \
 +      fsl-imx8qxp-mek.dtb \
 +      fsl-imx8qm-mek.dtb \
  
  dtb-$(CONFIG_ARCH_IMX8M) += fsl-imx8mq-evk.dtb