Merge branch 'master' of git://git.denx.de/u-boot-x86

[u-boot] / drivers / mtd / nand / jz4740_nand.c

diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index a691fbc40397d747df6acf11f8872e2da89ddedd..abcedc210211f94d0dd0698a31a528f96d29092f 100644 (file)
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -4,10 +4,7 @@
  * Copyright (c) 2007 Ingenic Semiconductor Inc.
  * Author: <jlwei@ingenic.cn>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 
@@ -19,7 +16,6 @@
 #define JZ_NAND_CMD_ADDR (JZ_NAND_DATA_ADDR + 0x8000)
 #define JZ_NAND_ADDR_ADDR (JZ_NAND_DATA_ADDR + 0x10000)
 
-#define BIT(x) (1 << (x))
 #define JZ_NAND_ECC_CTRL_ENCODING      BIT(3)
 #define JZ_NAND_ECC_CTRL_RS            BIT(2)
 #define JZ_NAND_ECC_CTRL_RESET         BIT(1)
@@ -256,7 +252,7 @@ int board_nand_init(struct nand_chip *nand)
        nand->ecc.strength      = 4;
        nand->ecc.layout        = &qi_lb60_ecclayout_2gb;
        nand->chip_delay        = 50;
-       nand->options           = NAND_USE_FLASH_BBT;
+       nand->bbt_options       |= NAND_BBT_USE_FLASH;
 
        return 0;
 }