From ea5f32dc3bc8d56d005421a264ef9ed06b88876e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 18 Apr 2013 15:25:08 +0000 Subject: [PATCH] imx-base.inc: Place UBOOT_ENTRYPOINT into common location Place the entry points for mx31 and mx35 into the common imx-base.inc instead of having them in board .conf files and also remove the unneeded UBOOT_LOADADDRESS occurrences. Signed-off-by: Fabio Estevam --- meta-fsl-arm/conf/machine/imx31pdk.conf | 2 -- meta-fsl-arm/conf/machine/imx35pdk.conf | 2 -- meta-fsl-arm/conf/machine/include/imx-base.inc | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/meta-fsl-arm/conf/machine/imx31pdk.conf b/meta-fsl-arm/conf/machine/imx31pdk.conf index 3aa66067..9ae62457 100644 --- a/meta-fsl-arm/conf/machine/imx31pdk.conf +++ b/meta-fsl-arm/conf/machine/imx31pdk.conf @@ -14,8 +14,6 @@ UBOOT_MAKE_TARGET = "u-boot-nand.bin" UBOOT_SUFFIX = "bin" UBOOT_MACHINE = "mx31pdk_config" UBOOT_BINARY = "u-boot-nand.bin" -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "0x80008000" IMAGE_FSTYPES = "ubi jffs2 tar.bz2" MKUBIFS_ARGS = "-m 2048 -e 129024 -c 2030" diff --git a/meta-fsl-arm/conf/machine/imx35pdk.conf b/meta-fsl-arm/conf/machine/imx35pdk.conf index 2d486994..86566f2a 100644 --- a/meta-fsl-arm/conf/machine/imx35pdk.conf +++ b/meta-fsl-arm/conf/machine/imx35pdk.conf @@ -8,8 +8,6 @@ require conf/machine/include/tune-arm1136jf-s.inc SOC_FAMILY = "mx3:mx35" -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "0x80008000" UBOOT_MACHINE = "mx35pdk_config" UBOOT_SUFFIX = "bin" UBOOT_BINARY = "u-boot.bin" diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc index d08c5f80..88a4d065 100644 --- a/meta-fsl-arm/conf/machine/include/imx-base.inc +++ b/meta-fsl-arm/conf/machine/include/imx-base.inc @@ -13,6 +13,7 @@ PERF_FEATURES_ENABLE = "" UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_SUFFIX ?= "imx" +UBOOT_ENTRYPOINT_mx3 = "0x80008000" UBOOT_ENTRYPOINT_mx51 = "0x90008000" UBOOT_ENTRYPOINT_mx53 = "0x70008000" UBOOT_ENTRYPOINT_mx6 = "0x10008000" -- 2.40.1