Merge branch '2022-09-01-assorted-Kconfig-migrations' into next

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

diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h
index d803fb7..2df5f3f 100644 (file)
--- a/include/configs/ls1046afrwy.h
+++ b/include/configs/ls1046afrwy.h
@@ -8,10 +8,6 @@
 
 #include "ls1046a_common.h"
 
-#define CONFIG_LAYERSCAPE_NS_ACCESS
-
-#define CONFIG_DIMM_SLOTS_PER_CTLR     1
-
 #define CONFIG_SYS_UBOOT_BASE          0x40100000
 
 /*
@@ -63,8 +59,6 @@
 #define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NAND_FTIM3
 
 /* EEPROM */
-#define CONFIG_SYS_I2C_EEPROM_NXID
-#define CONFIG_SYS_EEPROM_BUS_NUM              0
 #define I2C_RETIMER_ADDR                       0x18
 
 /* I2C bus multiplexer */
@@ -82,13 +76,11 @@
  */
 #define CONFIG_SYS_FSL_QSPI_BASE       0x40000000
 
-#ifndef CONFIG_SPL_BUILD
 #undef BOOT_TARGET_DEVICES
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
        func(USB, usb, 0) \
        func(DHCP, dhcp, na)
-#endif
 
 /* FMan */
 #ifdef CONFIG_SYS_DPAA_FMAN