Merge branch 'tx6-update-2016-02-03' into karo-tx6

[karo-tx-uboot.git] / include / configs / sunxi-common.h

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 1abf73c311792b21f2fa40857b5f11e43fbd76cc..48cc4ed6f629ebbf1229603aca99840edcc4f051 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -137,16 +137,10 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_SERIAL_TAG
 
-#if defined(CONFIG_SPL_NAND_SUNXI)
-#define CONFIG_SPL_NAND_DRIVERS
-#define CONFIG_SPL_NAND_SUPPORT
-
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000
-#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x008000
-
+#ifdef CONFIG_NAND_SUNXI
+#define CONFIG_SPL_NAND_SUPPORT 1
 #endif
 
-
 /* mmc config */
 #if !defined(CONFIG_UART0_PORT_F)
 #define CONFIG_MMC
@@ -185,7 +179,7 @@
 
 #define CONFIG_SYS_NO_FLASH
 
-#define CONFIG_SYS_MONITOR_LEN         (512 << 10)     /* 512 KiB */
+#define CONFIG_SYS_MONITOR_LEN         (768 << 10)     /* 768 KiB */
 #define CONFIG_IDENT_STRING            " Allwinner Technology"
 
 #define CONFIG_ENV_OFFSET              (544 << 10) /* (8 + 24 + 512) KiB */