From 5ed7d31a1461592a4e65d9a8cfdfd73de4738b35 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Fri, 12 May 2017 17:18:27 +0530 Subject: [PATCH] engicam: Add fdt_addr env value based on cpu_type 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 --- 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 f3e8481c94..531631d378 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 8f0128e250..4bc105546a 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 f7c48240c2..2617c8a994 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 2dff5ee78e..5de3e1d4bd 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 -- 2.39.5