commit 3dc2987f5c9b79e19ea6b0e69e01a817310abaac
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 a552ffc9d270769286d7a0697913689c31537bfa

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/T2080RDB_defconfig

diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig
index e43168e..563d0b5 100644
--- a/configs/T2080RDB_defconfig
+++ b/configs/T2080RDB_defconfig
@@ -12,6 +12,17 @@
 CONFIG_TARGET_T2080RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+<<<<<<< HEAD
+=======
+CONFIG_PCIE1=y
+CONFIG_PCIE2=y
+CONFIG_PCIE3=y
+CONFIG_PCIE4=y
+CONFIG_VID=y
+CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
+CONFIG_VOL_MONITOR_IR36021_READ=y
+CONFIG_VOL_MONITOR_IR36021_SET=y
+>>>>>>> Convert CONFIG_PCIE1 et al to Kconfig
 CONFIG_SYS_MEMTEST_START=0x00200000
 CONFIG_SYS_MEMTEST_END=0x00400000
 CONFIG_MP=y