diff options
Diffstat (limited to 'configs/beaver_defconfig')
| -rw-r--r-- | configs/beaver_defconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 45c0c29e53..29303441d9 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -13,6 +13,13 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y +<<<<<<< HEAD +CONFIG_SPI_FLASH_WINBOND=y +======= +CONFIG_PCI_TEGRA=y +>>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig +CONFIG_SYS_NS16550=y +CONFIG_TEGRA20_SLINK=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USE_PRIVATE_LIBGCC=y |