commit 7485ebf688899c8317586d85d10720622945288e
author Tom Rini <trini@konsulko.com> Mon Jun 20 08:07:45 2022 -0400
committer Tom Rini <trini@konsulko.com> Tue Jul 05 17:04:59 2022 -0400
tree 805f9479527bb5be5254ceb5bade28ee9b3719b9
parent 9d291f4c59aca2118c3ca08effb826c31345535a

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>

configs/T4240RDB_SDCARD_defconfig

diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig
index b0c9776..3e43f9b 100644
--- a/configs/T4240RDB_SDCARD_defconfig
+++ b/configs/T4240RDB_SDCARD_defconfig
@@ -18,6 +18,17 @@
 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