Add new board names for existing board support imx6q - icore and icore_rqs boards imx6ul - geam6ul and isiot boards Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>master
Jagan Teki
7 years ago
committed by
Stefano Babic
parent
539b1e228f
commit
52aaddd6f4
@ -1,8 +0,0 @@ |
||||
GEAM6UL BOARD |
||||
M: Jagan Teki <jagan@amarulasolutions.com> |
||||
S: Maintained |
||||
F: board/engicam/geam6ul |
||||
F: include/configs/imx6-engicam.h |
||||
F: configs/imx6ul_geam_mmc_defconfig |
||||
F: configs/imx6ul_geam_nand_defconfig |
||||
F: arch/arm/dts/imx6ul-geam-kit.dts |
||||
@ -1,28 +0,0 @@ |
||||
How to use U-Boot on Engicam GEAM6UL Starter Kit: |
||||
------------------------------------------------- |
||||
|
||||
- Configure U-Boot for Engicam GEAM6UL: |
||||
|
||||
$ make mrproper |
||||
$ make imx6ul_geam_mmc_defconfig |
||||
$ make |
||||
|
||||
This will generate the SPL image called SPL and the u-boot-dtb.img. |
||||
|
||||
- Flash the SPL image into the micro SD card: |
||||
|
||||
sudo dd if=SPL of=/dev/mmcblk0 bs=1k seek=1; sync |
||||
|
||||
- Flash the u-boot-dtb.img image into the micro SD card: |
||||
|
||||
sudo dd if=u-boot-dtb.img of=/dev/mmcblk0 bs=1k seek=69; sync |
||||
|
||||
- Jumper settings: |
||||
|
||||
MMC Boot: JM3 Closed |
||||
|
||||
- Connect the Serial cable between the Starter Kit and the PC for the console. |
||||
(J28 is the Linux Serial console connector) |
||||
|
||||
- Insert the micro SD card in the board, power it up and U-Boot messages should |
||||
come up. |
||||
@ -1,12 +0,0 @@ |
||||
if TARGET_MX6Q_ICORE_RQS |
||||
|
||||
config SYS_BOARD |
||||
default "icorem6_rqs" |
||||
|
||||
config SYS_VENDOR |
||||
default "engicam" |
||||
|
||||
config SYS_CONFIG_NAME |
||||
default "imx6-engicam" |
||||
|
||||
endif |
||||
@ -1,9 +0,0 @@ |
||||
ICOREM6QDL_RQS BOARD |
||||
M: Jagan Teki <jagan@amarulasolutions.com> |
||||
S: Maintained |
||||
F: board/engicam/icorem6_rqs |
||||
F: include/configs/imx6-engicam.h |
||||
F: configs/imx6qdl_icore_rqs_defconfig |
||||
F: arch/arm/dts/imx6qdl-icore-rqs.dtsi |
||||
F: arch/arm/dts/imx6q-icore-rqs.dts |
||||
F: arch/arm/dts/imx6dl-icore-rqs.dts |
||||
@ -1,6 +0,0 @@ |
||||
# Copyright (C) 2016 Amarula Solutions B.V.
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
obj-y := icorem6_rqs.o
|
||||
@ -1,7 +1,7 @@ |
||||
if TARGET_MX6UL_GEAM |
||||
if TARGET_MX6Q_ENGICAM |
||||
|
||||
config SYS_BOARD |
||||
default "geam6ul" |
||||
default "imx6q" |
||||
|
||||
config SYS_VENDOR |
||||
default "engicam" |
||||
@ -1,10 +1,14 @@ |
||||
ICOREM6QDL BOARD |
||||
MX6Q_ENGICAM BOARD |
||||
M: Jagan Teki <jagan@amarulasolutions.com> |
||||
S: Maintained |
||||
F: board/engicam/icorem6 |
||||
F: board/engicam/imx6q |
||||
F: include/configs/imx6-engicam.h |
||||
F: configs/imx6qdl_icore_mmc_defconfig |
||||
F: configs/imx6qdl_icore_nand_defconfig |
||||
F: configs/imx6qdl_icore_rqs_defconfig |
||||
F: arch/arm/dts/imx6qdl-icore.dtsi |
||||
F: arch/arm/dts/imx6q-icore.dts |
||||
F: arch/arm/dts/imx6dl-icore.dts |
||||
F: arch/arm/dts/imx6qdl-icore-rqs.dtsi |
||||
F: arch/arm/dts/imx6q-icore-rqs.dts |
||||
F: arch/arm/dts/imx6dl-icore-rqs.dts |
||||
@ -1,9 +1,12 @@ |
||||
How to use U-Boot on Engicam i.CoreM6 RQS Solo/DualLite and Quad/Dual Starter Kit: |
||||
---------------------------------------------------------------------------------- |
||||
Hsow to use U-Boot on Engicam i.CoreM6 (RQS) Solo/DualLite/Quad/Dual Starter Kit: |
||||
-------------------------------------------------------------------------------- |
||||
|
||||
$ make mrproper |
||||
|
||||
- Configure U-Boot for Engicam i.CoreM6 RQS Quad/Dual/Solo/DualLite: |
||||
- Configure U-Boot for Engicam i.CoreM6 Quad/Duali/Solo/DualLite: |
||||
$ make imx6qdl_icore_mmc_defconfig |
||||
|
||||
- Configure U-Boot for Engicam i.CoreM6 RQS Quad/Duali/Solo/DualLite: |
||||
$ make imx6qdl_icore_rqs_defconfig |
||||
|
||||
- Build U-Boot |
||||
@ -1,7 +1,7 @@ |
||||
if TARGET_MX6Q_ICORE |
||||
if TARGET_MX6UL_ENGICAM |
||||
|
||||
config SYS_BOARD |
||||
default "icorem6" |
||||
default "imx6ul" |
||||
|
||||
config SYS_VENDOR |
||||
default "engicam" |
||||
@ -1,11 +1,14 @@ |
||||
ISIOTMX6UL BOARD |
||||
MX6UL_ENGICAM BOARD |
||||
M: Jagan Teki <jagan@amarulasolutions.com> |
||||
S: Maintained |
||||
F: board/engicam/isiotmx6ul |
||||
F: board/engicam/imx6ul |
||||
F: include/configs/imx6-engicam.h |
||||
F: configs/imx6ul_isiot_mmc_defconfig |
||||
F: configs/imx6ul_geam_mmc_defconfig |
||||
F: configs/imx6ul_geam_nand_defconfig |
||||
F: configs/imx6ul_isiot_emmc_defconfig |
||||
F: configs/imx6ul_isiot_mmc_defconfig |
||||
F: configs/imx6ul_isiot_nand_defconfig |
||||
F: arch/arm/dts/imx6ul-geam-kit.dts |
||||
F: arch/arm/dts/imx6ul-isiot.dtsi |
||||
F: arch/arm/dts/imx6ul-isiot-mmc.dts |
||||
F: arch/arm/dts/imx6ul-isiot-emmc.dts |
||||
@ -1,10 +1,13 @@ |
||||
How to use U-Boot on Engicam i.CoreM6 Solo/DualLite and Quad/Dual Starter Kit: |
||||
----------------------------------------------------------------------------- |
||||
Hsow to use U-Boot on Engicam GEAM6UL and Is.IoT MX6UL Starter Kit: |
||||
------------------------------------------------------------------- |
||||
|
||||
$ make mrproper |
||||
|
||||
- Configure U-Boot for Engicam i.CoreM6 Quad/Dual/Solo/DualLite: |
||||
$ make imx6qdl_icore_mmc_defconfig |
||||
- Configure U-Boot for Engicam GEAM6UL: |
||||
$ make imx6ul_geam_mmc_defconfig |
||||
|
||||
- Configure U-Boot for Engicam Is.IoT MX6UL: |
||||
$ make imx6ul_isiot_mmc_defconfig |
||||
|
||||
- Build U-Boot |
||||
$ make |
||||
@ -1,12 +0,0 @@ |
||||
if TARGET_MX6UL_ISIOT |
||||
|
||||
config SYS_BOARD |
||||
default "isiotmx6ul" |
||||
|
||||
config SYS_VENDOR |
||||
default "engicam" |
||||
|
||||
config SYS_CONFIG_NAME |
||||
default "imx6-engicam" |
||||
|
||||
endif |
||||
@ -1,6 +0,0 @@ |
||||
# Copyright (C) 2016 Amarula Solutions B.V.
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
obj-y := isiotmx6ul.o
|
||||
@ -1,28 +0,0 @@ |
||||
How to use U-Boot on Engicam Is.IoT MX6UL Starter Kit: |
||||
----------------------------------------------------- |
||||
|
||||
- Configure U-Boot for Engicam Is.IoT MX6UL |
||||
|
||||
$ make mrproper |
||||
$ make imx6ul_isiot_mmc_defconfig |
||||
$ make |
||||
|
||||
This will generate the SPL image called SPL and the u-boot-dtb.img. |
||||
|
||||
- Flash the SPL image into the micro SD card: |
||||
|
||||
sudo dd if=SPL of=/dev/mmcblk0 bs=1k seek=1; sync |
||||
|
||||
- Flash the u-boot-dtb.img image into the micro SD card: |
||||
|
||||
sudo dd if=u-boot-dtb.img of=/dev/mmcblk0 bs=1k seek=69; sync |
||||
|
||||
- Jumper settings: |
||||
|
||||
MMC Boot: JM3 Closed |
||||
|
||||
- Connect the Serial cable between the Starter Kit and the PC for the console. |
||||
(J28 is the Linux Serial console connector) |
||||
|
||||
- Insert the micro SD card in the board, power it up and U-Boot messages should |
||||
come up. |
||||
@ -1,129 +0,0 @@ |
||||
/*
|
||||
* Copyright (C) 2016 Amarula Solutions B.V. |
||||
* Copyright (C) 2016 Engicam S.r.l. |
||||
* Author: Jagan Teki <jagan@amarulasolutions.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <mmc.h> |
||||
|
||||
#include <asm/io.h> |
||||
#include <asm/gpio.h> |
||||
#include <linux/sizes.h> |
||||
|
||||
#include <asm/arch/clock.h> |
||||
#include <asm/arch/crm_regs.h> |
||||
#include <asm/arch/iomux.h> |
||||
#include <asm/arch/mx6-pins.h> |
||||
#include <asm/arch/sys_proto.h> |
||||
#include <asm/mach-imx/iomux-v3.h> |
||||
|
||||
#include "../common/board.h" |
||||
|
||||
DECLARE_GLOBAL_DATA_PTR; |
||||
|
||||
#ifdef CONFIG_NAND_MXS |
||||
|
||||
#define GPMI_PAD_CTRL0 (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP) |
||||
#define GPMI_PAD_CTRL1 (PAD_CTL_DSE_40ohm | PAD_CTL_SPEED_MED | \ |
||||
PAD_CTL_SRE_FAST) |
||||
#define GPMI_PAD_CTRL2 (GPMI_PAD_CTRL0 | GPMI_PAD_CTRL1) |
||||
|
||||
static iomux_v3_cfg_t const nand_pads[] = { |
||||
IOMUX_PADS(PAD_NAND_DATA00__RAWNAND_DATA00 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_DATA01__RAWNAND_DATA01 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_DATA02__RAWNAND_DATA02 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_DATA03__RAWNAND_DATA03 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_DATA04__RAWNAND_DATA04 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_DATA05__RAWNAND_DATA05 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_DATA06__RAWNAND_DATA06 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_DATA07__RAWNAND_DATA07 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_CLE__RAWNAND_CLE | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_ALE__RAWNAND_ALE | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_CE0_B__RAWNAND_CE0_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_RE_B__RAWNAND_RE_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_WE_B__RAWNAND_WE_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_WP_B__RAWNAND_WP_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
IOMUX_PADS(PAD_NAND_READY_B__RAWNAND_READY_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), |
||||
}; |
||||
|
||||
void setup_gpmi_nand(void) |
||||
{ |
||||
struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; |
||||
|
||||
/* config gpmi nand iomux */ |
||||
SETUP_IOMUX_PADS(nand_pads); |
||||
|
||||
clrbits_le32(&mxc_ccm->CCGR4, |
||||
MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK | |
||||
MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK | |
||||
MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK | |
||||
MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK | |
||||
MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK); |
||||
|
||||
/*
|
||||
* config gpmi and bch clock to 100 MHz |
||||
* bch/gpmi select PLL2 PFD2 400M |
||||
* 100M = 400M / 4 |
||||
*/ |
||||
clrbits_le32(&mxc_ccm->cscmr1, |
||||
MXC_CCM_CSCMR1_BCH_CLK_SEL | |
||||
MXC_CCM_CSCMR1_GPMI_CLK_SEL); |
||||
clrsetbits_le32(&mxc_ccm->cscdr1, |
||||
MXC_CCM_CSCDR1_BCH_PODF_MASK | |
||||
MXC_CCM_CSCDR1_GPMI_PODF_MASK, |
||||
(3 << MXC_CCM_CSCDR1_BCH_PODF_OFFSET) | |
||||
(3 << MXC_CCM_CSCDR1_GPMI_PODF_OFFSET)); |
||||
|
||||
/* enable gpmi and bch clock gating */ |
||||
setbits_le32(&mxc_ccm->CCGR4, |
||||
MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK | |
||||
MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK | |
||||
MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK | |
||||
MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK | |
||||
MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK); |
||||
|
||||
/* enable apbh clock gating */ |
||||
setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK); |
||||
} |
||||
#endif /* CONFIG_NAND_MXS */ |
||||
|
||||
#ifdef CONFIG_ENV_IS_IN_MMC |
||||
int board_mmc_get_env_dev(int devno) |
||||
{ |
||||
/* dev 0 for SD/eSD, dev 1 for MMC/eMMC */ |
||||
return (devno == 0) ? 0 : 1; |
||||
} |
||||
#endif |
||||
|
||||
#ifdef CONFIG_SPL_BUILD |
||||
#include <spl.h> |
||||
|
||||
#ifdef CONFIG_ENV_IS_IN_MMC |
||||
void board_boot_order(u32 *spl_boot_list) |
||||
{ |
||||
u32 bmode = imx6_src_get_boot_mode(); |
||||
u8 boot_dev = BOOT_DEVICE_MMC1; |
||||
|
||||
switch ((bmode & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { |
||||
case IMX6_BMODE_SD: |
||||
case IMX6_BMODE_ESD: |
||||
/* SD/eSD - BOOT_DEVICE_MMC1 */ |
||||
break; |
||||
case IMX6_BMODE_MMC: |
||||
case IMX6_BMODE_EMMC: |
||||
/* MMC/eMMC */ |
||||
boot_dev = BOOT_DEVICE_MMC2; |
||||
break; |
||||
default: |
||||
/* Default - BOOT_DEVICE_MMC1 */ |
||||
printf("Wrong board boot order\n"); |
||||
break; |
||||
} |
||||
|
||||
spl_boot_list[0] = boot_dev; |
||||
} |
||||
#endif |
||||
#endif /* CONFIG_SPL_BUILD */ |
||||
Loading…
Reference in new issue