From: Otavio Salvador Date: Sat, 5 Jul 2014 21:15:55 +0000 (-0300) Subject: u-boot-fslc: Update to 2014.07-based release X-Git-Tag: 2.1~899 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=25959a42f6e7e9be6e98921291c6331e7f87f32a;p=meta-freescale.git u-boot-fslc: Update to 2014.07-based release This updates the FSL Community's U-Boot fork to a 2014.07-based release. Along with the recipe revision changes, this modifies the default kernel image to "zImage" as most machines maintained in meta-fsl-arm now uses it. The machines that are still using uImage are: - imx31pdk - imx35pdk - imx53ard - imx6dlsabreauto - imx6solosabreauto - imx6solosabresd Signed-off-by: Otavio Salvador --- diff --git a/meta-fsl-arm/conf/machine/imx31pdk.conf b/meta-fsl-arm/conf/machine/imx31pdk.conf index 50da78ee..cf368eb8 100644 --- a/meta-fsl-arm/conf/machine/imx31pdk.conf +++ b/meta-fsl-arm/conf/machine/imx31pdk.conf @@ -14,6 +14,7 @@ UBOOT_MAKE_TARGET = "u-boot-with-spl.bin" UBOOT_SUFFIX = "bin" UBOOT_MACHINE = "mx31pdk_config" UBOOT_BINARY = "u-boot-with-spl.bin" +KERNEL_IMAGETYPE = "uImage" 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 b49e9f23..a3fc60cb 100644 --- a/meta-fsl-arm/conf/machine/imx35pdk.conf +++ b/meta-fsl-arm/conf/machine/imx35pdk.conf @@ -12,6 +12,7 @@ UBOOT_MACHINE = "mx35pdk_config" UBOOT_SUFFIX = "bin" UBOOT_BINARY = "u-boot.bin" UBOOT_MAKE_TARGET = "u-boot.bin" +KERNEL_IMAGETYPE = "uImage" GUI_MACHINE_CLASS = "bigscreen" diff --git a/meta-fsl-arm/conf/machine/imx53ard.conf b/meta-fsl-arm/conf/machine/imx53ard.conf index 2da165ad..8a64e22b 100644 --- a/meta-fsl-arm/conf/machine/imx53ard.conf +++ b/meta-fsl-arm/conf/machine/imx53ard.conf @@ -12,6 +12,7 @@ SOC_FAMILY = "mx5:mx53" KERNEL_DEVICETREE = "imx53-ard.dtb" UBOOT_MACHINE = "mx53ard_config" +KERNEL_IMAGETYPE = "uImage" MACHINE_FIRMWARE += "linux-firmware-ar3k \ linux-firmware-ath6k" diff --git a/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf b/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf index 29d79d5d..6477ba42 100644 --- a/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf +++ b/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf @@ -13,6 +13,7 @@ KERNEL_DEVICETREE += "imx6dl-sabreauto-flexcan1.dtb " PREFERRED_PROVIDER_u-boot = "u-boot-imx" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" +KERNEL_IMAGETYPE = "uImage" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard" diff --git a/meta-fsl-arm/conf/machine/imx6solosabreauto.conf b/meta-fsl-arm/conf/machine/imx6solosabreauto.conf index 255c189e..5f3782d1 100644 --- a/meta-fsl-arm/conf/machine/imx6solosabreauto.conf +++ b/meta-fsl-arm/conf/machine/imx6solosabreauto.conf @@ -11,6 +11,7 @@ KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" PREFERRED_PROVIDER_u-boot = "u-boot-imx" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" +KERNEL_IMAGETYPE = "uImage" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6solosabreauto_config,sdcard" diff --git a/meta-fsl-arm/conf/machine/imx6solosabresd.conf b/meta-fsl-arm/conf/machine/imx6solosabresd.conf index f670ed38..085463a0 100644 --- a/meta-fsl-arm/conf/machine/imx6solosabresd.conf +++ b/meta-fsl-arm/conf/machine/imx6solosabresd.conf @@ -12,6 +12,7 @@ KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb" PREFERRED_PROVIDER_u-boot = "u-boot-imx" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" +KERNEL_IMAGETYPE = "uImage" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6solosabresd_config,sdcard" diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc index 9ac5e8ac..9f0217e8 100644 --- a/meta-fsl-arm/conf/machine/include/imx-base.inc +++ b/meta-fsl-arm/conf/machine/include/imx-base.inc @@ -103,6 +103,6 @@ IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard" SERIAL_CONSOLE = "115200 ttymxc0" -KERNEL_IMAGETYPE = "uImage" +KERNEL_IMAGETYPE = "zImage" MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen" diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.01.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.07.bb similarity index 83% rename from meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.01.bb rename to meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.07.bb index 298f1c02..6ba1552d 100644 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.01.bb +++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.07.bb @@ -5,10 +5,10 @@ SECTION = "bootloader" DEPENDS = "openssl" PROVIDES = "u-boot-mxsboot" -PV = "v2014.01" +PV = "v2014.07" -SRCREV = "f5d80303de12e6fefc022426a73136a288f70294" -SRCBRANCH = "patches-2014.01" +SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959" +SRCBRANCH = "patches-2014.07" SRC_URI = "git://github.com/Freescale/u-boot-imx.git;branch=${SRCBRANCH}" S = "${WORKDIR}/git" @@ -16,7 +16,7 @@ S = "${WORKDIR}/git" EXTRA_OEMAKE = 'HOSTCC="${CC} ${CPPFLAGS}" HOSTLDFLAGS="-L${libdir} -L${base_libdir}" HOSTSTRIP=true CONFIG_MX28=y' do_compile () { - oe_runmake tools + oe_runmake tools-only } do_install () { diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2014.01.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2014.01.bb deleted file mode 100644 index f6d46573..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2014.01.bb +++ /dev/null @@ -1,7 +0,0 @@ -include u-boot-fslc.inc - -PV = "v2014.01" - -SRCBRANCH = "patches-2014.01" - -SRCREV = "f5d80303de12e6fefc022426a73136a288f70294" diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb new file mode 100644 index 00000000..efccca6f --- /dev/null +++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb @@ -0,0 +1,6 @@ +include u-boot-fslc.inc + +PV = "v2014.07" + +SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959" +SRCBRANCH = "patches-2014.07"