Eric Lee / smarc-uboot | Embedian Git Server

Commit bd363f80e4462afe2b7551a87ac808a22de58aa1

Authored by Jagan Teki 2016-12-14 00:57:04 +0800

Committed by Stefano Babic 2016-12-17 01:39:05 +0800

Exists in v2017.01-smarct4x and in 25 other branches

imx6: geam6ul: Add FEC support

Add FEC support for Engicam GEAM6UL module.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

Showing 4 changed files with 17 additions and 0 deletions Inline Diff

arch/arm/cpu/armv7/mx6/Kconfig
configs/imx6ul_geam_mmc_defconfig
configs/imx6ul_geam_nand_defconfig
include/configs/imx6ul_geam.h

arch/arm/cpu/armv7/mx6/Kconfig

Diff comments View file @ bd363f8

 if ARCH_MX6
 config MX6
 	bool
 	default y
 config MX6D
 	bool
 config MX6DL
 	bool
 config MX6Q
 	bool
 config MX6QDL
 	bool
 config MX6S
 	bool
 config MX6SL
 	bool
 config MX6SX
 	select ROM_UNIFIED_SECTIONS
 	bool
 config MX6SLL
 	select ROM_UNIFIED_SECTIONS
 	bool
 config MX6UL
 	select SYS_L2CACHE_OFF
 	select ROM_UNIFIED_SECTIONS
 	bool
 config MX6ULL
 	bool
 	select MX6UL
 config MX6_DDRCAL
 	bool "Include dynamic DDR calibration routines"
 	depends on SPL
 	default n
 	help
 	  Say "Y" if your board uses dynamic (per-boot) DDR calibration.
 	  If unsure, say N.
 choice
 	prompt "MX6 board select"
 	optional
 config TARGET_ADVANTECH_DMS_BA16
 	bool "Advantech dms-ba16"
 	select MX6Q
 config TARGET_APALIS_IMX6
 	bool "Toradex Apalis iMX6 board"
 	select SUPPORT_SPL
 	select DM
 	select DM_SERIAL
 	select DM_THERMAL
 config TARGET_ARISTAINETOS
 	bool "aristainetos"
 config TARGET_ARISTAINETOS2
 	bool "aristainetos2"
 config TARGET_ARISTAINETOS2B
 	bool "Support aristainetos2-revB"
 config TARGET_CGTQMX6EVAL
 	bool "cgtqmx6eval"
 	select SUPPORT_SPL
 	select DM
 	select DM_THERMAL
 config TARGET_CM_FX6
 	bool "CM-FX6"
 	select SUPPORT_SPL
 	select DM
 	select DM_SERIAL
 	select DM_GPIO
 config TARGET_COLIBRI_IMX6
 	bool "Toradex Colibri iMX6 board"
 	select SUPPORT_SPL
 	select DM
 	select DM_SERIAL
 	select DM_THERMAL
 config TARGET_EMBESTMX6BOARDS
 	bool "embestmx6boards"
 config TARGET_GE_B450V3
 	bool "General Electric B450v3"
 	select MX6Q
 config TARGET_GE_B650V3
 	bool "General Electric B650v3"
 	select MX6Q
 config TARGET_GE_B850V3
 	bool "General Electric B850v3"
 	select MX6Q
 config TARGET_GW_VENTANA
 	bool "gw_ventana"
 	select SUPPORT_SPL
 config TARGET_KOSAGI_NOVENA
 	bool "Kosagi Novena"
 	select SUPPORT_SPL
 config TARGET_MX6CUBOXI
 	bool "Solid-run mx6 boards"
 	select SUPPORT_SPL
 config TARGET_MX6QARM2
 	bool "mx6qarm2"
 config TARGET_MX6Q_ICORE
 	bool "Support Engicam i.Core"
 	select MX6QDL
 	select OF_CONTROL
 	select DM
 	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
 	select DM_THERMAL
 	select SUPPORT_SPL
 config TARGET_MX6Q_ICORE_RQS
 	bool "Support Engicam i.Core RQS"
 	select MX6QDL
 	select OF_CONTROL
 	select DM
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
 	select DM_THERMAL
 	select SUPPORT_SPL
 config TARGET_MX6QSABREAUTO
 	bool "mx6qsabreauto"
 	select DM
 	select DM_THERMAL
 config TARGET_MX6SABRESD
 	bool "mx6sabresd"
 	select SUPPORT_SPL
 	select DM
 	select DM_THERMAL
 config TARGET_MX6SLEVK
 	bool "mx6slevk"
 	select SUPPORT_SPL
 config TARGET_MX6SLLEVK
         bool "mx6sll evk"
         select MX6SLL
         select DM
         select DM_THERMAL
 config TARGET_MX6SXSABRESD
 	bool "mx6sxsabresd"
 	select MX6SX
 	select SUPPORT_SPL
 	select DM
 	select DM_THERMAL
 config TARGET_MX6SXSABREAUTO
         bool "mx6sxsabreauto"
 	select MX6SX
         select DM
         select DM_THERMAL
 config TARGET_MX6UL_9X9_EVK
 	bool "mx6ul_9x9_evk"
 	select MX6UL
 	select DM
 	select DM_THERMAL
 	select SUPPORT_SPL
 config TARGET_MX6UL_14X14_EVK
 	bool "mx6ul_14x14_evk"
 	select MX6UL
 	select DM
 	select DM_THERMAL
 	select SUPPORT_SPL
 config TARGET_MX6UL_GEAM
 	bool "Support Engicam GEAM6UL"
 	select MX6UL
 	select OF_CONTROL
 	select DM
+	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
 	select DM_THERMAL
 	select SUPPORT_SPL
 config TARGET_MX6ULL_14X14_EVK
 	bool "Support mx6ull_14x14_evk"
 	select MX6ULL
 	select DM
 	select DM_THERMAL
 config TARGET_NITROGEN6X
 	bool "nitrogen6x"
 config TARGET_OT1200
 	bool "Bachmann OT1200"
 	select SUPPORT_SPL
 config TARGET_PICO_IMX6UL
 	bool "PICO-IMX6UL-EMMC"
 	select MX6UL
 config TARGET_LITEBOARD
 	bool "Grinn liteBoard (i.MX6UL)"
 	select LITESOM
 config TARGET_PLATINUM_PICON
 	bool "platinum-picon"
 	select SUPPORT_SPL
 config TARGET_PLATINUM_TITANIUM
 	bool "platinum-titanium"
 	select SUPPORT_SPL
 config TARGET_PCM058
 	bool "Phytec PCM058 i.MX6 Quad"
 	select SUPPORT_SPL
 config TARGET_SECOMX6
 	bool "secomx6 boards"
 config TARGET_TBS2910
 	bool "TBS2910 Matrix ARM mini PC"
 config TARGET_TITANIUM
 	bool "titanium"
 config TARGET_TQMA6
 	bool "TQ Systems TQMa6 board"
 config TARGET_UDOO
 	bool "udoo"
 	select SUPPORT_SPL
 config TARGET_UDOO_NEO
 	bool "UDOO Neo"
 	select SUPPORT_SPL
 	select MX6SX
 	select DM
 	select DM_THERMAL
 config TARGET_SAMTEC_VINING_2000
 	bool "samtec VIN|ING 2000"
 	select MX6SX
 	select DM
 	select DM_THERMAL
 config TARGET_WANDBOARD
 	bool "wandboard"
 	select SUPPORT_SPL
 config TARGET_WARP
 	bool "WaRP"
 config TARGET_XPRESS
 	bool "CCV xPress"
 	select MX6UL
 	select DM
 	select DM_THERMAL
 	select SUPPORT_SPL
 config TARGET_ZC5202
 	bool "zc5202"
 	select SUPPORT_SPL
 	select DM
 	select DM_THERMAL
 config TARGET_ZC5601
 	bool "zc5601"
 	select SUPPORT_SPL
 	select DM
 	select DM_THERMAL
 endchoice
 config SYS_SOC
 	default "mx6"
 source "board/ge/bx50v3/Kconfig"
 source "board/advantech/dms-ba16/Kconfig"
 source "board/aristainetos/Kconfig"
 source "board/bachmann/ot1200/Kconfig"
 source "board/barco/platinum/Kconfig"
 source "board/barco/titanium/Kconfig"
 source "board/boundary/nitrogen6x/Kconfig"
 source "board/ccv/xpress/Kconfig"
 source "board/compulab/cm_fx6/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/el/el6x/Kconfig"
 source "board/embest/mx6boards/Kconfig"
 source "board/engicam/geam6ul/Kconfig"
 source "board/engicam/icorem6/Kconfig"
 source "board/engicam/icorem6_rqs/Kconfig"
 source "board/freescale/mx6qarm2/Kconfig"
 source "board/freescale/mx6qsabreauto/Kconfig"
 source "board/freescale/mx6sabresd/Kconfig"
 source "board/freescale/mx6slevk/Kconfig"
 source "board/freescale/mx6sllevk/Kconfig"
 source "board/freescale/mx6sxsabresd/Kconfig"
 source "board/freescale/mx6sxsabreauto/Kconfig"
 source "board/freescale/mx6ul_14x14_evk/Kconfig"
 source "board/freescale/mx6ullevk/Kconfig"
 source "board/grinn/liteboard/Kconfig"
 source "board/phytec/pcm058/Kconfig"
 source "board/gateworks/gw_ventana/Kconfig"
 source "board/kosagi/novena/Kconfig"
 source "board/samtec/vining_2000/Kconfig"
 source "board/seco/Kconfig"
 source "board/solidrun/mx6cuboxi/Kconfig"
 source "board/technexion/pico-imx6ul/Kconfig"
 source "board/tbs/tbs2910/Kconfig"
 source "board/tqc/tqma6/Kconfig"
 source "board/toradex/apalis_imx6/Kconfig"
 source "board/toradex/colibri_imx6/Kconfig"
 source "board/udoo/Kconfig"
 source "board/udoo/neo/Kconfig"
 source "board/wandboard/Kconfig"
 source "board/warp/Kconfig"
 endif

configs/imx6ul_geam_mmc_defconfig

Diff comments View file @ bd363f8

 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6UL_GEAM=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
 CONFIG_DEFAULT_FDT_FILE="imx6ul-geam-kit.dtb"
 CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam-kit"
 CONFIG_SYS_PROMPT="geam6ul> "
 CONFIG_SPL=y
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_HUSH_PARSER=y
 CONFIG_AUTO_COMPLETE=y
 CONFIG_SYS_MAXARGS=32
 # CONFIG_CMD_IMLS is not set
 # CONFIG_BLK is not set
 # CONFIG_DM_MMC_OPS is not set
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_I2C=y
 CONFIG_OF_LIBFDT=y
+CONFIG_FEC_MXC=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_EXT_SUPPORT=y

configs/imx6ul_geam_nand_defconfig

Diff comments View file @ bd363f8

 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6UL_GEAM=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
 CONFIG_DEFAULT_FDT_FILE="imx6ul-geam-kit.dtb"
 CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam-kit"
 CONFIG_SYS_PROMPT="geam6ul> "
 CONFIG_SPL=y
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_HUSH_PARSER=y
 CONFIG_AUTO_COMPLETE=y
 CONFIG_SYS_MAXARGS=32
 # CONFIG_CMD_IMLS is not set
 # CONFIG_BLK is not set
 # CONFIG_DM_MMC_OPS is not set
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
 CONFIG_OF_LIBFDT=y
+CONFIG_FEC_MXC=y
 CONFIG_MXC_UART=y
 CONFIG_NAND_MXS=y
 CONFIG_IMX_THERMAL=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_DMA_SUPPORT=y

include/configs/imx6ul_geam.h

Diff comments View file @ bd363f8

 /*
  * Copyright (C) 2016 Amarula Solutions B.V.
  * Copyright (C) 2016 Engicam S.r.l.
  *
  * Configuration settings for the Engicam GEAM6UL  Starter Kits.
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #ifndef __IMX6UL_GEAM_CONFIG_H
 #define __IMX6UL_GEAM_CONFIG_H
 #include <linux/sizes.h>
 #include "mx6_common.h"
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(16 * SZ_1M)
 /* Total Size of Environment Sector */
 #define CONFIG_ENV_SIZE			SZ_128K
 /* Allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 /* Environment */
 #ifndef CONFIG_ENV_IS_NOWHERE
 /* Environment in MMC */
 # if defined(CONFIG_ENV_IS_IN_MMC)
 #  define CONFIG_ENV_OFFSET		0x100000
 /* Environment in NAND */
 # elif defined(CONFIG_ENV_IS_IN_NAND)
 #  define CONFIG_ENV_OFFSET		0x400000
 #  define CONFIG_ENV_SECT_SIZE		CONFIG_ENV_SIZE
 # endif
 #endif
 /* Default environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
 	"fdt_high=0xffffffff\0" \
 	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_addr=0x87800000\0" \
 	"boot_fdt=try\0" \
 	"mmcdev=0\0" \
 	"mmcpart=1\0" \
 	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
 	"mmcautodetect=yes\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
 		"root=${mmcroot}\0" \
 	"loadbootscript=" \
 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"source\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
 		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
 			"if run loadfdt; then " \
 				"bootz ${loadaddr} - ${fdt_addr}; " \
 			"else " \
 				"if test ${boot_fdt} = try; then " \
 					"bootz; " \
 				"else " \
 					"echo WARN: Cannot load the DT; " \
 				"fi; " \
 			"fi; " \
 		"else " \
 			"bootz; " \
 		"fi\0"
 #define CONFIG_BOOTCOMMAND \
 	   "mmc dev ${mmcdev};" \
 	   "mmc dev ${mmcdev}; if mmc rescan; then " \
 		   "if run loadbootscript; then " \
 			   "run bootscript; " \
 		   "else " \
 			"if run loadimage; then " \
 				"run mmcboot; " \
 			"fi; " \
 		   "fi; " \
 	   "fi"
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x8000000)
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 #define CONFIG_SYS_HZ			1000
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS		1
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR	IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 #define CONFIG_SYS_INIT_SP_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - \
 					GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
 					CONFIG_SYS_INIT_SP_OFFSET)
 /* UART */
 #ifdef CONFIG_MXC_UART
 # define CONFIG_MXC_UART_BASE		UART1_BASE
 #endif
 /* MMC */
 #ifdef CONFIG_FSL_USDHC
 # define CONFIG_SYS_MMC_ENV_DEV		0
 # define CONFIG_SYS_FSL_USDHC_NUM	1
 # define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 #endif
 /* NAND */
 #ifdef CONFIG_NAND_MXS
 # define CONFIG_SYS_MAX_NAND_DEVICE	1
 # define CONFIG_SYS_NAND_BASE		0x40000000
 # define CONFIG_SYS_NAND_5_ADDR_CYCLE
 # define CONFIG_SYS_NAND_ONFI_DETECTION
 # define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
 # define CONFIG_SYS_NAND_U_BOOT_OFFS	0x200000
 /* MTD device */
 # define CONFIG_MTD_DEVICE
 # define CONFIG_CMD_MTDPARTS
 # define CONFIG_MTD_PARTITIONS
 # define MTDIDS_DEFAULT			"nand0=nand"
 # define MTDPARTS_DEFAULT		"mtdparts=nand:2m(spl),2m(uboot)," \
 					"1m(env),4m(kernel),1m(dtb),-(rootfs)"
 # define CONFIG_APBH_DMA
 # define CONFIG_APBH_DMA_BURST
 # define CONFIG_APBH_DMA_BURST8
 #endif
+/* Ethernet */
+#ifdef CONFIG_FEC_MXC
+# define CONFIG_FEC_MXC_PHYADDR		0
+# define CONFIG_FEC_XCV_TYPE		RMII
+# define CONFIG_MII
+# define CONFIG_PHYLIB
+# define CONFIG_PHY_SMSC
+#endif
 /* SPL */
 #ifdef CONFIG_SPL
 # ifdef CONFIG_NAND_MXS
 #  define CONFIG_SPL_NAND_SUPPORT
 # else
 #  define CONFIG_SPL_MMC_SUPPORT
 # endif
 # include "imx6_spl.h"
 # ifdef CONFIG_SPL_BUILD
 #  undef CONFIG_DM_GPIO
 #  undef CONFIG_DM_MMC
 # endif
 #endif
 #endif /* __IMX6UL_GEAM_CONFIG_H */