karo: tx6: use standard config option CONFIG_SYS_NAND_BLOCK_SIZE instead of CONFIG_SY...

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 91159dc4c40990e03e9df2bf6dc0fbdbb5593696..aa44fd0feb7c7aedfe853004f438879db0bee96f 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -267,15 +267,15 @@
 #define CONFIG_MTD_DEBUG
 #define CONFIG_MTD_DEBUG_VERBOSE       4
 #endif
-#ifndef CONFIG_SYS_NAND_ERASE_SIZE
-#define CONFIG_SYS_NAND_ERASE_SIZE     SZ_128K
+#ifndef CONFIG_SYS_NAND_BLOCK_SIZE
+#define CONFIG_SYS_NAND_BLOCK_SIZE     SZ_128K
 #endif
 #define CONFIG_NAND_MXS
 #define CONFIG_NAND_MXS_NO_BBM_SWAP
 #define CONFIG_APBH_DMA
 #define CONFIG_APBH_DMA_BURST
 #define CONFIG_APBH_DMA_BURST8
-#define CONFIG_SYS_NAND_U_BOOT_OFFS    CONFIG_SYS_NAND_ERASE_SIZE
+#define CONFIG_SYS_NAND_U_BOOT_OFFS    CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_MXS_DMA_CHANNEL     4
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
@@ -291,7 +291,7 @@
 
 #define CONFIG_ENV_OFFSET              (CONFIG_U_BOOT_IMG_SIZE + CONFIG_SYS_NAND_U_BOOT_OFFS)
 #define CONFIG_ENV_SIZE                        SZ_128K
-#define CONFIG_ENV_RANGE               (3 * CONFIG_SYS_NAND_ERASE_SIZE)
+#define CONFIG_ENV_RANGE               (3 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #ifdef CONFIG_ENV_OFFSET_REDUND
 #define CONFIG_SYS_ENV_PART_STR                xstr(CONFIG_SYS_ENV_PART_SIZE)  \
        "(env),"                                                        \