diff options
author | Tom Rini <trini@konsulko.com> | 2020-10-22 20:32:02 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-10-22 20:32:02 -0400 |
commit | 18261b8552232e342709e69eadec33090a7f04e4 (patch) | |
tree | ecd17a26e30f20db41fb4b67c0f9060398a145bf /configs | |
parent | ae4fdd7b0432bcb0bc2fe7d90b6d3e92001ab478 (diff) | |
parent | 194923246c199bc6a4baa2ffcda1e08677b6f07c (diff) | |
download | u-boot-WIP/22Oct2020.zip u-boot-WIP/22Oct2020.tar.gz u-boot-WIP/22Oct2020.tar.bz2 |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxiWIP/22Oct2020
- sun8i emac changes (Andre)
- SCP firmware (Samuel)
Diffstat (limited to 'configs')
-rw-r--r-- | configs/A20-OLinuXino-Lime2-eMMC_defconfig | 2 | ||||
-rw-r--r-- | configs/pine_h64_defconfig | 1 | ||||
-rw-r--r-- | configs/teres_i_defconfig | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig index b1a38d7..f9f8f14 100644 --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig @@ -19,6 +19,8 @@ CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_SCSI_AHCI=y CONFIG_DFU_RAM=y CONFIG_FASTBOOT_CMD_OEM_FORMAT=y +CONFIG_PHY_MICREL=y +CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_PHY_REALTEK=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y diff --git a/configs/pine_h64_defconfig b/configs/pine_h64_defconfig index 328849d..07ad31e 100644 --- a/configs/pine_h64_defconfig +++ b/configs/pine_h64_defconfig @@ -11,5 +11,6 @@ CONFIG_SPL_SPI_SUNXI=y CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-pine-h64" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SUN8I_EMAC=y +CONFIG_MACPWR="PC16" CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y diff --git a/configs/teres_i_defconfig b/configs/teres_i_defconfig index 1eba20e..ee07f86 100644 --- a/configs/teres_i_defconfig +++ b/configs/teres_i_defconfig @@ -7,6 +7,7 @@ CONFIG_DRAM_ZQ=3881949 CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB1_VBUS_PIN="PL7" CONFIG_I2C0_ENABLE=y +CONFIG_PREBOOT="setenv usb_pgood_delay 2000; usb start" CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-teres-i" CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y |