Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5c0f12491072bff21e62a835c18b6fff4d2b2372

Authored by Ioana Ciornei
Committed by Priyanka Jain
1 parent ddd0d14bce
Exists in smarc_8mq_lf_v2020.04 and in 4 other branches pitx_8mp_lf_v2020.04, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mp_lf_v2020.04

configs: ls1088aqds: enable PHYLIB and related through Kconfig 

Starting with commit 7d9701db4089 ("cmd: mdio/mii: add Kconfig help and
allow break dependency"), CMD_MDIO depends on the PHYLIB Kconfig which
should be enabled properly from the Kconfig and not through any define
from a header file.

Move all LS1088AQDS configs to enable PHYLIB and related through
Kconfig options. Also, remove the defines from the header file so that
we do not redefine the same symbol.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>

Showing 7 changed files with 36 additions and 18 deletions Side-by-side Diff

configs/ls1088aqds_defconfig
Diff comments   View file @ 5c0f124
... ... @@ -42,8 +42,14 @@
42 42 CONFIG_SYS_FLASH_CFI=y
43 43 CONFIG_MTD_RAW_NAND=y
44 44 CONFIG_DM_SPI_FLASH=y
  45 +CONFIG_PHYLIB=y
  46 +CONFIG_PHY_AQUANTIA=y
  47 +CONFIG_PHY_REALTEK=y
  48 +CONFIG_PHY_TERANETICS=y
  49 +CONFIG_PHY_VITESSE=y
45 50 CONFIG_E1000=y
46 51 CONFIG_MII=y
  52 +CONFIG_NVME=y
47 53 CONFIG_PCI=y
48 54 CONFIG_DM_PCI=y
49 55 CONFIG_DM_PCI_COMPAT=y
... ... @@ -59,6 +65,4 @@
59 65 CONFIG_USB_DWC3=y
60 66 CONFIG_USB_STORAGE=y
61 67 CONFIG_USB_GADGET=y
62   -CONFIG_CMD_NVME=y
63   -CONFIG_NVME=y
configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
Diff comments   View file @ 5c0f124
... ... @@ -39,8 +39,14 @@
39 39 # CONFIG_SPI_FLASH_BAR is not set
40 40 CONFIG_SPI_FLASH_SPANSION=y
41 41 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  42 +CONFIG_PHYLIB=y
  43 +CONFIG_PHY_AQUANTIA=y
  44 +CONFIG_PHY_REALTEK=y
  45 +CONFIG_PHY_TERANETICS=y
  46 +CONFIG_PHY_VITESSE=y
42 47 CONFIG_E1000=y
43 48 CONFIG_MII=y
  49 +CONFIG_NVME=y
44 50 CONFIG_PCI=y
45 51 CONFIG_DM_PCI=y
46 52 CONFIG_DM_PCI_COMPAT=y
... ... @@ -60,6 +66,4 @@
60 66 CONFIG_RSA=y
61 67 CONFIG_RSA_SOFTWARE_EXP=y
62 68 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
63   -CONFIG_CMD_NVME=y
64   -CONFIG_NVME=y
configs/ls1088aqds_qspi_defconfig
Diff comments   View file @ 5c0f124
... ... @@ -42,8 +42,14 @@
42 42 # CONFIG_SPI_FLASH_BAR is not set
43 43 CONFIG_SPI_FLASH_SPANSION=y
44 44 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  45 +CONFIG_PHYLIB=y
  46 +CONFIG_PHY_AQUANTIA=y
  47 +CONFIG_PHY_REALTEK=y
  48 +CONFIG_PHY_TERANETICS=y
  49 +CONFIG_PHY_VITESSE=y
45 50 CONFIG_E1000=y
46 51 CONFIG_MII=y
  52 +CONFIG_NVME=y
47 53 CONFIG_PCI=y
48 54 CONFIG_DM_PCI=y
49 55 CONFIG_DM_PCI_COMPAT=y
... ... @@ -61,6 +67,4 @@
61 67 CONFIG_USB_DWC3=y
62 68 CONFIG_USB_GADGET=y
63 69 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
64   -CONFIG_CMD_NVME=y
65   -CONFIG_NVME=y
configs/ls1088aqds_sdcard_ifc_defconfig
Diff comments   View file @ 5c0f124
... ... @@ -52,8 +52,14 @@
52 52 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
53 53 CONFIG_SYS_FLASH_CFI=y
54 54 CONFIG_MTD_RAW_NAND=y
  55 +CONFIG_PHYLIB=y
  56 +CONFIG_PHY_AQUANTIA=y
  57 +CONFIG_PHY_REALTEK=y
  58 +CONFIG_PHY_TERANETICS=y
  59 +CONFIG_PHY_VITESSE=y
55 60 CONFIG_E1000=y
56 61 CONFIG_MII=y
  62 +CONFIG_NVME=y
57 63 CONFIG_PCI=y
58 64 CONFIG_DM_PCI=y
59 65 CONFIG_DM_PCI_COMPAT=y
... ... @@ -67,6 +73,4 @@
67 73 CONFIG_USB_DWC3=y
68 74 CONFIG_USB_STORAGE=y
69 75 CONFIG_USB_GADGET=y
70   -CONFIG_CMD_NVME=y
71   -CONFIG_NVME=y
configs/ls1088aqds_sdcard_qspi_defconfig
Diff comments   View file @ 5c0f124
... ... @@ -52,8 +52,14 @@
52 52 # CONFIG_SPI_FLASH_BAR is not set
53 53 CONFIG_SPI_FLASH_SPANSION=y
54 54 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  55 +CONFIG_PHYLIB=y
  56 +CONFIG_PHY_AQUANTIA=y
  57 +CONFIG_PHY_REALTEK=y
  58 +CONFIG_PHY_TERANETICS=y
  59 +CONFIG_PHY_VITESSE=y
55 60 CONFIG_E1000=y
56 61 CONFIG_MII=y
  62 +CONFIG_NVME=y
57 63 CONFIG_PCI=y
58 64 CONFIG_DM_PCI=y
59 65 CONFIG_DM_PCI_COMPAT=y
... ... @@ -70,6 +76,4 @@
70 76 CONFIG_USB_XHCI_DWC3=y
71 77 CONFIG_USB_DWC3=y
72 78 CONFIG_USB_GADGET=y
73   -CONFIG_CMD_NVME=y
74   -CONFIG_NVME=y
configs/ls1088aqds_tfa_defconfig
Diff comments   View file @ 5c0f124
... ... @@ -57,8 +57,14 @@
57 57 # CONFIG_SPI_FLASH_BAR is not set
58 58 CONFIG_SPI_FLASH_SPANSION=y
59 59 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  60 +CONFIG_PHYLIB=y
  61 +CONFIG_PHY_AQUANTIA=y
  62 +CONFIG_PHY_REALTEK=y
  63 +CONFIG_PHY_TERANETICS=y
  64 +CONFIG_PHY_VITESSE=y
60 65 CONFIG_E1000=y
61 66 CONFIG_MII=y
  67 +CONFIG_NVME=y
62 68 CONFIG_PCI=y
63 69 CONFIG_DM_PCI=y
64 70 CONFIG_DM_PCI_COMPAT=y
... ... @@ -78,6 +84,4 @@
78 84 CONFIG_USB_DWC3=y
79 85 CONFIG_USB_GADGET=y
80 86 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
81   -CONFIG_CMD_NVME=y
82   -CONFIG_NVME=y
include/configs/ls1088aqds.h
Diff comments   View file @ 5c0f124
... ... @@ -541,11 +541,6 @@
541 541  
542 542 #ifdef CONFIG_FSL_MC_ENET
543 543 #define CONFIG_FSL_MEMAC
544   -#define CONFIG_PHYLIB
545   -#define CONFIG_PHYLIB_10G
546   -#define CONFIG_PHY_VITESSE
547   -#define CONFIG_PHY_REALTEK
548   -#define CONFIG_PHY_TERANETICS
549 544 #define RGMII_PHY1_ADDR 0x1
550 545 #define RGMII_PHY2_ADDR 0x2
551 546 #define SGMII_CARD_PORT1_PHY_ADDR 0x1C
... ... @@ -571,7 +566,6 @@
571 566 #define XQSGMII_CARD_PHY4_PORT3_ADDR 0xf
572 567  
573 568 #define CONFIG_ETHPRIME "DPMAC1@xgmii"
574   -#define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */
575 569  
576 570 #endif
577 571