Merge git://git.denx.de/u-boot-rockchip

diff --combined arch/arm/Kconfig
index 5feef970a6d7817f9dd45c3dede6ad635168f068,194fb7bd8bcedd69347bcf88c892bfe5f8b03e94..c598f5e4c1147a54dd8ed7e4e9a0369a1e483d2e
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -62,12 -62,6 +62,12 @@@ config SEMIHOSTIN
          the hosted environment to call out to the emulator to
          retrieve files from the host machine.
  
 +config SYS_L2CACHE_OFF
 +      bool "L2cache off"
 +      help
 +        If SoC does not support L2CACHE or one do not want to enable
 +        L2CACHE, choose this option.
 +
  choice
        prompt "Target select"
        default ARCH_VERSATILE
@@@ -517,6 -511,112 +517,6 @@@ config TARGET_VISION
        bool "Support vision2"
        select CPU_V7
  
 -config TARGET_UDOO
 -      bool "Support udoo"
 -      select CPU_V7
 -
 -config TARGET_WANDBOARD
 -      bool "Support wandboard"
 -      select CPU_V7
 -      select SUPPORT_SPL
 -
 -config TARGET_WARP
 -      bool "Support WaRP"
 -      select CPU_V7
 -
 -config TARGET_TITANIUM
 -      bool "Support titanium"
 -      select CPU_V7
 -
 -config TARGET_NITROGEN6X
 -      bool "Support nitrogen6x"
 -      select CPU_V7
 -
 -config TARGET_CGTQMX6EVAL
 -      bool "Support cgtqmx6eval"
 -      select CPU_V7
 -
 -config TARGET_EMBESTMX6BOARDS
 -      bool "Support embestmx6boards"
 -      select CPU_V7
 -
 -config TARGET_ARISTAINETOS
 -      bool "Support aristainetos"
 -      select CPU_V7
 -
 -config TARGET_ARISTAINETOS2
 -      bool "Support aristainetos2"
 -      select CPU_V7
 -
 -config TARGET_MX6QARM2
 -      bool "Support mx6qarm2"
 -      select CPU_V7
 -
 -config TARGET_MX6QSABREAUTO
 -      bool "Support mx6qsabreauto"
 -      select CPU_V7
 -      select DM
 -      select DM_THERMAL
 -
 -config TARGET_MX6SABRESD
 -      bool "Support mx6sabresd"
 -      select CPU_V7
 -      select SUPPORT_SPL
 -      select DM
 -      select DM_THERMAL
 -
 -config TARGET_MX6CUBOXI
 -      bool "Support Solid-run mx6 boards"
 -      select CPU_V7
 -      select SUPPORT_SPL
 -
 -config TARGET_MX6SLEVK
 -      bool "Support mx6slevk"
 -      select CPU_V7
 -
 -config TARGET_MX6SXSABRESD
 -      bool "Support mx6sxsabresd"
 -      select CPU_V7
 -      select SUPPORT_SPL
 -      select DM
 -      select DM_THERMAL
 -
 -config TARGET_MX6UL_14X14_EVK
 -      bool "Support mx6ul_14x14_evk"
 -      select CPU_V7
 -      select DM
 -      select DM_THERMAL
 -      select SUPPORT_SPL
 -
 -config TARGET_GW_VENTANA
 -      bool "Support gw_ventana"
 -      select CPU_V7
 -      select SUPPORT_SPL
 -
 -config TARGET_KOSAGI_NOVENA
 -      bool "Support Kosagi Novena"
 -      select CPU_V7
 -      select SUPPORT_SPL
 -
 -config TARGET_TBS2910
 -      bool "Support tbs2910"
 -      select CPU_V7
 -
 -config TARGET_OT1200
 -      bool "Bachmann OT1200"
 -      select CPU_V7
 -      select SUPPORT_SPL
 -
 -config TARGET_PLATINUM_PICON
 -      bool "Support platinum-picon"
 -      select CPU_V7
 -      select SUPPORT_SPL
 -
 -config TARGET_PLATINUM_TITANIUM
 -      bool "Support platinum-titanium"
 -      select CPU_V7
 -      select SUPPORT_SPL
 -
  config OMAP34XX
        bool "OMAP34XX SoC"
        select CPU_V7
@@@ -566,10 -666,6 +566,10 @@@ config TARGET_SNOWBAL
        bool "Support snowball"
        select CPU_V7
  
 +config TARGET_TS4800
 +      bool "Support TS4800"
 +      select CPU_V7
 +
  config TARGET_U8500_HREF
        bool "Support u8500_href"
        select CPU_V7
@@@ -733,6 -829,14 +733,14 @@@ config TARGET_STM32F429_DISCOVER
        bool "Support STM32F429 Discovery"
        select CPU_V7M
  
+ config ARCH_ROCKCHIP
+       bool "Support Rockchip SoCs"
+       select SUPPORT_SPL
+       select SPL
+       select OF_CONTROL
+       select CPU_V7
+       select DM
+ 
  endchoice
  
  source "arch/arm/mach-at91/Kconfig"
@@@ -767,6 -871,8 +775,8 @@@ source "arch/arm/mach-orion5x/Kconfig
  
  source "arch/arm/cpu/armv7/rmobile/Kconfig"
  
+ source "arch/arm/mach-rockchip/Kconfig"
+ 
  source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
  
  source "arch/arm/mach-socfpga/Kconfig"
@@@ -787,6 -893,7 +797,6 @@@ source "arch/arm/cpu/armv8/Kconfig
  
  source "arch/arm/imx-common/Kconfig"
  
 -source "board/aristainetos/Kconfig"
  source "board/BuR/kwb/Kconfig"
  source "board/BuR/tseries/Kconfig"
  source "board/CarMediaLab/flea3/Kconfig"
@@@ -797,18 -904,26 +807,18 @@@ source "board/Marvell/gplugd/Kconfig
  source "board/armadeus/apf27/Kconfig"
  source "board/armltd/vexpress/Kconfig"
  source "board/armltd/vexpress64/Kconfig"
 -source "board/hisilicon/hikey/Kconfig"
 -source "board/bachmann/ot1200/Kconfig"
  source "board/balloon3/Kconfig"
 -source "board/barco/platinum/Kconfig"
 -source "board/barco/titanium/Kconfig"
  source "board/bluegiga/apx4devkit/Kconfig"
 -source "board/boundary/nitrogen6x/Kconfig"
  source "board/broadcom/bcm28155_ap/Kconfig"
  source "board/broadcom/bcmcygnus/Kconfig"
  source "board/broadcom/bcmnsp/Kconfig"
  source "board/cirrus/edb93xx/Kconfig"
  source "board/compulab/cm_t335/Kconfig"
  source "board/compulab/cm_t43/Kconfig"
 -source "board/compulab/cm_fx6/Kconfig"
 -source "board/congatec/cgtqmx6eval/Kconfig"
  source "board/creative/xfi3/Kconfig"
  source "board/davedenx/qong/Kconfig"
  source "board/denx/m28evk/Kconfig"
  source "board/denx/m53evk/Kconfig"
 -source "board/embest/mx6boards/Kconfig"
  source "board/esg/ima3-mx53/Kconfig"
  source "board/freescale/ls2085a/Kconfig"
  source "board/freescale/ls2085aqds/Kconfig"
@@@ -826,17 -941,24 +836,17 @@@ source "board/freescale/mx53ard/Kconfig
  source "board/freescale/mx53evk/Kconfig"
  source "board/freescale/mx53loco/Kconfig"
  source "board/freescale/mx53smd/Kconfig"
 -source "board/freescale/mx6qarm2/Kconfig"
 -source "board/freescale/mx6qsabreauto/Kconfig"
 -source "board/freescale/mx6sabresd/Kconfig"
 -source "board/freescale/mx6slevk/Kconfig"
 -source "board/freescale/mx6sxsabresd/Kconfig"
 -source "board/freescale/mx6ul_14x14_evk/Kconfig"
  source "board/freescale/vf610twr/Kconfig"
 -source "board/gateworks/gw_ventana/Kconfig"
  source "board/genesi/mx51_efikamx/Kconfig"
  source "board/gumstix/pepper/Kconfig"
  source "board/h2200/Kconfig"
  source "board/hale/tt01/Kconfig"
 +source "board/hisilicon/hikey/Kconfig"
  source "board/icpdas/lp8x4x/Kconfig"
  source "board/imx31_phycore/Kconfig"
  source "board/isee/igep0033/Kconfig"
  source "board/jornada/Kconfig"
  source "board/karo/tx25/Kconfig"
 -source "board/kosagi/novena/Kconfig"
  source "board/logicpd/imx27lite/Kconfig"
  source "board/logicpd/imx31_litekit/Kconfig"
  source "board/maxbcm/Kconfig"
@@@ -856,6 -978,7 +866,6 @@@ source "board/siemens/draco/Kconfig
  source "board/siemens/pxm2/Kconfig"
  source "board/siemens/rut/Kconfig"
  source "board/silica/pengwyn/Kconfig"
 -source "board/solidrun/mx6cuboxi/Kconfig"
  source "board/spear/spear300/Kconfig"
  source "board/spear/spear310/Kconfig"
  source "board/spear/spear320/Kconfig"
@@@ -867,6 -990,7 +877,6 @@@ source "board/st/stm32f429-discovery/Kc
  source "board/st/stv0991/Kconfig"
  source "board/sunxi/Kconfig"
  source "board/syteco/zmx25/Kconfig"
 -source "board/tbs/tbs2910/Kconfig"
  source "board/ti/am335x/Kconfig"
  source "board/ti/am43xx/Kconfig"
  source "board/birdland/bav335x/Kconfig"
@@@ -876,10 -1000,12 +886,10 @@@ source "board/timll/devkit3250/Kconfig
  source "board/toradex/colibri_pxa270/Kconfig"
  source "board/toradex/colibri_vf/Kconfig"
  source "board/trizepsiv/Kconfig"
 +source "board/technologic/ts4800/Kconfig"
  source "board/ttcontrol/vision2/Kconfig"
 -source "board/udoo/Kconfig"
  source "board/vpac270/Kconfig"
  source "board/vscom/baltos/Kconfig"
 -source "board/wandboard/Kconfig"
 -source "board/warp/Kconfig"
  source "board/woodburn/Kconfig"
  source "board/work-microwave/work_92105/Kconfig"
  source "board/xaeniax/Kconfig"

diff --combined arch/arm/lib/Makefile
index 51497cc289b42ab55b1aaa9ae4fd06c1ec649288,15e74bd484e8e3b97172ac79c11a40f4f66802fe..f7171035265eafb135f70ce21f1bd69dd8f1b961
--- 1/arch/arm/lib/Makefile
--- 2/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@@ -42,13 -42,14 +42,15 @@@ obj-y      += stack.
  ifdef CONFIG_CPU_V7M
  obj-y += interrupts_m.o
  else ifdef CONFIG_ARM64
 +obj-y += ccn504.o
  obj-y += gic_64.o
  obj-y += interrupts_64.o
  else
  obj-y += interrupts.o
  endif
+ ifndef CONFIG_RESET
  obj-y += reset.o
+ endif
  
  obj-y += cache.o
  ifndef CONFIG_ARM64

diff --combined drivers/power/pmic/Makefile
index e7a761703e186824d8c8a0656f63401172addef2,8f6463e127811ed76a56f97d41805d666a17ac99..00fde71b2c22f91ccae08eff799e80601ff9b09a
--- 1/drivers/power/pmic/Makefile
--- 2/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@@ -9,6 -9,7 +9,7 @@@ obj-$(CONFIG_DM_PMIC) += pmic-uclass.
  obj-$(CONFIG_DM_PMIC_MAX77686) += max77686.o
  obj-$(CONFIG_DM_PMIC_PFUZE100) += pfuze100.o
  obj-$(CONFIG_DM_PMIC_SANDBOX) += sandbox.o i2c_pmic_emul.o
+ obj-$(CONFIG_PMIC_ACT8846) += act8846.o
  obj-$(CONFIG_PMIC_TPS65090) += tps65090.o
  obj-$(CONFIG_PMIC_S5M8767) += s5m8767.o
  
@@@ -19,7 -20,6 +20,7 @@@ obj-$(CONFIG_POWER_MAX8997) += pmic_max
  obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
  obj-$(CONFIG_POWER_MAX77686) += pmic_max77686.o
  obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
 +obj-$(CONFIG_POWER_PFUZE3000) += pmic_pfuze3000.o
  obj-$(CONFIG_POWER_TPS65217) += pmic_tps65217.o
  obj-$(CONFIG_POWER_TPS65218) += pmic_tps62362.o
  obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o

diff --combined drivers/serial/Kconfig
index 002f1dafe18134ac74cee784f3f2c3756ad5dc45,7ddda9f205599c8e884652828febf26968eccaec..ccb80d2d1d90198c5ae104b532b234d3ca33fe43
--- 1/drivers/serial/Kconfig
--- 2/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@@ -109,9 -109,18 +109,18 @@@ config DEBUG_UART_SHIF
          value. Use this value to specify the shift to use, where 0=byte
          registers, 2=32-bit word registers, etc.
  
+ config ROCKCHIP_SERIAL
+       bool "Rockchip on-chip UART support"
+       depends on ARCH_UNIPHIER && DM_SERIAL
+       help
+         Select this to enable a debug UART for Rockchip devices. This uses
+         the ns16550 driver. You will need to #define CONFIG_SYS_NS16550 in
+         your board config header. The clock input is automatically set to
+         use the oscillator (24MHz).
+ 
  config SANDBOX_SERIAL
        bool "Sandbox UART support"
 -      depends on SANDBOX && DM
 +      depends on SANDBOX
        help
          Select this to enable a seral UART for sandbox. This is required to
          operate correctly, otherwise you will see no serial output from
@@@ -131,7 -140,7 +140,7 @@@
  
  config UNIPHIER_SERIAL
        bool "Support for UniPhier on-chip UART"
 -      depends on ARCH_UNIPHIER && DM_SERIAL
 +      depends on ARCH_UNIPHIER
        help
          If you have a UniPhier based board and want to use the on-chip
          serial ports, say Y to this option. If unsure, say N.