diff options
| author | Ian Campbell <ijc@hellion.org.uk> | 2015-06-26 19:42:24 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-28 11:46:31 -0400 |
| commit | da9971d1b3bdb554d4a4ac948119f8b2616bbcce (patch) | |
| tree | 891484a36f14b56879c7091a8e907a8f57f8c3f5 /include/configs/sunxi-common.h | |
| parent | ef0f2f57524ec85fb9058a23298f2c4995e0d950 (diff) | |
| download | u-boot-da9971d1b3bdb554d4a4ac948119f8b2616bbcce.tar.gz | |
Revert "sunxi/nand: Add support to the SPL for loading u-boot from internal NAND memory"
This reverts commit f76eba38b3eda905ff3bdc18dd1240d3dcbc6e5a.
This patch did not have a full and proper copyright/S-o-b chain.
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Conflicts:
include/configs/sun6i.h
include/configs/sun8i.h
Diffstat (limited to 'include/configs/sunxi-common.h')
| -rw-r--r-- | include/configs/sunxi-common.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index aed040b0eb..9576bc1a20 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -146,10 +146,8 @@ #define CONFIG_CMD_MMC #define CONFIG_MMC_SUNXI #define CONFIG_MMC_SUNXI_SLOT 0 -#if !defined(CONFIG_SPL_NAND_SUPPORT) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* first detected MMC controller */ -#endif /* CONFIG_SPL_NAND_SUPPORT */ #endif /* 4MB of malloc() pool */ @@ -351,24 +349,6 @@ extern int soft_i2c_gpio_scl; #define CONFIG_ENV_IS_NOWHERE #endif -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_NAND -#define CONFIG_SYS_NAND_SELF_INIT -#define CONFIG_NAND_SUNXI -#define CONFIG_CMD_SPL_WRITE_SIZE 0x000400 -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x008000 - -/* \todo Make these parameterisable in kernel config ? */ -#define CONFIG_NAND_SUNXI_PAGE_SIZE 8192 -#define CONFIG_NAND_SUNXI_ECC_STEP 1024 -#define CONFIG_NAND_SUNXI_ECC_STRENGTH 40 -#define CONFIG_NAND_SUNXI_ADDR_CYCLES 5 - -#ifndef CONFIG_NAND_SUNXI_GPC_PORTS -#error "No NAND GPC ports defined, NAND unsupported" -#endif -#endif /* CONFIG_SPL_NAND_SUPPORT */ - #define CONFIG_MISC_INIT_R #define CONFIG_SYS_CONSOLE_IS_IN_ENV |