diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-25 18:02:43 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-07-07 16:29:56 +0300 |
| commit | 3dab405b45e5089d42f59d01e3803fab8ac56fcf (patch) | |
| tree | 2fdacca693c87fe74849be57024e35b425293682 /configs/T4240RDB_defconfig | |
| parent | a457ebd78684ba0dba18b1bb5564331f47c180ed (diff) | |
| download | u-boot-3dab405b45e5089d42f59d01e3803fab8ac56fcf.tar.xz | |
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>
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 9f6457fc3a..6f403619d6 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 |