diff --git a/uboot-mtk-20220606/drivers/mtd/nand/spi/Kconfig b/uboot-mtk-20220606/drivers/mtd/nand/spi/Kconfig index bbd098196..cb42e70ba 100644 --- a/uboot-mtk-20220606/drivers/mtd/nand/spi/Kconfig +++ b/uboot-mtk-20220606/drivers/mtd/nand/spi/Kconfig @@ -6,10 +6,3 @@ menuconfig MTD_SPI_NAND help This is the framework for the SPI NAND device drivers. -config MTD_SPI_NAND_W25N01KV - tristate "Winbond W25N01KV Support" - select MTD_SPI_NAND - default n - help - Winbond W25N01KV share the same ID with W25N01GV. However, they have - different attributes. diff --git a/uboot-mtk-20220606/drivers/mtd/nand/spi/winbond.c b/uboot-mtk-20220606/drivers/mtd/nand/spi/winbond.c index 14b06cfd3..4e04ca68c 100644 --- a/uboot-mtk-20220606/drivers/mtd/nand/spi/winbond.c +++ b/uboot-mtk-20220606/drivers/mtd/nand/spi/winbond.c @@ -187,17 +187,6 @@ static const struct spinand_info winbond_spinand_table[] = { 0, SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL), SPINAND_SELECT_TARGET(w25m02gv_select_target)), -#if IS_ENABLED(CONFIG_MTD_SPI_NAND_W25N01KV) - SPINAND_INFO("W25N01KV", - SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x21), - NAND_MEMORG(1, 2048, 96, 64, 1024, 1, 1, 1), - NAND_ECCREQ(4, 512), - SPINAND_INFO_OP_VARIANTS(&read_cache_variants, - &write_cache_variants, - &update_cache_variants), - 0, - SPINAND_ECCINFO(&w25n02kv_n04kv_ooblayout, w25n01kv_ecc_get_status)), -#else SPINAND_INFO("W25N01GV", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x21), NAND_MEMORG(1, 2048, 64, 64, 1024, 1, 1, 1), @@ -207,7 +196,6 @@ static const struct spinand_info winbond_spinand_table[] = { &update_cache_variants), 0, SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)), -#endif SPINAND_INFO("W25N02KV", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x22), NAND_MEMORG(1, 2048, 128, 64, 2048, 2, 1, 1),