-#define MT29F_CMD_READ_1 0x00
-#define MT29F_CMD_READ_2 0x30
-#define MT29F_CMD_COPYBACK_READ_1 0x00
-#define MT29F_CMD_COPYBACK_READ_2 0x35
-#define MT29F_CMD_COPYBACK_PROGRAM_1 0x85
-#define MT29F_CMD_COPYBACK_PROGRAM_2 0x10
-#define MT29F_CMD_RANDOM_OUT 0x05
-#define MT29F_CMD_RANDOM_OUT_2 0xE0
-#define MT29F_CMD_RANDOM_IN 0x85
-#define MT29F_CMD_READID 0x90
-#define MT29F_CMD_WRITE_1 0x80
-#define MT29F_CMD_WRITE_2 0x10
-#define MT29F_CMD_ERASE_1 0x60
-#define MT29F_CMD_ERASE_2 0xD0
-#define MT29F_CMD_STATUS 0x70
-#define MT29F_CMD_RESET 0xFF
-
-
-// Get block from page
-#define PAGE(blk) ((blk) * CONFIG_MT29F_PAGES_PER_BLOCK)
-
-// Page from block and page in block
-#define BLOCK(page) ((uint16_t)((page) / CONFIG_MT29F_PAGES_PER_BLOCK))
-#define PAGE_IN_BLOCK(page) ((uint16_t)((page) % CONFIG_MT29F_PAGES_PER_BLOCK))
+#define NAND_CMD_READ_1 0x00
+#define NAND_CMD_READ_2 0x30
+#define NAND_CMD_COPYBACK_READ_1 0x00
+#define NAND_CMD_COPYBACK_READ_2 0x35
+#define NAND_CMD_COPYBACK_PROGRAM_1 0x85
+#define NAND_CMD_COPYBACK_PROGRAM_2 0x10
+#define NAND_CMD_RANDOM_OUT 0x05
+#define NAND_CMD_RANDOM_OUT_2 0xE0
+#define NAND_CMD_RANDOM_IN 0x85
+#define NAND_CMD_READID 0x90
+#define NAND_CMD_WRITE_1 0x80
+#define NAND_CMD_WRITE_2 0x10
+#define NAND_CMD_ERASE_1 0x60
+#define NAND_CMD_ERASE_2 0xD0
+#define NAND_CMD_STATUS 0x70
+#define NAND_CMD_RESET 0xFF