diff options
| author | Tom Rini <[email protected]> | 2023-03-31 10:04:23 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-03-31 10:04:23 -0400 |
| commit | b8deed53fe6a55ef76b4f9038bb419a9c853a9fa (patch) | |
| tree | 2f0cdb8f35d7c51611417bab680583a65bf21306 /configs | |
| parent | f1617e99b933d2c3ecb381954148284d37bf922e (diff) | |
| parent | f98b112f9e0516fc9333611d1228d0b634aa353e (diff) | |
Merge branch '2023-03-30-assorted-general-upates' into next
- RTC cleanups / improvements, run_commandf() cleanups, fs bugfixes,
socrates config fix, PCI MPS support, GPIO improvements, other code
cleanups
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/sandbox_defconfig | 2 | ||||
| -rw-r--r-- | configs/socrates_defconfig | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index b0f588da32e..cbace259f80 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -78,6 +78,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_MUX=y CONFIG_CMD_OSD=y CONFIG_CMD_PCI=y +CONFIG_CMD_PCI_MPS=y CONFIG_CMD_READ=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SPI=y @@ -268,6 +269,7 @@ CONFIG_SANDBOX_RESET=y CONFIG_RESET_SYSCON=y CONFIG_RESET_SCMI=y CONFIG_DM_RTC=y +CONFIG_RTC_MAX313XX=y CONFIG_RTC_RV8803=y CONFIG_RTC_HT1380=y CONFIG_SCSI=y diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig index 24655131a8a..df8b31b4e7b 100644 --- a/configs/socrates_defconfig +++ b/configs/socrates_defconfig @@ -18,7 +18,6 @@ CONFIG_SYS_MONITOR_LEN=786432 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=1 CONFIG_AUTOBOOT_KEYED=y |