iMX/panran-imx-uboot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2SOM: add NAND and eMMC for i2S-6UL

Browse Source
This commit is contained in:
SteveChen
2018-01-06 23:56:54 +08:00
parent 1705d0a0dd
commit f7652281cd
19 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/cpu/armv7/mx6/Kconfig
View File

@ -189,11 +189,17 @@ config TARGET_MX6ULL_9X9_EVK
select DM_THERMAL
config TARGET_I2SOM_IMX6ULL_14X14
bool "Support i2SOM i2c-imx6ull 14x14"
bool "Support i2SOM i2S-6ULL 14x14"
select MX6ULL
select DM
select DM_THERMAL
config TARGET_I2SOM_IMX6UL_14X14
bool "Support i2SOM i2S-6UL 14x14"
select MX6UL
select DM
select DM_THERMAL
config TARGET_SECOMX6
bool "secomx6 boards"
@ -249,7 +255,8 @@ source "board/seco/Kconfig"
source "board/solidrun/mx6cuboxi/Kconfig"
source "board/tbs/tbs2910/Kconfig"
source "board/technexion/picosom-imx6ul/Kconfig"
source "board/i2som/i2c_6ull_14x14/Kconfig"
source "board/i2som/i2s_6ull_14x14/Kconfig"
source "board/i2som/i2s_6ul_14x14/Kconfig"
source "board/tqc/tqma6/Kconfig"
source "board/udoo/Kconfig"
source "board/wandboard/Kconfig"

4
board/i2som/i2c_6ul_14x14/Kconfig → board/i2som/i2s_6ul_14x14/Kconfig
View File

@ -1,7 +1,7 @@
if TARGET_I2SOM_MX6UL_14X14 || TARGET_I2SOM_MX6UL_9X9
if TARGET_I2SOM_IMX6UL_14X14 || TARGET_I2SOM_IMX6UL_9X9
config SYS_BOARD
default "i2c_6ul_14x14"
default "i2s_6ul_14x14"
config SYS_VENDOR
default "i2som"

2
board/i2som/i2c_6ul_14x14/Makefile → board/i2som/i2s_6ul_14x14/Makefile
View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
obj-y := i2c_6ul_14x14.o
obj-y := i2s_6ul_14x14.o
extra-$(CONFIG_USE_PLUGIN) := plugin.bin
$(obj)/plugin.bin: $(obj)/plugin.o

14
board/i2som/i2c_6ul_14x14/i2c_6ul_14x14.c → board/i2som/i2s_6ul_14x14/i2s_6ul_14x14.c
View File

@ -681,8 +681,9 @@ static iomux_v3_cfg_t const fec1_pads[] = {
MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_ENET1_RX_ER__ENET1_RX_ER | MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_ENET1_RX_EN__ENET1_RX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
/* PHY Reset */
MX6_PAD_SNVS_TAMPER6__GPIO5_IO06 | MUX_PAD_CTRL(NO_PAD_CTRL),
/* PHY Reset */
MX6_PAD_SNVS_TAMPER6__GPIO5_IO06 | MUX_PAD_CTRL(NO_PAD_CTRL),
};
static iomux_v3_cfg_t const fec2_pads[] = {
@ -707,10 +708,11 @@ static void setup_iomux_fec(int fec_id)
ARRAY_SIZE(fec1_pads));
/* Reset the PHY */
gpio_direction_output(IMX_GPIO_NR(5, 6) , 1);
udelay(5000);
udelay(100);
gpio_direction_output(IMX_GPIO_NR(5, 6) , 0);
udelay(5000);
udelay(100);
gpio_direction_output(IMX_GPIO_NR(5, 6) , 1);
udelay(10000);
}else
imx_iomux_v3_setup_multiple_pads(fec2_pads,
ARRAY_SIZE(fec2_pads));
@ -762,6 +764,8 @@ static int setup_fec(int fec_id)
int board_phy_config(struct phy_device *phydev)
{
phy_write(phydev, MDIO_DEVAD_NONE, 0x1f, 0x8190);
if (phydev->drv->config)
phydev->drv->config(phydev);
@ -901,7 +905,7 @@ int board_late_init(void)
#endif
#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
setenv("board_name", "I2S-MX6UL");
setenv("board_name", "I2S-6UL");
if (is_mx6ul_9x9_evk())
setenv("board_rev", "9X9");

0
board/i2som/i2c_6ul_14x14/imximage.cfg → board/i2som/i2s_6ul_14x14/imximage.cfg
View File

0
board/i2som/i2c_6ul_14x14/imximage_lpddr2.cfg → board/i2som/i2s_6ul_14x14/imximage_lpddr2.cfg
View File

2
board/i2som/i2c_6ull_14x14/Kconfig → board/i2som/i2s_6ull_14x14/Kconfig
View File

@ -1,7 +1,7 @@
if TARGET_I2SOM_IMX6ULL_14X14 || TARGET_I2SOM_IMX6ULL_9X9_EVK
config SYS_BOARD
default "i2c_6ull_14x14"
default "i2s_6ull_14x14"
config SYS_VENDOR
default "i2som"

0
board/i2som/i2c_6ull_14x14/MAINTAINERS → board/i2som/i2s_6ull_14x14/MAINTAINERS
View File

3
board/i2som/i2c_6ull_14x14/Makefile → board/i2som/i2s_6ull_14x14/Makefile
View File

@ -1,9 +1,10 @@
# (C) Copyright 2017 i2SOM Team.
# (C) Copyright 2015 Freescale Semiconductor, Inc.
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y := i2c_6ull_14x14.o
obj-y := i2s_6ull_14x14.o
extra-$(CONFIG_USE_PLUGIN) := plugin.bin
$(obj)/plugin.bin: $(obj)/plugin.o

0
board/i2som/i2c_6ull_14x14/README → board/i2som/i2s_6ull_14x14/README
View File

6
board/i2som/i2c_6ull_14x14/i2c_6ull_14x14.c → board/i2som/i2s_6ull_14x14/i2s_6ull_14x14.c
View File

@ -944,11 +944,11 @@ int board_late_init(void)
#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#ifdef CONFIG_SYS_BOOT_NAND
setenv("board_name", "i2S-6ULL-NAND");
setenv("board_name", "I2S-6ULL-NAND");
#elif defined(CONFIG_SYS_BOOT_QSPI)
setenv("board_name", "i2S-6ULL-QSPI");
setenv("board_name", "I2S-6ULL-QSPI");
#else
setenv("board_name", "i2S-6ULL-eMMC");
setenv("board_name", "I2S-6ULL-eMMC");
#endif
if (is_mx6ull_9x9_evk())

0
board/i2som/i2c_6ull_14x14/imximage.cfg → board/i2som/i2s_6ull_14x14/imximage.cfg
View File

0
board/i2som/i2c_6ull_14x14/imximage_lpddr2.cfg → board/i2som/i2s_6ull_14x14/imximage_lpddr2.cfg
View File

4
configs/i2som_imx6ul_14x14_emmc_defconfig
View File

@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_I2SOM_MX6UL_14X14=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/i2som/i2c_6ul_14x14/imximage.cfg,MX6UL_EVK_EMMC_REWORK"
CONFIG_TARGET_I2SOM_IMX6UL_14X14=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/i2som/i2s_6ul_14x14/imximage.cfg,MX6UL_EVK_EMMC_REWORK"
CONFIG_CMD_GPIO=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y

4
configs/i2som_imx6ul_14x14_nand_defconfig
View File

@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_I2SOM_MX6UL_14X14=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/i2som/i2c_6ul_14x14/imximage.cfg,SYS_BOOT_NAND"
CONFIG_TARGET_I2SOM_IMX6UL_14X14=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/i2som/i2s_6ul_14x14/imximage.cfg,SYS_BOOT_NAND"
CONFIG_CMD_GPIO=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y

2
configs/i2som_imx6ull_14x14_emmc_defconfig
View File

@ -1,4 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/i2som/i2c_6ull_14x14/imximage.cfg,MX6ULL_EVK_EMMC_REWORK"
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/i2som/i2s_6ull_14x14/imximage.cfg,MX6ULL_EVK_EMMC_REWORK"
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_I2SOM_IMX6ULL_14X14=y

2
configs/i2som_imx6ull_14x14_nand_defconfig
View File

@ -1,4 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/i2som/i2c_6ull_14x14/imximage.cfg,SYS_BOOT_NAND"
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/i2som/i2s_6ull_14x14/imximage.cfg,SYS_BOOT_NAND"
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_I2SOM_IMX6ULL_14X14=y

2
configs/i2som_imx6ull_14x14_qspi_defconfig
View File

@ -1,4 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/i2som/i2c_6ull_14x14/imximage.cfg,SYS_BOOT_QSPI"
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/i2som/i2s_6ull_14x14/imximage.cfg,SYS_BOOT_QSPI"
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_I2SOM_IMX6ULL_14X14=y

8
include/configs/i2som_6ull_14x14.h
View File

@ -94,9 +94,9 @@
#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:5m(boot),10m(kernel),1m(dtb),-(rootfs) "
#define CONFIG_FDT_FILE "findfdt="\
"if test $fdt_file = undefined; then " \
"if test $board_name = EVK && test $board_rev = 9X9; then " \
"if test $board_name = I2S-6ULL-NAND && test $board_rev = 9X9; then " \
"setenv fdt_file imx6ull-9x9-evk.dtb; fi; " \
"if test $board_name = i2S-6ULL-eMMC && test $board_rev = 14X14; then " \
"if test $board_name = I2S-6ULL-NAND && test $board_rev = 14X14; then " \
"setenv fdt_file zImage-i2c-b6ull-nand.dtb; fi; " \
"if test $fdt_file = undefined; then " \
"echo WARNING: Could not determine dtb to use; fi; " \
@ -106,9 +106,9 @@
#define CONFIG_MFG_NAND_PARTITION ""
#define CONFIG_FDT_FILE "findfdt="\
"if test $fdt_file = undefined; then " \
"if test $board_name = EVK && test $board_rev = 9X9; then " \
"if test $board_name = I2S-6ULL-eMMC && test $board_rev = 9X9; then " \
"setenv fdt_file imx6ull-9x9-evk.dtb; fi; " \
"if test $board_name = i2S-6ULL-eMMC && test $board_rev = 14X14; then " \
"if test $board_name = I2S-6ULL-eMMC && test $board_rev = 14X14; then " \
"setenv fdt_file zImage-i2c-b6ull-emmc.dtb; fi; " \
"if test $fdt_file = undefined; then " \
"echo WARNING: Could not determine dtb to use; fi; " \