From 03c226dc8e48bb2096f18a3cce833daff6232115 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Fri, 13 Nov 2015 13:14:13 +0100 Subject: Remove unused b2qt-update-framework This reverts commit f309d05bccefc29977d474df734fecbe311f8f7b. Change-Id: Ia25e629247c6863d2ce48e1b8a80029d13248ded Reviewed-by: Gatis Paeglis --- conf/distro/include/nitrogen6x.conf | 13 +--- .../0002-nitrogen6x-update.patch | 84 ---------------------- .../u-boot/u-boot-script-boundary_git.bbappend | 1 - .../b2qt-update-framework/b2qt-update-framework.bb | 45 ------------ 4 files changed, 1 insertion(+), 142 deletions(-) delete mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch delete mode 100644 recipes/b2qt-update-framework/b2qt-update-framework.bb diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 819960d..3b1b627 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -32,17 +32,8 @@ BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \ 6x_bootscript-${MACHINE}:6x_bootscript \ 6x_upgrade-${MACHINE}:6x_upgrade \ - u-boot-${MACHINE}.imx:u-boot.imx \ - ${KERNEL_IMAGETYPE}:update/${KERNEL_IMAGETYPE} \ - ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:update/imx6q-${MACHINE}.dtb \ - ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:update/imx6dl-${MACHINE}.dtb \ - ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:update/imx6q-sabrelite.dtb \ - ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:update/imx6dl-nit6xlite.dtb \ - ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:update/imx6dl-nitrogen6_max.dtb \ - ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:update/imx6q-nitrogen6_max.dtb \ - update/platform:update/platform \ " -BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy b2qt-update-framework:do_deploy" +BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy" EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" @@ -71,6 +62,4 @@ MACHINE_EXTRA_INSTALL_SDK = " \ opencv-dev \ " -B2QT_PLATFORM = "iMX6-eLinux" - ADB_PRODUCTID = "0x0d02" diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch deleted file mode 100644 index dd699d8..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 3d7276b2b27317c5067d2095ea5c3952d11f4390 Mon Sep 17 00:00:00 2001 -From: Rainer Keller -Date: Fri, 5 Sep 2014 14:39:50 +0200 -Subject: [PATCH] Add support for update recovery linux - ---- - board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 61 +++++++++++++++++++++++ - 1 file changed, 61 insertions(+) - -diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt -index 5bc6170..4116ed4 100644 ---- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt -+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt -@@ -1,3 +1,67 @@ -+# Boot2Qt update part begin -+echo "Boot to Qt" -+mw.b 0x13000000 0x76 1 # v -+mw.b 0x13000001 0x75 1 # u -+mw.b 0x13000002 0x74 1 # t -+mw.b 0x13000003 0x69 1 # i -+ -+fdtaddr=0x12000000 -+ -+if test "x$boot2qt_update_state" = "x" ; then -+ setenv boot2qt_update_state valid -+ saveenv -+fi -+ -+# This is a workaround because environment partition is read-only. -+if fatload mmc 1:1 0x12000000 update/state ; then -+ if cmp.b 0x12000000 0x13000000 1 ; then -+ echo "State: Valid" -+ setenv boot2qt_fat_state valid -+ setenv boot2qt_update_state valid -+ saveenv -+ fi -+ if cmp.b 0x12000000 0x13000001 1 ; then -+ echo "State: Update" -+ setenv boot2qt_fat_state update -+ fi -+ if cmp.b 0x12000000 0x13000002 1 ; then -+ echo "State: Testing" -+ setenv boot2qt_fat_state testing -+ fi -+fi -+ -+if test "x$boot2qt_fat_state" = "xupdate" || test "x$boot2qt_update_state" = "xinvalid" ; then -+ setenv boot2qt_update_state testing -+ saveenv -+ echo "Recovery linux starting..." -+ setenv bootargs "console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 root=/dev/ram0" -+ -+ # Guess dtb name -+ dtbname="imx6"; -+ if itest.s x6S != "x$cpu" ; then -+ dtbname=${dtbname}q-; -+ else -+ dtbname=${dtbname}s-; -+ fi -+ -+ if itest.s x == "x$board" ; then -+ board=sabrelite -+ fi -+ dtbname=${dtbname}${board}.dtb; -+ -+ fatload mmc 1:1 ${loadaddr} update/uImage -+ fatload mmc 1:1 ${fdtaddr} update/${dtbname} -+ fatload mmc 1:1 0x13000000 update/uRamdisk -+ bootm ${loadaddr} 0x13000000 ${fdtaddr} -+fi -+ -+if test "x$boot2qt_fat_state" = "xtesting" || test "x$boot2qt_update_state" = "xtesting"; then -+ setenv boot2qt_update_state invalid -+ saveenv -+fi -+ -+# Boot2Qt update part end -+ - # Yocto-specifics - setenv bootpart 2 - setenv bootdir / --- -1.8.5.5 - diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend index abbc222..a6cee2b 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend @@ -23,5 +23,4 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-nitrogen6x-update-bootargs.patch \ - file://0002-nitrogen6x-update.patch \ " diff --git a/recipes/b2qt-update-framework/b2qt-update-framework.bb b/recipes/b2qt-update-framework/b2qt-update-framework.bb deleted file mode 100644 index ceae95a..0000000 --- a/recipes/b2qt-update-framework/b2qt-update-framework.bb +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -DESCRIPTION = "Boot to Qt update framework" -HOMEPAGE = "http://www.qt.io" -SECTION = "devel" -LICENSE = "CLOSED" - -PV = "1.0.0" -PR = "r0" -SRCREV = "${PV}" - -inherit deploy - -do_deploy() { - install -d ${DEPLOYDIR}/update/ - echo ${B2QT_PLATFORM} > ${DEPLOYDIR}/update/platform -} - -addtask deploy after do_install before do_build - -do_compile[noexec] = "1" -do_install[noexec] = "1" -do_populate_sysroot[noexec] = "1" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3-54-g00ecf