diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-08 05:58:18 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-08 05:58:18 +0300 |
| commit | 0b59138690a93f3d880be3d5aa675f7219376e58 (patch) | |
| tree | b139bf8d951a50c2196f3f36dc2f5ab2f3bb1cc7 /configs | |
| parent | 1e88e78177da80fa8e9fa9fc7613657478d61d1e (diff) | |
| parent | 9b9f10e3ccded02443162980d34be517886b0645 (diff) | |
| download | u-boot-0b59138690a93f3d880be3d5aa675f7219376e58.tar.xz | |
Merge branch '2020-07-07-misc-new-features'
- Improve s700 SoC support
- Fix building with clang on ARM.
- Juno platform updates
- fs/dm cmd improvements
- Other assorted improvements / fixes
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/cubieboard7_defconfig | 4 | ||||
| -rw-r--r-- | configs/vexpress_aemv8a_juno_defconfig | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/configs/cubieboard7_defconfig b/configs/cubieboard7_defconfig index 637dc9e9fb..c82afc3403 100644 --- a/configs/cubieboard7_defconfig +++ b/configs/cubieboard7_defconfig @@ -10,3 +10,7 @@ CONFIG_BOOTARGS="console=ttyOWL3,115200n8" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot => " CONFIG_DEFAULT_DEVICE_TREE="s700-cubieboard7" +CONFIG_ETH_DESIGNWARE_S700=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_PHY_REALTEK=y +CONFIG_RTL8201F_PHY_S700_RMII_TIMINGS=y diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig index 49acb34310..4654c529e8 100644 --- a/configs/vexpress_aemv8a_juno_defconfig +++ b/configs/vexpress_aemv8a_juno_defconfig @@ -29,9 +29,15 @@ CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set CONFIG_CMD_UBI=y -# CONFIG_ISO_PARTITION is not set -# CONFIG_EFI_PARTITION is not set CONFIG_OF_BOARD=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_PCIE_ECAM_GENERIC=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_CMD_PCI=y +CONFIG_LIBATA=y +CONFIG_SATA_SIL=y +CONFIG_CMD_SATA=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xBFC0000 # CONFIG_MMC is not set |