diff options
| author | Tom Rini <trini@konsulko.com> | 2022-07-07 21:12:07 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-07-07 21:29:37 +0300 |
| commit | ea92f95d630cba9c3a324d250258ad2e35d9c997 (patch) | |
| tree | 68ad93bb452ccf3873a9b457a8cca9ea7e3c1916 /configs/T4240RDB_defconfig | |
| parent | cb9843bda3e500eb4add1927be4ed72077a69774 (diff) | |
| parent | c45568cc4e51b7bbe2f3ce28d8f2566048aeebf3 (diff) | |
| download | u-boot-ea92f95d630cba9c3a324d250258ad2e35d9c997.tar.xz | |
Merge branch '2022-07-07-Kconfig-migrations-dead-code-removal' into next
- Migrate more CONFIG options to Kconfig and remove some unused code
while we're at it.
Diffstat (limited to 'configs/T4240RDB_defconfig')
| -rw-r--r-- | configs/T4240RDB_defconfig | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig index 9f6457fc3a..c3216474c3 100644 --- a/configs/T4240RDB_defconfig +++ b/configs/T4240RDB_defconfig @@ -3,17 +3,13 @@ CONFIG_SYS_TEXT_BASE=0xEFF40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="t4240rdb" -CONFIG_VID=y -CONFIG_VID_FLS_ENV="t4240rdb_vdd_mv" -CONFIG_VOL_MONITOR_IR36021_READ=y -CONFIG_VOL_MONITOR_IR36021_SET=y CONFIG_ENV_ADDR=0xEFF20000 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_SYS_FSL_CPC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PCIE3=y @@ -22,7 +18,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 |