commit 2daaf648af2d17b2788dbd42544b83f8b636994c
author Tom Rini <trini@konsulko.com> Sat Jun 25 11:02:43 2022 -0400
committer Tom Rini <trini@konsulko.com> Thu Jul 07 09:29:56 2022 -0400
tree 2fdacca693c87fe74849be57024e35b425293682
parent 1e56de0d72753c7cfcd5a36863b3526db121cc0b

Convert CONFIG_SYS_BOOK3E_HV to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_BOOK3E_HV

Signed-off-by: Tom Rini <trini@konsulko.com>

configs/T4240RDB_defconfig

diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig
index 9f6457f..6f40361 100644
--- a/configs/T4240RDB_defconfig
+++ b/configs/T4240RDB_defconfig
@@ -12,8 +12,7 @@
 CONFIG_TARGET_T4240RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
-<<<<<<< HEAD
-=======
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -22,7 +21,6 @@
 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