diff options
Diffstat (limited to 'configs/T4240RDB_defconfig')
| -rw-r--r-- | configs/T4240RDB_defconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig index 9f6457fc3a3..6f403619d67 100644 --- a/configs/T4240RDB_defconfig +++ b/configs/T4240RDB_defconfig @@ -12,8 +12,7 @@ CONFIG_MPC85xx=y 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=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 |