ENGR00275348-10 imx6/sabre{sd,auto}: clean up the image config file

This patch does the following housekeep:
- improve the comments for the BOOT_FROM item
- fix the mising EIMNOR boot condition,
- fix the nand clock gating in the image config file

Signed-off-by: Jason Liu <r64343@freescale.com>

6 files changed, 41 insertions, 14 deletions

diff --git a/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg b/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
index fe92070..6dac048 100644
--- a/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
+++ b/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
@@ -34,10 +34,14 @@
 IMAGE_VERSION 2
 
 /*
- * Boot Device : one of
- * spi, sd (the board has no nand neither onenand)
+ * Boot Device : one of spi, sd, sata
+ * the board has no nand and eimnor
+ * spinor: flash_offset: 0x0400
+ * sata:   flash_offset: 0x0400
+ * sd/mmc: flash_offset: 0x0400
  */
 
+/* the same flash_offset as sd */
 BOOT_FROM      sd
 
 #ifdef CONFIG_USE_PLUGIN
diff --git a/board/freescale/mx6qsabreauto/mx6dl.cfg b/board/freescale/mx6qsabreauto/mx6dl.cfg
index 97027f4..ce6172c 100644
--- a/board/freescale/mx6qsabreauto/mx6dl.cfg
+++ b/board/freescale/mx6qsabreauto/mx6dl.cfg
@@ -33,15 +33,17 @@
 IMAGE_VERSION 2
 
 /*
- * Boot Device : one of spi, sd, eimnor:
+ * Boot Device : one of spi, sd, eimnor, nand, sata:
  * spinor: flash_offset: 0x0400
+ * nand:   flash_offset: 0x0400
+ * sata:   flash_offset: 0x0400
  * sd/mmc: flash_offset: 0x0400
  * eimnor: flash_offset: 0x1000
  */
 
 #if defined(CONFIG_SYS_BOOT_EIMNOR)
 BOOT_FROM	nor
-#else
+#else /* others has the same flash_offset as sd */
 BOOT_FROM	sd
 #endif
 
diff --git a/board/freescale/mx6qsabreauto/mx6q.cfg b/board/freescale/mx6qsabreauto/mx6q.cfg
index bdc022b..ea365c2 100644
--- a/board/freescale/mx6qsabreauto/mx6q.cfg
+++ b/board/freescale/mx6qsabreauto/mx6q.cfg
@@ -32,15 +32,17 @@
 IMAGE_VERSION 2
 
 /*
- * Boot Device : one of spi, sd, eimnor:
+ * Boot Device : one of spi, sd, eimnor, nand, sata:
  * spinor: flash_offset: 0x0400
+ * nand:   flash_offset: 0x0400
+ * sata:   flash_offset: 0x0400
  * sd/mmc: flash_offset: 0x0400
  * eimnor: flash_offset: 0x1000
  */
 
 #if defined(CONFIG_SYS_BOOT_EIMNOR)
 BOOT_FROM	nor
-#else
+#else /* others has the same flash_offset as sd */
 BOOT_FROM	sd
 #endif
 
diff --git a/board/freescale/mx6qsabreauto/mx6solo.cfg b/board/freescale/mx6qsabreauto/mx6solo.cfg
index a584a14..b3ae3e2 100644
--- a/board/freescale/mx6qsabreauto/mx6solo.cfg
+++ b/board/freescale/mx6qsabreauto/mx6solo.cfg
@@ -30,10 +30,19 @@
 IMAGE_VERSION 2
 
 /*
- * Boot Device : one of
- * spi, sd (the board has no nand neither onenand)
+ * Boot Device : one of spi, sd, eimnor, nand, sata:
+ * spinor: flash_offset: 0x0400
+ * nand:   flash_offset: 0x0400
+ * sata:   flash_offset: 0x0400
+ * sd/mmc: flash_offset: 0x0400
+ * eimnor: flash_offset: 0x1000
  */
+
+#if defined(CONFIG_SYS_BOOT_EIMNOR)
+BOOT_FROM	nor
+#else /* others has the same flash_offset as sd */
 BOOT_FROM	sd
+#endif
 
 #ifdef CONFIG_USE_PLUGIN
 /*PLUGIN    plugin-binary-file    IRAM_FREE_START_ADDR*/
@@ -120,9 +129,9 @@ DATA 4, 0x020c4068, 0x00C03F3F
 DATA 4, 0x020c406c, 0x0030FC03
 DATA 4, 0x020c4070, 0x0FFFC000
 DATA 4, 0x020c4074, 0x3FF00000
-DATA 4, 0x020c4078, 0x00FFF300
+DATA 4, 0x020c4078, 0xFFFFF300
 DATA 4, 0x020c407c, 0x0F0000C3
-DATA 4, 0x020c4080, 0x000003FF
+DATA 4, 0x020c4080, 0x00000FFF
 
 /* enable AXI cache for VDOA/VPU/IPU */
 DATA 4, 0x020e0010, 0xF00000CF
diff --git a/board/freescale/mx6qsabresd/mx6dl_4x_mt41j128.cfg b/board/freescale/mx6qsabresd/mx6dl_4x_mt41j128.cfg
index 87aa56c..bca01db 100644
--- a/board/freescale/mx6qsabresd/mx6dl_4x_mt41j128.cfg
+++ b/board/freescale/mx6qsabresd/mx6dl_4x_mt41j128.cfg
@@ -33,9 +33,14 @@
 IMAGE_VERSION 2
 
 /*
- * Boot Device : one of
- * spi, sd (the board has no nand neither onenand)
+ * Boot Device : one of spi, sd, sata
+ * the board has no nand and eimnor
+ * spinor: flash_offset: 0x0400
+ * sata:   flash_offset: 0x0400
+ * sd/mmc: flash_offset: 0x0400
  */
+
+/* the same flash_offset as sd */
 BOOT_FROM      sd
 
 #ifdef CONFIG_USE_PLUGIN
diff --git a/board/freescale/mx6qsabresd/mx6solo_4x_mt41j128.cfg b/board/freescale/mx6qsabresd/mx6solo_4x_mt41j128.cfg
index 9a05762..57976aa 100644
--- a/board/freescale/mx6qsabresd/mx6solo_4x_mt41j128.cfg
+++ b/board/freescale/mx6qsabresd/mx6solo_4x_mt41j128.cfg
@@ -33,9 +33,14 @@
 IMAGE_VERSION 2
 
 /*
- * Boot Device : one of
- * spi, sd (the board has no nand neither onenand)
+ * Boot Device : one of spi, sd, sata
+ * the board has no nand and eimnor
+ * spinor: flash_offset: 0x0400
+ * sata:   flash_offset: 0x0400
+ * sd/mmc: flash_offset: 0x0400
  */
+
+/* the same flash_offset as sd */
 BOOT_FROM      sd
 
 #ifdef CONFIG_USE_PLUGIN