summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGong Qianyu <Qianyu.Gong@nxp.com>2017-09-18 16:59:28 +0800
committerYork Sun <york.sun@nxp.com>2017-10-09 08:35:58 -0700
commit752513d8d9768ef9d9da29db608d89b5d3517c2f (patch)
tree280784061a96e9ea77979e4134de65cc6db2a516
parent39dd65a059e503883dbf16d4c00ac083d15837da (diff)
downloadu-boot-752513d8d9768ef9d9da29db608d89b5d3517c2f.tar.gz
armv8: ls1046aqds: Fix NAND offset for Fman ucode and env
Fix a bug of 'commit 8104deb2d6b7 ("armv8: layerscape: Adjust memory mapping for Flash/SD card on LS1046A")' as NAND block size is 256KB on LS1046AQDS. Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
-rw-r--r--include/configs/ls1046a_common.h2
-rw-r--r--include/configs/ls1046aqds.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index dfc8e9237d..6d501b9c54 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -183,7 +183,7 @@
#define CONFIG_ENV_SPI_MODE 0x03
#elif defined(CONFIG_NAND_BOOT)
#define CONFIG_SYS_QE_FMAN_FW_IN_NAND
-#define CONFIG_SYS_FMAN_FW_ADDR (72 * CONFIG_SYS_NAND_BLOCK_SIZE)
+#define CONFIG_SYS_FMAN_FW_ADDR (36 * CONFIG_SYS_NAND_BLOCK_SIZE)
#else
#define CONFIG_SYS_QE_FMAN_FW_IN_NOR
#define CONFIG_SYS_FMAN_FW_ADDR 0x60900000
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 9231cca9e9..39bd1c38a8 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -435,7 +435,7 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_NAND_BOOT
#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_ENV_OFFSET (24 * CONFIG_SYS_NAND_BLOCK_SIZE)
+#define CONFIG_ENV_OFFSET (12 * CONFIG_SYS_NAND_BLOCK_SIZE)
#elif defined(CONFIG_SD_BOOT)
#define CONFIG_ENV_OFFSET (3 * 1024 * 1024)
#define CONFIG_SYS_MMC_ENV_DEV 0