From f5aa2841d445b1601d506a34fa86d43aa5b18d8e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 21 May 2012 17:47:32 -0300 Subject: imx-bootlets: avoid using linux-ivt module as it is mx25 dependant Signed-off-by: Otavio Salvador --- .../imx-bootlets/linux-fix-paths.patch | 28 ++++++++++++++++++++++ .../imx-bootlets/linux_ivt-fix-paths.patch | 28 ---------------------- recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb | 10 ++++---- 3 files changed, 34 insertions(+), 32 deletions(-) create mode 100644 recipes-bsp/imx-bootlets/imx-bootlets/linux-fix-paths.patch delete mode 100644 recipes-bsp/imx-bootlets/imx-bootlets/linux_ivt-fix-paths.patch (limited to 'recipes-bsp/imx-bootlets') diff --git a/recipes-bsp/imx-bootlets/imx-bootlets/linux-fix-paths.patch b/recipes-bsp/imx-bootlets/imx-bootlets/linux-fix-paths.patch new file mode 100644 index 0000000..abcf5b0 --- /dev/null +++ b/recipes-bsp/imx-bootlets/imx-bootlets/linux-fix-paths.patch @@ -0,0 +1,28 @@ +imx-bootlets: Fix paths for used during boot stream generation + +This will be run during image generation thus this won't use a +complete path to allow for relocation. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Otavio Salvador + +diff --git a/linux.bd b/linux.bd +index 516f4f2..366ac22 100644 +--- a/linux.bd ++++ b/linux.bd +@@ -4,10 +4,10 @@ + flags = 0x01; + } + sources { +- power_prep="./power_prep/power_prep"; +- sdram_prep="./boot_prep/boot_prep"; +- linux_prep="./linux_prep/output-target/linux_prep"; +- zImage = "./zImage"; ++ power_prep="imx-bootlets-power_prep-@MACHINE@"; ++ sdram_prep="imx-bootlets-boot_prep-@MACHINE@"; ++ linux_prep="imx-bootlets-linux_prep-@MACHINE@"; ++ zImage="zImage-@MACHINE@.bin"; + } + + section (0) { diff --git a/recipes-bsp/imx-bootlets/imx-bootlets/linux_ivt-fix-paths.patch b/recipes-bsp/imx-bootlets/imx-bootlets/linux_ivt-fix-paths.patch deleted file mode 100644 index 2ce5a0f..0000000 --- a/recipes-bsp/imx-bootlets/imx-bootlets/linux_ivt-fix-paths.patch +++ /dev/null @@ -1,28 +0,0 @@ -imx-bootlets: Fix paths for used during boot stream generation - -This will be run during image generation thus this won't use a -complete path to allow for relocation. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Otavio Salvador - -diff --git a/linux_ivt.bd b/linux_ivt.bd -index 516f4f2..366ac22 100644 ---- a/linux_ivt.bd -+++ b/linux_ivt.bd -@@ -4,10 +4,10 @@ options { - flags = 0x01; - } - sources { -- power_prep="./power_prep/power_prep"; -- sdram_prep="./boot_prep/boot_prep"; -- linux_prep="./linux_prep/output-target/linux_prep"; -- zImage="./zImage"; -+ power_prep="imx-bootlets-power_prep-@MACHINE@"; -+ sdram_prep="imx-bootlets-boot_prep-@MACHINE@"; -+ linux_prep="imx-bootlets-linux_prep-@MACHINE@"; -+ zImage="zImage-@MACHINE@.bin"; - } - - section (0) { diff --git a/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb b/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb index 941b458..d2f51fd 100644 --- a/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb +++ b/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb @@ -2,8 +2,10 @@ DESCRIPTION = "i.MXS boot streams" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +PR = "r1" + SRC_URI = "http://download.ossystems.com.br/bsp/freescale/source/imx-bootlets-src-${PV}.tar.gz \ - file://linux_ivt-fix-paths.patch \ + file://linux-fix-paths.patch \ file://linux_prep-fix-cmdlines.patch" SRC_URI[md5sum] = "cf0ab3822dca694b930a051501c1d0e4" @@ -28,7 +30,7 @@ python () { do_configure () { # Use machine specific binaries - sed -i 's,@MACHINE@,${MACHINE},g' linux_ivt.bd + sed -i 's,@MACHINE@,${MACHINE},g' linux.bd } do_compile () { @@ -40,7 +42,7 @@ do_compile () { do_install () { install -d ${D}/boot/ install -m 644 boot_prep/boot_prep power_prep/power_prep \ - linux_prep/output-target/linux_prep linux_ivt.bd \ + linux_prep/output-target/linux_prep linux.bd \ ${D}/boot } @@ -52,7 +54,7 @@ do_deploy () { for f in boot_prep/boot_prep \ power_prep/power_prep \ linux_prep/output-target/linux_prep \ - linux_ivt.bd; do + linux.bd; do full_name="imx-bootlets-`basename $f`-${MACHINE}-${PV}-${PR}" symlink_name="imx-bootlets-`basename $f`-${MACHINE}" -- cgit v1.2.3-54-g00ecf