* [U-Boot] [PATCH 1/9] mmc: fsl_esdhc: Move non DM_MMC code in #ifndef CONFIG_DM_MMC
2017-05-12 11:48 [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
@ 2017-05-12 11:48 ` Jagan Teki
2017-05-12 11:48 ` [U-Boot] [PATCH 2/9] engicam: Move SPL mmc configs under CONFIG_SPL_BUILD Jagan Teki
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Jagan Teki @ 2017-05-12 11:48 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
Don't build non DM_MMC code when DM_MMC defined so move
them into #ifndef CONFIG_DM_MMC
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
drivers/mmc/fsl_esdhc.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index f3c6358..87c96ad 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -723,20 +723,6 @@ static const struct mmc_ops esdhc_ops = {
.getcd = esdhc_getcd,
};
-static int fsl_esdhc_cfg_to_priv(struct fsl_esdhc_cfg *cfg,
- struct fsl_esdhc_priv *priv)
-{
- if (!cfg || !priv)
- return -EINVAL;
-
- priv->esdhc_regs = (struct fsl_esdhc *)(unsigned long)(cfg->esdhc_base);
- priv->bus_width = cfg->max_bus_width;
- priv->sdhc_clk = cfg->sdhc_clk;
- priv->wp_enable = cfg->wp_enable;
-
- return 0;
-};
-
static int fsl_esdhc_init(struct fsl_esdhc_priv *priv)
{
struct fsl_esdhc *regs;
@@ -833,6 +819,21 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv)
return 0;
}
+#ifndef CONFIG_DM_MMC
+static int fsl_esdhc_cfg_to_priv(struct fsl_esdhc_cfg *cfg,
+ struct fsl_esdhc_priv *priv)
+{
+ if (!cfg || !priv)
+ return -EINVAL;
+
+ priv->esdhc_regs = (struct fsl_esdhc *)(unsigned long)(cfg->esdhc_base);
+ priv->bus_width = cfg->max_bus_width;
+ priv->sdhc_clk = cfg->sdhc_clk;
+ priv->wp_enable = cfg->wp_enable;
+
+ return 0;
+};
+
int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg)
{
struct fsl_esdhc_priv *priv;
@@ -871,6 +872,7 @@ int fsl_esdhc_mmc_init(bd_t *bis)
cfg->sdhc_clk = gd->arch.sdhc_clk;
return fsl_esdhc_initialize(bis, cfg);
}
+#endif
#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT
void mmc_adapter_card_type_ident(void)
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 2/9] engicam: Move SPL mmc configs under CONFIG_SPL_BUILD
2017-05-12 11:48 [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
2017-05-12 11:48 ` [U-Boot] [PATCH 1/9] mmc: fsl_esdhc: Move non DM_MMC code in #ifndef CONFIG_DM_MMC Jagan Teki
@ 2017-05-12 11:48 ` Jagan Teki
2017-05-12 11:48 ` [U-Boot] [PATCH 3/9] icorem6: Recover missing nand defconfig Jagan Teki
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Jagan Teki @ 2017-05-12 11:48 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
- CONFIG_SYS_FSL_USDHC_NUM
- CONFIG_SYS_FSL_ESDHC_ADDR
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
include/configs/imx6qdl_icore.h | 4 ++--
include/configs/imx6qdl_icore_rqs.h | 5 +++--
include/configs/imx6ul_geam.h | 4 ++--
include/configs/imx6ul_isiot.h | 4 ++--
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index f783eac..e4efad2 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -139,8 +139,6 @@
/* MMC */
#ifdef CONFIG_FSL_USDHC
# define CONFIG_SYS_MMC_ENV_DEV 0
-# define CONFIG_SYS_FSL_USDHC_NUM 1
-# define CONFIG_SYS_FSL_ESDHC_ADDR 0
#endif
/* NAND */
@@ -205,6 +203,8 @@
# include "imx6_spl.h"
# ifdef CONFIG_SPL_BUILD
+# define CONFIG_SYS_FSL_USDHC_NUM 1
+# define CONFIG_SYS_FSL_ESDHC_ADDR 0
# undef CONFIG_DM_GPIO
# undef CONFIG_DM_MMC
# endif
diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index a639468..4bc42eb 100644
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -121,8 +121,6 @@
/* MMC */
#ifdef CONFIG_FSL_USDHC
# define CONFIG_SYS_MMC_ENV_DEV 0
-# define CONFIG_SYS_FSL_USDHC_NUM 2
-# define CONFIG_SYS_FSL_ESDHC_ADDR 0
#endif
/* Ethernet */
@@ -139,8 +137,11 @@
/* SPL */
#ifdef CONFIG_SPL
# define CONFIG_SPL_MMC_SUPPORT
+
# include "imx6_spl.h"
# ifdef CONFIG_SPL_BUILD
+# define CONFIG_SYS_FSL_USDHC_NUM 2
+# define CONFIG_SYS_FSL_ESDHC_ADDR 0
# undef CONFIG_DM_GPIO
# undef CONFIG_DM_MMC
# endif
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 9f66dd3..19b366e 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -138,8 +138,6 @@
/* MMC */
#ifdef CONFIG_FSL_USDHC
# define CONFIG_SYS_MMC_ENV_DEV 0
-# define CONFIG_SYS_FSL_USDHC_NUM 1
-# define CONFIG_SYS_FSL_ESDHC_ADDR 0
#endif
/* NAND */
@@ -189,6 +187,8 @@
# include "imx6_spl.h"
# ifdef CONFIG_SPL_BUILD
+# define CONFIG_SYS_FSL_USDHC_NUM 1
+# define CONFIG_SYS_FSL_ESDHC_ADDR 0
# undef CONFIG_DM_GPIO
# undef CONFIG_DM_MMC
# endif
diff --git a/include/configs/imx6ul_isiot.h b/include/configs/imx6ul_isiot.h
index 5ce70ae..ac89cee 100644
--- a/include/configs/imx6ul_isiot.h
+++ b/include/configs/imx6ul_isiot.h
@@ -138,8 +138,6 @@
/* MMC */
#ifdef CONFIG_FSL_USDHC
# define CONFIG_SYS_MMC_ENV_DEV 0
-# define CONFIG_SYS_FSL_USDHC_NUM 2
-# define CONFIG_SYS_FSL_ESDHC_ADDR 0
#endif
/* NAND */
@@ -190,6 +188,8 @@
# include "imx6_spl.h"
# ifdef CONFIG_SPL_BUILD
+# define CONFIG_SYS_FSL_USDHC_NUM 2
+# define CONFIG_SYS_FSL_ESDHC_ADDR 0
# undef CONFIG_DM_GPIO
# undef CONFIG_DM_MMC
# endif
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 3/9] icorem6: Recover missing nand defconfig
2017-05-12 11:48 [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
2017-05-12 11:48 ` [U-Boot] [PATCH 1/9] mmc: fsl_esdhc: Move non DM_MMC code in #ifndef CONFIG_DM_MMC Jagan Teki
2017-05-12 11:48 ` [U-Boot] [PATCH 2/9] engicam: Move SPL mmc configs under CONFIG_SPL_BUILD Jagan Teki
@ 2017-05-12 11:48 ` Jagan Teki
2017-05-12 11:48 ` [U-Boot] [PATCH 4/9] drivers: net: Kconfig: Add PHY_MICREL_KSZ9021 entry Jagan Teki
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Jagan Teki @ 2017-05-12 11:48 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
nand defconfig is accidentally removed from below
commit, so recover the same.
"icorem6: Make SPL to pick suitable fdt"
(sha1: 15455a6b01d97d575afe2f494cfc9722424230c0)
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
configs/imx6qdl_icore_nand_defconfig | 45 ++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 configs/imx6qdl_icore_nand_defconfig
diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig
new file mode 100644
index 0000000..7bedc31
--- /dev/null
+++ b/configs/imx6qdl_icore_nand_defconfig
@@ -0,0 +1,45 @@
+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_OF_LIST="imx6q-icore 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
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 4/9] drivers: net: Kconfig: Add PHY_MICREL_KSZ9021 entry
2017-05-12 11:48 [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
` (2 preceding siblings ...)
2017-05-12 11:48 ` [U-Boot] [PATCH 3/9] icorem6: Recover missing nand defconfig Jagan Teki
@ 2017-05-12 11:48 ` Jagan Teki
2017-05-12 11:48 ` [U-Boot] [PATCH 5/9] engicam: Move PHY configs to defconfig Jagan Teki
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Jagan Teki @ 2017-05-12 11:48 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
Add kconfig entry for Micrel KSZ9021 PHY support.
Cc: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
drivers/net/phy/Kconfig | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index aca3990..ce1b30a 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -58,6 +58,14 @@ config PHY_MARVELL
config PHY_MICREL
bool "Micrel Ethernet PHYs support"
+config PHY_MICREL_KSZ9021
+ bool "Micrel KSZ9021 Ethernet PHYs support"
+ depends on PHY_MICREL
+ help
+ KSZ9021 is a completely integrated triple speed (10Base-T/100Base-TX/1000Base-T)
+ Ethernet Physical Layer Transceiver for transmission and reception of data over
+ standard CAT-5 unshielded twisted pair (UTP) cable.
+
config PHY_MSCC
bool "Microsemi Corp Ethernet PHYs support"
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 5/9] engicam: Move PHY configs to defconfig
2017-05-12 11:48 [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
` (3 preceding siblings ...)
2017-05-12 11:48 ` [U-Boot] [PATCH 4/9] drivers: net: Kconfig: Add PHY_MICREL_KSZ9021 entry Jagan Teki
@ 2017-05-12 11:48 ` Jagan Teki
2017-05-12 11:48 ` [U-Boot] [PATCH 6/9] icorem6: Remove unused FEC configs Jagan Teki
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Jagan Teki @ 2017-05-12 11:48 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
- CONFIG_PHYLIB
- CONFIG_PHY_SMSC
- CONFIG_PHY_MICREL
- CONFIG_PHY_MICREL_KSZ9021
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
configs/imx6qdl_icore_mmc_defconfig | 2 ++
configs/imx6qdl_icore_nand_defconfig | 2 ++
configs/imx6qdl_icore_rqs_mmc_defconfig | 3 +++
configs/imx6ul_geam_mmc_defconfig | 2 ++
configs/imx6ul_geam_nand_defconfig | 2 ++
configs/imx6ul_isiot_emmc_defconfig | 2 ++
configs/imx6ul_isiot_mmc_defconfig | 2 ++
configs/imx6ul_isiot_nand_defconfig | 2 ++
include/configs/imx6qdl_icore.h | 2 --
include/configs/imx6qdl_icore_rqs.h | 3 ---
include/configs/imx6ul_geam.h | 2 --
include/configs/imx6ul_isiot.h | 2 --
12 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig
index b6b1b4b..4ab1fac 100644
--- a/configs/imx6qdl_icore_mmc_defconfig
+++ b/configs/imx6qdl_icore_mmc_defconfig
@@ -42,3 +42,5 @@ CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_SMSC=y
diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig
index 7bedc31..4bc661e 100644
--- a/configs/imx6qdl_icore_nand_defconfig
+++ b/configs/imx6qdl_icore_nand_defconfig
@@ -43,3 +43,5 @@ CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_SMSC=y
diff --git a/configs/imx6qdl_icore_rqs_mmc_defconfig b/configs/imx6qdl_icore_rqs_mmc_defconfig
index 08e6784..a03aa0a 100644
--- a/configs/imx6qdl_icore_rqs_mmc_defconfig
+++ b/configs/imx6qdl_icore_rqs_mmc_defconfig
@@ -39,3 +39,6 @@ CONFIG_FEC_MXC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_MICREL=y
+CONFIG_PHY_MICREL_KSZ9021=y
diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig
index 8751a36..561c0b0 100644
--- a/configs/imx6ul_geam_mmc_defconfig
+++ b/configs/imx6ul_geam_mmc_defconfig
@@ -39,3 +39,5 @@ CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_SMSC=y
diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig
index 704c0c0..6037db8 100644
--- a/configs/imx6ul_geam_nand_defconfig
+++ b/configs/imx6ul_geam_nand_defconfig
@@ -40,3 +40,5 @@ CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_SMSC=y
diff --git a/configs/imx6ul_isiot_emmc_defconfig b/configs/imx6ul_isiot_emmc_defconfig
index 1f501cb..4165cc5 100644
--- a/configs/imx6ul_isiot_emmc_defconfig
+++ b/configs/imx6ul_isiot_emmc_defconfig
@@ -37,3 +37,5 @@ CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_SMSC=y
diff --git a/configs/imx6ul_isiot_mmc_defconfig b/configs/imx6ul_isiot_mmc_defconfig
index 5214479..06ef950 100644
--- a/configs/imx6ul_isiot_mmc_defconfig
+++ b/configs/imx6ul_isiot_mmc_defconfig
@@ -39,3 +39,5 @@ CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_SMSC=y
diff --git a/configs/imx6ul_isiot_nand_defconfig b/configs/imx6ul_isiot_nand_defconfig
index 1b28336..01a6c6f 100644
--- a/configs/imx6ul_isiot_nand_defconfig
+++ b/configs/imx6ul_isiot_nand_defconfig
@@ -40,3 +40,5 @@ CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_SMSC=y
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index e4efad2..510b784 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -176,8 +176,6 @@
# define CONFIG_ETHPRIME "FEC"
# define CONFIG_MII
-# define CONFIG_PHYLIB
-# define CONFIG_PHY_SMSC
#endif
/* Framebuffer */
diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index 4bc42eb..846dc2b 100644
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -129,9 +129,6 @@
# define CONFIG_FEC_XCV_TYPE RGMII
# define CONFIG_MII
-# define CONFIG_PHYLIB
-# define CONFIG_PHY_MICREL
-# define CONFIG_PHY_MICREL_KSZ9021
#endif
/* SPL */
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 19b366e..cbbc617 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -173,8 +173,6 @@
# define CONFIG_FEC_XCV_TYPE RMII
# define CONFIG_MII
-# define CONFIG_PHYLIB
-# define CONFIG_PHY_SMSC
#endif
/* SPL */
diff --git a/include/configs/imx6ul_isiot.h b/include/configs/imx6ul_isiot.h
index ac89cee..ea2f333 100644
--- a/include/configs/imx6ul_isiot.h
+++ b/include/configs/imx6ul_isiot.h
@@ -174,8 +174,6 @@
# define CONFIG_FEC_XCV_TYPE RMII
# define CONFIG_MII
-# define CONFIG_PHYLIB
-# define CONFIG_PHY_SMSC
#endif
/* SPL */
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 6/9] icorem6: Remove unused FEC configs
2017-05-12 11:48 [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
` (4 preceding siblings ...)
2017-05-12 11:48 ` [U-Boot] [PATCH 5/9] engicam: Move PHY configs to defconfig Jagan Teki
@ 2017-05-12 11:48 ` Jagan Teki
2017-05-12 11:48 ` [U-Boot] [PATCH 7/9] engicam: Set console env on board_late_init Jagan Teki
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Jagan Teki @ 2017-05-12 11:48 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
- IMX_FEC_BASE: icorem6 using dts, no need for explicit base.
- CONFIG_ETHPRIME: ethprime env not using anywhere in the board.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
include/configs/imx6qdl_icore.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 510b784..d325de7 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -170,10 +170,8 @@
/* Ethernet */
#ifdef CONFIG_FEC_MXC
-# define IMX_FEC_BASE ENET_BASE_ADDR
# define CONFIG_FEC_MXC_PHYADDR 0
# define CONFIG_FEC_XCV_TYPE RMII
-# define CONFIG_ETHPRIME "FEC"
# define CONFIG_MII
#endif
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 7/9] engicam: Set console env on board_late_init
2017-05-12 11:48 [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
` (5 preceding siblings ...)
2017-05-12 11:48 ` [U-Boot] [PATCH 6/9] icorem6: Remove unused FEC configs Jagan Teki
@ 2017-05-12 11:48 ` Jagan Teki
2017-05-12 11:48 ` [U-Boot] [PATCH 8/9] engicam: Add fdt_addr env value based on cpu_type Jagan Teki
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Jagan Teki @ 2017-05-12 11:48 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
Set console env on board_late_init instead of configs.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
board/engicam/common/board.c | 5 +++++
include/configs/imx6qdl_icore.h | 1 -
include/configs/imx6qdl_icore_rqs.h | 1 -
include/configs/imx6ul_geam.h | 1 -
include/configs/imx6ul_isiot.h | 1 -
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index af4ef28..e3bb569 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -53,6 +53,11 @@ int board_late_init(void)
break;
}
+ if (is_mx6ul())
+ setenv("console", "ttymxc0");
+ else
+ setenv("console", "ttymxc3");
+
setenv_fdt_file();
return 0;
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index d325de7..7e4d0c1 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -40,7 +40,6 @@
"splashpos=m,m\0" \
"image=uImage\0" \
"fit_image=fit.itb\0" \
- "console=ttymxc3\0" \
"fdt_high=0xffffffff\0" \
"fdt_addr=0x18000000\0" \
"boot_fdt=try\0" \
diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index 846dc2b..525901b 100644
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -35,7 +35,6 @@
"script=boot.scr\0" \
"image=uImage\0" \
"fit_image=fit.itb\0" \
- "console=ttymxc3\0" \
"fdt_high=0xffffffff\0" \
"fdt_addr=0x18000000\0" \
"boot_fdt=try\0" \
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index cbbc617..9841686 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -39,7 +39,6 @@
"script=boot.scr\0" \
"image=uImage\0" \
"fit_image=fit.itb\0" \
- "console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \
"fdt_addr=0x87800000\0" \
"boot_fdt=try\0" \
diff --git a/include/configs/imx6ul_isiot.h b/include/configs/imx6ul_isiot.h
index ea2f333..f7fbaf2 100644
--- a/include/configs/imx6ul_isiot.h
+++ b/include/configs/imx6ul_isiot.h
@@ -40,7 +40,6 @@
"image=uImage\0" \
"fit_image=fit.itb\0" \
"splashpos=m,m\0" \
- "console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \
"fdt_addr=0x87800000\0" \
"boot_fdt=try\0" \
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 8/9] engicam: Add fdt_addr env value based on cpu_type
2017-05-12 11:48 [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
` (6 preceding siblings ...)
2017-05-12 11:48 ` [U-Boot] [PATCH 7/9] engicam: Set console env on board_late_init Jagan Teki
@ 2017-05-12 11:48 ` Jagan Teki
2017-05-12 11:48 ` [U-Boot] [PATCH 9/9] engicam: Generate single config file Jagan Teki
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Jagan Teki @ 2017-05-12 11:48 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
Define FDT_ADDR based on the respective SOM, and later patches
will make use of this fdt_addr in single config file.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
include/configs/imx6qdl_icore.h | 5 ++++-
include/configs/imx6qdl_icore_rqs.h | 5 ++++-
include/configs/imx6ul_geam.h | 5 ++++-
include/configs/imx6ul_isiot.h | 5 ++++-
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 7e4d0c1..4f7029d 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -41,7 +41,7 @@
"image=uImage\0" \
"fit_image=fit.itb\0" \
"fdt_high=0xffffffff\0" \
- "fdt_addr=0x18000000\0" \
+ "fdt_addr=" FDT_ADDR "\0" \
"boot_fdt=try\0" \
"mmcpart=1\0" \
"nandroot=ubi0:rootfs rootfstype=ubifs\0" \
@@ -109,6 +109,9 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000
+#define DRAM_OFFSET(x) 0x1##x
+#define FDT_ADDR __stringify(DRAM_OFFSET(8000000))
+
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index 525901b..d1e482d 100644
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -36,7 +36,7 @@
"image=uImage\0" \
"fit_image=fit.itb\0" \
"fdt_high=0xffffffff\0" \
- "fdt_addr=0x18000000\0" \
+ "fdt_addr=" FDT_ADDR "\0" \
"boot_fdt=try\0" \
"mmcpart=1\0" \
"mmcautodetect=yes\0" \
@@ -91,6 +91,9 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000
+#define DRAM_OFFSET(x) 0x1##x
+#define FDT_ADDR __stringify(DRAM_OFFSET(8000000))
+
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 9841686..0502e1b 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -40,7 +40,7 @@
"image=uImage\0" \
"fit_image=fit.itb\0" \
"fdt_high=0xffffffff\0" \
- "fdt_addr=0x87800000\0" \
+ "fdt_addr=" FDT_ADDR "\0" \
"boot_fdt=try\0" \
"mmcpart=1\0" \
"nandroot=ubi0:rootfs rootfstype=ubifs\0" \
@@ -108,6 +108,9 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000
+#define DRAM_OFFSET(x) 0x87##x
+#define FDT_ADDR __stringify(DRAM_OFFSET(800000))
+
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/imx6ul_isiot.h b/include/configs/imx6ul_isiot.h
index f7fbaf2..23aabed 100644
--- a/include/configs/imx6ul_isiot.h
+++ b/include/configs/imx6ul_isiot.h
@@ -41,7 +41,7 @@
"fit_image=fit.itb\0" \
"splashpos=m,m\0" \
"fdt_high=0xffffffff\0" \
- "fdt_addr=0x87800000\0" \
+ "fdt_addr=" FDT_ADDR "\0" \
"boot_fdt=try\0" \
"mmcpart=1\0" \
"nandroot=ubi0:rootfs rootfstype=ubifs\0" \
@@ -108,6 +108,9 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000
+#define DRAM_OFFSET(x) 0x87##x
+#define FDT_ADDR __stringify(DRAM_OFFSET(800000))
+
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 9/9] engicam: Generate single config file
2017-05-12 11:48 [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
` (7 preceding siblings ...)
2017-05-12 11:48 ` [U-Boot] [PATCH 8/9] engicam: Add fdt_addr env value based on cpu_type Jagan Teki
@ 2017-05-12 11:48 ` Jagan Teki
2017-05-22 10:35 ` [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
2017-05-31 8:48 ` Stefano Babic
10 siblings, 0 replies; 12+ messages in thread
From: Jagan Teki @ 2017-05-12 11:48 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
Engicam has several SOM's on i.MX6 stream, where each SOM
has one include/configs/*.h file, this patch generate single
config file for all SOM's include/configs/imx6-engicam.h
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
board/engicam/geam6ul/Kconfig | 2 +-
board/engicam/icorem6/Kconfig | 2 +-
board/engicam/icorem6_rqs/Kconfig | 2 +-
board/engicam/isiotmx6ul/Kconfig | 2 +-
.../configs/{imx6qdl_icore.h => imx6-engicam.h} | 39 ++--
include/configs/imx6qdl_icore_rqs.h | 149 ----------------
include/configs/imx6ul_geam.h | 197 --------------------
include/configs/imx6ul_isiot.h | 198 ---------------------
8 files changed, 33 insertions(+), 558 deletions(-)
rename include/configs/{imx6qdl_icore.h => imx6-engicam.h} (85%)
delete mode 100644 include/configs/imx6qdl_icore_rqs.h
delete mode 100644 include/configs/imx6ul_geam.h
delete mode 100644 include/configs/imx6ul_isiot.h
diff --git a/board/engicam/geam6ul/Kconfig b/board/engicam/geam6ul/Kconfig
index 8753d15..7f4023e 100644
--- a/board/engicam/geam6ul/Kconfig
+++ b/board/engicam/geam6ul/Kconfig
@@ -7,6 +7,6 @@ config SYS_VENDOR
default "engicam"
config SYS_CONFIG_NAME
- default "imx6ul_geam"
+ default "imx6-engicam"
endif
diff --git a/board/engicam/icorem6/Kconfig b/board/engicam/icorem6/Kconfig
index 6d62f0e..4a1c9ac 100644
--- a/board/engicam/icorem6/Kconfig
+++ b/board/engicam/icorem6/Kconfig
@@ -7,6 +7,6 @@ config SYS_VENDOR
default "engicam"
config SYS_CONFIG_NAME
- default "imx6qdl_icore"
+ default "imx6-engicam"
endif
diff --git a/board/engicam/icorem6_rqs/Kconfig b/board/engicam/icorem6_rqs/Kconfig
index 1352c68..6dc3a07 100644
--- a/board/engicam/icorem6_rqs/Kconfig
+++ b/board/engicam/icorem6_rqs/Kconfig
@@ -7,6 +7,6 @@ config SYS_VENDOR
default "engicam"
config SYS_CONFIG_NAME
- default "imx6qdl_icore_rqs"
+ default "imx6-engicam"
endif
diff --git a/board/engicam/isiotmx6ul/Kconfig b/board/engicam/isiotmx6ul/Kconfig
index 213ffad..10c2c50 100644
--- a/board/engicam/isiotmx6ul/Kconfig
+++ b/board/engicam/isiotmx6ul/Kconfig
@@ -7,6 +7,6 @@ config SYS_VENDOR
default "engicam"
config SYS_CONFIG_NAME
- default "imx6ul_isiot"
+ default "imx6-engicam"
endif
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6-engicam.h
similarity index 85%
rename from include/configs/imx6qdl_icore.h
rename to include/configs/imx6-engicam.h
index 4f7029d..e85dbc7 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6-engicam.h
@@ -2,13 +2,13 @@
* Copyright (C) 2016 Amarula Solutions B.V.
* Copyright (C) 2016 Engicam S.r.l.
*
- * Configuration settings for the Engicam i.CoreM6 QDL Starter Kits.
+ * Configuration settings for the Engicam i.MX6 SOM Starter Kits.
*
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef __IMX6QLD_ICORE_CONFIG_H
-#define __IMX6QLD_ICORE_CONFIG_H
+#ifndef __IMX6_ENGICAM_CONFIG_H
+#define __IMX6_ENGICAM_CONFIG_H
#include <linux/sizes.h>
#include "mx6_common.h"
@@ -109,8 +109,13 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000
-#define DRAM_OFFSET(x) 0x1##x
-#define FDT_ADDR __stringify(DRAM_OFFSET(8000000))
+#ifdef CONFIG_MX6UL
+# define DRAM_OFFSET(x) 0x87##x
+# define FDT_ADDR __stringify(DRAM_OFFSET(800000))
+#else
+# define DRAM_OFFSET(x) 0x1##x
+# define FDT_ADDR __stringify(DRAM_OFFSET(8000000))
+#endif
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
@@ -135,7 +140,11 @@
/* UART */
#ifdef CONFIG_MXC_UART
-# define CONFIG_MXC_UART_BASE UART4_BASE
+# ifdef CONFIG_MX6UL
+# define CONFIG_MXC_UART_BASE UART1_BASE
+# else
+# define CONFIG_MXC_UART_BASE UART4_BASE
+# endif
#endif
/* MMC */
@@ -172,8 +181,13 @@
/* Ethernet */
#ifdef CONFIG_FEC_MXC
-# define CONFIG_FEC_MXC_PHYADDR 0
-# define CONFIG_FEC_XCV_TYPE RMII
+# ifdef CONFIG_TARGET_MX6Q_ICORE_RQS
+# define CONFIG_FEC_MXC_PHYADDR 3
+# define CONFIG_FEC_XCV_TYPE RGMII
+# else
+# define CONFIG_FEC_MXC_PHYADDR 0
+# define CONFIG_FEC_XCV_TYPE RMII
+# endif
# define CONFIG_MII
#endif
@@ -201,11 +215,16 @@
# include "imx6_spl.h"
# ifdef CONFIG_SPL_BUILD
-# define CONFIG_SYS_FSL_USDHC_NUM 1
+# if defined(CONFIG_TARGET_MX6Q_ICORE_RQS) || defined(CONFIG_TARGET_MX6UL_ISIOT)
+# define CONFIG_SYS_FSL_USDHC_NUM 2
+# else
+# define CONFIG_SYS_FSL_USDHC_NUM 1
+# endif
+
# define CONFIG_SYS_FSL_ESDHC_ADDR 0
# undef CONFIG_DM_GPIO
# undef CONFIG_DM_MMC
# endif
#endif
-#endif /* __IMX6QLD_ICORE_CONFIG_H */
+#endif /* __IMX6_ENGICAM_CONFIG_H */
diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
deleted file mode 100644
index d1e482d..0000000
--- a/include/configs/imx6qdl_icore_rqs.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (C) 2016 Amarula Solutions B.V.
- * Copyright (C) 2016 Engicam S.r.l.
- *
- * Configuration settings for the Engicam i.CoreM6 QDL RQS Starter Kits.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#ifndef __IMX6QLD_ICORE_RQS_CONFIG_H
-#define __IMX6QLD_ICORE_RQS_CONFIG_H
-
-#include <linux/sizes.h>
-#include "mx6_common.h"
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)
-
-/* Total Size of Environment Sector */
-#define CONFIG_ENV_SIZE SZ_128K
-
-/* Allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
-/* Environment */
-#ifndef CONFIG_ENV_IS_NOWHERE
-/* Environment in MMC */
-# if defined(CONFIG_ENV_IS_IN_MMC)
-# define CONFIG_ENV_OFFSET 0x100000
-# endif
-#endif
-
-/* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "script=boot.scr\0" \
- "image=uImage\0" \
- "fit_image=fit.itb\0" \
- "fdt_high=0xffffffff\0" \
- "fdt_addr=" FDT_ADDR "\0" \
- "boot_fdt=try\0" \
- "mmcpart=1\0" \
- "mmcautodetect=yes\0" \
- "mmcargs=setenv bootargs console=${console},${baudrate} " \
- "root=${mmcroot}\0" \
- "loadbootscript=" \
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
- "bootscript=echo Running bootscript from mmc ...; " \
- "source\0" \
- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
- "loadfit=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${fit_image}\0" \
- "fitboot=echo Booting FIT image from mmc ...; " \
- "run mmcargs; " \
- "bootm ${loadaddr}\0" \
- "_mmcboot=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" \
- "mmcboot=echo Booting from mmc ...; " \
- "mmc dev ${mmcdev};" \
- "if mmc rescan; then " \
- "if run loadbootscript; then " \
- "run bootscript; " \
- "else " \
- "if run loadfit; then " \
- "run fitboot; " \
- "else " \
- "if run loadimage; then " \
- "run _mmcboot; " \
- "fi; " \
- "fi; " \
- "fi; " \
- "fi\0"
-
-#define CONFIG_BOOTCOMMAND "run $modeboot"
-
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_MEMTEST_START 0x80000000
-#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x8000000)
-
-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_SYS_HZ 1000
-
-#define DRAM_OFFSET(x) 0x1##x
-#define FDT_ADDR __stringify(DRAM_OFFSET(8000000))
-
-/* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS 1
-#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
-
-#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)
-
-/* FIT */
-#ifdef CONFIG_FIT
-# define CONFIG_HASH_VERIFY
-# define CONFIG_SHA1
-# define CONFIG_SHA256
-# define CONFIG_IMAGE_FORMAT_LEGACY
-#endif
-
-/* UART */
-#ifdef CONFIG_MXC_UART
-# define CONFIG_MXC_UART_BASE UART4_BASE
-#endif
-
-/* MMC */
-#ifdef CONFIG_FSL_USDHC
-# define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
-
-/* Ethernet */
-#ifdef CONFIG_FEC_MXC
-# define CONFIG_FEC_MXC_PHYADDR 3
-# define CONFIG_FEC_XCV_TYPE RGMII
-
-# define CONFIG_MII
-#endif
-
-/* SPL */
-#ifdef CONFIG_SPL
-# define CONFIG_SPL_MMC_SUPPORT
-
-# include "imx6_spl.h"
-# ifdef CONFIG_SPL_BUILD
-# define CONFIG_SYS_FSL_USDHC_NUM 2
-# define CONFIG_SYS_FSL_ESDHC_ADDR 0
-# undef CONFIG_DM_GPIO
-# undef CONFIG_DM_MMC
-# endif
-#endif
-
-#endif /* __IMX6QLD_ICORE_RQS_CONFIG_H */
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
deleted file mode 100644
index 0502e1b..0000000
--- a/include/configs/imx6ul_geam.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2016 Amarula Solutions B.V.
- * Copyright (C) 2016 Engicam S.r.l.
- *
- * Configuration settings for the Engicam GEAM6UL Starter Kits.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#ifndef __IMX6UL_GEAM_CONFIG_H
-#define __IMX6UL_GEAM_CONFIG_H
-
-#include <linux/sizes.h>
-#include "mx6_common.h"
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)
-
-/* Total Size of Environment Sector */
-#define CONFIG_ENV_SIZE SZ_128K
-
-/* Allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
-/* Environment */
-#ifndef CONFIG_ENV_IS_NOWHERE
-/* Environment in MMC */
-# if defined(CONFIG_ENV_IS_IN_MMC)
-# define CONFIG_ENV_OFFSET 0x100000
-/* Environment in NAND */
-# elif defined(CONFIG_ENV_IS_IN_NAND)
-# define CONFIG_ENV_OFFSET 0x400000
-# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
-# endif
-#endif
-
-/* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "script=boot.scr\0" \
- "image=uImage\0" \
- "fit_image=fit.itb\0" \
- "fdt_high=0xffffffff\0" \
- "fdt_addr=" FDT_ADDR "\0" \
- "boot_fdt=try\0" \
- "mmcpart=1\0" \
- "nandroot=ubi0:rootfs rootfstype=ubifs\0" \
- "mmcautodetect=yes\0" \
- "mmcargs=setenv bootargs console=${console},${baudrate} " \
- "root=${mmcroot}\0" \
- "ubiargs=setenv bootargs console=${console},${baudrate} " \
- "ubi.mtd=5 root=${nandroot} ${mtdparts}\0" \
- "loadbootscript=" \
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
- "bootscript=echo Running bootscript from mmc ...; " \
- "source\0" \
- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
- "loadfit=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${fit_image}\0" \
- "fitboot=echo Booting FIT image from mmc ...; " \
- "run mmcargs; " \
- "bootm ${loadaddr}\0" \
- "_mmcboot=run mmcargs; " \
- "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" \
- "mmcboot=echo Booting from mmc ...; " \
- "if mmc rescan; then " \
- "if run loadbootscript; then " \
- "run bootscript; " \
- "else " \
- "if run loadfit; then " \
- "run fitboot; " \
- "else " \
- "if run loadimage; then " \
- "run _mmcboot; " \
- "fi; " \
- "fi; " \
- "fi; " \
- "fi\0" \
- "nandboot=echo Booting from nand ...; " \
- "if mtdparts; then " \
- "echo Starting nand boot ...; " \
- "else " \
- "mtdparts default; " \
- "fi; " \
- "run ubiargs; " \
- "nand read ${loadaddr} kernel 0x800000; " \
- "nand read ${fdt_addr} dtb 0x100000; " \
- "bootm ${loadaddr} - ${fdt_addr}\0"
-
-#define CONFIG_BOOTCOMMAND "run $modeboot"
-
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_MEMTEST_START 0x80000000
-#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x8000000)
-
-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_SYS_HZ 1000
-
-#define DRAM_OFFSET(x) 0x87##x
-#define FDT_ADDR __stringify(DRAM_OFFSET(800000))
-
-/* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS 1
-#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
-
-#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)
-
-/* FIT */
-#ifdef CONFIG_FIT
-# define CONFIG_HASH_VERIFY
-# define CONFIG_SHA1
-# define CONFIG_SHA256
-# define CONFIG_IMAGE_FORMAT_LEGACY
-#endif
-
-/* UART */
-#ifdef CONFIG_MXC_UART
-# define CONFIG_MXC_UART_BASE UART1_BASE
-#endif
-
-/* MMC */
-#ifdef CONFIG_FSL_USDHC
-# define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
-
-/* NAND */
-#ifdef CONFIG_NAND_MXS
-# define CONFIG_SYS_MAX_NAND_DEVICE 1
-# define CONFIG_SYS_NAND_BASE 0x40000000
-# define CONFIG_SYS_NAND_5_ADDR_CYCLE
-# define CONFIG_SYS_NAND_ONFI_DETECTION
-# define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
-# define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000
-
-/* MTD device */
-# define CONFIG_MTD_DEVICE
-# define CONFIG_CMD_MTDPARTS
-# define CONFIG_MTD_PARTITIONS
-# define MTDIDS_DEFAULT "nand0=gpmi-nand"
-# define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:2m(spl),2m(uboot)," \
- "1m(env),8m(kernel),1m(dtb),-(rootfs)"
-
-/* UBI */
-# define CONFIG_CMD_UBIFS
-# define CONFIG_RBTREE
-# define CONFIG_LZO
-
-# define CONFIG_APBH_DMA
-# define CONFIG_APBH_DMA_BURST
-# define CONFIG_APBH_DMA_BURST8
-#endif
-
-/* Ethernet */
-#ifdef CONFIG_FEC_MXC
-# define CONFIG_FEC_MXC_PHYADDR 0
-# define CONFIG_FEC_XCV_TYPE RMII
-
-# define CONFIG_MII
-#endif
-
-/* SPL */
-#ifdef CONFIG_SPL
-# ifdef CONFIG_NAND_MXS
-# define CONFIG_SPL_NAND_SUPPORT
-# else
-# define CONFIG_SPL_MMC_SUPPORT
-# endif
-
-# include "imx6_spl.h"
-# ifdef CONFIG_SPL_BUILD
-# define CONFIG_SYS_FSL_USDHC_NUM 1
-# define CONFIG_SYS_FSL_ESDHC_ADDR 0
-# undef CONFIG_DM_GPIO
-# undef CONFIG_DM_MMC
-# endif
-#endif
-
-#endif /* __IMX6UL_GEAM_CONFIG_H */
diff --git a/include/configs/imx6ul_isiot.h b/include/configs/imx6ul_isiot.h
deleted file mode 100644
index 23aabed..0000000
--- a/include/configs/imx6ul_isiot.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (C) 2016 Amarula Solutions B.V.
- * Copyright (C) 2016 Engicam S.r.l.
- *
- * Configuration settings for the Engicam Is.IoT MX6UL Starter Kits.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#ifndef __IMX6UL_ISIOT_CONFIG_H
-#define __IMX6UL_ISIOT_CONFIG_H
-
-#include <linux/sizes.h>
-#include "mx6_common.h"
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)
-
-/* Total Size of Environment Sector */
-#define CONFIG_ENV_SIZE SZ_128K
-
-/* Allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
-/* Environment */
-#ifndef CONFIG_ENV_IS_NOWHERE
-/* Environment in MMC */
-# if defined(CONFIG_ENV_IS_IN_MMC)
-# define CONFIG_ENV_OFFSET 0x100000
-/* Environment in NAND */
-# elif defined(CONFIG_ENV_IS_IN_NAND)
-# define CONFIG_ENV_OFFSET 0x400000
-# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
-# endif
-#endif
-
-/* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "script=boot.scr\0" \
- "image=uImage\0" \
- "fit_image=fit.itb\0" \
- "splashpos=m,m\0" \
- "fdt_high=0xffffffff\0" \
- "fdt_addr=" FDT_ADDR "\0" \
- "boot_fdt=try\0" \
- "mmcpart=1\0" \
- "nandroot=ubi0:rootfs rootfstype=ubifs\0" \
- "mmcautodetect=yes\0" \
- "mmcargs=setenv bootargs console=${console},${baudrate} " \
- "root=${mmcroot}\0" \
- "ubiargs=setenv bootargs console=${console},${baudrate} " \
- "ubi.mtd=5 root=${nandroot} ${mtdparts}\0" \
- "loadbootscript=" \
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
- "bootscript=echo Running bootscript from mmc ...; " \
- "source\0" \
- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
- "loadfit=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${fit_image}\0" \
- "fitboot=echo Booting FIT image from mmc ...; " \
- "run mmcargs; " \
- "bootm ${loadaddr}\0" \
- "_mmcboot=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" \
- "mmcboot=echo Booting from mmc ...; " \
- "if mmc rescan; then " \
- "if run loadbootscript; then " \
- "run bootscript; " \
- "else " \
- "if run loadfit; then " \
- "run fitboot; " \
- "else " \
- "if run loadimage; then " \
- "run _mmcboot; " \
- "fi; " \
- "fi; " \
- "fi; " \
- "fi\0" \
- "nandboot=echo Booting from nand ...; " \
- "if mtdparts; then " \
- "echo Starting nand boot ...; " \
- "else " \
- "mtdparts default; " \
- "fi; " \
- "run ubiargs; " \
- "nand read ${loadaddr} kernel 0x800000; " \
- "nand read ${fdt_addr} dtb 0x100000; " \
- "bootm ${loadaddr} - ${fdt_addr}\0"
-
-#define CONFIG_BOOTCOMMAND "run $modeboot"
-
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_MEMTEST_START 0x80000000
-#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x8000000)
-
-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_SYS_HZ 1000
-
-#define DRAM_OFFSET(x) 0x87##x
-#define FDT_ADDR __stringify(DRAM_OFFSET(800000))
-
-/* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS 1
-#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
-
-#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)
-
-/* FIT */
-#ifdef CONFIG_FIT
-# define CONFIG_HASH_VERIFY
-# define CONFIG_SHA1
-# define CONFIG_SHA256
-# define CONFIG_IMAGE_FORMAT_LEGACY
-#endif
-
-/* UART */
-#ifdef CONFIG_MXC_UART
-# define CONFIG_MXC_UART_BASE UART1_BASE
-#endif
-
-/* MMC */
-#ifdef CONFIG_FSL_USDHC
-# define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
-
-/* NAND */
-#ifdef CONFIG_NAND_MXS
-# define CONFIG_SYS_MAX_NAND_DEVICE 1
-# define CONFIG_SYS_NAND_BASE 0x40000000
-# define CONFIG_SYS_NAND_5_ADDR_CYCLE
-# define CONFIG_SYS_NAND_ONFI_DETECTION
-# define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
-# define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000
-
-/* MTD device */
-# define CONFIG_MTD_DEVICE
-# define CONFIG_CMD_MTDPARTS
-# define CONFIG_MTD_PARTITIONS
-# define MTDIDS_DEFAULT "nand0=gpmi-nand"
-# define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:2m(spl),2m(uboot)," \
- "1m(env),8m(kernel),1m(dtb),-(rootfs)"
-
-/* UBI */
-# define CONFIG_CMD_UBIFS
-# define CONFIG_RBTREE
-# define CONFIG_LZO
-
-/* APBH DMA */
-# define CONFIG_APBH_DMA
-# define CONFIG_APBH_DMA_BURST
-# define CONFIG_APBH_DMA_BURST8
-#endif
-
-/* Ethernet */
-#ifdef CONFIG_FEC_MXC
-# define CONFIG_FEC_MXC_PHYADDR 0
-# define CONFIG_FEC_XCV_TYPE RMII
-
-# define CONFIG_MII
-#endif
-
-/* SPL */
-#ifdef CONFIG_SPL
-# ifdef CONFIG_NAND_MXS
-# define CONFIG_SPL_NAND_SUPPORT
-# else
-# define CONFIG_SPL_MMC_SUPPORT
-# endif
-
-# include "imx6_spl.h"
-# ifdef CONFIG_SPL_BUILD
-# define CONFIG_SYS_FSL_USDHC_NUM 2
-# define CONFIG_SYS_FSL_ESDHC_ADDR 0
-# undef CONFIG_DM_GPIO
-# undef CONFIG_DM_MMC
-# endif
-#endif
-
-#endif /* __IMX6UL_ISIOT_CONFIG_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code
2017-05-12 11:48 [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
` (8 preceding siblings ...)
2017-05-12 11:48 ` [U-Boot] [PATCH 9/9] engicam: Generate single config file Jagan Teki
@ 2017-05-22 10:35 ` Jagan Teki
2017-05-31 8:48 ` Stefano Babic
10 siblings, 0 replies; 12+ messages in thread
From: Jagan Teki @ 2017-05-22 10:35 UTC (permalink / raw)
To: u-boot
Hi Stefano,
On Fri, May 12, 2017 at 5:18 PM, Jagan Teki <jagan@openedev.com> wrote:
> From: Jagan Teki <jagan@amarulasolutions.com>
>
> This series move configs code used by different i.MX6 SOM's into
> single config file, include/configs/imx6-engicam.h
>
> (1) Generate single config file imx6-engicam.h
> (2) Drop 4 som based config files
> (3) Add Kconfig entry for PHY_MICREL_KSZ9021
>
> thanks!
> Jagan.
>
> Jagan Teki (9):
> mmc: fsl_esdhc: Move non DM_MMC code
> engicam: Move SPL mmc configs under CONFIG_SPL_BUILD
> icorem6: Recover missing nand defconfig
> drivers: net: Kconfig: Add PHY_MICREL_KSZ9021 entry
> engicam: Move PHY configs to defconfig
> icorem6: Remove unused FEC configs
> engicam: Set console env on board_late_init
> engicam: Add fdt_addr env value based on cpu_type
> engicam: Generate single config file
Please push, if it's OK?
thanks!
--
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
^ permalink raw reply [flat|nested] 12+ messages in thread* [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code
2017-05-12 11:48 [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
` (9 preceding siblings ...)
2017-05-22 10:35 ` [U-Boot] [PATCH 0/9] i.MX6: Engicam: Move common config code Jagan Teki
@ 2017-05-31 8:48 ` Stefano Babic
10 siblings, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2017-05-31 8:48 UTC (permalink / raw)
To: u-boot
Hi Jagan,
On 12/05/2017 13:48, Jagan Teki wrote:
> From: Jagan Teki <jagan@amarulasolutions.com>
>
> This series move configs code used by different i.MX6 SOM's into
> single config file, include/configs/imx6-engicam.h
>
> (1) Generate single config file imx6-engicam.h
> (2) Drop 4 som based config files
> (3) Add Kconfig entry for PHY_MICREL_KSZ9021
>
> thanks!
> Jagan.
>
> Jagan Teki (9):
> mmc: fsl_esdhc: Move non DM_MMC code
> engicam: Move SPL mmc configs under CONFIG_SPL_BUILD
> icorem6: Recover missing nand defconfig
> drivers: net: Kconfig: Add PHY_MICREL_KSZ9021 entry
> engicam: Move PHY configs to defconfig
> icorem6: Remove unused FEC configs
> engicam: Set console env on board_late_init
> engicam: Add fdt_addr env value based on cpu_type
> engicam: Generate single config file
>
> board/engicam/common/board.c | 5 +
> board/engicam/geam6ul/Kconfig | 2 +-
> board/engicam/icorem6/Kconfig | 2 +-
> board/engicam/icorem6_rqs/Kconfig | 2 +-
> board/engicam/isiotmx6ul/Kconfig | 2 +-
> configs/imx6qdl_icore_mmc_defconfig | 2 +
> configs/imx6qdl_icore_nand_defconfig | 47 +++++
> configs/imx6qdl_icore_rqs_mmc_defconfig | 3 +
> configs/imx6ul_geam_mmc_defconfig | 2 +
> configs/imx6ul_geam_nand_defconfig | 2 +
> configs/imx6ul_isiot_emmc_defconfig | 2 +
> configs/imx6ul_isiot_mmc_defconfig | 2 +
> configs/imx6ul_isiot_nand_defconfig | 2 +
> drivers/mmc/fsl_esdhc.c | 30 ++--
> drivers/net/phy/Kconfig | 8 +
> .../configs/{imx6qdl_icore.h => imx6-engicam.h} | 47 +++--
> include/configs/imx6qdl_icore_rqs.h | 149 ----------------
> include/configs/imx6ul_geam.h | 197 --------------------
> include/configs/imx6ul_isiot.h | 198 ---------------------
> 19 files changed, 127 insertions(+), 577 deletions(-)
> create mode 100644 configs/imx6qdl_icore_nand_defconfig
> rename include/configs/{imx6qdl_icore.h => imx6-engicam.h} (84%)
> delete mode 100644 include/configs/imx6qdl_icore_rqs.h
> delete mode 100644 include/configs/imx6ul_geam.h
> delete mode 100644 include/configs/imx6ul_isiot.h
>
Applied to u-boot-imx -master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 12+ messages in thread