Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ddd0d14bceab240b930f00a8a5a8e376d54993cf

Authored by Ioana Ciornei
Committed by Priyanka Jain
1 parent f4d394c416
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: ls1088ardb: 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 LS1088ARDB 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 31 additions and 15 deletions Side-by-side Diff

configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
Diff comments   View file @ ddd0d14
... ... @@ -40,8 +40,14 @@
40 40 # CONFIG_SPI_FLASH_BAR is not set
41 41 CONFIG_SPI_FLASH_SPANSION=y
42 42 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  43 +CONFIG_PHYLIB=y
  44 +CONFIG_PHY_AQUANTIA=y
  45 +CONFIG_PHY_REALTEK=y
  46 +CONFIG_PHY_TERANETICS=y
  47 +CONFIG_PHY_VITESSE=y
43 48 CONFIG_E1000=y
44 49 CONFIG_MII=y
  50 +CONFIG_NVME=y
45 51 CONFIG_PCI=y
46 52 CONFIG_DM_PCI=y
47 53 CONFIG_DM_PCI_COMPAT=y
... ... @@ -61,6 +67,4 @@
61 67 CONFIG_RSA=y
62 68 CONFIG_RSA_SOFTWARE_EXP=y
63 69 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
64   -CONFIG_CMD_NVME=y
65   -CONFIG_NVME=y
configs/ls1088ardb_qspi_defconfig
Diff comments   View file @ ddd0d14
... ... @@ -43,8 +43,14 @@
43 43 # CONFIG_SPI_FLASH_BAR is not set
44 44 CONFIG_SPI_FLASH_SPANSION=y
45 45 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  46 +CONFIG_PHYLIB=y
  47 +CONFIG_PHY_AQUANTIA=y
  48 +CONFIG_PHY_REALTEK=y
  49 +CONFIG_PHY_TERANETICS=y
  50 +CONFIG_PHY_VITESSE=y
46 51 CONFIG_E1000=y
47 52 CONFIG_MII=y
  53 +CONFIG_NVME=y
48 54 CONFIG_PCI=y
49 55 CONFIG_DM_PCI=y
50 56 CONFIG_DM_PCI_COMPAT=y
... ... @@ -62,6 +68,4 @@
62 68 CONFIG_USB_DWC3=y
63 69 CONFIG_USB_GADGET=y
64 70 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
65   -CONFIG_CMD_NVME=y
66   -CONFIG_NVME=y
configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
Diff comments   View file @ ddd0d14
... ... @@ -52,6 +52,11 @@
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
57 62 CONFIG_PCI=y
... ... @@ -70,6 +75,4 @@
70 75 CONFIG_USB_DWC3=y
71 76 CONFIG_RSA=y
72 77 CONFIG_SPL_RSA=y
73   -CONFIG_CMD_NVME=y
74   -CONFIG_NVME=y
configs/ls1088ardb_sdcard_qspi_defconfig
Diff comments   View file @ ddd0d14
... ... @@ -53,8 +53,14 @@
53 53 # CONFIG_SPI_FLASH_BAR is not set
54 54 CONFIG_SPI_FLASH_SPANSION=y
55 55 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  56 +CONFIG_PHYLIB=y
  57 +CONFIG_PHY_AQUANTIA=y
  58 +CONFIG_PHY_REALTEK=y
  59 +CONFIG_PHY_TERANETICS=y
  60 +CONFIG_PHY_VITESSE=y
56 61 CONFIG_E1000=y
57 62 CONFIG_MII=y
  63 +CONFIG_NVME=y
58 64 CONFIG_PCI=y
59 65 CONFIG_DM_PCI=y
60 66 CONFIG_DM_PCI_COMPAT=y
... ... @@ -71,6 +77,4 @@
71 77 CONFIG_USB_XHCI_DWC3=y
72 78 CONFIG_USB_DWC3=y
73 79 CONFIG_USB_GADGET=y
74   -CONFIG_CMD_NVME=y
75   -CONFIG_NVME=y
configs/ls1088ardb_tfa_SECURE_BOOT_defconfig
Diff comments   View file @ ddd0d14
... ... @@ -47,8 +47,12 @@
47 47 # CONFIG_SPI_FLASH_BAR is not set
48 48 CONFIG_SPI_FLASH_SPANSION=y
49 49 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  50 +CONFIG_PHYLIB=y
  51 +CONFIG_PHY_AQUANTIA=y
  52 +CONFIG_PHY_VITESSE=y
50 53 CONFIG_E1000=y
51 54 CONFIG_MII=y
  55 +CONFIG_NVME=y
52 56 CONFIG_PCI=y
53 57 CONFIG_DM_PCI=y
54 58 CONFIG_DM_PCI_COMPAT=y
... ... @@ -71,6 +75,4 @@
71 75 CONFIG_SPL_RSA=y
72 76 CONFIG_RSA_SOFTWARE_EXP=y
73 77 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
74   -CONFIG_CMD_NVME=y
75   -CONFIG_NVME=y
configs/ls1088ardb_tfa_defconfig
Diff comments   View file @ ddd0d14
... ... @@ -52,8 +52,12 @@
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_VITESSE=y
55 58 CONFIG_E1000=y
56 59 CONFIG_MII=y
  60 +CONFIG_NVME=y
57 61 CONFIG_PCI=y
58 62 CONFIG_DM_PCI=y
59 63 CONFIG_DM_PCI_COMPAT=y
... ... @@ -77,6 +81,4 @@
77 81 CONFIG_USB_ETHER_ASIX88179=y
78 82 CONFIG_USB_ETHER_RTL8152=y
79 83 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
80   -CONFIG_CMD_NVME=y
81   -CONFIG_NVME=y
include/configs/ls1088ardb.h
Diff comments   View file @ ddd0d14
... ... @@ -504,9 +504,7 @@
504 504  
505 505 /* MAC/PHY configuration */
506 506 #ifdef CONFIG_FSL_MC_ENET
507   -#define CONFIG_PHYLIB
508 507  
509   -#define CONFIG_PHY_VITESSE
510 508 #define AQ_PHY_ADDR1 0x00
511 509 #define AQR105_IRQ_MASK 0x00000004
512 510  
... ... @@ -520,7 +518,6 @@
520 518 #define QSGMII2_PORT4_PHY_ADDR 0x1f
521 519  
522 520 #define CONFIG_ETHPRIME "DPMAC1@xgmii"
523   -#define CONFIG_PHY_GIGE
524 521 #endif
525 522 #endif
526 523