From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sat, 19 May 2012 12:05:39 +0000 (-0300)
Subject: imx-bootlets: add 10.12.01
X-Git-Tag: 2.1~1818
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=07a7d6320f70b00c10d55ff7b466b1bd94d3d108;p=meta-freescale.git

imx-bootlets: add 10.12.01

Every machine intending to use this, need to set IMXBOOTLETS_MACHINE
variable to allow it to generate proper target code.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/linux_ivt-fix-paths.patch b/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/linux_ivt-fix-paths.patch
new file mode 100644
index 00000000..2ce5a0f3
--- /dev/null
+++ b/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/linux_ivt-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 <otavio@ossystems.com.br>
+
+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/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/linux_prep-fix-cmdlines.patch b/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/linux_prep-fix-cmdlines.patch
new file mode 100644
index 00000000..4fb4c519
--- /dev/null
+++ b/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/linux_prep-fix-cmdlines.patch
@@ -0,0 +1,30 @@
+imx-bootlets: Fix cmdlines for Linux boot
+
+This adapt the cmdlines for the partitioning layout used on the
+generated SD cards.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+
+diff --git a/linux_prep/cmdlines/iMX28_EVK.txt b/linux_prep/cmdlines/iMX28_EVK.txt
+index 6bc36b9..6cf89a0 100644
+--- a/linux_prep/cmdlines/iMX28_EVK.txt
++++ b/linux_prep/cmdlines/iMX28_EVK.txt
+@@ -1 +1 @@
+-console=ttyAM0,115200 root=/dev/mmcblk0p3 rw rootwait
++console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait
+diff --git a/linux_prep/cmdlines/stmp378x_dev.txt b/linux_prep/cmdlines/stmp378x_dev.txt
+index 9a717eb..fdb7390 100644
+--- a/linux_prep/cmdlines/stmp378x_dev.txt
++++ b/linux_prep/cmdlines/stmp378x_dev.txt
+@@ -1,6 +1,3 @@
+-console=ttyAM0,115200 root=/dev/mmcblk0p3 rw rootwait lcd_panel=lms430 no_console_suspend
+-console=ttyAM0,115200 root=/dev/mmcblk0p3 rw rootwait lcd_panel=lms350
+-console=ttyAM0,115200 ssp1=spi1 ubi.mtd=2 root=ubi0:rootfs0 rootfstype=ubifs lcd_panel=lms430
+-
+-
+-
++console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc lcd_panel=lms430 no_console_suspend
++console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc lcd_panel=lms350
++console=ttyAMA0,115200 ssp1=spi1 ubi.mtd=2 root=ubi0:rootfs0 rootfstype=ubifs lcd_panel=lms430
diff --git a/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb b/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb
new file mode 100644
index 00000000..941b4586
--- /dev/null
+++ b/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb
@@ -0,0 +1,67 @@
+DESCRIPTION = "i.MXS boot streams"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+SRC_URI = "http://download.ossystems.com.br/bsp/freescale/source/imx-bootlets-src-${PV}.tar.gz \
+           file://linux_ivt-fix-paths.patch \
+           file://linux_prep-fix-cmdlines.patch"
+
+SRC_URI[md5sum] = "cf0ab3822dca694b930a051501c1d0e4"
+SRC_URI[sha256sum] = "63f6068ae36884adef4259bbb1fe2591755718f22c46d0a59d854883dfab1ffc"
+
+S = "${WORKDIR}/imx-bootlets-src-${PV}"
+
+# Disable parallel building or it may fail to build.
+PARALLEL_MAKE = ""
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+
+# Ensure machine defines the IMXBOOTLETS_MACHINE
+python () {
+	if not d.getVar("IMXBOOTLETS_MACHINE", True):
+		PN = d.getVar("PN", True)
+		FILE = os.path.basename(d.getVar("FILE", True))
+		bb.debug(1, "To build %s, see %s for instructions on \
+			     setting up your machine config" % (PN, FILE))
+		raise bb.parse.SkipPackage("because IMXBOOTLETS_MACHINE is not set")
+}
+
+do_configure () {
+    # Use machine specific binaries
+    sed -i 's,@MACHINE@,${MACHINE},g' linux_ivt.bd
+}
+
+do_compile () {
+    oe_runmake BOARD=${IMXBOOTLETS_MACHINE} linux_prep \
+                                            boot_prep \
+                                            power_prep
+}
+
+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 \
+                   ${D}/boot
+}
+
+FILES_${PN} = "/boot"
+
+do_deploy () {
+    install -d ${DEPLOY_DIR_IMAGE}
+
+	for f in boot_prep/boot_prep \
+             power_prep/power_prep \
+             linux_prep/output-target/linux_prep \
+             linux_ivt.bd; do
+        full_name="imx-bootlets-`basename $f`-${MACHINE}-${PV}-${PR}"
+        symlink_name="imx-bootlets-`basename $f`-${MACHINE}"
+
+        install -m 644 ${S}/$f ${DEPLOY_DIR_IMAGE}/$full_name
+        (cd ${DEPLOY_DIR_IMAGE} ; rm -f $symlink_nake ; ln -sf $full_name $symlink_name)
+    done
+}
+
+addtask deploy before do_build after do_compile
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mxs)"