MXSCM-245 mx6scm: additional scm board support for 6dq and 6sx

Add aditional support for MX6DQSCM and MX6SXSCM boards like:

 - MX6DQSCM 2GB EVB
 - MX6DQSCM 512MB EVB
 - MX6DQSCM 512MB QWKS
 - MX6SXSCM EPOP EVB
 - MX6SXSCM 512MB EVB

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>

13 files changed, 65 insertions, 1 deletions

diff --git a/configs/mx6dqscm_1gb_fix_evb_spinor_defconfig b/configs/mx6dqscm_1gb_fix_evb_spinor_defconfig
new file mode 100644
index 0000000..d920184
--- /dev/null
+++ b/configs/mx6dqscm_1gb_fix_evb_spinor_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6DQSCM=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6dqscm/imximage_scm_lpddr2.cfg,MX6Q,DDR_MB=1024,SYS_BOOT_SPINOR,DEFAULT_FDT_FILE=\"imx6dqscm-1gb-evb-fix-ldo.dtb\",SCMEVB"
+CONFIG_CMD_GPIO=y
diff --git a/configs/mx6dqscm_2gb_fix_evb_defconfig b/configs/mx6dqscm_2gb_fix_evb_defconfig
new file mode 100644
index 0000000..9ce062e
--- /dev/null
+++ b/configs/mx6dqscm_2gb_fix_evb_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6DQSCM=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6dqscm/imximage_scm_lpddr2.cfg,MX6Q,DDR_MB=2048,SYS_USE_SPINOR,DEFAULT_FDT_FILE=\"imx6dqscm-2gb-evb-fix-ldo.dtb\",SCMEVB,SCM_LPDDR2_2GB"
+CONFIG_CMD_GPIO=y
diff --git a/configs/mx6dqscm_2gb_fix_evb_spinor_defconfig b/configs/mx6dqscm_2gb_fix_evb_spinor_defconfig
new file mode 100644
index 0000000..c4b0dfe
--- /dev/null
+++ b/configs/mx6dqscm_2gb_fix_evb_spinor_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6DQSCM=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6dqscm/imximage_scm_lpddr2.cfg,MX6Q,DDR_MB=2048,SYS_BOOT_SPINOR,DEFAULT_FDT_FILE=\"imx6dqscm-2gb-evb-fix-ldo.dtb\",SCMEVB,SCM_LPDDR2_2GB"
+CONFIG_CMD_GPIO=y
diff --git a/configs/mx6dqscm_512mb_evb_defconfig b/configs/mx6dqscm_512mb_evb_defconfig
new file mode 100644
index 0000000..f7a8b2f
--- /dev/null
+++ b/configs/mx6dqscm_512mb_evb_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6DQSCM=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6dqscm/imximage_scm_lpddr2.cfg,MX6Q,DDR_MB=512,SYS_USE_SPINOR,DEFAULT_FDT_FILE=\"imx6dqscm-512mb-evb-ldo.dtb\",SCMEVB,SCM_LPDDR2_512MB"
+CONFIG_CMD_GPIO=y
diff --git a/configs/mx6dqscm_512mb_evb_spinor_defconfig b/configs/mx6dqscm_512mb_evb_spinor_defconfig
new file mode 100644
index 0000000..b3c91d0
--- /dev/null
+++ b/configs/mx6dqscm_512mb_evb_spinor_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6DQSCM=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6dqscm/imximage_scm_lpddr2.cfg,MX6Q,DDR_MB=512,SYS_BOOT_SPINOR,DEFAULT_FDT_FILE=\"imx6dqscm-512mb-evb-ldo.dtb\",SCMEVB,SCM_LPDDR2_512MB"
+CONFIG_CMD_GPIO=y
diff --git a/configs/mx6dqscm_512mb_qwks_rev2_defconfig b/configs/mx6dqscm_512mb_qwks_rev2_defconfig
new file mode 100644
index 0000000..8e33a3b
--- /dev/null
+++ b/configs/mx6dqscm_512mb_qwks_rev2_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6DQSCM=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6dqscm/imximage_scm_lpddr2.cfg,MX6Q,DDR_MB=512,SYS_USE_SPINOR,DEFAULT_FDT_FILE=\"imx6dqscm-512mb-qwks-rev2-ldo.dtb\",SCM_LPDDR2_512MB"
+CONFIG_CMD_GPIO=y
diff --git a/configs/mx6dqscm_512mb_qwks_rev2_spinor_defconfig b/configs/mx6dqscm_512mb_qwks_rev2_spinor_defconfig
new file mode 100644
index 0000000..83d3165
--- /dev/null
+++ b/configs/mx6dqscm_512mb_qwks_rev2_spinor_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6DQSCM=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6dqscm/imximage_scm_lpddr2.cfg,MX6Q,DDR_MB=512,SYS_BOOT_SPINOR,DEFAULT_FDT_FILE=\"imx6dqscm-512mb-qwks-rev2-ldo.dtb\",SCM_LPDDR2_512MB"
+CONFIG_CMD_GPIO=y
diff --git a/configs/mx6sxscm_512mb_evb_defconfig b/configs/mx6sxscm_512mb_evb_defconfig
new file mode 100644
index 0000000..ce3076c
--- /dev/null
+++ b/configs/mx6sxscm_512mb_evb_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6SXSCM=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxscm/imximage_lpddr2.cfg,MX6SX,512MB_LPDDR2"
+CONFIG_CMD_GPIO=y
diff --git a/configs/mx6sxscm_512mb_evb_m4fastup_defconfig b/configs/mx6sxscm_512mb_evb_m4fastup_defconfig
new file mode 100644
index 0000000..1181434
--- /dev/null
+++ b/configs/mx6sxscm_512mb_evb_m4fastup_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6SXSCM=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxscm/imximage_lpddr2.cfg,MX6SX,512MB_LPDDR2,SYS_BOOT_QSPI,SYS_AUXCORE_FASTUP"
+CONFIG_CMD_GPIO=y
diff --git a/configs/mx6sxscm_512mb_evb_qspi2_defconfig b/configs/mx6sxscm_512mb_evb_qspi2_defconfig
new file mode 100644
index 0000000..c030a2b
--- /dev/null
+++ b/configs/mx6sxscm_512mb_evb_qspi2_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6SXSCM=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxscm/imximage_lpddr2.cfg,MX6SX,512MB_LPDDR2,SYS_BOOT_QSPI"
+CONFIG_CMD_GPIO=y
diff --git a/configs/mx6sxscm_epop_evb_m4fastup_defconfig b/configs/mx6sxscm_epop_evb_m4fastup_defconfig
new file mode 100644
index 0000000..b85123d
--- /dev/null
+++ b/configs/mx6sxscm_epop_evb_m4fastup_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6SXSCM=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxscm/imximage_lpddr2.cfg,MX6SX,512MB_LPDDR2,MX6SXSABRESD_EMMC_REWORK,SYS_BOOT_QSPI,SYS_AUXCORE_FASTUP"
+CONFIG_CMD_GPIO=y
diff --git a/configs/mx6sxscm_epop_evb_qspi2_defconfig b/configs/mx6sxscm_epop_evb_qspi2_defconfig
new file mode 100644
index 0000000..bb1c283
--- /dev/null
+++ b/configs/mx6sxscm_epop_evb_qspi2_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6SXSCM=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxscm/imximage_lpddr2.cfg,MX6SX,512MB_LPDDR2,MX6SXSABRESD_EMMC_REWORK,SYS_BOOT_QSPI"
+CONFIG_CMD_GPIO=y
diff --git a/include/configs/mx6sxscm.h b/include/configs/mx6sxscm.h
index a360320..2067da0 100644
--- a/include/configs/mx6sxscm.h
+++ b/include/configs/mx6sxscm.h
@@ -32,9 +32,13 @@
 #define PHYS_SDRAM_SIZE		SZ_512M
 #endif
 
-#if defined CONFIG_512MB_LPDDR2 && defined CONFIG_MX6SXSCM_EMMC
+#if defined CONFIG_512MB_LPDDR2
+#if defined CONFIG_MX6SXSCM_EMMC
 #define CONFIG_FDT_FILE		"imx6sxscm-epop-evb-ldo.dtb"
 #else
+#define CONFIG_FDT_FILE		"imx6sxscm-512mb-evb-ldo.dtb"
+#endif
+#else
 #define CONFIG_FDT_FILE		"imx6sxscm-1gb-evb-ldo.dtb"
 #endif