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

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc configs/CHIP_pro_defconfig
index 60dcaa76db10f5f400e645b0b1d9a72143b37d33,faaee831cec21f295692364b7bc3216981a9dab1..2e204d539393e4220affbfdab8dfc2ee4a1ac36a
--- 1/configs/CHIP_pro_defconfig
--- 2/configs/CHIP_pro_defconfig
+++ b/configs/CHIP_pro_defconfig
@@@ -5,7 -4,9 +4,9 @@@ CONFIG_MACH_SUN5I=
  CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
  CONFIG_USB0_VBUS_PIN="PB10"
  CONFIG_DEFAULT_DEVICE_TREE="sun5i-gr8-chip-pro"
- CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCK_SIZE=0x40000,SYS_NAND_PAGE_SIZE=4096,SYS_NAND_OOBSIZE=256"
+ CONFIG_SYS_NAND_BLOCK_SIZE=0x40000
 -CONFIG_SYS_NAND_OOBSIZE=0x1000
++CONFIG_SYS_NAND_PAGE_SIZE=0x1000
+ CONFIG_SYS_NAND_OOBSIZE=0x100
  CONFIG_SPL=y
  CONFIG_SPL_I2C_SUPPORT=y
  # CONFIG_CMD_FLASH is not set

diff --cc configs/pine64_plus_defconfig
Simple merge

diff --cc env/Kconfig
Simple merge

diff --cc lib/Kconfig
Simple merge