diff options
| author | Tom Rini <[email protected]> | 2023-08-15 10:39:41 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-08-15 10:39:41 -0400 |
| commit | bdc682437a67b47a382edfa30f58f8271b8acfed (patch) | |
| tree | a57e22d5bb8a7b789878f455397d9d76b6fdb170 /configs | |
| parent | 51171cdd6dc9af8e74bbdb1f3e46c15187f7e979 (diff) | |
| parent | aaf5b5923054efbf1244dc7fbae68d0bd2a03cf7 (diff) | |
Merge branch '2023-08-14-assorted-general-updates' into next
- Assorted PCI-related fixes, add Apple Type-C PHY support, semihosting
updates, fix a FAT corner-case, update the help on the pxe cmd and
clean up the gpio uclass slightly.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/apple_m1_defconfig | 1 | ||||
| -rw-r--r-- | configs/qemu_arm64_defconfig | 1 | ||||
| -rw-r--r-- | configs/sandbox_defconfig | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/configs/apple_m1_defconfig b/configs/apple_m1_defconfig index 755560971e5..d58a9030dbd 100644 --- a/configs/apple_m1_defconfig +++ b/configs/apple_m1_defconfig @@ -16,6 +16,7 @@ CONFIG_NVME_APPLE=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_PCI=y +CONFIG_USB_DWC3=y CONFIG_USB_KEYBOARD=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_NO_FB_CLEAR=y diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig index 94bd9667844..2080f5ee9a5 100644 --- a/configs/qemu_arm64_defconfig +++ b/configs/qemu_arm64_defconfig @@ -71,4 +71,5 @@ CONFIG_TPM2_MMIO=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_PCI=y +CONFIG_SEMIHOSTING=y CONFIG_TPM=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index f031b509105..259f31f26ce 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -231,6 +231,7 @@ CONFIG_MUX_MMIO=y CONFIG_NVME_PCI=y CONFIG_PCI_REGION_MULTI_ENTRY=y CONFIG_PCI_SANDBOX=y +CONFIG_PCI_FTPCI100=y CONFIG_PHY=y CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y |