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

fail0verflow · Dec 13, 2017 · 7ef548e · 7ef548e
2 parents 6b30849 + 8755ceb
commit 7ef548e
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
@@ -142,7 +142,6 @@
 #ifdef CONFIG_NAND_DENALI
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_SYS_NAND_ONFI_DETECTION
-#define CONFIG_NAND_DENALI_ECC_SIZE	512
 #define CONFIG_SYS_NAND_REGS_BASE	SOCFPGA_NANDREGS_ADDRESS
 #define CONFIG_SYS_NAND_DATA_BASE	SOCFPGA_NANDDATA_ADDRESS
 #endif
@@ -294,7 +293,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 
 /* SPL NAND boot support */
 #ifdef CONFIG_SPL_NAND_SUPPORT
-#define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x40000
 #endif