summaryrefslogtreecommitdiff
path: root/configs/T4240RDB_SDCARD_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-06-20 08:07:45 -0400
committerTom Rini <trini@konsulko.com>2022-07-05 17:04:59 -0400
commit3dc2987f5c9b79e19ea6b0e69e01a817310abaac (patch)
tree805f9479527bb5be5254ceb5bade28ee9b3719b9 /configs/T4240RDB_SDCARD_defconfig
parenta552ffc9d270769286d7a0697913689c31537bfa (diff)
Convert CONFIG_PCIE1 et al to Kconfig
This converts the following to Kconfig: CONFIG_PCIE1 CONFIG_PCIE2 CONFIG_PCIE3 CONFIG_PCIE4 CONFIG_PCI1 Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/T4240RDB_SDCARD_defconfig')
-rw-r--r--configs/T4240RDB_SDCARD_defconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig
index b0c9776dbe..3e43f9bb98 100644
--- a/configs/T4240RDB_SDCARD_defconfig
+++ b/configs/T4240RDB_SDCARD_defconfig
@@ -18,6 +18,17 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T4240RDB=y
CONFIG_ENABLE_36BIT_PHYS=y
CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+<<<<<<< HEAD
+=======
+CONFIG_PCIE1=y
+CONFIG_PCIE2=y
+CONFIG_PCIE3=y
+CONFIG_PCIE4=y
+CONFIG_VID=y
+CONFIG_VID_FLS_ENV="t4240rdb_vdd_mv"
+CONFIG_VOL_MONITOR_IR36021_READ=y
+CONFIG_VOL_MONITOR_IR36021_SET=y
+>>>>>>> Convert CONFIG_PCIE1 et al to Kconfig
CONFIG_MP=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y