diff options
4 files changed, 1 insertions, 142 deletions
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 = "\ | |||
32 | ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \ | 32 | ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \ |
33 | 6x_bootscript-${MACHINE}:6x_bootscript \ | 33 | 6x_bootscript-${MACHINE}:6x_bootscript \ |
34 | 6x_upgrade-${MACHINE}:6x_upgrade \ | 34 | 6x_upgrade-${MACHINE}:6x_upgrade \ |
35 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
36 | ${KERNEL_IMAGETYPE}:update/${KERNEL_IMAGETYPE} \ | ||
37 | ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:update/imx6q-${MACHINE}.dtb \ | ||
38 | ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:update/imx6dl-${MACHINE}.dtb \ | ||
39 | ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:update/imx6q-sabrelite.dtb \ | ||
40 | ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:update/imx6dl-nit6xlite.dtb \ | ||
41 | ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:update/imx6dl-nitrogen6_max.dtb \ | ||
42 | ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:update/imx6q-nitrogen6_max.dtb \ | ||
43 | update/platform:update/platform \ | ||
44 | " | 35 | " |
45 | BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy b2qt-update-framework:do_deploy" | 36 | BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy" |
46 | 37 | ||
47 | EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" | 38 | EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" |
48 | 39 | ||
@@ -71,6 +62,4 @@ MACHINE_EXTRA_INSTALL_SDK = " \ | |||
71 | opencv-dev \ | 62 | opencv-dev \ |
72 | " | 63 | " |
73 | 64 | ||
74 | B2QT_PLATFORM = "iMX6-eLinux" | ||
75 | |||
76 | ADB_PRODUCTID = "0x0d02" | 65 | 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 @@ | |||
1 | From 3d7276b2b27317c5067d2095ea5c3952d11f4390 Mon Sep 17 00:00:00 2001 | ||
2 | From: Rainer Keller <rainer.keller@digia.com> | ||
3 | Date: Fri, 5 Sep 2014 14:39:50 +0200 | ||
4 | Subject: [PATCH] Add support for update recovery linux | ||
5 | |||
6 | --- | ||
7 | board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 61 +++++++++++++++++++++++ | ||
8 | 1 file changed, 61 insertions(+) | ||
9 | |||
10 | diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt | ||
11 | index 5bc6170..4116ed4 100644 | ||
12 | --- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt | ||
13 | +++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt | ||
14 | @@ -1,3 +1,67 @@ | ||
15 | +# Boot2Qt update part begin | ||
16 | +echo "Boot to Qt" | ||
17 | +mw.b 0x13000000 0x76 1 # v | ||
18 | +mw.b 0x13000001 0x75 1 # u | ||
19 | +mw.b 0x13000002 0x74 1 # t | ||
20 | +mw.b 0x13000003 0x69 1 # i | ||
21 | + | ||
22 | +fdtaddr=0x12000000 | ||
23 | + | ||
24 | +if test "x$boot2qt_update_state" = "x" ; then | ||
25 | + setenv boot2qt_update_state valid | ||
26 | + saveenv | ||
27 | +fi | ||
28 | + | ||
29 | +# This is a workaround because environment partition is read-only. | ||
30 | +if fatload mmc 1:1 0x12000000 update/state ; then | ||
31 | + if cmp.b 0x12000000 0x13000000 1 ; then | ||
32 | + echo "State: Valid" | ||
33 | + setenv boot2qt_fat_state valid | ||
34 | + setenv boot2qt_update_state valid | ||
35 | + saveenv | ||
36 | + fi | ||
37 | + if cmp.b 0x12000000 0x13000001 1 ; then | ||
38 | + echo "State: Update" | ||
39 | + setenv boot2qt_fat_state update | ||
40 | + fi | ||
41 | + if cmp.b 0x12000000 0x13000002 1 ; then | ||
42 | + echo "State: Testing" | ||
43 | + setenv boot2qt_fat_state testing | ||
44 | + fi | ||
45 | +fi | ||
46 | + | ||
47 | +if test "x$boot2qt_fat_state" = "xupdate" || test "x$boot2qt_update_state" = "xinvalid" ; then | ||
48 | + setenv boot2qt_update_state testing | ||
49 | + saveenv | ||
50 | + echo "Recovery linux starting..." | ||
51 | + setenv bootargs "console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 root=/dev/ram0" | ||
52 | + | ||
53 | + # Guess dtb name | ||
54 | + dtbname="imx6"; | ||
55 | + if itest.s x6S != "x$cpu" ; then | ||
56 | + dtbname=${dtbname}q-; | ||
57 | + else | ||
58 | + dtbname=${dtbname}s-; | ||
59 | + fi | ||
60 | + | ||
61 | + if itest.s x == "x$board" ; then | ||
62 | + board=sabrelite | ||
63 | + fi | ||
64 | + dtbname=${dtbname}${board}.dtb; | ||
65 | + | ||
66 | + fatload mmc 1:1 ${loadaddr} update/uImage | ||
67 | + fatload mmc 1:1 ${fdtaddr} update/${dtbname} | ||
68 | + fatload mmc 1:1 0x13000000 update/uRamdisk | ||
69 | + bootm ${loadaddr} 0x13000000 ${fdtaddr} | ||
70 | +fi | ||
71 | + | ||
72 | +if test "x$boot2qt_fat_state" = "xtesting" || test "x$boot2qt_update_state" = "xtesting"; then | ||
73 | + setenv boot2qt_update_state invalid | ||
74 | + saveenv | ||
75 | +fi | ||
76 | + | ||
77 | +# Boot2Qt update part end | ||
78 | + | ||
79 | # Yocto-specifics | ||
80 | setenv bootpart 2 | ||
81 | setenv bootdir / | ||
82 | -- | ||
83 | 1.8.5.5 | ||
84 | |||
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 @@ | |||
23 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | 23 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" |
24 | SRC_URI += " \ | 24 | SRC_URI += " \ |
25 | file://0001-nitrogen6x-update-bootargs.patch \ | 25 | file://0001-nitrogen6x-update-bootargs.patch \ |
26 | file://0002-nitrogen6x-update.patch \ | ||
27 | " | 26 | " |
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 @@ | |||
1 | ############################################################################# | ||
2 | ## | ||
3 | ## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). | ||
4 | ## | ||
5 | ## This file is part of the Qt Enterprise Embedded Scripts of the Qt | ||
6 | ## framework. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE$ | ||
9 | ## Commercial License Usage Only | ||
10 | ## Licensees holding valid commercial Qt license agreements with Digia | ||
11 | ## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, | ||
12 | ## may use this file in accordance with the terms contained in said license | ||
13 | ## agreement. | ||
14 | ## | ||
15 | ## For further information use the contact form at | ||
16 | ## http://www.qt.io/contact-us. | ||
17 | ## | ||
18 | ## | ||
19 | ## $QT_END_LICENSE$ | ||
20 | ## | ||
21 | ############################################################################# | ||
22 | |||
23 | DESCRIPTION = "Boot to Qt update framework" | ||
24 | HOMEPAGE = "http://www.qt.io" | ||
25 | SECTION = "devel" | ||
26 | LICENSE = "CLOSED" | ||
27 | |||
28 | PV = "1.0.0" | ||
29 | PR = "r0" | ||
30 | SRCREV = "${PV}" | ||
31 | |||
32 | inherit deploy | ||
33 | |||
34 | do_deploy() { | ||
35 | install -d ${DEPLOYDIR}/update/ | ||
36 | echo ${B2QT_PLATFORM} > ${DEPLOYDIR}/update/platform | ||
37 | } | ||
38 | |||
39 | addtask deploy after do_install before do_build | ||
40 | |||
41 | do_compile[noexec] = "1" | ||
42 | do_install[noexec] = "1" | ||
43 | do_populate_sysroot[noexec] = "1" | ||
44 | |||
45 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||