From 8f1a80e99e4a838d1540cdb1d59ccc7785fe4618 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 28 Jul 2017 21:31:42 -0400 Subject: configs: Migrate CMD_NAND* Migrate all remaining instances of CMD_NAND, CMD_NAND_TRIMFFS CMD_NAND_LOCK_UNLOCK and CMD_NAND_TORTURE from the headers into the defconfig files. Tested-by: Adam Ford Signed-off-by: Tom Rini Reviewed-by: Bin Meng --- include/configs/sama5d3xek.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include/configs/sama5d3xek.h') diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index a5a0f7c32f..83b527c0de 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -69,8 +69,6 @@ #endif /* NAND flash */ -#define CONFIG_CMD_NAND - #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 @@ -80,13 +78,12 @@ /* our CLE is AD22 */ #define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_ONFI_DETECTION +#endif /* PMECC & PMERRLOC */ #define CONFIG_ATMEL_NAND_HWECC #define CONFIG_ATMEL_NAND_HW_PMECC #define CONFIG_PMECC_CAP 4 #define CONFIG_PMECC_SECTOR_SIZE 512 -#define CONFIG_CMD_NAND_TRIMFFS -#endif #define CONFIG_PHY_MICREL_KSZ9021 -- cgit v1.2.3