From: Tom Rini <trini@konsulko.com>
Date: Wed, 4 Apr 2018 13:18:38 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-sunxi
X-Git-Tag: v2018.05-rc2~140
X-Git-Url: https://git.sur5r.net/?p=u-boot;a=commitdiff_plain;h=e294ba0678359bc32085c1714329af37e33e8f16

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

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

e294ba0678359bc32085c1714329af37e33e8f16
diff --cc configs/CHIP_pro_defconfig
index 60dcaa76db,faaee831ce..2e204d5393
--- a/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