From: Tom Rini Date: Thu, 30 Apr 2020 14:06:54 +0000 (-0400) Subject: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq X-Git-Tag: v2020.07-rc2~25 X-Git-Url: https://git.librecmc.org/?p=oweals%2Fu-boot.git;a=commitdiff_plain;h=b9da77f1958aab4ec50ff2f095b40464ca2489dd Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq - Add DM_ETH support for DPAA1, DPAA2 based RDB platforms: ls1046ardb, ls1043ardb, lx2160ardb, ls2088ardb, ls1088ardb. - Add GICv3 support for ls1028a, ls2088a, ls1088a. - Add lpuart support on ls1028aqds. - Few bug fixes and updates on ls2088a, ls1012a, ls1046a, ls1021a based platforms. --- b9da77f1958aab4ec50ff2f095b40464ca2489dd diff --cc configs/ls1043ardb_SECURE_BOOT_defconfig index 7980e7b785,b06cbd8bbc..911bbef72c --- a/configs/ls1043ardb_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_SECURE_BOOT_defconfig @@@ -38,8 -37,8 +39,10 @@@ CONFIG_MTD_RAW_NAND= CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=1 CONFIG_PHYLIB=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_FMAN_ENET=y diff --cc configs/ls1043ardb_defconfig index 588090b7ba,82bd693c4e..4a15992f7c --- a/configs/ls1043ardb_defconfig +++ b/configs/ls1043ardb_defconfig @@@ -42,8 -41,8 +43,10 @@@ CONFIG_SPI_FLASH= CONFIG_SF_DEFAULT_BUS=1 CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_PCI=y diff --cc configs/ls1043ardb_nand_SECURE_BOOT_defconfig index 9afa795c26,e708fbc85b..f399b1cbb3 --- a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig @@@ -59,8 -58,8 +60,10 @@@ CONFIG_SPI_FLASH= CONFIG_SF_DEFAULT_BUS=1 CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_PCI=y diff --cc configs/ls1043ardb_nand_defconfig index 6f9319ef88,6b9b30676a..5f794605d6 --- a/configs/ls1043ardb_nand_defconfig +++ b/configs/ls1043ardb_nand_defconfig @@@ -60,8 -59,8 +61,10 @@@ CONFIG_SPI_FLASH= CONFIG_SF_DEFAULT_BUS=1 CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_PCI=y diff --cc configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig index e899f6089e,c59caf1f1b..224321810a --- a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig @@@ -57,8 -56,8 +58,10 @@@ CONFIG_MTD_RAW_NAND= CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=1 CONFIG_PHYLIB=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_FMAN_ENET=y diff --cc configs/ls1043ardb_sdcard_defconfig index 1350ef4359,b39a9074cc..bf557d7650 --- a/configs/ls1043ardb_sdcard_defconfig +++ b/configs/ls1043ardb_sdcard_defconfig @@@ -59,8 -58,8 +60,10 @@@ CONFIG_SPI_FLASH= CONFIG_SF_DEFAULT_BUS=1 CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_PCI=y diff --cc configs/ls1043ardb_tfa_SECURE_BOOT_defconfig index 090325d495,9828320b1a..0f3f920ffd --- a/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig @@@ -40,8 -39,8 +41,10 @@@ CONFIG_MTD_RAW_NAND= CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=1 CONFIG_PHYLIB=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_FMAN_ENET=y diff --cc configs/ls1043ardb_tfa_defconfig index 66afef95df,6301076133..a62310ccc9 --- a/configs/ls1043ardb_tfa_defconfig +++ b/configs/ls1043ardb_tfa_defconfig @@@ -47,8 -46,8 +48,10 @@@ CONFIG_SPI_FLASH= CONFIG_SF_DEFAULT_BUS=1 CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_PCI=y diff --cc configs/ls1046ardb_emmc_defconfig index 2ab210fec0,777f818be5..def9140fd6 --- a/configs/ls1046ardb_emmc_defconfig +++ b/configs/ls1046ardb_emmc_defconfig @@@ -58,7 -57,8 +59,9 @@@ CONFIG_MTD_RAW_NAND= # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_REALTEK=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_PCI=y diff --cc configs/ls1046ardb_qspi_SECURE_BOOT_defconfig index b6211490fc,450c2d0601..1f8922293f --- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig @@@ -39,7 -38,8 +40,9 @@@ CONFIG_MTD_RAW_NAND= # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_REALTEK=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_PCI=y diff --cc configs/ls1046ardb_qspi_defconfig index 2e33e60273,25665baa2b..8b1b6950fb --- a/configs/ls1046ardb_qspi_defconfig +++ b/configs/ls1046ardb_qspi_defconfig @@@ -42,7 -41,8 +43,9 @@@ CONFIG_MTD_RAW_NAND= # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_REALTEK=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_PCI=y diff --cc configs/ls1046ardb_qspi_spl_defconfig index a630b0afc9,e33b6419fe..cbc598dea8 --- a/configs/ls1046ardb_qspi_spl_defconfig +++ b/configs/ls1046ardb_qspi_spl_defconfig @@@ -60,7 -59,8 +61,9 @@@ CONFIG_MTD_RAW_NAND= # CONFIG_SPI_FLASH_BAR is not set # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y +CONFIG_PHY_REALTEK=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_FMAN_ENET=y diff --cc configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig index 8a7cbd02bd,b7e4d8e230..aeac0a248e --- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig @@@ -54,7 -53,8 +55,9 @@@ CONFIG_MTD_RAW_NAND= # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_REALTEK=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_PCI=y diff --cc configs/ls1046ardb_sdcard_defconfig index 261ddf53e1,2861acb521..878bdf0513 --- a/configs/ls1046ardb_sdcard_defconfig +++ b/configs/ls1046ardb_sdcard_defconfig @@@ -57,7 -56,8 +58,9 @@@ CONFIG_MTD_RAW_NAND= # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_REALTEK=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_PCI=y diff --cc configs/ls1046ardb_tfa_SECURE_BOOT_defconfig index cfc9e4eeb5,159cd71ab1..140da79d0b --- a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig @@@ -39,7 -38,8 +40,9 @@@ CONFIG_MTD_RAW_NAND= # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_REALTEK=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_PCI=y diff --cc configs/ls1046ardb_tfa_defconfig index 3a0530ca74,5d4d952922..eab34cd717 --- a/configs/ls1046ardb_tfa_defconfig +++ b/configs/ls1046ardb_tfa_defconfig @@@ -44,7 -43,8 +45,9 @@@ CONFIG_MTD_RAW_NAND= # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_REALTEK=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_PCI=y diff --cc configs/ls1088ardb_qspi_SECURE_BOOT_defconfig index c91d646069,d2fca24306..806d7705de --- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig @@@ -1,8 -1,8 +1,9 @@@ CONFIG_ARM=y ++CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088ARDB=y CONFIG_SYS_TEXT_BASE=0x20100000 -CONFIG_NXP_ESBC=y CONFIG_ENV_SIZE=0x2000 +CONFIG_NXP_ESBC=y CONFIG_FSL_LS_PPA=y CONFIG_QSPI_AHB_INIT=y CONFIG_NR_DRAM_BANKS=2 @@@ -42,9 -42,11 +44,12 @@@ CONFIG_DM_SPI_FLASH= CONFIG_SPI_FLASH_SPANSION=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_MII=y + CONFIG_FSL_LS_MDIO=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y diff --cc configs/ls1088ardb_qspi_defconfig index 4230b63e6b,1c3d9e4b81..9b66fd9101 --- a/configs/ls1088ardb_qspi_defconfig +++ b/configs/ls1088ardb_qspi_defconfig @@@ -1,4 -1,4 +1,5 @@@ CONFIG_ARM=y ++CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088ARDB=y CONFIG_SYS_TEXT_BASE=0x20100000 CONFIG_ENV_SIZE=0x2000 @@@ -45,9 -45,11 +47,12 @@@ CONFIG_DM_SPI_FLASH= CONFIG_SPI_FLASH_SPANSION=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_MII=y + CONFIG_FSL_LS_MDIO=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y diff --cc configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig index 2b27d7ab5c,cb74b2d95f..4a15f82e9e --- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig @@@ -1,4 -1,4 +1,5 @@@ CONFIG_ARM=y ++CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088ARDB=y CONFIG_SYS_TEXT_BASE=0x80400000 CONFIG_SPL_LIBCOMMON_SUPPORT=y @@@ -54,9 -54,11 +56,12 @@@ CONFIG_DM_SPI_FLASH= CONFIG_SPI_FLASH_SPANSION=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_MII=y + CONFIG_FSL_LS_MDIO=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y diff --cc configs/ls1088ardb_sdcard_qspi_defconfig index 0e882513be,9497e3d5dd..1ab1fa3a2f --- a/configs/ls1088ardb_sdcard_qspi_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_defconfig @@@ -1,4 -1,4 +1,5 @@@ CONFIG_ARM=y ++CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088ARDB=y CONFIG_SYS_TEXT_BASE=0x80400000 CONFIG_SPL_LIBCOMMON_SUPPORT=y @@@ -55,9 -55,11 +57,12 @@@ CONFIG_DM_SPI_FLASH= CONFIG_SPI_FLASH_SPANSION=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_MII=y + CONFIG_FSL_LS_MDIO=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y diff --cc configs/ls1088ardb_tfa_SECURE_BOOT_defconfig index faa87f4cfc,e64c97678c..4ad9a66333 --- a/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig @@@ -1,4 -1,4 +1,5 @@@ CONFIG_ARM=y ++CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088ARDB=y CONFIG_TFABOOT=y CONFIG_SYS_TEXT_BASE=0x82000000 @@@ -49,9 -49,11 +51,12 @@@ CONFIG_DM_SPI_FLASH= CONFIG_SPI_FLASH_SPANSION=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_MII=y + CONFIG_FSL_LS_MDIO=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y diff --cc configs/ls1088ardb_tfa_defconfig index 0037b38f9c,94fe6dbc9a..7690292db4 --- a/configs/ls1088ardb_tfa_defconfig +++ b/configs/ls1088ardb_tfa_defconfig @@@ -1,4 -1,4 +1,5 @@@ CONFIG_ARM=y ++CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088ARDB=y CONFIG_TFABOOT=y CONFIG_SYS_TEXT_BASE=0x82000000 @@@ -54,9 -54,11 +56,12 @@@ CONFIG_DM_SPI_FLASH= CONFIG_SPI_FLASH_SPANSION=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y +CONFIG_PHY_VITESSE=y + CONFIG_DM_ETH=y + CONFIG_DM_MDIO=y CONFIG_E1000=y CONFIG_MII=y + CONFIG_FSL_LS_MDIO=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y