-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR (SZ_512K / 0x200)
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (SZ_32K / 0x200)
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR (SZ_1M / 0x200)
-
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_SPI_FLASH_MTD
-#endif
+#define CFG_SYS_SPI_KERNEL_OFFS SZ_1M
+#define CFG_SYS_SPI_ARGS_OFFS SZ_512K
+#define CFG_SYS_SPI_ARGS_SIZE SZ_32K