Merge branch '2021-12-27-CONFIG-migrations' into next

[platform/kernel/u-boot.git] / include / configs / ulcb.h

diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index 165c82d..bdd6b4b 100644 (file)
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -20,12 +20,9 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_FLASH_CFI_MTD
 #define CONFIG_FLASH_SHOW_PROGRESS     45
 #define CONFIG_SYS_FLASH_QUIET_TEST
 #define CONFIG_SYS_FLASH_BANKS_LIST    { 0x08000000 }
-#define CONFIG_SYS_FLASH_CFI
 #define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
 #define CONFIG_SYS_MAX_FLASH_BANKS_DETECT      1
 #define CONFIG_SYS_MAX_FLASH_SECT      256