Introduce cm-fx6 board (partial V2 cont.)

According to MX6 TRM, both MMDC and DRAM should be configured to the same powerdown precharge. Currently, mx6_dram_cfg() configures MMDC for fast pd (MDPDC[7] = 0), and the DRAM for 'slow exit (DLL off)' (MR0[12] = 0).

Configure MMDC for slow pd.

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

Signed-off-by Nikita Kiryanov <[email protected]>

---
Changes in V2:
- Updated commit message to explain what bits in what registers correspond to what settings.

 arch/arm/cpu/armv7/mx6/ddr.c | 1 +
 1 file changed, 1 insertion(+)

arch/arm/cpu/armv7/mx6/ddr.c +1 -0

index 70ce38f..c0fb749 100644
@@ -463,6 +463,7 @@ void mx6_dram_cfg(const struct mx6_ddr_sysinfo *sysinfo,
 	mmdc0->mdpdc = (tcke & 0x7) << 16 |
 			5            << 12 |  /* PWDT_1: 256 cycles */
 			5            <<  8 |  /* PWDT_0: 256 cycles */
+			1            <<  7 |  /* SLOW_PD */
 			1            <<  6 |  /* BOTH_CS_PD */
 			(tcksrx & 0x7) << 3 |
 			(tcksre & 0x7);

Add initial support for Compulab CM-FX6 CoM.
Support includes MMC, SPI flash, and SPL with dynamic DRAM detection.

Cc Igor Grinberg <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tom Rini <[email protected]>

Cc Marek Vasut <[email protected]>

Signed-off-by Nikita Kiryanov <[email protected]>

Add initial support for Compulab CM-FX6 CoM.
Support includes MMC, SPI flash, and SPL with dynamic DRAM detection.

Cc Igor Grinberg <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tom Rini <[email protected]>

Cc Marek Vasut <[email protected]>

Acked-by Marek Vasut <[email protected]>

Signed-off-by Nikita Kiryanov <[email protected]>

---
Changes in V3:
- Remove CONFIG_SYS_TEXT_BASE from config file to not clash with the one supplied by imx6_spl.h

Changes in V2:
- Remove unnecessary line removal from arch/arm/cpu/armv7/mx6/ddr.c
- Move probe_mmdc_config() code straight to dram_init()
- Use imx6_spl.h
- Use imx_ddr_size()
NOTE: the correctness of this patch now depends on https://patchwork.ozlabs.org/patch/376095/

 board/compulab/cm_fx6/Makefile     |  12 ++
 board/compulab/cm_fx6/cm_fx6.c     |  98 +++++++++
 board/compulab/cm_fx6/common.c     |  83 ++++++++
 board/compulab/cm_fx6/common.h     |  36 ++++
 board/compulab/cm_fx6/imximage.cfg |   8 +
 board/compulab/cm_fx6/spl.c        | 400 +++++++++++++++++++++++++++++++++++++
 boards.cfg                         |   2 +
 include/configs/cm_fx6.h           | 211 +++++++++++++++++++

 8 files changed, 850 insertions(+)
 create mode 100644 board/compulab/cm_fx6/Makefile
 create mode 100644 board/compulab/cm_fx6/cm_fx6.c
 create mode 100644 board/compulab/cm_fx6/common.c
 create mode 100644 board/compulab/cm_fx6/common.h
 create mode 100644 board/compulab/cm_fx6/imximage.cfg
 create mode 100644 board/compulab/cm_fx6/spl.c
 create mode 100644 include/configs/cm_fx6.h

board/compulab/cm_fx6/Makefile new file +2 -0

new file mode 100644
index 0000000..3e5c903
@@ -0,0 +1,12 @@
+#
+# (C) Copyright 2014 CompuLab, Ltd. <www.compulab.co.il>

include/configs/cm_fx6.h new file +13 -0

new file mode 100644
index 0000000..b877b65
@@ -0,0 +1,211 @@
+/*
+ * Config file for Compulab CM-FX6 board
+ *
+ * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
+ *
+ * Author: Nikita Kiryanov <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __CONFIG_CM_FX6_H
+#define __CONFIG_CM_FX6_H
+

include/configs/cm_fx6.h new file +188 -1

+#define CONFIG_SYS_LITTLE_ENDIAN
+#define CONFIG_MACH_TYPE               4273
+#define CONFIG_SYS_HZ                  1000
+
+/* Display information on boot */
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_TIMESTAMP
+
+/* CMD */
+#include <config_cmd_default.h>
+#define CONFIG_CMD_GREPENV
+#undef CONFIG_CMD_FLASH
+#undef CONFIG_CMD_LOADB
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_XIMG
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_NFS
+
+/* MMC */
+#define CONFIG_MMC
+#define CONFIG_CMD_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_FSL_ESDHC
+#define CONFIG_FSL_USDHC
+#define CONFIG_SYS_FSL_USDHC_NUM       3
+#define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
+
+/* RAM */
+#define PHYS_SDRAM_1                   MMDC0_ARB_BASE_ADDR
+#define PHYS_SDRAM_2                   MMDC1_ARB_BASE_ADDR
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CONFIG_NR_DRAM_BANKS           2
+#define CONFIG_SYS_MEMTEST_START       0x10000000
+#define CONFIG_SYS_MEMTEST_END         0x10010000
+#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)
+
+/* Serial console */
+#define CONFIG_MXC_UART
+#define CONFIG_MXC_UART_BASE           UART4_BASE
+#define CONFIG_BAUDRATE                        115200
+#define CONFIG_SYS_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, 115200}
+
+/* Shell */
+#define CONFIG_SYS_PROMPT      "CM-FX6 # "
+#define CONFIG_SYS_CBSIZE      1024
+#define CONFIG_SYS_MAXARGS     16
+#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
+#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + \
+                                       sizeof(CONFIG_SYS_PROMPT) + 16)
+
+/* SPI flash */
+#define CONFIG_SYS_NO_FLASH
+#define CONFIG_CMD_SF
+#define CONFIG_SF_DEFAULT_BUS          0
+#define CONFIG_SF_DEFAULT_CS           0
+#define CONFIG_SF_DEFAULT_SPEED                25000000
+#define CONFIG_SF_DEFAULT_MODE         (SPI_MODE_0)
+
+/* Environment */
+#define CONFIG_ENV_OVERWRITE
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
+#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
+#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
+#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
+#define CONFIG_ENV_SECT_SIZE           (64 * 1024)
+#define CONFIG_ENV_SIZE                        (8 * 1024)
+#define CONFIG_ENV_OFFSET              (768 * 1024)
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       "kernel=uImage-cm-fx6\0" \
+       "autoload=no\0" \
+       "loadaddr=0x10800000\0" \
+       "fdtaddr=0x11000000\0" \
+       "console=ttymxc3,115200\0" \
+       "ethprime=FEC0\0" \
+       "bootscr=boot.scr\0" \
+       "bootm_low=18000000\0" \
+       "video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32 at 50,if=RGB32\0" \
+       "video_dvi=mxcfb0:dev=dvi,1280x800M-32 at 50,if=RGB32\0" \
+       "fdtfile=cm-fx6.dtb\0" \
+       "doboot=bootm ${loadaddr}\0" \
+       "loadfdt=false\0" \
+       "setboottypez=setenv kernel zImage-cm-fx6;" \
+               "setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
+               "setenv loadfdt true;\0" \
+       "setboottypem=setenv kernel uImage-cm-fx6;" \
+               "setenv doboot bootm ${loadaddr};" \
+               "setenv loadfdt false;\0"\
+       "run_eboot=echo Starting EBOOT ...; "\
+               "mmc dev ${mmcdev} && " \
+               "mmc rescan && mmc read 10042000 a 400 && go 10042000\0" \
+       "mmcdev=2\0" \
+       "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
+       "loadmmcbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \
+       "mmcbootscript=echo Running bootscript from mmc ...; "\
+               "source ${loadaddr}\0" \
+       "mmcargs=setenv bootargs console=${console} " \
+               "root=${mmcroot} " \
+               "${video}\0" \
+       "mmcloadkernel=fatload mmc ${mmcdev} ${loadaddr} ${kernel}\0" \
+       "mmcloadfdt=fatload mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \
+       "mmcboot=echo Booting from mmc ...; " \
+               "run mmcargs; " \
+               "run doboot\0" \
+       "nandroot=/dev/mtdblock4 rw\0" \
+       "nandrootfstype=ubifs\0" \
+       "nandargs=setenv bootargs console=${console} " \
+               "root=${nandroot} " \
+               "rootfstype=${nandrootfstype} " \
+               "${video}\0" \
+       "nandloadfdt=nand read ${fdtaddr} 780000 80000;\0" \
+       "nandboot=echo Booting from nand ...; " \
+               "run nandargs; " \
+               "nand read ${loadaddr} 0 780000; " \
+               "if ${loadfdt}; then " \
+                       "run nandloadfdt;" \
+               "fi; " \
+               "run doboot\0" \
+       "boot=mmc dev ${mmcdev}; " \
+               "if mmc rescan; then " \
+                       "if run loadmmcbootscript; then " \
+                               "run mmcbootscript;" \
+                       "else " \
+                               "if run mmcloadkernel; then " \
+                                       "if ${loadfdt}; then " \
+                                               "run mmcloadfdt;" \
+                                       "fi;" \
+                                       "run mmcboot;" \
+                               "fi;" \
+                       "fi;" \
+               "fi;"
+
+#define CONFIG_BOOTCOMMAND \
+       "run setboottypem; run boot"
+
+/* SPI */
+#define CONFIG_SPI
+#define CONFIG_MXC_SPI
+#define CONFIG_SPI_FLASH
+#define CONFIG_SPI_FLASH_ATMEL
+#define CONFIG_SPI_FLASH_EON
+#define CONFIG_SPI_FLASH_GIGADEVICE
+#define CONFIG_SPI_FLASH_MACRONIX
+#define CONFIG_SPI_FLASH_SPANSION
+#define CONFIG_SPI_FLASH_STMICRO
+#define CONFIG_SPI_FLASH_SST
+#define CONFIG_SPI_FLASH_WINBOND
+
+/* GPIO */
+#define CONFIG_MXC_GPIO
+
+/* Boot */
+#define CONFIG_ZERO_BOOTDELAY_CHECK
+#define CONFIG_LOADADDR                        0x10800000
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs */
+#define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
+
+/* misc */
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_STACKSIZE                       (128 * 1024)
+#define CONFIG_SYS_MALLOC_LEN                  (2 * 1024 * 1024)
+#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     800 /* 400 KB */
+
+/* SPL */
+#define CONFIG_SPL
+#include "imx6_spl.h"
+#define CONFIG_SPL_BOARD_INIT
+#define CONFIG_SPL_MMC_SUPPORT
+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x80 /* offset 64 kb */
+#define CONFIG_SYS_MONITOR_LEN (CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS / 2 * 1024)
+#define CONFIG_SPL_SPI_SUPPORT
+#define CONFIG_SPL_SPI_FLASH_SUPPORT
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)
+#define CONFIG_SPL_SPI_LOAD
+
+#endif /* __CONFIG_CM_FX6_H */
--

1.9.1

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Hi Nikita,

Quoted 3 lines · Nikita Kiryanov

Add initial support for Compulab CM-FX6 CoM.
Support includes MMC, SPI flash, and SPL with dynamic DRAM detection.

Quoted 5 lines

  board/compulab/cm_fx6/common.h     |  36 ++++
  board/compulab/cm_fx6/imximage.cfg |   8 +
  board/compulab/cm_fx6/spl.c        | 400 +++++++++++++++++++++++++++++++++++++
  boards.cfg                         |   2 +
  include/configs/cm_fx6.h           | 211 +++++++++++++++++++

I think you need Kconfig etc. here? Also we don't use boards.cfg anymore. I pushed a tree to u-boot-x86.git branch cm_fx6 which hacks in a few of these things as an example (enough to make it build anyway).

board/compulab/cm_fx6/Makefile line 12

Quoted 6 lines

board/compulab/cm_fx6/Makefile new file +6 -0

+#
+ifdef CONFIG_SPL_BUILD
+obj-y = common.o spl.o
+else
+obj-y = common.o cm_fx6.o
+endif

Note this doesn't apply or build for me on mainline due to missing Kconfig stuff. I might be missing a patch.

boards.cfg Active arm armv7 mx6 freescale mx6sabresd · line 341

Quoted 13 lines

boards.cfg +2 -0

index e3a0726..308b94e 100644
@@ -334,6 +334,8 @@ Active  arm         armv7          mx6         freescale       mx6sabresd
  Active  arm         armv7          mx6         freescale       mx6slevk            mx6slevk                              mx6slevk:IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL                                                                   Fabio Estevam <[email protected]>
  Active  arm         armv7          mx6         gateworks       gw_ventana          gwventana                             gw_ventana:IMX_CONFIG=board/gateworks/gw_ventana/gw_ventana.cfg,MX6QDL,SPL                                                        Tim Harvey <[email protected]>
  Active  arm         armv7          mx6         solidrun        hummingboard        hummingboard_solo                     hummingboard:IMX_CONFIG=board/solidrun/hummingboard/solo.cfg,MX6S,DDR_MB=512                                                      Jon Nettleton <[email protected]>
+Active  arm         armv7          mx6         compulab        cm_fx6              cm_fx6
+-                                                                                                                                 Nikita Kiryanov <[email protected]>
  Active  arm         armv7          omap3       -               overo               omap3_overo                           -                                                                                                                                 Steve Sakoman <[email protected]>
  Active  arm         armv7          omap3       -               pandora             omap3_pandora                         -                                                                                                                                 Grazvydas Ignotas <[email protected]>
  Active  arm         armv7          omap3       8dtech          eco5pk              eco5pk                                -                                                                                                                                 Raphael Assenat <[email protected]>

We don't use this file anymore.

Quoted 2 lines

include/configs/cm_fx6.h new file +0 -0

new file mode 100644

include/configs/cm_fx6.h line 23

Quoted 5 lines

include/configs/cm_fx6.h new file +5 -0

+
+/* Machine config */
+#define CONFIG_MX6
+#define CONFIG_MX6QDL
+#define CONFIG_CM_FX6

Should these three be defined in the Kconfig file instead? What does CONFIG_CM_FX6 represent? There might be a CONFIG_TARGET_CM_FX6 defined by Kconfig.

include/configs/cm_fx6.h line 26

Quoted 3 lines

include/configs/cm_fx6.h new file +3 -0

+#define CONFIG_SYS_LITTLE_ENDIAN
+#define CONFIG_MACH_TYPE               4273
+#define CONFIG_SYS_HZ                  1000

Regards,
Simon

Add initial support for Compulab CM-FX6 CoM.
Support includes MMC, SPI flash, and SPL with dynamic DRAM detection.

Cc Igor Grinberg <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tom Rini <[email protected]>

Cc Marek Vasut <[email protected]>

Acked-by Marek Vasut <[email protected]>

Signed-off-by Nikita Kiryanov <[email protected]>

---
Changes in V3:
- Remove CONFIG_SYS_TEXT_BASE from config file to not clash with the one supplied by imx6_spl.h

Changes in V2:
- Remove unnecessary line removal from arch/arm/cpu/armv7/mx6/ddr.c
- Move probe_mmdc_config() code straight to dram_init()
- Use imx6_spl.h
- Use imx_ddr_size()
NOTE: the correctness of this patch now depends on https://patchwork.ozlabs.org/patch/376095/

 board/compulab/cm_fx6/Makefile     |  12 ++
 board/compulab/cm_fx6/cm_fx6.c     |  98 +++++++++
 board/compulab/cm_fx6/common.c     |  83 ++++++++
 board/compulab/cm_fx6/common.h     |  36 ++++
 board/compulab/cm_fx6/imximage.cfg |   8 +
 board/compulab/cm_fx6/spl.c        | 400 +++++++++++++++++++++++++++++++++++++
 boards.cfg                         |   2 +
 include/configs/cm_fx6.h           | 211 +++++++++++++++++++
 8 files changed, 850 insertions(+)
 create mode 100644 board/compulab/cm_fx6/Makefile
 create mode 100644 board/compulab/cm_fx6/cm_fx6.c
 create mode 100644 board/compulab/cm_fx6/common.c
 create mode 100644 board/compulab/cm_fx6/common.h
 create mode 100644 board/compulab/cm_fx6/imximage.cfg
 create mode 100644 board/compulab/cm_fx6/spl.c
 create mode 100644 include/configs/cm_fx6.h

board/compulab/cm_fx6/cm_fx6.c new file +0 -0

new file mode 100644
index 0000000..47d17bb
@@ -0,0 +1,98 @@

board/compulab/cm_fx6/cm_fx6.c new file +38 -0

+	}
+
+	return 0;
+}
+#endif
+
+int board_init(void)
+{
+	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
+	return 0;
+}
+
+int checkboard(void)
+{
+	puts("Board: CM-FX6\n");
+	return 0;
+}
+
+static ulong bank1_size;
+static ulong bank2_size;
+
+void dram_init_banksize(void)
+{
+	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+	gd->bd->bi_dram[0].size = bank1_size;
+	gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
+	gd->bd->bi_dram[1].size = bank2_size;
+}
+
+int dram_init(void)
+{
+	gd->ram_size = imx_ddr_size();
+	switch (gd->ram_size) {
+	case 0x10000000: /* DDR_16BIT_256MB */
+		bank1_size = 0x10000000;
+		bank2_size = 0;
+		break;
+	case 0x20000000: /* DDR_32BIT_512MB */

board/compulab/cm_fx6/cm_fx6.c new file +12 -0

+		}
+		break;
+	case 0x80000000: /* DDR_64BIT_2GB */
+		bank1_size = 0x40000000;
+		bank2_size = 0x40000000;
+		break;
+	case 0xF0000000: /* DDR_64BIT_4GB */
+		bank1_size = 0x70000000;
+		bank2_size = 0x7FF00000;
+		gd->ram_size -= 0x100000;
+		break;
+	default:

+}

board/compulab/cm_fx6/common.h new file +22 -0

new file mode 100644
index 0000000..05eab34
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
+ *
+ * Author: Nikita Kiryanov <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <asm/arch/mx6-pins.h>
+#include <asm/arch/clock.h>
+
+#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |	\
+			PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |	\
+			PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
+
+#define CM_FX6_ECSPI_BUS0_CS0	IMX_GPIO_NR(2, 30)
+#define CM_FX6_GREEN_LED	IMX_GPIO_NR(2, 31)
+
+#if defined(CONFIG_FSL_ESDHC)
+#include <fsl_esdhc.h>
+
+static __maybe_unused struct fsl_esdhc_cfg usdhc_cfg[3] = {

board/compulab/cm_fx6/common.h new file +1 -0

+#endif

board/compulab/cm_fx6/spl.c new file +74 -0

new file mode 100644
index 0000000..9f9e5f8
@@ -0,0 +1,400 @@
+/*
+ * SPL specific code for Compulab CM-FX6 board
+ *
+ * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
+ *
+ * Author: Nikita Kiryanov <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <spl.h>
+#include <asm/io.h>
+#include <asm/gpio.h>
+#include <asm/arch/mx6-ddr.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/imx-common/iomux-v3.h>
+#include <fsl_esdhc.h>
+#include "common.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+enum ddr_config {
+	DDR_16BIT_256MB,
+	DDR_32BIT_512MB,
+	DDR_32BIT_1GB,
+	DDR_64BIT_1GB,
+	DDR_64BIT_2GB,
+	DDR_64BIT_4GB,
+	DDR_UNKNOWN,
+};
+
+static void spl_mx6s_dram_setup_iomux(void)
+{
+	struct mx6sdl_iomux_ddr_regs ddr_iomux;
+	struct mx6sdl_iomux_grp_regs grp_iomux;
+
+	ddr_iomux.dram_sdqs0	= 0x00000038;
+	ddr_iomux.dram_sdqs1	= 0x00000038;
+	ddr_iomux.dram_sdqs2	= 0x00000038;
+	ddr_iomux.dram_sdqs3	= 0x00000038;
+	ddr_iomux.dram_sdqs4	= 0x00000038;
+	ddr_iomux.dram_sdqs5	= 0x00000038;
+	ddr_iomux.dram_sdqs6	= 0x00000038;
+	ddr_iomux.dram_sdqs7	= 0x00000038;
+	ddr_iomux.dram_dqm0	= 0x00000038;
+	ddr_iomux.dram_dqm1	= 0x00000038;
+	ddr_iomux.dram_dqm2	= 0x00000038;
+	ddr_iomux.dram_dqm3	= 0x00000038;
+	ddr_iomux.dram_dqm4	= 0x00000038;
+	ddr_iomux.dram_dqm5	= 0x00000038;
+	ddr_iomux.dram_dqm6	= 0x00000038;
+	ddr_iomux.dram_dqm7	= 0x00000038;
+	ddr_iomux.dram_cas	= 0x00000038;
+	ddr_iomux.dram_ras	= 0x00000038;
+	ddr_iomux.dram_sdclk_0	= 0x00000038;
+	ddr_iomux.dram_sdclk_1	= 0x00000038;
+	ddr_iomux.dram_sdcke0	= 0x00003000;
+	ddr_iomux.dram_sdcke1	= 0x00003000;
+	/*
+	 * Below DRAM_RESET[DDR_SEL] = 0 which is incorrect according to
+	 * Freescale QRM, but this is exactly the value used by the automatic
+	 * calibration script and it works also in all our tests, so we leave
+	 * it as is at this point.
+	 */
+	ddr_iomux.dram_reset	= 0x00000038;
+	ddr_iomux.dram_sdba2	= 0x00000000;
+	ddr_iomux.dram_sdodt0	= 0x00000038;
+	ddr_iomux.dram_sdodt1	= 0x00000038;
+	grp_iomux.grp_b0ds	= 0x00000038;
+	grp_iomux.grp_b1ds	= 0x00000038;
+	grp_iomux.grp_b2ds	= 0x00000038;
+	grp_iomux.grp_b3ds	= 0x00000038;

board/compulab/cm_fx6/spl.c new file +44 -0

+	mx6sdl_dram_iocfg(64, &ddr_iomux, &grp_iomux);
+}
+
+static void spl_mx6q_dram_setup_iomux(void)
+{
+	struct mx6dq_iomux_ddr_regs ddr_iomux;
+	struct mx6dq_iomux_grp_regs grp_iomux;
+
+	ddr_iomux.dram_sdqs0	= 0x00000038;
+	ddr_iomux.dram_sdqs1	= 0x00000038;
+	ddr_iomux.dram_sdqs2	= 0x00000038;
+	ddr_iomux.dram_sdqs3	= 0x00000038;
+	ddr_iomux.dram_sdqs4	= 0x00000038;
+	ddr_iomux.dram_sdqs5	= 0x00000038;
+	ddr_iomux.dram_sdqs6	= 0x00000038;
+	ddr_iomux.dram_sdqs7	= 0x00000038;
+	ddr_iomux.dram_dqm0	= 0x00000038;
+	ddr_iomux.dram_dqm1	= 0x00000038;
+	ddr_iomux.dram_dqm2	= 0x00000038;
+	ddr_iomux.dram_dqm3	= 0x00000038;
+	ddr_iomux.dram_dqm4	= 0x00000038;
+	ddr_iomux.dram_dqm5	= 0x00000038;
+	ddr_iomux.dram_dqm6	= 0x00000038;
+	ddr_iomux.dram_dqm7	= 0x00000038;
+	ddr_iomux.dram_cas	= 0x00000038;
+	ddr_iomux.dram_ras	= 0x00000038;
+	ddr_iomux.dram_sdclk_0	= 0x00000038;
+	ddr_iomux.dram_sdclk_1	= 0x00000038;
+	ddr_iomux.dram_sdcke0	= 0x00003000;
+	ddr_iomux.dram_sdcke1	= 0x00003000;
+	/*
+	 * Below DRAM_RESET[DDR_SEL] = 0 which is incorrect according to
+	 * Freescale QRM, but this is exactly the value used by the automatic
+	 * calibration script and it works also in all our tests, so we leave
+	 * it as is at this point.
+	 */
+	ddr_iomux.dram_reset	= 0x00000038;
+	ddr_iomux.dram_sdba2	= 0x00000000;
+	ddr_iomux.dram_sdodt0	= 0x00000038;
+	ddr_iomux.dram_sdodt1	= 0x00000038;
+	grp_iomux.grp_b0ds	= 0x00000038;
+	grp_iomux.grp_b1ds	= 0x00000038;
+	grp_iomux.grp_b2ds	= 0x00000038;
+	grp_iomux.grp_b3ds	= 0x00000038;

board/compulab/cm_fx6/spl.c new file +23 -0

+{
+	struct mx6_mmdc_calibration calib;
+	struct mx6_ddr_sysinfo sysinfo;
+	struct mx6_ddr3_cfg ddr3_cfg;
+
+	if (reset)
+		((struct mmdc_p_regs *)MX6_MMDC_P0_MDCTL)->mdmisc = 2;
+
+	calib.p0_mpwldectrl0	= 0x005B0061;
+	calib.p0_mpwldectrl1	= 0x004F0055;
+	calib.p0_mpdgctrl0	= 0x0314030C;
+	calib.p0_mpdgctrl1	= 0x025C0268;
+	calib.p0_mprddlctl	= 0x42464646;
+	calib.p0_mpwrdlctl	= 0x36322C34;
+	ddr3_cfg.mem_speed	= 800;
+	ddr3_cfg.density	= 4;
+	ddr3_cfg.rowaddr	= 14;
+	ddr3_cfg.coladdr	= 10;
+	ddr3_cfg.pagesz		= 2;
+	ddr3_cfg.trcd		= 1800;
+	ddr3_cfg.trcmin		= 5200;
+	ddr3_cfg.trasmin	= 3600;
+	ddr3_cfg.SRT		= 0;

board/compulab/cm_fx6/spl.c new file +52 -0

+	switch (dram_config) {
+	case DDR_16BIT_256MB:
+		sysinfo.dsize = 0;
+		sysinfo.ncs = 1;
+		break;
+	case DDR_32BIT_512MB:
+		sysinfo.dsize = 1;
+		sysinfo.ncs = 1;
+		break;
+	case DDR_32BIT_1GB:
+		sysinfo.dsize = 1;
+		sysinfo.ncs = 2;
+		break;
+	default:
+		puts("Tried to setup invalid DDR configuration\n");
+		hang();
+	}
+
+	mx6_dram_cfg(&sysinfo, &calib, &ddr3_cfg);
+	udelay(100);
+}
+
+static void spl_mx6q_dram_init(enum ddr_config dram_config, int reset)
+{
+	struct mx6_mmdc_calibration calib;
+	struct mx6_ddr_sysinfo sysinfo;
+	struct mx6_ddr3_cfg ddr3_cfg;
+
+	if (reset)
+		((struct mmdc_p_regs *)MX6_MMDC_P0_MDCTL)->mdmisc = 2;
+
+	calib.p0_mpwldectrl0	= 0x00630068;
+	calib.p0_mpwldectrl1	= 0x0068005D;
+	calib.p0_mpdgctrl0	= 0x04140428;
+	calib.p0_mpdgctrl1	= 0x037C037C;
+	calib.p0_mprddlctl	= 0x3C30303A;
+	calib.p0_mpwrdlctl	= 0x3A344038;
+	calib.p1_mpwldectrl0	= 0x0035004C;
+	calib.p1_mpwldectrl1	= 0x00170026;
+	calib.p1_mpdgctrl0	= 0x0374037C;
+	calib.p1_mpdgctrl1	= 0x0350032C;
+	calib.p1_mprddlctl	= 0x30322A3C;
+	calib.p1_mpwrdlctl	= 0x48304A3E;
+	ddr3_cfg.mem_speed	= 1066;
+	ddr3_cfg.density	= 4;
+	ddr3_cfg.rowaddr	= 14;
+	ddr3_cfg.coladdr	= 10;
+	ddr3_cfg.pagesz		= 2;
+	ddr3_cfg.trcd		= 1324;
+	ddr3_cfg.trcmin		= 59500;
+	ddr3_cfg.trasmin	= 9750;
+	ddr3_cfg.SRT		= 0;

board/compulab/cm_fx6/spl.c new file +28 -0

+	switch (dram_config) {
+	case DDR_16BIT_256MB:
+		sysinfo.dsize = 0;
+		sysinfo.ncs = 1;
+		break;
+	case DDR_32BIT_512MB:
+		sysinfo.dsize = 1;
+		sysinfo.ncs = 1;
+		break;
+	case DDR_64BIT_1GB:
+		sysinfo.dsize = 2;
+		sysinfo.ncs = 1;
+		break;
+	case DDR_64BIT_2GB:
+		sysinfo.dsize = 2;
+		sysinfo.ncs = 2;
+		break;
+	case DDR_64BIT_4GB:
+		sysinfo.dsize = 2;
+		sysinfo.ncs = 2;
+		ddr3_cfg.rowaddr = 15;
+		break;
+	default:
+		puts("Tried to setup invalid DDR configuration\n");
+		hang();
+	}
+
+	mx6_dram_cfg(&sysinfo, &calib, &ddr3_cfg);

board/compulab/cm_fx6/spl.c new file +65 -0

+
+	switch (imxtype) {
+	case MXC_CPU_MX6SOLO:
+		spl_mx6s_dram_setup_iomux();
+
+		spl_mx6s_dram_init(DDR_32BIT_1GB, 0);
+		bank1_size = get_ram_size((long int *)PHYS_SDRAM_1, 0x80000000);
+		if (bank1_size == 0x40000000)
+			return 0;
+
+		if (bank1_size == 0x20000000) {
+			spl_mx6s_dram_init(DDR_32BIT_512MB, 1);
+			return 0;
+		}
+
+		spl_mx6s_dram_init(DDR_16BIT_256MB, 1);
+		bank1_size = get_ram_size((long int *)PHYS_SDRAM_1, 0x80000000);
+		if (bank1_size == 0x10000000)
+			return 0;
+
+		break;
+	case MXC_CPU_MX6D:
+	case MXC_CPU_MX6Q:
+		spl_mx6q_dram_setup_iomux();
+
+		spl_mx6q_dram_init(DDR_64BIT_4GB, 0);
+		bank1_size = get_ram_size((long int *)PHYS_SDRAM_1, 0x80000000);
+		if (bank1_size == 0x80000000)
+			return 0;
+
+		if (bank1_size == 0x40000000) {
+			bank2_size = get_ram_size((long int *)PHYS_SDRAM_2,
+								0x80000000);
+			if (bank2_size == 0x40000000) {
+				/* Don't do a full reset here */
+				spl_mx6q_dram_init(DDR_64BIT_2GB, 0);
+			} else {
+				spl_mx6q_dram_init(DDR_64BIT_1GB, 1);
+			}
+
+			return 0;
+		}
+
+		spl_mx6q_dram_init(DDR_32BIT_512MB, 1);
+		bank1_size = get_ram_size((long int *)PHYS_SDRAM_1, 0x80000000);
+		if (bank1_size == 0x20000000)
+			return 0;
+
+		spl_mx6q_dram_init(DDR_16BIT_256MB, 1);
+		bank1_size = get_ram_size((long int *)PHYS_SDRAM_1, 0x80000000);
+		if (bank1_size == 0x10000000)
+			return 0;
+
+		break;
+	}
+
+	return -1;
+}
+
+static iomux_v3_cfg_t const uart4_pads[] = {
+	IOMUX_PADS(PAD_KEY_COL0__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
+	IOMUX_PADS(PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
+};
+
+static void cm_fx6_setup_uart(void)

board/compulab/cm_fx6/spl.c new file +8 -0

+	}
+
+	memset(__bss_start, 0, __bss_end - __bss_start);
+	board_init_r(NULL, 0);
+}
+
+void spl_board_init(void)
+{

board/compulab/cm_fx6/spl.c new file +4 -0

+
+	return fsl_esdhc_initialize(bis, &usdhc_cfg[2]);
+}
+#endif

include/configs/cm_fx6.h new file +7 -0

new file mode 100644
index 0000000..b877b65
@@ -0,0 +1,211 @@
+/*
+ * Config file for Compulab CM-FX6 board
+ *
+ * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
+ *
+ * Author: Nikita Kiryanov <[email protected]>
+ *

include/configs/cm_fx6.h new file +16 -0

+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"kernel=uImage-cm-fx6\0" \
+	"autoload=no\0" \
+	"loadaddr=0x10800000\0" \
+	"fdtaddr=0x11000000\0" \
+	"console=ttymxc3,115200\0" \
+	"ethprime=FEC0\0" \
+	"bootscr=boot.scr\0" \
+	"bootm_low=18000000\0" \
+	"video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32 at 50,if=RGB32\0" \
+	"video_dvi=mxcfb0:dev=dvi,1280x800M-32 at 50,if=RGB32\0" \
+	"fdtfile=cm-fx6.dtb\0" \
+	"doboot=bootm ${loadaddr}\0" \
+	"loadfdt=false\0" \
+	"setboottypez=setenv kernel zImage-cm-fx6;" \
+		"setenv doboot bootz ${loadaddr} - ${fdtaddr};" \

include/configs/cm_fx6.h new file +41 -0

+	"mmcbootscript=echo Running bootscript from mmc ...; "\
+		"source ${loadaddr}\0" \
+	"mmcargs=setenv bootargs console=${console} " \
+		"root=${mmcroot} " \
+		"${video}\0" \
+	"mmcloadkernel=fatload mmc ${mmcdev} ${loadaddr} ${kernel}\0" \
+	"mmcloadfdt=fatload mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \
+	"mmcboot=echo Booting from mmc ...; " \
+		"run mmcargs; " \
+		"run doboot\0" \
+	"nandroot=/dev/mtdblock4 rw\0" \
+	"nandrootfstype=ubifs\0" \
+	"nandargs=setenv bootargs console=${console} " \
+		"root=${nandroot} " \
+		"rootfstype=${nandrootfstype} " \
+		"${video}\0" \
+	"nandloadfdt=nand read ${fdtaddr} 780000 80000;\0" \
+	"nandboot=echo Booting from nand ...; " \
+		"run nandargs; " \
+		"nand read ${loadaddr} 0 780000; " \
+		"if ${loadfdt}; then " \
+			"run nandloadfdt;" \
+		"fi; " \
+		"run doboot\0" \
+	"boot=mmc dev ${mmcdev}; " \
+		"if mmc rescan; then " \
+			"if run loadmmcbootscript; then " \
+				"run mmcbootscript;" \
+			"else " \
+				"if run mmcloadkernel; then " \
+					"if ${loadfdt}; then " \
+						"run mmcloadfdt;" \
+					"fi;" \
+					"run mmcboot;" \
+				"fi;" \
+			"fi;" \
+		"fi;"
+
+#define CONFIG_BOOTCOMMAND \
+	"run setboottypem; run boot"
+

Hi Nikita,

Several comments below in addition to Simon's.

Quoted 10 lines · Nikita Kiryanov

Add initial support for Compulab CM-FX6 CoM.
Support includes MMC, SPI flash, and SPL with dynamic DRAM detection.

Cc Igor Grinberg <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tom Rini <[email protected]>

Cc Marek Vasut <[email protected]>

Acked-by Marek Vasut <[email protected]>

Signed-off-by Nikita Kiryanov <[email protected]>

---

Quoted 16 lines

include/configs/cm_fx6.h new file +16 -0

+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"kernel=uImage-cm-fx6\0" \
+	"autoload=no\0" \
+	"loadaddr=0x10800000\0" \
+	"fdtaddr=0x11000000\0" \
+	"console=ttymxc3,115200\0" \
+	"ethprime=FEC0\0" \
+	"bootscr=boot.scr\0" \
+	"bootm_low=18000000\0" \
+	"video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32 at 50,if=RGB32\0" \
+	"video_dvi=mxcfb0:dev=dvi,1280x800M-32 at 50,if=RGB32\0" \
+	"fdtfile=cm-fx6.dtb\0" \
+	"doboot=bootm ${loadaddr}\0" \
+	"loadfdt=false\0" \
+	"setboottypez=setenv kernel zImage-cm-fx6;" \
+		"setenv doboot bootz ${loadaddr} - ${fdtaddr};" \

include/configs/cm_fx6.h line 126

Quoted 10 lines

include/configs/cm_fx6.h new file +10 -0

+		"setenv loadfdt true;\0" \
+	"setboottypem=setenv kernel uImage-cm-fx6;" \
+		"setenv doboot bootm ${loadaddr};" \
+		"setenv loadfdt false;\0"\
+	"run_eboot=echo Starting EBOOT ...; "\
+		"mmc dev ${mmcdev} && " \
+		"mmc rescan && mmc read 10042000 a 400 && go 10042000\0" \
+	"mmcdev=2\0" \
+	"mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
+	"loadmmcbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \

Can we switch to use load instead of fatload?

Quoted 16 lines

include/configs/cm_fx6.h new file +16 -0

+	"mmcbootscript=echo Running bootscript from mmc ...; "\
+		"source ${loadaddr}\0" \
+	"mmcargs=setenv bootargs console=${console} " \
+		"root=${mmcroot} " \
+		"${video}\0" \
+	"mmcloadkernel=fatload mmc ${mmcdev} ${loadaddr} ${kernel}\0" \
+	"mmcloadfdt=fatload mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \
+	"mmcboot=echo Booting from mmc ...; " \
+		"run mmcargs; " \
+		"run doboot\0" \
+	"nandroot=/dev/mtdblock4 rw\0" \
+	"nandrootfstype=ubifs\0" \
+	"nandargs=setenv bootargs console=${console} " \
+		"root=${nandroot} " \
+		"rootfstype=${nandrootfstype} " \
+		"${video}\0" \

include/configs/cm_fx6.h line 150

Quoted 8 lines

include/configs/cm_fx6.h new file +8 -0

+	"nandloadfdt=nand read ${fdtaddr} 780000 80000;\0" \
+	"nandboot=echo Booting from nand ...; " \
+		"run nandargs; " \
+		"nand read ${loadaddr} 0 780000; " \
+		"if ${loadfdt}; then " \
+			"run nandloadfdt;" \
+		"fi; " \
+		"run doboot\0" \

Quoted 5 lines

include/configs/cm_fx6.h new file +5 -0

+	"boot=mmc dev ${mmcdev}; " \
+		"if mmc rescan; then " \
+			"if run loadmmcbootscript; then " \
+				"run mmcbootscript;" \
+			"else " \

include/configs/cm_fx6.h line 163

Quoted 8 lines

include/configs/cm_fx6.h new file +8 -0

+				"if run mmcloadkernel; then " \
+					"if ${loadfdt}; then " \
+						"run mmcloadfdt;" \
+					"fi;" \
+					"run mmcboot;" \
+				"fi;" \
+			"fi;" \
+		"fi;"

Quoted 15 lines · Igor Grinberg

Hi Nikita,

Several comments below in addition to Simon's.

Quoted 10 lines · Nikita Kiryanov

Add initial support for Compulab CM-FX6 CoM.
Support includes MMC, SPI flash, and SPL with dynamic DRAM detection.

Cc Igor Grinberg <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tom Rini <[email protected]>

Cc Marek Vasut <[email protected]>

Acked-by Marek Vasut <[email protected]>

Signed-off-by Nikita Kiryanov <[email protected]>

---

[...]

Quoted 20 lines

Quoted 20 lines

include/configs/cm_fx6.h new file +20 -0

+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"kernel=uImage-cm-fx6\0" \
+	"autoload=no\0" \
+	"loadaddr=0x10800000\0" \
+	"fdtaddr=0x11000000\0" \
+	"console=ttymxc3,115200\0" \
+	"ethprime=FEC0\0" \
+	"bootscr=boot.scr\0" \
+	"bootm_low=18000000\0" \
+	"video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32 at 50,if=RGB32\0" \
+	"video_dvi=mxcfb0:dev=dvi,1280x800M-32 at 50,if=RGB32\0" \
+	"fdtfile=cm-fx6.dtb\0" \
+	"doboot=bootm ${loadaddr}\0" \
+	"loadfdt=false\0" \
+	"setboottypez=setenv kernel zImage-cm-fx6;" \
+		"setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
+		"setenv loadfdt true;\0" \
+	"setboottypem=setenv kernel uImage-cm-fx6;" \
+		"setenv doboot bootm ${loadaddr};" \
+		"setenv loadfdt false;\0"\

Quoted 8 lines

include/configs/cm_fx6.h line 126

Quoted 6 lines

include/configs/cm_fx6.h new file +6 -0

+	"run_eboot=echo Starting EBOOT ...; "\
+		"mmc dev ${mmcdev} && " \
+		"mmc rescan && mmc read 10042000 a 400 && go 10042000\0" \
+	"mmcdev=2\0" \
+	"mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
+	"loadmmcbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \

Can we switch to use load instead of fatload?

Quoted 21 lines

Quoted 21 lines

include/configs/cm_fx6.h new file +20 -0

+	"mmcbootscript=echo Running bootscript from mmc ...; "\
+		"source ${loadaddr}\0" \
+	"mmcargs=setenv bootargs console=${console} " \
+		"root=${mmcroot} " \
+		"${video}\0" \
+	"mmcloadkernel=fatload mmc ${mmcdev} ${loadaddr} ${kernel}\0" \
+	"mmcloadfdt=fatload mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \
+	"mmcboot=echo Booting from mmc ...; " \
+		"run mmcargs; " \
+		"run doboot\0" \
+	"nandroot=/dev/mtdblock4 rw\0" \
+	"nandrootfstype=ubifs\0" \
+	"nandargs=setenv bootargs console=${console} " \
+		"root=${nandroot} " \
+		"rootfstype=${nandrootfstype} " \
+		"${video}\0" \
+	"nandloadfdt=nand read ${fdtaddr} 780000 80000;\0" \
+	"nandboot=echo Booting from nand ...; " \
+		"run nandargs; " \
+		"nand read ${loadaddr} 0 780000; " \

Quoted 4 lines

include/configs/cm_fx6.h line 150

Quoted 4 lines

include/configs/cm_fx6.h new file +4 -0

+		"if ${loadfdt}; then " \
+			"run nandloadfdt;" \
+		"fi; " \
+		"run doboot\0" \

I think, if we add NAND support in a separate patch, then probably it will be better also to add nand boot related environment stuff along with the NAND support.

Quoted 14 lines

Quoted 4 lines

include/configs/cm_fx6.h new file +3 -0

+	"boot=mmc dev ${mmcdev}; " \
+		"if mmc rescan; then " \
+			"if run loadmmcbootscript; then " \

include/configs/cm_fx6.h line 163

Quoted 10 lines

include/configs/cm_fx6.h new file +10 -0

+				"run mmcbootscript;" \
+			"else " \
+				"if run mmcloadkernel; then " \
+					"if ${loadfdt}; then " \
+						"run mmcloadfdt;" \
+					"fi;" \
+					"run mmcboot;" \
+				"fi;" \
+			"fi;" \
+		"fi;"

Also, you add NAND boot commands neither here, nor in the NAND support patch. Can we have them too? Please?

Quoted 6 lines

board/compulab/cm_fx6/cm_fx6.c new file +6 -0

+#ifdef CONFIG_FSL_ESDHC
+int board_mmc_init(bd_t *bis)
+{
+	int i;
+
+	cm_fx6_set_usdhc_iomux();

board/compulab/cm_fx6/cm_fx6.c line 27

Quoted 5 lines

board/compulab/cm_fx6/cm_fx6.c new file +5 -0

+	for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) {
+		usdhc_cfg[i].sdhc_clk = mxc_get_clock(usdhc_clk[i]);
+		usdhc_cfg[i].max_bus_width = 4;
+		fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
+		enable_usdhc_clk(1, i);

Why does the board code needs to handle the mmc clocks? Can't this be handled in the common code?

Quoted 43 lines

board/compulab/cm_fx6/cm_fx6.c new file +42 -0

+	}
+
+	return 0;
+}
+#endif
+
+int board_init(void)
+{
+	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
+	return 0;
+}
+
+int checkboard(void)
+{
+	puts("Board: CM-FX6\n");
+	return 0;
+}
+
+static ulong bank1_size;
+static ulong bank2_size;
+
+void dram_init_banksize(void)
+{
+	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+	gd->bd->bi_dram[0].size = bank1_size;
+	gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
+	gd->bd->bi_dram[1].size = bank2_size;
+}
+
+int dram_init(void)
+{
+	gd->ram_size = imx_ddr_size();
+	switch (gd->ram_size) {
+	case 0x10000000: /* DDR_16BIT_256MB */
+		bank1_size = 0x10000000;
+		bank2_size = 0;
+		break;
+	case 0x20000000: /* DDR_32BIT_512MB */
+		bank1_size = 0x20000000;
+		bank2_size = 0;
+		break;
+	case 0x40000000:

board/compulab/cm_fx6/cm_fx6.c line 75

Quoted 6 lines

board/compulab/cm_fx6/cm_fx6.c new file +6 -0

+		if (is_cpu_type(MXC_CPU_MX6SOLO)) { /* DDR_32BIT_1GB */
+			bank1_size = 0x20000000;
+			bank2_size = 0x20000000;
+		} else { /* DDR_64BIT_1GB */
+			bank1_size = 0x40000000;
+			bank2_size = 0;

You don't need to init bank2_size to zero in all above cases.

Quoted 17 lines

board/compulab/cm_fx6/cm_fx6.c new file +16 -0

+		}
+		break;
+	case 0x80000000: /* DDR_64BIT_2GB */
+		bank1_size = 0x40000000;
+		bank2_size = 0x40000000;
+		break;
+	case 0xF0000000: /* DDR_64BIT_4GB */
+		bank1_size = 0x70000000;
+		bank2_size = 0x7FF00000;
+		gd->ram_size -= 0x100000;
+		break;
+	default:
+		printf("ERROR: Unsupported DRAM size 0x%lx\n", gd->ram_size);
+		return -1;
+	}
+

board/compulab/cm_fx6/cm_fx6.c line 97

Quoted 6 lines

board/compulab/cm_fx6/cm_fx6.c new file +6 -0

+	return 0;
+}
+
+u32 get_board_rev(void)
+{
+	return 100;

Hmmm... cl_eeprom_get_board_rev()?

board/compulab/cm_fx6/common.h line 32

Quoted 5 lines

board/compulab/cm_fx6/common.h new file +5 -0

+static __maybe_unused enum mxc_clock usdhc_clk[3] = {
+	MXC_ESDHC_CLK,
+	MXC_ESDHC2_CLK,
+	MXC_ESDHC3_CLK,
+};

Why do you need the above structures defined here in .h file? Can they live in .c file that is using them?
I think cm_fx6.c is the appropriate place for these.

Quoted 45 lines

board/compulab/cm_fx6/spl.c new file +45 -0

+static void spl_mx6s_dram_setup_iomux(void)
+{
+	struct mx6sdl_iomux_ddr_regs ddr_iomux;
+	struct mx6sdl_iomux_grp_regs grp_iomux;
+
+	ddr_iomux.dram_sdqs0	= 0x00000038;
+	ddr_iomux.dram_sdqs1	= 0x00000038;
+	ddr_iomux.dram_sdqs2	= 0x00000038;
+	ddr_iomux.dram_sdqs3	= 0x00000038;
+	ddr_iomux.dram_sdqs4	= 0x00000038;
+	ddr_iomux.dram_sdqs5	= 0x00000038;
+	ddr_iomux.dram_sdqs6	= 0x00000038;
+	ddr_iomux.dram_sdqs7	= 0x00000038;
+	ddr_iomux.dram_dqm0	= 0x00000038;
+	ddr_iomux.dram_dqm1	= 0x00000038;
+	ddr_iomux.dram_dqm2	= 0x00000038;
+	ddr_iomux.dram_dqm3	= 0x00000038;
+	ddr_iomux.dram_dqm4	= 0x00000038;
+	ddr_iomux.dram_dqm5	= 0x00000038;
+	ddr_iomux.dram_dqm6	= 0x00000038;
+	ddr_iomux.dram_dqm7	= 0x00000038;
+	ddr_iomux.dram_cas	= 0x00000038;
+	ddr_iomux.dram_ras	= 0x00000038;
+	ddr_iomux.dram_sdclk_0	= 0x00000038;
+	ddr_iomux.dram_sdclk_1	= 0x00000038;
+	ddr_iomux.dram_sdcke0	= 0x00003000;
+	ddr_iomux.dram_sdcke1	= 0x00003000;
+	/*
+	 * Below DRAM_RESET[DDR_SEL] = 0 which is incorrect according to
+	 * Freescale QRM, but this is exactly the value used by the automatic
+	 * calibration script and it works also in all our tests, so we leave
+	 * it as is at this point.
+	 */
+	ddr_iomux.dram_reset	= 0x00000038;
+	ddr_iomux.dram_sdba2	= 0x00000000;
+	ddr_iomux.dram_sdodt0	= 0x00000038;
+	ddr_iomux.dram_sdodt1	= 0x00000038;
+	grp_iomux.grp_b0ds	= 0x00000038;
+	grp_iomux.grp_b1ds	= 0x00000038;
+	grp_iomux.grp_b2ds	= 0x00000038;
+	grp_iomux.grp_b3ds	= 0x00000038;
+	grp_iomux.grp_b4ds	= 0x00000038;
+	grp_iomux.grp_b5ds	= 0x00000038;
+	grp_iomux.grp_b6ds	= 0x00000038;
+	grp_iomux.grp_b7ds	= 0x00000038;

board/compulab/cm_fx6/spl.c line 84

Quoted 6 lines

board/compulab/cm_fx6/spl.c new file +6 -0

+	grp_iomux.grp_addds	= 0x00000038;
+	grp_iomux.grp_ddrmode_ctl = 0x00020000;
+	grp_iomux.grp_ddrpke	= 0x00000000;
+	grp_iomux.grp_ddrmode	= 0x00020000;
+	grp_iomux.grp_ctlds	= 0x00000038;
+	grp_iomux.grp_ddr_type	= 0x000C0000;

Hmmm... Can we do the above initializations statically?

I mean, define the structures outside of the function and initialize them statically, and then only pass the structures to the below function. Moreover, this way, you will not need this function at all, but call the below from cm_fx6_spl_dram_init().

Quoted 9 lines

board/compulab/cm_fx6/spl.c new file +8 -0

+	mx6sdl_dram_iocfg(64, &ddr_iomux, &grp_iomux);
+}
+
+static void spl_mx6q_dram_setup_iomux(void)
+{
+	struct mx6dq_iomux_ddr_regs ddr_iomux;
+	struct mx6dq_iomux_grp_regs grp_iomux;
+

board/compulab/cm_fx6/spl.c line 142

Quoted 4 lines

board/compulab/cm_fx6/spl.c new file +4 -0

+	mx6dq_dram_iocfg(64, &ddr_iomux, &grp_iomux);
+}
+
+static void spl_mx6s_dram_init(enum ddr_config dram_config, int reset)

I think we have bool type in U-Boot, right?
If so, it would be more descriptive to have bool reset.

Quoted 11 lines

board/compulab/cm_fx6/spl.c new file +10 -0

+{
+	struct mx6_mmdc_calibration calib;
+	struct mx6_ddr_sysinfo sysinfo;
+	struct mx6_ddr3_cfg ddr3_cfg;
+
+	if (reset)
+		((struct mmdc_p_regs *)MX6_MMDC_P0_MDCTL)->mdmisc = 2;
+
+	calib.p0_mpwldectrl0	= 0x005B0061;
+	calib.p0_mpwldectrl1	= 0x004F0055;

board/compulab/cm_fx6/spl.c line 275

Quoted 8 lines

board/compulab/cm_fx6/spl.c new file +8 -0

+
+static int cm_fx6_spl_dram_init(void)
+{
+	u32 cpurev, imxtype;
+	unsigned long bank1_size, bank2_size;
+
+	cpurev = get_cpu_rev();
+	imxtype = (cpurev & 0xFF000) >> 12;

I would expect here at least cpu_type() usage instead of open coding. Or may be to spare the above construct, it is worth introducing a kind of get_cpu_type()? like:

#define get_cpu_type() (cpu_type(get_cpu_rev()))

in arch/arm/include/asm/arch-mx6/sys_proto.h
And then you can use get_imx_cpu_type() inside the switch below. What do you think?

Quoted 71 lines

board/compulab/cm_fx6/spl.c new file +70 -0

+
+	switch (imxtype) {
+	case MXC_CPU_MX6SOLO:
+		spl_mx6s_dram_setup_iomux();
+
+		spl_mx6s_dram_init(DDR_32BIT_1GB, 0);
+		bank1_size = get_ram_size((long int *)PHYS_SDRAM_1, 0x80000000);
+		if (bank1_size == 0x40000000)
+			return 0;
+
+		if (bank1_size == 0x20000000) {
+			spl_mx6s_dram_init(DDR_32BIT_512MB, 1);
+			return 0;
+		}
+
+		spl_mx6s_dram_init(DDR_16BIT_256MB, 1);
+		bank1_size = get_ram_size((long int *)PHYS_SDRAM_1, 0x80000000);
+		if (bank1_size == 0x10000000)
+			return 0;
+
+		break;
+	case MXC_CPU_MX6D:
+	case MXC_CPU_MX6Q:
+		spl_mx6q_dram_setup_iomux();
+
+		spl_mx6q_dram_init(DDR_64BIT_4GB, 0);
+		bank1_size = get_ram_size((long int *)PHYS_SDRAM_1, 0x80000000);
+		if (bank1_size == 0x80000000)
+			return 0;
+
+		if (bank1_size == 0x40000000) {
+			bank2_size = get_ram_size((long int *)PHYS_SDRAM_2,
+								0x80000000);
+			if (bank2_size == 0x40000000) {
+				/* Don't do a full reset here */
+				spl_mx6q_dram_init(DDR_64BIT_2GB, 0);
+			} else {
+				spl_mx6q_dram_init(DDR_64BIT_1GB, 1);
+			}
+
+			return 0;
+		}
+
+		spl_mx6q_dram_init(DDR_32BIT_512MB, 1);
+		bank1_size = get_ram_size((long int *)PHYS_SDRAM_1, 0x80000000);
+		if (bank1_size == 0x20000000)
+			return 0;
+
+		spl_mx6q_dram_init(DDR_16BIT_256MB, 1);
+		bank1_size = get_ram_size((long int *)PHYS_SDRAM_1, 0x80000000);
+		if (bank1_size == 0x10000000)
+			return 0;
+
+		break;
+	}
+
+	return -1;
+}
+
+static iomux_v3_cfg_t const uart4_pads[] = {
+	IOMUX_PADS(PAD_KEY_COL0__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
+	IOMUX_PADS(PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
+};
+
+static void cm_fx6_setup_uart(void)
+{
+	SETUP_IOMUX_PADS(uart4_pads);
+	enable_uart_clk(1);
+}
+

board/compulab/cm_fx6/spl.c line 350

Quoted 5 lines

board/compulab/cm_fx6/spl.c new file +5 -0

+#ifdef CONFIG_SPL_SPI_SUPPORT
+static void cm_fx6_setup_ecspi(void)
+{
+	enable_cspi_clock(1, 0);
+	cm_fx6_set_ecspi_iomux();

It does not really meter, but it will lok better if the sequence will be the same as for uart: mux and then clock...

board/compulab/cm_fx6/spl.c line 359

Quoted 10 lines

board/compulab/cm_fx6/spl.c new file +9 -0

+}
+#else
+static void cm_fx6_setup_ecspi(void) { }
+#endif
+
+void board_init_f(ulong dummy)
+{
+	gd = &gdata;
+	enable_usdhc_clk(1, 2);

can this be done inside board_mmc_init() or even in a common location like fsl_esdhc_initialize()?

board/compulab/cm_fx6/spl.c line 369

Quoted 10 lines

board/compulab/cm_fx6/spl.c new file +10 -0

+	arch_cpu_init();
+	timer_init();
+	cm_fx6_setup_ecspi();
+	cm_fx6_setup_uart();
+	get_clocks();
+	preloader_console_init();
+	gpio_direction_output(CM_FX6_GREEN_LED, 1);
+	if (cm_fx6_spl_dram_init()) {
+		puts("!!!ERROR!!! DRAM detection failed!!!\n");
+		hang();

Hmmm... why hang? may be reset the cpu/board and try again?

Quoted 13 lines

board/compulab/cm_fx6/spl.c new file +12 -0

+	}
+
+	memset(__bss_start, 0, __bss_end - __bss_start);
+	board_init_r(NULL, 0);
+}
+
+void spl_board_init(void)
+{
+	uint soc_sbmr = readl(SRC_BASE_ADDR + 0x4);
+	uint bt_mem_ctl = (soc_sbmr & 0x000000FF) >> 4;
+	uint bt_mem_type = (soc_sbmr & 0x00000008) >> 3;
+

board/compulab/cm_fx6/spl.c line 387

Quoted 6 lines

board/compulab/cm_fx6/spl.c new file +6 -0

+	if (bt_mem_ctl == 0x3 && !bt_mem_type)
+		puts("Booting from SPI flash\n");
+	else if (bt_mem_ctl == 0x4 || bt_mem_ctl == 0x5)
+		puts("Booting from MMC\n");
+	else
+		puts("Unknown boot device\n");

Can we call spl_boot_device() here instead?

board/compulab/cm_fx6/spl.c line 396

Quoted 10 lines

board/compulab/cm_fx6/spl.c new file +9 -0

+}
+
+#ifdef CONFIG_SPL_MMC_SUPPORT
+int board_mmc_init(bd_t *bis)
+{
+	cm_fx6_set_usdhc_iomux();
+
+	usdhc_cfg[2].sdhc_clk = mxc_get_clock(usdhc_clk[2]);
+	usdhc_cfg[2].max_bus_width = 4;

You use only one member of that array...
It is not likely to change.
Can we just define one instance on the stack and hardcode its initialization?
This will eliminate the need for sharing the same definition of that array between SPL and U-Boot and thus make things simpler.

Quoted 17 lines

include/configs/cm_fx6.h new file +11 -0

new file mode 100644
index 0000000..b877b65
@@ -0,0 +1,211 @@
+/*
+ * Config file for Compulab CM-FX6 board
+ *
+ * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
+ *
+ * Author: Nikita Kiryanov <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_CM_FX6_H

include/configs/cm_fx6.h line 17

Quoted 6 lines

include/configs/cm_fx6.h new file +6 -0

+#define __CONFIG_CM_FX6_H
+
+#include <asm/arch/imx-regs.h>
+#include <config_distro_defaults.h>
+
+#define CONFIG_SYS_L2CACHE_OFF

Hmmm... Is there a problem using cache on i.MX6 currently?

Quoted 21 lines

include/configs/cm_fx6.h new file +20 -0

+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"kernel=uImage-cm-fx6\0" \
+	"autoload=no\0" \
+	"loadaddr=0x10800000\0" \
+	"fdtaddr=0x11000000\0" \
+	"console=ttymxc3,115200\0" \
+	"ethprime=FEC0\0" \
+	"bootscr=boot.scr\0" \
+	"bootm_low=18000000\0" \
+	"video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32 at 50,if=RGB32\0" \
+	"video_dvi=mxcfb0:dev=dvi,1280x800M-32 at 50,if=RGB32\0" \
+	"fdtfile=cm-fx6.dtb\0" \
+	"doboot=bootm ${loadaddr}\0" \
+	"loadfdt=false\0" \
+	"setboottypez=setenv kernel zImage-cm-fx6;" \
+		"setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
+		"setenv loadfdt true;\0" \
+	"setboottypem=setenv kernel uImage-cm-fx6;" \
+		"setenv doboot bootm ${loadaddr};" \
+		"setenv loadfdt false;\0"\

include/configs/cm_fx6.h line 126

Quoted 6 lines

include/configs/cm_fx6.h new file +6 -0

+	"run_eboot=echo Starting EBOOT ...; "\
+		"mmc dev ${mmcdev} && " \
+		"mmc rescan && mmc read 10042000 a 400 && go 10042000\0" \
+	"mmcdev=2\0" \
+	"mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
+	"loadmmcbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \

Can we switch to use load instead of fatload?

Hi Nikita,

Quoted 4 lines

board/compulab/cm_fx6/spl.c new file +4 -0

+}
+#else
+static void cm_fx6_setup_ecspi(void) { }
+#endif

board/compulab/cm_fx6/spl.c line 359

Quoted 5 lines

board/compulab/cm_fx6/spl.c new file +5 -0

+
+void board_init_f(ulong dummy)
+{
+	gd = &gdata;
+	enable_usdhc_clk(1, 2);

can this be done inside board_mmc_init() or even in a common location like fsl_esdhc_initialize()?

Add NAND support for Compulab CM-FX6 CoM.

Cc Igor Grinberg <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tom Rini <[email protected]>

Signed-off-by Nikita Kiryanov <[email protected]>

Add ethernet support for Compulab CM-FX6 CoM

Cc Igor Grinberg <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tom Rini <[email protected]>

Signed-off-by Nikita Kiryanov <[email protected]>

Add USB and USB OTG host support for Compulab CM-FX6 CoM.

Cc Igor Grinberg <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tom Rini <[email protected]>

Signed-off-by Nikita Kiryanov <[email protected]>

---
Changes in V2:
- No changes

 board/compulab/cm_fx6/cm_fx6.c | 75 ++++++++++++++++++++++++++++++++++++++++++
 board/compulab/cm_fx6/common.h |  3 ++
 include/configs/cm_fx6.h       | 10 ++++++
 3 files changed, 88 insertions(+)

board/compulab/cm_fx6/cm_fx6.c +0 -0

index e993de2..28c54b4 100644

board/compulab/cm_fx6/cm_fx6.c +10 -0

+static int cm_fx6_usb_hub_reset(void)
+{
+	int err;
+
+	err = gpio_request(CM_FX6_USB_HUB_RST, "usb hub rst");
+	if (err) {
+		printf("USB hub rst gpio request failed: %d\n", err);
+		return -1;
+	}
+

board/compulab/cm_fx6/cm_fx6.c +25 -0

+{
+	int ret;
+	struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
+
+	ret = gpio_request(SB_FX6_USB_OTG_PWR, "usb-pwr");
+	if (ret)
+		printf("USB OTG pwr gpio request failed: %d\n", ret);
+
+	SETUP_IOMUX_PAD(PAD_EIM_D22__GPIO3_IO22 | MUX_PAD_CTRL(NO_PAD_CTRL));
+	SETUP_IOMUX_PAD(PAD_ENET_RX_ER__USB_OTG_ID |
+						MUX_PAD_CTRL(WEAK_PULLDOWN));
+	clrbits_le32(&iomux->gpr[1], IOMUXC_GPR1_OTG_ID_MASK);
+	/* disable ext. charger detect, or it'll affect signal quality at dp. */
+	gpio_direction_output(SB_FX6_USB_OTG_PWR, 0);
+}
+
+#define MX6_USBNC_BASEADDR	0x2184800
+#define USBNC_USB_H1_PWR_POL	(1 << 9)
+int board_ehci_hcd_init(int port)
+{
+	u32 *usbnc_usb_uh1_ctrl = (u32 *)(MX6_USBNC_BASEADDR + 4);
+	u32 val;
+
+	switch (port) {
+	case 0:

Quoted 19 lines · Nikita Kiryanov

Add USB and USB OTG host support for Compulab CM-FX6 CoM.

Cc Igor Grinberg <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tom Rini <[email protected]>

Signed-off-by Nikita Kiryanov <[email protected]>

---
Changes in V2:
- No changes

  board/compulab/cm_fx6/cm_fx6.c | 75 ++++++++++++++++++++++++++++++++++++++++++
  board/compulab/cm_fx6/common.h |  3 ++
  include/configs/cm_fx6.h       | 10 ++++++
  3 files changed, 88 insertions(+)

board/compulab/cm_fx6/cm_fx6.c +0 -0

index e993de2..28c54b4 100644

[...]

Quoted 14 lines

board/compulab/cm_fx6/cm_fx6.c +14 -0

+static int cm_fx6_usb_hub_reset(void)
+{
+	int err;
+
+	err = gpio_request(CM_FX6_USB_HUB_RST, "usb hub rst");
+	if (err) {
+		printf("USB hub rst gpio request failed: %d\n", err);
+		return -1;
+	}
+
+	SETUP_IOMUX_PAD(PAD_SD3_RST__GPIO7_IO08 | MUX_PAD_CTRL(NO_PAD_CTRL));
+	gpio_direction_output(CM_FX6_USB_HUB_RST, 0);
+	udelay(10);
+	gpio_direction_output(CM_FX6_USB_HUB_RST, 1);

board/compulab/cm_fx6/cm_fx6.c line 48

Quoted 6 lines

board/compulab/cm_fx6/cm_fx6.c +6 -0

+	mdelay(1);
+
+	return 0;
+}
+
+static void cm_fx6_init_usb_otg(void)

Can this function also return int as the one above?

Quoted 30 lines

board/compulab/cm_fx6/cm_fx6.c +29 -0

+{
+	int ret;
+	struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
+
+	ret = gpio_request(SB_FX6_USB_OTG_PWR, "usb-pwr");
+	if (ret)
+		printf("USB OTG pwr gpio request failed: %d\n", ret);
+
+	SETUP_IOMUX_PAD(PAD_EIM_D22__GPIO3_IO22 | MUX_PAD_CTRL(NO_PAD_CTRL));
+	SETUP_IOMUX_PAD(PAD_ENET_RX_ER__USB_OTG_ID |
+						MUX_PAD_CTRL(WEAK_PULLDOWN));
+	clrbits_le32(&iomux->gpr[1], IOMUXC_GPR1_OTG_ID_MASK);
+	/* disable ext. charger detect, or it'll affect signal quality at dp. */
+	gpio_direction_output(SB_FX6_USB_OTG_PWR, 0);
+}
+
+#define MX6_USBNC_BASEADDR	0x2184800
+#define USBNC_USB_H1_PWR_POL	(1 << 9)
+int board_ehci_hcd_init(int port)
+{
+	u32 *usbnc_usb_uh1_ctrl = (u32 *)(MX6_USBNC_BASEADDR + 4);
+	u32 val;
+
+	switch (port) {
+	case 0:
+		cm_fx6_init_usb_otg();
+		break;
+	case 1:
+		SETUP_IOMUX_PAD(PAD_GPIO_0__USB_H1_PWR |

board/compulab/cm_fx6/cm_fx6.c line 83

Quoted 6 lines

board/compulab/cm_fx6/cm_fx6.c +6 -0

+						MUX_PAD_CTRL(NO_PAD_CTRL));
+
+		/* Set PWR polarity to match power switch's enable polarity */
+		val = __raw_readl(usbnc_usb_uh1_ctrl);
+		val |= USBNC_USB_H1_PWR_POL;
+		__raw_writel(val, usbnc_usb_uh1_ctrl);

Can we have setbits_le32() here?

board/compulab/cm_fx6/cm_fx6.c line 94

Quoted 12 lines

board/compulab/cm_fx6/cm_fx6.c +11 -0

+		return cm_fx6_usb_hub_reset();
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+int board_ehci_power(int port, int on)
+{
+	return port ? 0 : gpio_direction_output(SB_FX6_USB_OTG_PWR, on);

Here port is a port number, not some bool conditional.
Please be explicit about it and don't use the construct above for such cases.

Add support for all 3 I2C busses on Compulab CM-FX6 CoM.

Cc Igor Grinberg <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tom Rini <[email protected]>

Signed-off-by Nikita Kiryanov <[email protected]>

Use Compulab eeprom module to obtain revision number, serial number, and mac address from the EEPROM.

Cc Igor Grinberg <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tom Rini <[email protected]>

Signed-off-by Nikita Kiryanov <[email protected]>

---
Changes in V2:
- No changes

 board/compulab/cm_fx6/cm_fx6.c | 26 +++++++++++++++++++++++++-
 include/configs/cm_fx6.h       |  2 ++
 2 files changed, 27 insertions(+), 1 deletion(-)

board/compulab/cm_fx6/cm_fx6.c +0 -0

index 1b967e5..76d7430 100644