Re: [U-Boot] [PATCH v3] Add support for Congatec Conga-QEVAl board

Le Wednesday 15 May 2013 15:46:49, Otavio Salvador a écrit :

On Wed, May 15, 2013 at 10:36 AM, SARTRE Leo

lsartre@adeneo-embedded.com wrote:

...

Add minimal support (only boot from mmc device) for the Congatec Conga-QEVAl Evaluation Carrier Board with conga-Qmx6q (i.MX6 Quad processor) module.

Signed-off-by: Leo Sartre lsartre@adeneo-embedded.com

Changes in v3: -Files where moved to cgtqmx6eval. -MX6Q macro is passed in config as it is done for the wandboard.

Thanks Otavio for these advices.

MAINTAINERS | 4 + board/congatec/cgtqmx6eval/Makefile | 42 +++++++ board/congatec/cgtqmx6eval/README | 28 +++++ board/congatec/cgtqmx6eval/cgtqmx6eval.c | 178 +++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/cgtqmx6eval.h | 197 ++++++++++++++++++++++++++++++ 6 files changed, 450 insertions(+) create mode 100644 board/congatec/cgtqmx6eval/Makefile create mode 100644 board/congatec/cgtqmx6eval/README create mode 100644 board/congatec/cgtqmx6eval/cgtqmx6eval.c create mode 100644 include/configs/cgtqmx6eval.h

diff --git a/MAINTAINERS b/MAINTAINERS index 643a5ac..b61484b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -889,6 +889,10 @@ Steve Sakoman sakoman@gmail.com

    omap3_overo     ARM ARMV7 (OMAP3xx SoC)

+Leo Sartre lsartre@adeneo-embedded.com

•   cgtqmx6q                i.MX6Q
  

Jens Scharsig esw@bus-elektronik.de

    eb_cpux9k2      ARM920T (AT91RM9200 SoC)

diff --git a/board/congatec/cgtqmx6eval/Makefile b/board/congatec/cgtqmx6eval/Makefile new file mode 100644 index 0000000..ac16c1f --- /dev/null +++ b/board/congatec/cgtqmx6eval/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2007, Guennadi Liakhovetski lg@denx.de +# +# (C) Copyright 2011 Freescale Semiconductor, Inc. +# (C) Copyright 2013 Adeneo Embedded <www.adeneo-embedded.com> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +#

+include $(TOPDIR)/config.mk

+LIB = $(obj)lib$(BOARD).o

+COBJS := cgtqmx6eval.o

+SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS))

+$(LIB): $(obj).depend $(OBJS)

•   $(call cmd_link_o_target, $(OBJS))
  

+######################################################################## # + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk

+sinclude $(obj).depend

+######################################################################## # diff --git a/board/congatec/cgtqmx6eval/README b/board/congatec/cgtqmx6eval/README new file mode 100644 index 0000000..31162e2 --- /dev/null +++ b/board/congatec/cgtqmx6eval/README @@ -0,0 +1,28 @@ +U-Boot for the Congatec Conga-QEVAl Evaluation Carrier board

+This file contains information for the port of U-Boot to the Congatec +Conga-QEVAl Evaluation Carrier board.

+1. Boot source, boot from SD card +---------------------------------

+This version of u-boot works only on the SD card. By default, the +Congatec board can boot only from the SPI-NOR. +But, with the u-boot version provided with the board you can write boot +registers to force the board to reboot and boot from the SD slot. If +"bmode" command is not available from your pre-installed u-boot, these +instruction will produce the same effect:

+conga-QMX6 U-Boot > mw.l 0x20d8040 0x3850 +conga-QMX6 U-Boot > mw.l 0x020d8044 0x10000000 +conga-QMX6 U-Boot > reset +resetting ...

+The the board will reboot and, if you have written your SD correctly +the board will use u-boot that live into the SD

+To copy the resulting u-boot.imx to the SD card:

• dd if=u-boot.imx of=/dev/xxx bs=512 seek=2

+Note: Replace xxx with the device representing the SD card in your system. diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c new file mode 100644 index 0000000..e5d2adb --- /dev/null +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -0,0 +1,178 @@ +/*

• • Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
• • Based on mx6qsabrelite.c file
• • Copyright (C) 2013, Adeneo Embedded <www.adeneo-embedded.com>
• • Leo Sartre, lsartre@adeneo-embedded.com
• • This program is free software; you can redistribute it and/or
• • modify it under the terms of the GNU General Public License as
• • published by the Free Software Foundation; either version 2 of
• • the License, or (at your option) any later version.
• • This program is distributed in the hope that it will be useful,
• • but WITHOUT ANY WARRANTY; without even the implied warranty of
• • MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
• • GNU General Public License for more details.
• • You should have received a copy of the GNU General Public License
• • along with this program; if not, write to the Free Software
• • Foundation, Inc., 59 Temple Place, Suite 330, Boston,
• • MA 02111-1307 USA
• */

+#include <common.h> +#include <asm/io.h> +#include <asm/arch/clock.h> +#include <asm/arch/imx-regs.h> +#include <asm/arch/iomux.h> +#include <asm/arch/mx6-pins.h> +#include <asm/gpio.h> +#include <asm/imx-common/iomux-v3.h> +#include <asm/imx-common/boot_mode.h> +#include <mmc.h> +#include <fsl_esdhc.h>

+DECLARE_GLOBAL_DATA_PTR;

+#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |\

•   PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |\
  

•   PAD_CTL_DSE_40ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
  

+#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |\

•   PAD_CTL_PUS_47K_UP  | PAD_CTL_SPEED_LOW |\
  

•   PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
  

+int dram_init(void) +{

•   gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
  

•   return 0;
  

+}

+iomux_v3_cfg_t const uart2_pads[] = {

•   MX6_PAD_EIM_D26__UART2_TXD | MUX_PAD_CTRL(UART_PAD_CTRL),
  

•   MX6_PAD_EIM_D27__UART2_RXD | MUX_PAD_CTRL(UART_PAD_CTRL),
  

+};

+iomux_v3_cfg_t const usdhc2_pads[] = {

•   MX6_PAD_SD2_CLK__USDHC2_CLK   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD2_CMD__USDHC2_CMD   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD2_DAT0__USDHC2_DAT0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD2_DAT1__USDHC2_DAT1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD2_DAT2__USDHC2_DAT2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD2_DAT3__USDHC2_DAT3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_GPIO_4__GPIO_1_4      | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

+};

+iomux_v3_cfg_t const usdhc4_pads[] = {

•   MX6_PAD_SD4_CLK__USDHC4_CLK   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD4_CMD__USDHC4_CMD   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD4_DAT0__USDHC4_DAT0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD4_DAT1__USDHC4_DAT1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD4_DAT2__USDHC4_DAT2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD4_DAT3__USDHC4_DAT3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD4_DAT4__USDHC4_DAT4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD4_DAT5__USDHC4_DAT5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD4_DAT6__USDHC4_DAT6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_SD4_DAT7__USDHC4_DAT7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
  

•   MX6_PAD_NANDF_D6__GPIO_2_6    | MUX_PAD_CTRL(NO_PAD_CTRL), /* CD
  

*/ +};

+static void setup_iomux_uart(void) +{

•   imx_iomux_v3_setup_multiple_pads(uart2_pads,
  

ARRAY_SIZE(uart2_pads)); +}

+#ifdef CONFIG_FSL_ESDHC +struct fsl_esdhc_cfg usdhc_cfg[] = {

•   {USDHC2_BASE_ADDR},
  

•   {USDHC4_BASE_ADDR},
  

+};

+int board_mmc_getcd(struct mmc *mmc) +{

•   struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
  

•   int ret;
  

•   switch (cfg->esdhc_base) {
  

•   case USDHC2_BASE_ADDR:
  

•           gpio_direction_input(IMX_GPIO_NR(1, 4));
  

•           ret = !gpio_get_value(IMX_GPIO_NR(1, 4));
  

•           break;
  

•   case USDHC4_BASE_ADDR:
  

•           gpio_direction_input(IMX_GPIO_NR(2, 6));
  

•           ret = !gpio_get_value(IMX_GPIO_NR(2, 6));
  

•           break;
  

•   default:
  

•           printf("Bad USDHC interface\n");
  

•   }
  

•   return ret;
  

+}

+int board_mmc_init(bd_t *bis) +{

•   s32 status = 0;
  

•   usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
  

•   usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
  

•   imx_iomux_v3_setup_multiple_pads(
  

•                           usdhc2_pads, ARRAY_SIZE(usdhc2_pads));
  

•   imx_iomux_v3_setup_multiple_pads(
  

•                           usdhc4_pads, ARRAY_SIZE(usdhc4_pads));
  

•   status = fsl_esdhc_initialize(bis, &usdhc_cfg[0]) |
  

•                fsl_esdhc_initialize(bis, &usdhc_cfg[1]);
  

•   return status;
  

+} +#endif

+int board_early_init_f(void) +{

•   setup_iomux_uart();
  

•   return 0;
  

+}

+int board_init(void) +{

•   u32 reg;
  

•   /*Same init as the sabrelite*/
  

•   writel(0x41736166, SNVS_BASE_ADDR + 0x64);/*set LPPGDR*/
  

•   udelay(10);
  

•   reg = readl(SNVS_BASE_ADDR + 0x4c);
  

•   reg |= (1 << 3);
  

•   writel(reg, SNVS_BASE_ADDR + 0x4c);/*clear LPSR*/
  

•   /* address of boot parameters */
  

•   gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
  

•   return 0;
  

+}

+int checkboard(void) +{ +#ifdef CONFIG_MX6Q

•   puts("Board: Congatec QMX6 Quad\n");
  

+#endif

You missed DL variant, it seems.

I do not have the DL variant, so I cannot test it, that why I remove it.

...

•   return 0;
  

+}

+#ifdef CONFIG_CMD_BMODE +static const struct boot_mode board_boot_modes[] = {

•   /* 4 bit bus width */
  

•   {"mmc0",        MAKE_CFGVAL(0x50, 0x20, 0x00, 0x00)},
  

•   {"mmc1",        MAKE_CFGVAL(0x50, 0x38, 0x00, 0x00)},
  

•   {NULL,          0},
  

+}; +#endif

+int misc_init_r(void) +{ +#ifdef CONFIG_CMD_BMODE

•   add_board_boot_modes(board_boot_modes);
  

+#endif

•   return 0;
  

+} diff --git a/boards.cfg b/boards.cfg index 5d78064..b6c16b1 100644 --- a/boards.cfg +++ b/boards.cfg @@ -259,6 +259,7 @@ mx6qarm2 arm armv7 mx6qarm2 freesca

mx6qsabreauto arm armv7 mx6qsabreauto freescale mx6 mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg mx6qsabrelite arm armv7 mx6qsabrelite freescale mx6 mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg mx6qsabresd arm armv7 mx6qsabresd freescale mx6 mx6qsabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg

+cgtqmx6q arm armv7 cgtqmx6eval congatec mx6 cgtqmx6eval:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q

I'd name the config:

cgtgmx6qeval cgtgmx6dleval

Yes you are write, I will change it for cgtqmx6qeval.

Or similar. You seem to use the SOM name as the board config. Seems confusing for me.

...

eco5pk arm armv7 eco5pk 8dtech omap3 nitrogen6dl arm armv7 nitrogen6x boundary mx6 nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,D DR_MB=1024 nitrogen6dl2g arm armv7 nitrogen6x boundary mx6 nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL ,DDR_MB=2048

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h new file mode 100644 index 0000000..73664bf --- /dev/null +++ b/include/configs/cgtqmx6eval.h @@ -0,0 +1,197 @@ +/*

• • cgtqmx6.h
• • Congatec Conga-QEVAl board configuration file.
• • Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
• • Based on Freescale i.MX6Q Sabre Lite board configuration file.
• • Copyright (C) 2013, Adeneo Embedded <www.adeneo-embedded.com>
• • Leo Sartre, lsartre@adeneo-embedded.com
• • This program is free software; you can redistribute it and/or
• • modify it under the terms of the GNU General Public License as
• • published by the Free Software Foundation; either version 2 of
• • the License, or (at your option) any later version.
• • This program is distributed in the hope that it will be useful,
• • but WITHOUT ANY WARRANTY; without even the implied warranty of
• • MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

See the + * GNU General Public License for more details.

• • You should have received a copy of the GNU General Public License
• • along with this program; if not, write to the Free Software
• • Foundation, Inc., 59 Temple Place, Suite 330, Boston,
• • MA 02111-1307 USA
• */

+#ifndef __CONFIG_H +#define __CONFIG_H

+#define CONFIG_MX6

+#include "mx6_common.h"

+#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO

+#define CONFIG_MACH_TYPE 4122

+#include <asm/arch/imx-regs.h> +#include <asm/imx-common/gpio.h>

+#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG +#define CONFIG_REVISION_TAG

+/* Size of malloc() pool */ +#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)

+#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_MISC_INIT_R +#define CONFIG_MXC_GPIO

+#define CONFIG_MXC_UART +#define CONFIG_MXC_UART_BASE UART2_BASE

+/* MMC Configs */ +#define CONFIG_FSL_ESDHC +#define CONFIG_FSL_USDHC +#define CONFIG_SYS_FSL_ESDHC_ADDR 0

+#define CONFIG_MMC +#define CONFIG_CMD_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_BOUNCE_BUFFER +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_FAT +#define CONFIG_DOS_PARTITION

+/* Miscellaneous commands */ +#define CONFIG_CMD_BMODE

+/* allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 115200

+/* Command definition */ +#include <config_cmd_default.h>

+#undef CONFIG_CMD_IMLS

+#define CONFIG_BOOTDELAY 3

+#define CONFIG_LOADADDR 0x12000000 +#define CONFIG_SYS_TEXT_BASE 0x17800000

+#ifdef CONFIG_MX6Q +#define CONFIG_DEFAULT_FDT_FILE "imx6q-congatec.dtb" +#endif

+#define CONFIG_EXTRA_ENV_SETTINGS \

•   "script=boot.scr\0" \
  

•   "uimage=uImage\0" \
  

•   "fdt_file=imx6q-congatec.dtb\0" \
  

•   "boot_dir=/boot\0" \
  

•   "console=ttymxc1\0" \
  

•   "fdt_high=0xffffffff\0" \
  

•   "initrd_high=0xffffffff\0" \
  

•   "fdt_addr=0x11000000\0" \
  

•   "boot_fdt=try\0" \
  

•   "mmcdev=1\0" \
  

•   "mmcpart=1\0" \
  

•   "mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
  

•   "mmcargs=setenv bootargs console=${console},${baudrate} " \
  

•           "root=${mmcroot}\0" \
  

•   "loadbootscript=" \
  

•           "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr}
  

${script};\0" \ + "bootscript=echo Running bootscript from mmc ...; " \

•           "source\0" \
  

•   "loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr}
  

${boot_dir}/${uimage}\0" \ + "loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${boot_dir}/${fdt_file}\0" \ + "mmcboot=echo Booting from mmc ...; " \

•           "run mmcargs; " \
  

•           "if test ${boot_fdt} = yes || test ${boot_fdt} = try;
  

then " \ + "if run loadfdt; then " \

•                           "bootm ${loadaddr} - ${fdt_addr}; " \
  

•                   "else " \
  

•                           "if test ${boot_fdt} = try; then " \
  

•                                   "bootm; " \
  

•                           "else " \
  

•                                   "echo WARN: Cannot load the DT; "
  

\ + "fi; " \

•                   "fi; " \
  

•           "else " \
  

•                   "bootm; " \
  

•           "fi;\0"
  

+#define CONFIG_BOOTCOMMAND \

•      "mmc dev ${mmcdev};" \
  

•      "mmc dev ${mmcdev}; if mmc rescan; then " \
  

•              "if run loadbootscript; then " \
  

•                      "run bootscript; " \
  

•              "else " \
  

•                      "if run loaduimage; then " \
  

•                              "run mmcboot; " \
  

•                      "else "\
  

•                              "echo ERR: Fail to boot from mmc; " \
  

•                      "fi; " \
  

•              "fi; " \
  

•      "else echo ERR: Fail to boot from mmc; fi"
  

+/* Miscellaneous configurable options */ +#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_HUSH_PARSER +#ifdef CONFIG_MX6Q +#define CONFIG_SYS_PROMPT "CGT-QMX6-Quad U-Boot > " +#endif +#define CONFIG_AUTO_COMPLETE +#define CONFIG_SYS_CBSIZE 256

+/* Print Buffer Size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT)

• 16. +#define CONFIG_SYS_MAXARGS 16

+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

+#define CONFIG_SYS_MEMTEST_START 0x10000000 +#define CONFIG_SYS_MEMTEST_END 0x10010000 +#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000

+#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_HZ 1000

+#define CONFIG_CMDLINE_EDITING

+/* Physical Memory Map */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR +#define PHYS_SDRAM_SIZE (1u * 1024 * 1024

+#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)
  

+/* FLASH and environment organization */ +#define CONFIG_SYS_NO_FLASH

+#define CONFIG_ENV_SIZE (8 * 1024)

+#define CONFIG_ENV_IS_IN_MMC

+#define CONFIG_ENV_OFFSET (6 * 64 * 1024) +#define CONFIG_SYS_MMC_ENV_DEV 0

+#define CONFIG_OF_LIBFDT +#define CONFIG_CMD_BOOTZ

+#ifndef CONFIG_SYS_DCACHE_OFF +#define CONFIG_CMD_CACHE +#endif

+#endif /* __CONFIG_H */

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

-- Otavio Salvador O.S. Systems E-mail: otavio@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br