mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-04 18:41:03 +00:00
77b508d34b
Commit d397f7c45b
("net: phy: micrel: Separate KSZ9000 drivers from
KSZ8000 drivers") separated the KSZ8xxx and KSZ90x1 drivers and warns
that you shouldn't select both of them due to a device ID clash between
the KSZ9021 and the KS8721, asserting that "it is highly unlikely for a
system to contain both a KSZ8000 and a KSZ9000 PHY". Unfortunately
boards like the SAMA5D3xEK do contain both types of PHY, but fortunately
the Linux Micrel PHY driver provides a solution by using different PHY
ID and mask values to distinguish these chips.
This commit contains the following changes:
- The PHY ID and mask values for the KSZ9021 and the KS8721 now match
those used by the Linux driver.
- The warnings about not enabling both drivers have been removed.
- The description for PHY_MICREL_KSZ8XXX has been corrected (these are
10/100 PHYs, not GbE PHYs).
- PHY_MICREL_KSZ9021 and PHY_MICREL_KSZ9031 no longer select PHY_GIGE
since this is selected by PHY_MICREL_KSZ90X1.
- All of the relevant defconfig files have been updated now that
PHY_MICREL_KSZ8XXX does not default to 'Y'.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
96 lines
2.5 KiB
Text
96 lines
2.5 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_SYS_THUMB_BUILD=y
|
|
CONFIG_ARCH_VF610=y
|
|
CONFIG_SYS_TEXT_BASE=0x3f401000
|
|
CONFIG_SYS_MALLOC_F_LEN=0x800
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_TARGET_COLIBRI_VF=y
|
|
CONFIG_ENV_VARS_UBOOT_CONFIG=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,IMX_NAND"
|
|
CONFIG_BOOTDELAY=1
|
|
CONFIG_LOGLEVEL=3
|
|
CONFIG_VERSION_VARIABLE=y
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
CONFIG_ARCH_MISC_INIT=y
|
|
CONFIG_BOARD_EARLY_INIT_F=y
|
|
CONFIG_HUSH_PARSER=y
|
|
# CONFIG_CMDLINE_EDITING is not set
|
|
# CONFIG_AUTO_COMPLETE is not set
|
|
# CONFIG_SYS_LONGHELP is not set
|
|
CONFIG_SYS_PROMPT="Colibri VFxx # "
|
|
# CONFIG_CMD_BOOTD is not set
|
|
# CONFIG_CMD_BOOTM is not set
|
|
CONFIG_CMD_BOOTZ=y
|
|
# CONFIG_CMD_ELF is not set
|
|
# CONFIG_CMD_IMI is not set
|
|
CONFIG_CMD_ASKENV=y
|
|
CONFIG_CMD_MEMTEST=y
|
|
CONFIG_CMD_DFU=y
|
|
CONFIG_CMD_DM=y
|
|
# CONFIG_CMD_FLASH is not set
|
|
CONFIG_CMD_FUSE=y
|
|
CONFIG_CMD_GPIO=y
|
|
# CONFIG_CMD_LOADB is not set
|
|
# CONFIG_CMD_LOADS is not set
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
CONFIG_CMD_DHCP=y
|
|
# CONFIG_CMD_NFS is not set
|
|
CONFIG_CMD_MII=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_BMP=y
|
|
CONFIG_CMD_EXT4=y
|
|
CONFIG_CMD_FAT=y
|
|
CONFIG_CMD_FS_GENERIC=y
|
|
CONFIG_MTDIDS_DEFAULT="nand0=vf610_nfc"
|
|
CONFIG_MTDPARTS_DEFAULT="mtdparts=vf610_nfc:128k(vf-bcb)ro,1408k(u-boot)ro,512k(u-boot-env),-(ubi)"
|
|
CONFIG_CMD_UBI=y
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
|
|
CONFIG_ENV_IS_IN_NAND=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
CONFIG_DM=y
|
|
CONFIG_DFU_NAND=y
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_VYBRID_GPIO=y
|
|
CONFIG_DM_MMC=y
|
|
# CONFIG_MMC_HW_PARTITIONING is not set
|
|
CONFIG_FSL_ESDHC=y
|
|
CONFIG_MTD=y
|
|
CONFIG_NAND_VF610_NFC=y
|
|
CONFIG_NAND_VF610_NFC_DT=y
|
|
CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
|
|
CONFIG_MTD_UBI_FASTMAP=y
|
|
CONFIG_PHYLIB=y
|
|
CONFIG_PHY_MICREL=y
|
|
CONFIG_PHY_MICREL_KSZ8XXX=y
|
|
CONFIG_DM_ETH=y
|
|
CONFIG_FEC_MXC=y
|
|
CONFIG_MII=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_PINCTRL_VYBRID=y
|
|
CONFIG_DM_REGULATOR=y
|
|
CONFIG_DM_REGULATOR_FIXED=y
|
|
# CONFIG_SPL_SERIAL_PRESENT is not set
|
|
# CONFIG_TPL_SERIAL_PRESENT is not set
|
|
CONFIG_DM_SERIAL=y
|
|
CONFIG_FSL_LPUART=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_GADGET_MANUFACTURER="Toradex"
|
|
CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
|
|
CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
|
|
CONFIG_CI_UDC=y
|
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
|
CONFIG_VIDEO_FSL_DCU_FB=y
|
|
CONFIG_VIDEO=y
|
|
CONFIG_SYS_CONSOLE_FG_COL=0x00
|
|
CONFIG_OF_LIBFDT_OVERLAY=y
|
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|
|
# CONFIG_EFI_UNICODE_CAPITALIZATION is not set
|