diff options
| author | Tom Rini | 2022-06-20 14:40:59 -0400 |
|---|---|---|
| committer | Tom Rini | 2022-06-20 14:40:59 -0400 |
| commit | 52af0101be55da74a32e9b169864508101f886fe (patch) | |
| tree | 0027962a3a4e43a1e29fa7411934501b75fe811b /configs | |
| parent | 78533a1ce87786d2ba9be70e657b09cded1267e1 (diff) | |
| parent | 568a226f87655fd5339514f66413c2ad72f65d6f (diff) | |
Merge branch 'master' into next
Merge in v2022.07-rc5.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/imx8mn_evk_defconfig | 8 | ||||
| -rw-r--r-- | configs/mx6cuboxi_defconfig | 2 | ||||
| -rw-r--r-- | configs/stm32mp15_dhcor_basic_defconfig | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig index 56145a1b6d4..70d3d83e9a5 100644 --- a/configs/imx8mn_evk_defconfig +++ b/configs/imx8mn_evk_defconfig @@ -59,6 +59,9 @@ CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y @@ -83,7 +86,12 @@ CONFIG_MMC_HS400_SUPPORT=y CONFIG_SPL_MMC_HS400_SUPPORT=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y +CONFIG_DM_ETH_PHY=y +CONFIG_PHY_GIGE=y +CONFIG_FEC_MXC=y +CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig index d68335b5b68..edfa8b69288 100644 --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_HDMIDETECT=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y +CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="if hdmidet; then usb start; setenv stdin serial,usbkbd; setenv stdout serial,vidconsole; setenv stderr serial,vidconsole; else setenv stdin serial; setenv stdout serial; setenv stderr serial; fi;" @@ -58,6 +59,7 @@ CONFIG_DWC_AHSATA=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADIN=y CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y CONFIG_FEC_MXC=y diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig index e08510179e6..95338c58c7d 100644 --- a/configs/stm32mp15_dhcor_basic_defconfig +++ b/configs/stm32mp15_dhcor_basic_defconfig @@ -121,6 +121,7 @@ CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y CONFIG_DWC_ETH_QOS=y +CONFIG_KS8851_MLL=y CONFIG_PHY=y CONFIG_SPL_PHY=y CONFIG_PHY_STM32_USBPHYC=y |