mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 15:14:43 +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>
76 lines
1.9 KiB
Text
76 lines
1.9 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_SYS_THUMB_BUILD=y
|
|
CONFIG_ARCH_MX7=y
|
|
CONFIG_SYS_TEXT_BASE=0x87800000
|
|
CONFIG_SECURE_BOOT=y
|
|
CONFIG_TARGET_COLIBRI_IMX7=y
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_IMX_RDC=y
|
|
CONFIG_IMX_BOOTAUX=y
|
|
# CONFIG_CMD_DEKBLOB is not set
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
|
|
CONFIG_BOOTDELAY=1
|
|
# CONFIG_USE_BOOTCOMMAND is not set
|
|
# CONFIG_CONSOLE_MUX is not set
|
|
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
CONFIG_BOUNCE_BUFFER=y
|
|
CONFIG_SYS_PROMPT="Colibri iMX7 # "
|
|
# CONFIG_CMD_BOOTD is not set
|
|
# CONFIG_CMD_IMI is not set
|
|
# CONFIG_CMD_XIMG is not set
|
|
CONFIG_CMD_ASKENV=y
|
|
CONFIG_CMD_MEMTEST=y
|
|
CONFIG_CMD_DFU=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_MTD=y
|
|
CONFIG_CMD_NAND_TRIMFFS=y
|
|
CONFIG_CMD_NAND_TORTURE=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
# CONFIG_BOOTP_PXE is not set
|
|
CONFIG_CMD_BMP=y
|
|
CONFIG_CMD_CACHE=y
|
|
# CONFIG_CMD_HASH is not set
|
|
CONFIG_CMD_MTDPARTS=y
|
|
CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
|
|
CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:512k(mx7-bcb),1536k(u-boot1)ro,1536k(u-boot2)ro,512k(u-boot-env),-(ubi)"
|
|
CONFIG_CMD_UBI=y
|
|
# CONFIG_ISO_PARTITION is not set
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand"
|
|
CONFIG_ENV_IS_IN_NAND=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
CONFIG_FSL_CAAM=y
|
|
CONFIG_DFU_NAND=y
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_DM_MMC=y
|
|
CONFIG_FSL_ESDHC=y
|
|
CONFIG_MTD=y
|
|
CONFIG_NAND=y
|
|
CONFIG_NAND_MXS_DT=y
|
|
CONFIG_MTD_UBI_FASTMAP=y
|
|
CONFIG_PHYLIB=y
|
|
CONFIG_PHY_MICREL=y
|
|
CONFIG_PHY_MICREL_KSZ8XXX=y
|
|
CONFIG_MII=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_PINCTRL_IMX7=y
|
|
CONFIG_DM_PMIC=y
|
|
CONFIG_PMIC_RN5T567=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=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=y
|
|
CONFIG_OF_LIBFDT_OVERLAY=y
|
|
CONFIG_FDT_FIXUP_PARTITIONS=y
|