diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-31 12:12:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-31 12:12:27 -0400 |
| commit | b7e84c93c450480ca4ff51ad2eb56bd83c1dc368 (patch) | |
| tree | 1523b49f2bd4d1880bfa12f22e11cb6ef66d2e3b /include | |
| parent | 80cd58b99e8690b05e8537dbf76276e24fcfa652 (diff) | |
| parent | fa5e102019e28a5936e52d6aa9f5624cf1744a35 (diff) | |
| download | blackbird-obmc-uboot-b7e84c93c450480ca4ff51ad2eb56bd83c1dc368.tar.gz blackbird-obmc-uboot-b7e84c93c450480ca4ff51ad2eb56bd83c1dc368.zip | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sunxi-common.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 1abf73c311..48cc4ed6f6 100644 --- 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 */ |
