Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

icorem6: Make SPL to pick suitable fdt

Browse Source 
SPL FIT is able to pick the suitable fdt file for u-boot,
so add that function through board_fit_config_name_match.

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>
master
Jagan Teki 8 years ago committed by Stefano Babic
parent 6f1f3f59ed
commit bc1fe9006d
11 changed files with 33 additions and 177 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      arch/arm/cpu/armv7/mx6/Kconfig
  2. 6
      board/engicam/icorem6/MAINTAINERS
  3. 12
      board/engicam/icorem6/icorem6.c
  4. 3
      board/engicam/icorem6_rqs/MAINTAINERS
  5. 12
      board/engicam/icorem6_rqs/icorem6_rqs.c
  6. 43
      configs/imx6dl_icore_mmc_defconfig
  7. 44
      configs/imx6dl_icore_nand_defconfig
  8. 40
      configs/imx6dl_icore_rqs_mmc_defconfig
  9. 44
      configs/imx6q_icore_nand_defconfig
  10. 1
      configs/imx6qdl_icore_mmc_defconfig
  11. 1
      configs/imx6qdl_icore_rqs_mmc_defconfig

4
arch/arm/cpu/armv7/mx6/Kconfig
Unescape View File

@ -176,6 +176,7 @@ config TARGET_MX6Q_ICORE
select BOARD_LATE_INIT select BOARD_LATE_INIT
select MX6QDL select MX6QDL
select OF_CONTROL select OF_CONTROL
select SPL_OF_LIBFDT
select DM select DM
select DM_ETH select DM_ETH
select DM_GPIO select DM_GPIO
@ -183,12 +184,14 @@ config TARGET_MX6Q_ICORE
select DM_MMC select DM_MMC
select DM_THERMAL select DM_THERMAL
select SUPPORT_SPL select SUPPORT_SPL
select SPL_LOAD_FIT
config TARGET_MX6Q_ICORE_RQS config TARGET_MX6Q_ICORE_RQS
bool "Support Engicam i.Core RQS" bool "Support Engicam i.Core RQS"
select BOARD_LATE_INIT select BOARD_LATE_INIT
select MX6QDL select MX6QDL
select OF_CONTROL select OF_CONTROL
select SPL_OF_LIBFDT
select DM select DM
select DM_ETH select DM_ETH
select DM_GPIO select DM_GPIO
@ -196,6 +199,7 @@ config TARGET_MX6Q_ICORE_RQS
select DM_MMC select DM_MMC
select DM_THERMAL select DM_THERMAL
select SUPPORT_SPL select SUPPORT_SPL
select SPL_LOAD_FIT
config TARGET_MX6QSABREAUTO config TARGET_MX6QSABREAUTO
bool "mx6qsabreauto" bool "mx6qsabreauto"

6
board/engicam/icorem6/MAINTAINERS
Unescape View File

@ -3,10 +3,8 @@ M: Jagan Teki <jagan@amarulasolutions.com>
S: Maintained S: Maintained
F: board/engicam/icorem6 F: board/engicam/icorem6
F: include/configs/imx6qdl_icore.h F: include/configs/imx6qdl_icore.h
F: configs/imx6q_icore_mmc_defconfig F: configs/imx6qdl_icore_mmc_defconfig
F: configs/imx6q_icore_nand_defconfig F: configs/imx6qdl_icore_nand_defconfig
F: configs/imx6dl_icore_mmc_defconfig
F: configs/imx6dl_icore_nand_defconfig
F: arch/arm/dts/imx6qdl-icore.dtsi F: arch/arm/dts/imx6qdl-icore.dtsi
F: arch/arm/dts/imx6q-icore.dts F: arch/arm/dts/imx6q-icore.dts
F: arch/arm/dts/imx6dl-icore.dts F: arch/arm/dts/imx6dl-icore.dts

12
board/engicam/icorem6/icorem6.c
Unescape View File

@ -353,6 +353,18 @@ int board_mmc_init(bd_t *bis)
} }
#endif #endif
#ifdef CONFIG_SPL_LOAD_FIT
int board_fit_config_name_match(const char *name)
{
if (is_mx6dq() && !strcmp(name, "imx6q-icore"))
return 0;
else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore"))
return 0;
else
return -1;
}
#endif
/* /*
* Driving strength: * Driving strength:
* 0x30 == 40 Ohm * 0x30 == 40 Ohm

3
board/engicam/icorem6_rqs/MAINTAINERS
Unescape View File

@ -3,8 +3,7 @@ M: Jagan Teki <jagan@amarulasolutions.com>
S: Maintained S: Maintained
F: board/engicam/icorem6_rqs F: board/engicam/icorem6_rqs
F: include/configs/imx6qdl_icore_rqs.h F: include/configs/imx6qdl_icore_rqs.h
F: configs/imx6q_icore_rqs_mmc_defconfig F: configs/imx6qdl_icore_rqs_mmc_defconfig
F: configs/imx6dl_icore_rqs_mmc_defconfig
F: arch/arm/dts/imx6qdl-icore-rqs.dtsi F: arch/arm/dts/imx6qdl-icore-rqs.dtsi
F: arch/arm/dts/imx6q-icore-rqs.dts F: arch/arm/dts/imx6q-icore-rqs.dts
F: arch/arm/dts/imx6dl-icore-rqs.dts F: arch/arm/dts/imx6dl-icore-rqs.dts

12
board/engicam/icorem6_rqs/icorem6_rqs.c
Unescape View File

@ -224,6 +224,18 @@ void board_boot_order(u32 *spl_boot_list)
#endif #endif
#endif #endif
#ifdef CONFIG_SPL_LOAD_FIT
int board_fit_config_name_match(const char *name)
{
if (is_mx6dq() && !strcmp(name, "imx6q-icore-rqs"))
return 0;
else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore-rqs"))
return 0;
else
return -1;
}
#endif
/* /*
* Driving strength: * Driving strength:
* 0x30 == 40 Ohm * 0x30 == 40 Ohm

43
configs/imx6dl_icore_mmc_defconfig
Unescape View File

@ -1,43 +0,0 @@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_MX6Q_ICORE=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
# CONFIG_CMD_BMODE is not set
CONFIG_VIDEO=y
CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
CONFIG_BOOTDELAY=3
CONFIG_SPL=y
CONFIG_SPL_EXT_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="icorem6qdl> "
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y
CONFIG_CMD_I2C=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=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_BLK is not set
CONFIG_SYS_I2C_MXC=y
# CONFIG_DM_MMC_OPS is not set
CONFIG_FEC_MXC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y
CONFIG_VIDEO_IPUV3=y

44
configs/imx6dl_icore_nand_defconfig
Unescape View File

@ -1,44 +0,0 @@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_MX6Q_ICORE=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
# CONFIG_CMD_BMODE is not set
CONFIG_VIDEO=y
CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
CONFIG_BOOTDELAY=3
CONFIG_SPL=y
CONFIG_SPL_DMA_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="icorem6qdl> "
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y
CONFIG_CMD_NAND=y
CONFIG_CMD_I2C=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_CMD_UBI=y
# CONFIG_BLK is not set
CONFIG_SYS_I2C_MXC=y
# CONFIG_DM_MMC_OPS is not set
CONFIG_NAND_MXS=y
CONFIG_FEC_MXC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y
CONFIG_VIDEO_IPUV3=y

40
configs/imx6dl_icore_rqs_mmc_defconfig
Unescape View File

@ -1,40 +0,0 @@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_MX6Q_ICORE_RQS=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
# CONFIG_CMD_BMODE is not set
CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore-rqs"
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
CONFIG_BOOTDELAY=3
CONFIG_SPL=y
CONFIG_SPL_EXT_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="icorem6qdl-rqs> "
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y
CONFIG_CMD_I2C=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=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_BLK is not set
CONFIG_SYS_I2C_MXC=y
# CONFIG_DM_MMC_OPS is not set
CONFIG_FEC_MXC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y

44
configs/imx6q_icore_nand_defconfig
Unescape View File

@ -1,44 +0,0 @@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_MX6Q_ICORE=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
# CONFIG_CMD_BMODE is not set
CONFIG_VIDEO=y
CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
CONFIG_BOOTDELAY=3
CONFIG_SPL=y
CONFIG_SPL_DMA_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="icorem6qdl> "
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y
CONFIG_CMD_NAND=y
CONFIG_CMD_I2C=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_CMD_UBI=y
# CONFIG_BLK is not set
CONFIG_SYS_I2C_MXC=y
# CONFIG_DM_MMC_OPS is not set
CONFIG_NAND_MXS=y
CONFIG_FEC_MXC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y
CONFIG_VIDEO_IPUV3=y

1
configs/imx6q_icore_mmc_defconfig → configs/imx6qdl_icore_mmc_defconfig
Unescape View File

@ -10,6 +10,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
# CONFIG_CMD_BMODE is not set # CONFIG_CMD_BMODE is not set
CONFIG_VIDEO=y CONFIG_VIDEO=y
CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore" CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
CONFIG_OF_LIST="imx6q-icore imx6dl-icore"
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/imx6q_icore_rqs_mmc_defconfig → configs/imx6qdl_icore_rqs_mmc_defconfig
Unescape View File

@ -9,6 +9,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y
# CONFIG_CMD_BMODE is not set # CONFIG_CMD_BMODE is not set
CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-rqs" CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-rqs"
CONFIG_OF_LIST="imx6q-icore-rqs imx6dl-icore-rqs"
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
Write Preview
Loading…
Cancel
Save