diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-01-07 18:52:19 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-03-06 13:44:33 +0100 |
| commit | 15f04e6f015747df2aaf594c875e0764a6cdf171 (patch) | |
| tree | 08998180fcdb41f23f9ea6c98e7a1bc06facee17 /recipes-images | |
| parent | 43088430f9d261426eb1d9835525549cf371ebfc (diff) | |
apalis/colibri-t20 -t30: drop machines
These machines use an old Nvidia provided downstream kernel 3.1.10.
They are no longer compatible with more recent sysroot components,
e.g. libc, xserver et. al.
The maintenance burden to keep the userspace components in their old version
becomes simply to high. Keep using the rocko based 2.8 BSP for these machines.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-images')
55 files changed, 15 insertions, 1257 deletions
diff --git a/recipes-images/images/angstrom-lxde-image.bb b/recipes-images/images/angstrom-lxde-image.bb index d8f8014..5bbd537 100644 --- a/recipes-images/images/angstrom-lxde-image.bb +++ b/recipes-images/images/angstrom-lxde-image.bb @@ -7,7 +7,6 @@ LICENSE = "MIT" #start of the resulting deployable tarball name export IMAGE_BASENAME = "LXDE-Image" IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}" -IMAGE_NAME_apalis-t30 = "Apalis-T30_${IMAGE_BASENAME}" IMAGE_NAME_apalis-tk1 = "Apalis-TK1_${IMAGE_BASENAME}" IMAGE_NAME_apalis-tk1-mainline = "Apalis-TK1-Mainline_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx6 = "Colibri-iMX6_${IMAGE_BASENAME}" @@ -15,8 +14,6 @@ IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}" IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-t20 = "Colibri-T20_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-t30 = "Colibri-T30_${IMAGE_BASENAME}" IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}" IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" @@ -34,9 +31,6 @@ ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", " CONMANPKGS ?= "connman connman-client connman-gnome" -#deploy the OpenGL ES headers to the sysroot -DEPENDS_append_tegra = " nvsamples" - IMAGE_BROWSER = "firefox" #keep the rootfs size small IMAGE_BROWSER_colibri-imx6ull = "" @@ -102,41 +96,6 @@ GSTREAMER_append_mx7 = " \ # gst-fsl-plugin \ # -# use gstreamer-0.10 for tegra -GSTREAMER_tegra = " \ - gstreamer \ - gst-plugins-base \ - gst-plugins-base-alsa \ - gst-plugins-base-audioconvert \ - gst-plugins-base-audioresample \ - gst-plugins-base-audiotestsrc \ - gst-plugins-base-decodebin \ - gst-plugins-base-decodebin2 \ - gst-plugins-base-playbin \ - gst-plugins-base-typefindfunctions \ - gst-plugins-base-ivorbisdec \ - gst-plugins-base-ogg \ - gst-plugins-base-theora \ - gst-plugins-base-videotestsrc \ - gst-plugins-base-vorbis \ - gst-plugins-good-audioparsers \ - gst-plugins-good-autodetect \ - gst-plugins-good-avi \ - gst-plugins-good-deinterlace \ - gst-plugins-good-id3demux \ - gst-plugins-good-isomp4 \ - gst-plugins-good-matroska \ - gst-plugins-good-rtp \ - gst-plugins-good-rtpmanager \ - gst-plugins-good-udp \ - gst-plugins-good-video4linux2 \ - gst-plugins-good-wavenc \ - gst-plugins-good-wavparse \ - gst-plugins-ugly-asf \ -" -GSTREAMER_append_tegra3 = " \ - gst-plugins-good-jpeg \ -" GSTREAMER_append_tegra124 = " \ gstreamer1.0-libav \ gstreamer1.0-plugins-bad-videoparsersbad \ @@ -177,17 +136,6 @@ GSTREAMER_append_tegra124 = " \ " GSTREAMER_colibri-vf = "" -IMAGE_INSTALL_append_tegra = " \ - gpio-tool \ - tegrastats-gtk \ - gnome-disk-utility \ - mime-support \ - eglinfo-x11 \ - xvinfo \ -" -IMAGE_INSTALL_append_tegra3 = " \ - \ -" IMAGE_INSTALL_append_tegra124 = " \ gpio-tool \ gnome-disk-utility \ diff --git a/recipes-images/images/angstrom-lxqt-image.bb b/recipes-images/images/angstrom-lxqt-image.bb index 5b4873c..76dba2e 100644 --- a/recipes-images/images/angstrom-lxqt-image.bb +++ b/recipes-images/images/angstrom-lxqt-image.bb @@ -7,7 +7,6 @@ LICENSE = "MIT" #start of the resulting deployable tarball name export IMAGE_BASENAME = "LXQt-Image" IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}" -IMAGE_NAME_apalis-t30 = "Apalis-T30_${IMAGE_BASENAME}" IMAGE_NAME_apalis-tk1 = "Apalis-TK1_${IMAGE_BASENAME}" IMAGE_NAME_apalis-tk1-mainline = "Apalis-TK1-Mainline_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx6 = "Colibri-iMX6_${IMAGE_BASENAME}" @@ -15,8 +14,6 @@ IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}" IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-t20 = "Colibri-T20_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-t30 = "Colibri-T30_${IMAGE_BASENAME}" IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}" IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" @@ -38,9 +35,6 @@ ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", " # with cmst at the price of a bigger footprint CONMANPKGS ?= "connman connman-client lxqt-connman-applet" -#deploy the OpenGL ES headers to the sysroot -DEPENDS_append_tegra = " nvsamples" - IMAGE_BROWSER = "falkon" #keep the rootfs size small IMAGE_BROWSER_colibri-imx6ull = "" @@ -96,41 +90,6 @@ GSTREAMER_append_mx7 = " \ imx-gst1.0-plugin \ " -# use gstreamer-0.10 for tegra -GSTREAMER_tegra = " \ - gstreamer \ - gst-plugins-base \ - gst-plugins-base-alsa \ - gst-plugins-base-audioconvert \ - gst-plugins-base-audioresample \ - gst-plugins-base-audiotestsrc \ - gst-plugins-base-decodebin \ - gst-plugins-base-decodebin2 \ - gst-plugins-base-playbin \ - gst-plugins-base-typefindfunctions \ - gst-plugins-base-ivorbisdec \ - gst-plugins-base-ogg \ - gst-plugins-base-theora \ - gst-plugins-base-videotestsrc \ - gst-plugins-base-vorbis \ - gst-plugins-good-audioparsers \ - gst-plugins-good-autodetect \ - gst-plugins-good-avi \ - gst-plugins-good-deinterlace \ - gst-plugins-good-id3demux \ - gst-plugins-good-isomp4 \ - gst-plugins-good-matroska \ - gst-plugins-good-rtp \ - gst-plugins-good-rtpmanager \ - gst-plugins-good-udp \ - gst-plugins-good-video4linux2 \ - gst-plugins-good-wavenc \ - gst-plugins-good-wavparse \ - gst-plugins-ugly-asf \ -" -GSTREAMER_append_tegra3 = " \ - gst-plugins-good-jpeg \ -" GSTREAMER_append_tegra124 = " \ gstreamer1.0-libav \ gstreamer1.0-plugins-bad-videoparsersbad \ @@ -171,11 +130,6 @@ GSTREAMER_append_tegra124 = " \ " GSTREAMER_colibri-vf = "" -IMAGE_INSTALL_append_tegra = " \ - mime-support \ - eglinfo-x11 \ - xvinfo \ -" IMAGE_INSTALL_append_tegra124 = " \ libglu \ mesa-demos \ diff --git a/recipes-images/images/angstrom-qt-x11-image.bb b/recipes-images/images/angstrom-qt-x11-image.bb index 9841434..db1d643 100644 --- a/recipes-images/images/angstrom-qt-x11-image.bb +++ b/recipes-images/images/angstrom-qt-x11-image.bb @@ -7,7 +7,6 @@ LICENSE = "MIT" #start of the resulting deployable tarball name export IMAGE_BASENAME = "Qt4-X11-Image" IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}" -IMAGE_NAME_apalis-t30 = "Apalis-T30_${IMAGE_BASENAME}" IMAGE_NAME_apalis-tk1 = "Apalis-TK1_${IMAGE_BASENAME}" IMAGE_NAME_apalis-tk1-mainline = "Apalis-TK1-Mainline_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx6 = "Colibri-iMX6_${IMAGE_BASENAME}" @@ -15,8 +14,6 @@ IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}" IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-t20 = "Colibri-T20_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-t30 = "Colibri-T30_${IMAGE_BASENAME}" IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}" IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" @@ -34,9 +31,6 @@ ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", " CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client" -#deploy the OpenGL ES headers to the sysroot -DEPENDS_append_tegra = " nvsamples" - #don't install some id databases #BAD_RECOMMENDATIONS_append_colibri-vf = " udev-hwdb cpufrequtils " @@ -94,41 +88,6 @@ GSTREAMER_append_mx7 = " \ # gst-fsl-plugin \ # -# use gstreamer-0.10 for tegra -GSTREAMER_tegra = " \ - gstreamer \ - gst-plugins-base \ - gst-plugins-base-alsa \ - gst-plugins-base-audioconvert \ - gst-plugins-base-audioresample \ - gst-plugins-base-audiotestsrc \ - gst-plugins-base-decodebin \ - gst-plugins-base-decodebin2 \ - gst-plugins-base-playbin \ - gst-plugins-base-typefindfunctions \ - gst-plugins-base-ivorbisdec \ - gst-plugins-base-ogg \ - gst-plugins-base-theora \ - gst-plugins-base-videotestsrc \ - gst-plugins-base-vorbis \ - gst-plugins-good-audioparsers \ - gst-plugins-good-autodetect \ - gst-plugins-good-avi \ - gst-plugins-good-deinterlace \ - gst-plugins-good-id3demux \ - gst-plugins-good-isomp4 \ - gst-plugins-good-matroska \ - gst-plugins-good-rtp \ - gst-plugins-good-rtpmanager \ - gst-plugins-good-udp \ - gst-plugins-good-video4linux2 \ - gst-plugins-good-wavenc \ - gst-plugins-good-wavparse \ - gst-plugins-ugly-asf \ -" -GSTREAMER_append_tegra3 = " \ - gst-plugins-good-jpeg \ -" GSTREAMER_append_tegra124 = " \ gstreamer1.0-libav \ gstreamer1.0-plugins-bad-videoparsersbad \ @@ -205,10 +164,6 @@ IMAGE_INSTALL_QT4 = " \ icu \ " -IMAGE_INSTALL_append_tegra = " \ - eglinfo-x11 \ - xvinfo \ -" IMAGE_INSTALL_append_tegra124 = " \ libglu \ mesa-demos \ diff --git a/recipes-images/images/angstrom-qt5-x11-image.bb b/recipes-images/images/angstrom-qt5-x11-image.bb index 71a55c0..a8e99f1 100644 --- a/recipes-images/images/angstrom-qt5-x11-image.bb +++ b/recipes-images/images/angstrom-qt5-x11-image.bb @@ -12,7 +12,6 @@ LICENSE = "MIT" #start of the resulting deployable tarball name export IMAGE_BASENAME = "Qt5-X11-Image" IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}" -IMAGE_NAME_apalis-t30 = "Apalis-T30_${IMAGE_BASENAME}" IMAGE_NAME_apalis-tk1 = "Apalis-TK1_${IMAGE_BASENAME}" IMAGE_NAME_apalis-tk1-mainline = "Apalis-TK1-Mainline_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx6 = "Colibri-iMX6_${IMAGE_BASENAME}" @@ -20,8 +19,6 @@ IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}" IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-t20 = "Colibri-T20_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-t30 = "Colibri-T30_${IMAGE_BASENAME}" IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}" IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" @@ -41,9 +38,6 @@ ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", " CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client" -#deploy the OpenGL ES headers to the sysroot -DEPENDS_append_tegra = " nvsamples" - #don't install some id databases #BAD_RECOMMENDATIONS_append_colibri-vf = " udev-hwdb cpufrequtils " @@ -101,41 +95,6 @@ GSTREAMER_append_mx7 = " \ # gst-fsl-plugin \ # -# use gstreamer-0.10 for tegra -GSTREAMER_tegra = " \ - gstreamer \ - gst-plugins-base \ - gst-plugins-base-alsa \ - gst-plugins-base-audioconvert \ - gst-plugins-base-audioresample \ - gst-plugins-base-audiotestsrc \ - gst-plugins-base-decodebin \ - gst-plugins-base-decodebin2 \ - gst-plugins-base-playbin \ - gst-plugins-base-typefindfunctions \ - gst-plugins-base-ivorbisdec \ - gst-plugins-base-ogg \ - gst-plugins-base-theora \ - gst-plugins-base-videotestsrc \ - gst-plugins-base-vorbis \ - gst-plugins-good-audioparsers \ - gst-plugins-good-autodetect \ - gst-plugins-good-avi \ - gst-plugins-good-deinterlace \ - gst-plugins-good-id3demux \ - gst-plugins-good-isomp4 \ - gst-plugins-good-matroska \ - gst-plugins-good-rtp \ - gst-plugins-good-rtpmanager \ - gst-plugins-good-udp \ - gst-plugins-good-video4linux2 \ - gst-plugins-good-wavenc \ - gst-plugins-good-wavparse \ - gst-plugins-ugly-asf \ -" -GSTREAMER_append_tegra3 = " \ - gst-plugins-good-jpeg \ -" GSTREAMER_append_tegra124 = " \ gstreamer1.0-libav \ gstreamer1.0-plugins-bad-videoparsersbad \ @@ -184,10 +143,6 @@ IMAGE_INSTALL_QT5 = " \ x-window-simple-app \ " -IMAGE_INSTALL_append_tegra = " \ - eglinfo-x11 \ - xvinfo \ -" IMAGE_INSTALL_append_tegra124 = " \ libglu \ mesa-demos \ diff --git a/recipes-images/images/console-tdx-image.bb b/recipes-images/images/console-tdx-image.bb index 29245d3..a9734ab 100644 --- a/recipes-images/images/console-tdx-image.bb +++ b/recipes-images/images/console-tdx-image.bb @@ -7,7 +7,6 @@ LICENSE = "MIT" #start of the resulting deployable tarball name export IMAGE_BASENAME = "Console-Image" IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}" -IMAGE_NAME_apalis-t30 = "Apalis-T30_${IMAGE_BASENAME}" IMAGE_NAME_apalis-tk1 = "Apalis-TK1_${IMAGE_BASENAME}" IMAGE_NAME_apalis-tk1-mainline = "Apalis-TK1-Mainline_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx6 = "Colibri-iMX6_${IMAGE_BASENAME}" @@ -15,8 +14,6 @@ IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}" IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-t20 = "Colibri-T20_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-t30 = "Colibri-T30_${IMAGE_BASENAME}" IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}" IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" @@ -40,7 +37,6 @@ CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-p #deploy the X server for the tegras #this adds a few MB to the image, but all graphical HW acceleration is #available only on top of X, this is not required for nouveau based build. -IMAGE_INSTALL_append_tegra = " ${XSERVER} xterm xclock" IMAGE_INSTALL_append_tegra124 = " ${XSERVER} xterm xclock" IMAGE_INSTALL += " \ diff --git a/recipes-images/images/files/apalis-t30/library b/recipes-images/images/files/apalis-t30/library deleted file mode 120000 index 53bed96..0000000 --- a/recipes-images/images/files/apalis-t30/library +++ /dev/null @@ -1 +0,0 @@ -../library
\ No newline at end of file diff --git a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/Apalis_T30_2GB_800Mhz.bct b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/Apalis_T30_2GB_800Mhz.bct Binary files differdeleted file mode 100644 index f228cd2..0000000 --- a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/Apalis_T30_2GB_800Mhz.bct +++ /dev/null diff --git a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/apalis_t30.img.cfg b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/apalis_t30.img.cfg deleted file mode 100644 index 6fbdc0d..0000000 --- a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/apalis_t30.img.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2014 Toradex, Inc. -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# 3. This notice may not be removed or altered from any source distribution. - -Version = 0x00020001; -Bctcopy = 1; -Bctfile = Apalis_T30_2GB_800Mhz.bct; -BootLoader = u-boot-dtb-tegra.bin,0x80108000,0x80108000,Complete; diff --git a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/apalis_t30_12MHz_MT41K512M8RH-125_533MHz.bct b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/apalis_t30_12MHz_MT41K512M8RH-125_533MHz.bct Binary files differdeleted file mode 100644 index 423aad1..0000000 --- a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/apalis_t30_12MHz_MT41K512M8RH-125_533MHz.bct +++ /dev/null diff --git a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/flash_blk.scr b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/flash_blk.scr deleted file mode 100644 index 8bdb6ef..0000000 --- a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/flash_blk.scr +++ /dev/null @@ -1,46 +0,0 @@ -test -n ${interface} || setenv interface mmc -test -n ${drive} || setenv drive 1 - -setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' -#workaround U-Boot counting in hex and split did in decimal -setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true' -setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' - -setenv check_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; for off in 7ff fff 1fff 3fff 7fff ffff 1ffff; do mmc read ${fdt_addr_r} ${off} 1 && setenv conf_blk_offset $off; done; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' - -setenv migrate_1 'setexpr conf_blk_addr ${fdt_addr_r} - 8; mmc dev 0 1; mmc read ${conf_blk_addr} 9 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_2 'mmc dev 0 0; mmc read ${fdt_addr_r} 6000 1 crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_3 'mmc dev 0 0; mmc read ${fdt_addr_r} 8000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_4 'mmc dev 0 0; mmc read ${fdt_addr_r} 9000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_5 'mmc dev 0 0; mmc read ${fdt_addr_r} 28000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_6 'mmc dev 0 0; mmc read ${fdt_addr_r} 32000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_7 'mmc dev 0 0; mmc read ${fdt_addr_r} 32400 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_8 'mmc dev 0 0; mmc read ${fdt_addr_r} 34000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_9 'mmc dev 0 0; mmc read ${fdt_addr_r} 34800 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_a 'mmc dev 0 0; mmc read ${fdt_addr_r} 36000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_b 'mmc dev 0 0; mmc read ${fdt_addr_r} 37000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4; run migrate_5; run migrate_6; run migrate_7; run migrate_8; run migrate_9; run migrate_a; run migrate_b' - -setenv cp_file_chunk 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/root.ext3-${filenum} || setenv filesize 0; run set_blkcnt; mmc dev 0 0 && mmc write ${fdt_addr_r} ${blkstart} ${blkcnt}' - -setenv update_uboot 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}' - -setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' - -setenv update_fdt 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${soc}-apalis-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb ${filesize}' - -setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' - -setenv update_1 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x0 0x1' -setenv update_2 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x2000 ${blkcnt}' -#do it in chunks of 64M to fit into DDR RAM of the smallest module -setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done' - -setenv echo_v2.3b2 echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_v2.3b2\" to complete update" -setenv migrate_v2.3b2 'run migrate_configblock; run update_new' -setenv update_v2.3b2 'run update_uboot && run echo_v2.3b2' - -setenv update_new 'run check_configblock || run migrate_configblock; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3; reset' -setenv update 'if test -v ${ver}; then run update_new; else run update_v2.3b2; fi' - -echo 'enter "run update" to update the entire module' diff --git a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/flash_eth.scr b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/flash_eth.scr deleted file mode 100644 index 3a01ae3..0000000 --- a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/flash_eth.scr +++ /dev/null @@ -1,43 +0,0 @@ -setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' -#workaround U-Boot counting in hex and split did in decimal -setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true' -setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' - -setenv check_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; for off in 7ff fff 1fff 3fff 7fff ffff 1ffff; do mmc read ${fdt_addr_r} ${off} 1 && setenv conf_blk_offset $off; done; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' - -setenv migrate_1 'setexpr conf_blk_addr ${fdt_addr_r} - 8; mmc dev 0 1; mmc read ${conf_blk_addr} 9 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_2 'mmc dev 0 0; mmc read ${fdt_addr_r} 6000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_3 'mmc dev 0 0; mmc read ${fdt_addr_r} 8000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_4 'mmc dev 0 0; mmc read ${fdt_addr_r} 9000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_5 'mmc dev 0 0; mmc read ${fdt_addr_r} 28000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_6 'mmc dev 0 0; mmc read ${fdt_addr_r} 32000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_7 'mmc dev 0 0; mmc read ${fdt_addr_r} 32400 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_8 'mmc dev 0 0; mmc read ${fdt_addr_r} 34000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_9 'mmc dev 0 0; mmc read ${fdt_addr_r} 34800 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_a 'mmc dev 0 0; mmc read ${fdt_addr_r} 36000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_b 'mmc dev 0 0; mmc read ${fdt_addr_r} 37000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4; run migrate_5; run migrate_6; run migrate_7; run migrate_8; run migrate_9; run migrate_a; run migrate_b' - -setenv cp_file_chunk 'tftpboot ${fdt_addr_r} ${board_name}/root.ext3-${filenum} || setenv filesize 0; run set_blkcnt; mmc dev 0 0 && mmc write ${fdt_addr_r} ${blkstart} ${blkcnt}' - -setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}' - -setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' - -setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-apalis-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb ${filesize}' - -setenv update_configblock 'run check_configblock; tftpboot ${fdt_addr_r} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' - -setenv update_1 'tftpboot ${fdt_addr_r} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x0 0x1' -setenv update_2 'tftpboot ${fdt_addr_r} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x2000 ${blkcnt}' -#do it in chunks of 64M to fit into DDR RAM of the smallest module -setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done' - -setenv echo_v2.3b2 echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_v2.3b2\" to complete update" -setenv migrate_v2.3b2 'run migrate_configblock; run update_new' -setenv update_v2.3b2 'run update_uboot && run echo_v2.3b2' - -setenv update_new 'run check_configblock || run migrate_configblock; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3; reset' -setenv update 'if test -v ${ver}; then run update_new; else run update_v2.3b2; fi' - -echo 'enter "run update" to update the entire module' diff --git a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_blk.scr b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_blk.scr deleted file mode 120000 index 5954646..0000000 --- a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_blk.scr +++ /dev/null @@ -1 +0,0 @@ -../../library/fwd_blk.scr
\ No newline at end of file diff --git a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_eth.scr b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_eth.scr deleted file mode 120000 index decc214..0000000 --- a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_eth.scr +++ /dev/null @@ -1 +0,0 @@ -../../library/fwd_eth.scr
\ No newline at end of file diff --git a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_mmc.scr b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_mmc.scr deleted file mode 120000 index 3848cfa..0000000 --- a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_mmc.scr +++ /dev/null @@ -1 +0,0 @@ -../../library/fwd_mmc.scr
\ No newline at end of file diff --git a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/mk-u-boot-scripts.sh deleted file mode 120000 index ce71dbd..0000000 --- a/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/mk-u-boot-scripts.sh +++ /dev/null @@ -1 +0,0 @@ -../../library/mk-u-boot-scripts.sh
\ No newline at end of file diff --git a/recipes-images/images/files/apalis-t30/update/tegra-uboot-flasher/genext3fs.sh b/recipes-images/images/files/apalis-t30/update/tegra-uboot-flasher/genext3fs.sh deleted file mode 120000 index cc716db..0000000 --- a/recipes-images/images/files/apalis-t30/update/tegra-uboot-flasher/genext3fs.sh +++ /dev/null @@ -1 +0,0 @@ -../../library/genext3fs.sh
\ No newline at end of file diff --git a/recipes-images/images/files/apalis-t30/update/update.sh b/recipes-images/images/files/apalis-t30/update/update.sh deleted file mode 120000 index 6ebea84..0000000 --- a/recipes-images/images/files/apalis-t30/update/update.sh +++ /dev/null @@ -1 +0,0 @@ -../library/tegra/update.sh
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t20/library b/recipes-images/images/files/colibri-t20/library deleted file mode 120000 index 53bed96..0000000 --- a/recipes-images/images/files/colibri-t20/library +++ /dev/null @@ -1 +0,0 @@ -../library
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-hsmmc.bct b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-hsmmc.bct Binary files differdeleted file mode 100644 index bcef8b1..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-hsmmc.bct +++ /dev/null diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-hsmmc.img.cfg b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-hsmmc.img.cfg deleted file mode 100644 index 6fc664d..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-hsmmc.img.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2015 Toradex, Inc. -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# 3. This notice may not be removed or altered from any source distribution. - -Version = 0x00020001; -Bctcopy = 1; -Bctfile = colibri_t20-256-hsmmc.bct; -BootLoader = u-boot-dtb-tegra.bin,0x00108000,0x00108000,Complete; diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v11-nand.bct b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v11-nand.bct Binary files differdeleted file mode 100644 index 7ddd5d8..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v11-nand.bct +++ /dev/null diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v11-nand.img.cfg b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v11-nand.img.cfg deleted file mode 100644 index 3ce017e..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v11-nand.img.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2015 Toradex, Inc. -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# 3. This notice may not be removed or altered from any source distribution. - -Version = 0x00020001; -Bctcopy = 1; -Bctfile = colibri_t20-256-v11-nand.bct; -BootLoader = u-boot-dtb-tegra.bin,0x00108000,0x00108000,Complete; diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v12-nand.bct b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v12-nand.bct Binary files differdeleted file mode 100644 index 365877f..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v12-nand.bct +++ /dev/null diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v12-nand.img.cfg b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v12-nand.img.cfg deleted file mode 100644 index 41ed535..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v12-nand.img.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2015 Toradex, Inc. -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# 3. This notice may not be removed or altered from any source distribution. - -Version = 0x00020001; -Bctcopy = 1; -Bctfile = colibri_t20-256-v12-nand.bct; -BootLoader = u-boot-dtb-tegra.bin,0x00108000,0x00108000,Complete; diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-hsmmc.bct b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-hsmmc.bct Binary files differdeleted file mode 100644 index 09eb434..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-hsmmc.bct +++ /dev/null diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-hsmmc.img.cfg b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-hsmmc.img.cfg deleted file mode 100644 index 60760fc..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-hsmmc.img.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2015 Toradex, Inc. -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# 3. This notice may not be removed or altered from any source distribution. - -Version = 0x00020001; -Bctcopy = 1; -Bctfile = colibri_t20-512-hsmmc.bct; -BootLoader = u-boot-dtb-tegra.bin,0x00108000,0x00108000,Complete; diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v11-nand.bct b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v11-nand.bct Binary files differdeleted file mode 100644 index 5d68994..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v11-nand.bct +++ /dev/null diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v11-nand.img.cfg b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v11-nand.img.cfg deleted file mode 100644 index 992f47a..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v11-nand.img.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2015 Toradex, Inc. -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# 3. This notice may not be removed or altered from any source distribution. - -Version = 0x00020001; -Bctcopy = 1; -Bctfile = colibri_t20-512-v11-nand.bct; -BootLoader = u-boot-dtb-tegra.bin,0x00108000,0x00108000,Complete; diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v12-nand.bct b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v12-nand.bct Binary files differdeleted file mode 100644 index f9db8fc..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v12-nand.bct +++ /dev/null diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v12-nand.img.cfg b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v12-nand.img.cfg deleted file mode 100644 index cb96289..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v12-nand.img.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2015 Toradex, Inc. -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# 3. This notice may not be removed or altered from any source distribution. - -Version = 0x00020001; -Bctcopy = 1; -Bctfile = colibri_t20-512-v12-nand.bct; -BootLoader = u-boot-dtb-tegra.bin,0x00108000,0x00108000,Complete; diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/flash_blk.scr b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/flash_blk.scr deleted file mode 100644 index b2728bb..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/flash_blk.scr +++ /dev/null @@ -1,34 +0,0 @@ -test -n ${interface} || setenv interface mmc - -test -n ${hw-version} || if test $lnxoffset = 0x1200000; then setenv hw-version v11; else setenv hw-version v12; fi - -setenv check_configblock 'setexpr toradex_oui_addr $fdt_addr_r + 8; nand read $fdt_addr_r 0x300000 0x64; crc32 -v $toradex_oui_addr 3 94305232' - -setenv migrate_1 'nand read $fdt_addr_r 0x15C0000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $fdt_addr_r 0x300000 0x64' -setenv migrate_2 'nand read $fdt_addr_r 0x1C80000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $fdt_addr_r 0x300000 0x64' -setenv migrate_3 'nand read $fdt_addr_r 0x7380000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $fdt_addr_r 0x300000 0x64' -setenv migrate_4 'nand read $fdt_addr_r 0x7900000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $fdt_addr_r 0x300000 0x64' -setenv migrate_configblock 'setexpr toradex_oui_addr $fdt_addr_r + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4' - -# Migrate to UBI volume based boot schema -setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' -setenv prepare_rootfs 'ubi create rootfs - dynamic' -setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi' - -setenv update_configblock 'load ${interface} 0:1 ${fdt_addr_r} ${board_name}/configblock.bin && nand erase.part cfgblock && nand write ${fdt_addr_r} cfgblock ${filesize}' -setenv update_uboot 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${board_name}-${ram-size}-${hw-version}-nand.img && nand erase 0x0 0x300000 && nand write ${fdt_addr_r} 0x0 ${filesize}' - -setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' -#Writting data to invalidate current device tree -setenv update_fdt 'mw.w ${fdt_addr_r} 0xFF 16 && ubi write ${fdt_addr_r} dtb 16 && fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && -ubi write ${fdt_addr_r} dtb ${filesize}' -setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs_${leb-size}.img && ubi write ${fdt_addr_r} rootfs ${filesize}' - -setenv echo_v2.3b7 echo "successfully updated U-Boot," \${note} "power-cycle and enter \"run setupdate\; run migrate_v2.3b7\" to complete update" -setenv migrate_v2.3b7 'run migrate_configblock; nand erase.part ubi; run update_new' -setenv update_v2.3b7 'setenv ram-size 256; run update_uboot && setenv note "wait a sec," && run echo_v2.3b7 && md 0x1ffffffc 1 && setenv ram-size 512 && run update_uboot && setenv note && run echo_v2.3b7' - -setenv update_new 'run check_configblock || run migrate_configblock; run update_uboot; run prepare_ubi && run update_kernel && run update_rootfs && run update_fdt; reset' -setenv update 'if test -v $ver; then run update_new; else run update_v2.3b7; fi' - -echo 'enter "run update" to update the entire module' diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/flash_eth.scr b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/flash_eth.scr deleted file mode 100644 index 7f4cbb4..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/flash_eth.scr +++ /dev/null @@ -1,33 +0,0 @@ -test -n ${hw-version} || if test $lnxoffset = 0x1200000; then setenv hw-version v11; else setenv hw-version v12; fi - -setenv check_configblock 'setexpr toradex_oui_addr $fdt_addr_r + 8; nand read $fdt_addr_r 0x300000 0x64; crc32 -v $toradex_oui_addr 3 94305232' - -setenv migrate_1 'nand read $fdt_addr_r 0x15C0000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $fdt_addr_r 0x300000 0x64' -setenv migrate_2 'nand read $fdt_addr_r 0x1C80000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $fdt_addr_r 0x300000 0x64' -setenv migrate_3 'nand read $fdt_addr_r 0x7380000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $fdt_addr_r 0x300000 0x64' -setenv migrate_4 'nand read $fdt_addr_r 0x7900000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $fdt_addr_r 0x300000 0x64' -setenv migrate_configblock 'setexpr toradex_oui_addr $fdt_addr_r + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4' - -# Migrate to UBI volume based boot schema -setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' -setenv prepare_rootfs 'ubi create rootfs - dynamic' -setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi' - -setenv update_configblock 'tftpboot ${fdt_addr_r} ${board_name}/configblock.bin && nand erase.part cfgblock && nand write ${fdt_addr_r} cfgblock ${filesize}' -setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/${board_name}-${ram-size}-${hw-version}-nand.img && nand erase 0x0 0x300000 && nand write ${fdt_addr_r} 0x0 ${filesize}' - -setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs_${leb-size}.img && run prepare_rootfs && ubi write ${fdt_addr_r} rootfs ${filesize}' -setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' -#Writting data to invalidate current device tree -setenv update_fdt 'mw.w ${fdt_addr_r} 0xFF 16 && ubi write ${fdt_addr_r} dtb 16 && tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && -ubi write ${fdt_addr_r} dtb ${filesize}' -setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs_${leb-size}.img && ubi write ${fdt_addr_r} rootfs ${filesize}' - -setenv echo_v2.3b7 echo "successfully updated U-Boot," \${note} "power-cycle and enter \"run setupdate\; run migrate_v2.3b7\" to complete update" -setenv migrate_v2.3b7 'run migrate_configblock; nand erase.part ubi; run update_new' -setenv update_v2.3b7 'setenv ram-size 256; run update_uboot && setenv note "wait a sec," && run echo_v2.3b7 && md 0x1ffffffc 1 && setenv ram-size 512 && run update_uboot && setenv note && run echo_v2.3b7' - -setenv update_new 'run check_configblock || run migrate_configblock; run update_uboot; run prepare_ubi && run update_kernel && run update_rootfs && run update_fdt; reset' -setenv update 'if test -v $ver; then run update_new; else run update_v2.3b7; fi' - -echo 'enter "run update" to update the entire module' diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_blk.scr b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_blk.scr deleted file mode 120000 index 5954646..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_blk.scr +++ /dev/null @@ -1 +0,0 @@ -../../library/fwd_blk.scr
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_eth.scr b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_eth.scr deleted file mode 120000 index decc214..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_eth.scr +++ /dev/null @@ -1 +0,0 @@ -../../library/fwd_eth.scr
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_mmc.scr b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_mmc.scr deleted file mode 120000 index 3848cfa..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_mmc.scr +++ /dev/null @@ -1 +0,0 @@ -../../library/fwd_mmc.scr
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/mk-u-boot-scripts.sh deleted file mode 120000 index ce71dbd..0000000 --- a/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/mk-u-boot-scripts.sh +++ /dev/null @@ -1 +0,0 @@ -../../library/mk-u-boot-scripts.sh
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t20/update/tegra-uboot-flasher/genext3fs.sh b/recipes-images/images/files/colibri-t20/update/tegra-uboot-flasher/genext3fs.sh deleted file mode 120000 index cc716db..0000000 --- a/recipes-images/images/files/colibri-t20/update/tegra-uboot-flasher/genext3fs.sh +++ /dev/null @@ -1 +0,0 @@ -../../library/genext3fs.sh
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t20/update/update.sh b/recipes-images/images/files/colibri-t20/update/update.sh deleted file mode 120000 index 6ebea84..0000000 --- a/recipes-images/images/files/colibri-t20/update/update.sh +++ /dev/null @@ -1 +0,0 @@ -../library/tegra/update.sh
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t30/library b/recipes-images/images/files/colibri-t30/library deleted file mode 120000 index 53bed96..0000000 --- a/recipes-images/images/files/colibri-t30/library +++ /dev/null @@ -1 +0,0 @@ -../library
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30.img.cfg b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30.img.cfg deleted file mode 100644 index d797a13..0000000 --- a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30.img.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2013-2014 Toradex, Inc. -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# 3. This notice may not be removed or altered from any source distribution. - -Version = 0x00020001; -Bctcopy = 1; -Bctfile = colibri_t30_12MHz_NT5CC256M16CP-DI_400MHz.bct; -BootLoader = u-boot-dtb-tegra.bin,0x80108000,0x80108000,Complete; diff --git a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_400MHz.bct b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_400MHz.bct Binary files differdeleted file mode 100755 index 109f0c0..0000000 --- a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_400MHz.bct +++ /dev/null diff --git a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_533MHz.bct b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_533MHz.bct Binary files differdeleted file mode 100644 index 0349242..0000000 --- a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_533MHz.bct +++ /dev/null diff --git a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/flash_blk.scr b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/flash_blk.scr deleted file mode 100644 index aefc08f..0000000 --- a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/flash_blk.scr +++ /dev/null @@ -1,46 +0,0 @@ -test -n ${interface} || setenv interface mmc -test -n ${drive} || setenv drive 1 - -setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' -#workaround U-Boot counting in hex and split did in decimal -setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true' -setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' - -setenv check_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; for off in 7ff fff 1fff 3fff 7fff ffff 1ffff; do mmc read ${fdt_addr_r} ${off} 1 && setenv conf_blk_offset $off; done; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' - -setenv migrate_1 'setexpr conf_blk_addr ${fdt_addr_r} - 8; mmc dev 0 1; mmc read ${conf_blk_addr} 9 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_2 'mmc dev 0 0; mmc read ${fdt_addr_r} 6000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_3 'mmc dev 0 0; mmc read ${fdt_addr_r} 8000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_4 'mmc dev 0 0; mmc read ${fdt_addr_r} 9000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_5 'mmc dev 0 0; mmc read ${fdt_addr_r} 28000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_6 'mmc dev 0 0; mmc read ${fdt_addr_r} 32000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_7 'mmc dev 0 0; mmc read ${fdt_addr_r} 32400 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_8 'mmc dev 0 0; mmc read ${fdt_addr_r} 34000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_9 'mmc dev 0 0; mmc read ${fdt_addr_r} 34800 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_a 'mmc dev 0 0; mmc read ${fdt_addr_r} 36000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_b 'mmc dev 0 0; mmc read ${fdt_addr_r} 37000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4; run migrate_5; run migrate_6; run migrate_7; run migrate_8; run migrate_9; run migrate_a; run migrate_b' - -setenv cp_file_chunk 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/root.ext3-${filenum} || setenv filesize 0; run set_blkcnt; mmc dev 0 0 && mmc write ${fdt_addr_r} ${blkstart} ${blkcnt}' - -setenv update_uboot 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}' - -setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' - -setenv update_fdt 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb ${filesize}' - -setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' - -setenv update_1 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x0 0x1' -setenv update_2 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x2000 ${blkcnt}' -#do it in chunks of 64M to fit into DDR RAM of the smallest module -setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done' - -setenv echo_v2.3b1 echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_v2.3b1\" to complete update" -setenv migrate_v2.3b1 'run migrate_configblock; run update_new' -setenv update_v2.3b1 'run update_uboot && run echo_v2.3b1' - -setenv update_new 'run check_configblock || run migrate_configblock; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3; reset' -setenv update 'if test -v ${ver}; then run update_new; else run update_v2.3b1; fi' - -echo 'enter "run update" to update the entire module' diff --git a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/flash_eth.scr b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/flash_eth.scr deleted file mode 100644 index 26eb0a3..0000000 --- a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/flash_eth.scr +++ /dev/null @@ -1,43 +0,0 @@ -setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' -#workaround U-Boot counting in hex and split did in decimal -setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true' -setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' - -setenv check_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; for off in 7ff fff 1fff 3fff 7fff ffff 1ffff; do mmc read ${fdt_addr_r} ${off} 1 && setenv conf_blk_offset $off; done; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' - -setenv migrate_1 'setexpr conf_blk_addr ${fdt_addr_r} - 8; mmc dev 0 1; mmc read ${conf_blk_addr} 9 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_2 'mmc dev 0 0; mmc read ${fdt_addr_r} 6000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_3 'mmc dev 0 0; mmc read ${fdt_addr_r} 8000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_4 'mmc dev 0 0; mmc read ${fdt_addr_r} 9000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_5 'mmc dev 0 0; mmc read ${fdt_addr_r} 28000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_6 'mmc dev 0 0; mmc read ${fdt_addr_r} 32000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_7 'mmc dev 0 0; mmc read ${fdt_addr_r} 32400 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_8 'mmc dev 0 0; mmc read ${fdt_addr_r} 34000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_9 'mmc dev 0 0; mmc read ${fdt_addr_r} 34800 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_a 'mmc dev 0 0; mmc read ${fdt_addr_r} 36000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_b 'mmc dev 0 0; mmc read ${fdt_addr_r} 37000 1; crc32 -v ${toradex_oui_addr} 3 94305232 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' -setenv migrate_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4; run migrate_5; run migrate_6; run migrate_7; run migrate_8; run migrate_9; run migrate_a; run migrate_b' - -setenv cp_file_chunk 'tftpboot ${fdt_addr_r} ${board_name}/root.ext3-${filenum} || setenv filesize 0; run set_blkcnt; mmc dev 0 0 && mmc write ${fdt_addr_r} ${blkstart} ${blkcnt}' - -setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}' - -setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' - -setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb ${filesize}' - -setenv update_configblock 'run check_configblock; tftpboot ${fdt_addr_r} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' - -setenv update_1 'tftpboot ${fdt_addr_r} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x0 0x1' -setenv update_2 'tftpboot ${fdt_addr_r} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x2000 ${blkcnt}' -#do it in chunks of 64M to fit into DDR RAM of the smallest module -setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done' - -setenv echo_v2.3b1 echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_v2.3b1\" to complete update" -setenv migrate_v2.3b1 'run migrate_configblock; run update_new' -setenv update_v2.3b1 'run update_uboot && run echo_v2.3b1' - -setenv update_new 'run check_configblock || run migrate_configblock; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3; reset' -setenv update 'if test -v ${ver}; then run update_new; else run update_v2.3b1; fi' - -echo 'enter "run update" to update the entire module' diff --git a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_blk.scr b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_blk.scr deleted file mode 120000 index 5954646..0000000 --- a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_blk.scr +++ /dev/null @@ -1 +0,0 @@ -../../library/fwd_blk.scr
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_eth.scr b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_eth.scr deleted file mode 120000 index decc214..0000000 --- a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_eth.scr +++ /dev/null @@ -1 +0,0 @@ -../../library/fwd_eth.scr
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_mmc.scr b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_mmc.scr deleted file mode 120000 index 3848cfa..0000000 --- a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_mmc.scr +++ /dev/null @@ -1 +0,0 @@ -../../library/fwd_mmc.scr
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/mk-u-boot-scripts.sh deleted file mode 120000 index ce71dbd..0000000 --- a/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/mk-u-boot-scripts.sh +++ /dev/null @@ -1 +0,0 @@ -../../library/mk-u-boot-scripts.sh
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t30/update/tegra-uboot-flasher/genext3fs.sh b/recipes-images/images/files/colibri-t30/update/tegra-uboot-flasher/genext3fs.sh deleted file mode 120000 index cc716db..0000000 --- a/recipes-images/images/files/colibri-t30/update/tegra-uboot-flasher/genext3fs.sh +++ /dev/null @@ -1 +0,0 @@ -../../library/genext3fs.sh
\ No newline at end of file diff --git a/recipes-images/images/files/colibri-t30/update/update.sh b/recipes-images/images/files/colibri-t30/update/update.sh deleted file mode 120000 index 6ebea84..0000000 --- a/recipes-images/images/files/colibri-t30/update/update.sh +++ /dev/null @@ -1 +0,0 @@ -../library/tegra/update.sh
\ No newline at end of file diff --git a/recipes-images/images/files/library/create_configblock.sh b/recipes-images/images/files/library/create_configblock.sh index 3829fbb..63e9951 100755 --- a/recipes-images/images/files/library/create_configblock.sh +++ b/recipes-images/images/files/library/create_configblock.sh @@ -39,43 +39,24 @@ AWKTEST=`echo 12345678abcdefgh | awk 'BEGIN{ FIELDWIDTHS = "8 8"} {print $2}'` | [ "${AWKTEST}x" = "abcdefghx" ] || { echo >&2 "Program gawk not available. Aborting."; exit 1; } # autotect MODTYPE from from rootfs directory -CNT=`grep -c "T20" rootfs/etc/issue || true` -if [ ${CNT} -ge 1 ] ; then - echo "Colibri T20 rootfs detected" - MODTYPE=colibri-t20 - BOOT_DEVICE=nand +CNT=`grep -c "VF" rootfs/etc/issue || true` +if [ "$CNT" -ge 1 ] ; then + echo "Colibri VF rootfs detected" + MODTYPE=colibri-vf else - CNT=`grep -c "T30" rootfs/etc/issue || true` - if [ ${CNT} -ge 1 ] ; then - CNT=`grep -c "Apalis" rootfs/etc/issue || true` - if [ ${CNT} -ge 1 ] ; then - echo "Apalis T30 rootfs detected" - MODTYPE=apalis-t30 - else - echo "Colibri T30 rootfs detected" - MODTYPE=colibri-t30 - fi + CNT=`grep -c "Colibri_iMX6" rootfs/etc/issue || true` + if [ "$CNT" -ge 1 ] ; then + echo "Colibri iMX6 rootfs detected" + MODTYPE=colibri-imx6 else - CNT=`grep -c "VF" rootfs/etc/issue || true` + CNT=`grep -ic "imx6" rootfs/etc/issue || true` if [ "$CNT" -ge 1 ] ; then - echo "Colibri VF rootfs detected" - MODTYPE=colibri-vf + echo "Apalis iMX6 rootfs detected" + MODTYPE=apalis-imx6 else - CNT=`grep -c "Colibri_iMX6" rootfs/etc/issue || true` - if [ "$CNT" -ge 1 ] ; then - echo "Colibri iMX6 rootfs detected" - MODTYPE=colibri-imx6 - else - CNT=`grep -ic "imx6" rootfs/etc/issue || true` - if [ "$CNT" -ge 1 ] ; then - echo "Apalis iMX6 rootfs detected" - MODTYPE=apalis-imx6 - else - echo "can not detect modulue type from ./rootfs/etc/issue" - echo "exiting" - exit 1 - fi - fi + echo "can not detect modulue type from ./rootfs/etc/issue" + echo "exiting" + exit 1 fi fi fi @@ -127,19 +108,6 @@ else ;; esac ;; - "apalis-t30") - RAM_SIZE=1024 - echo "Enter the RAM size ( 1024 / 2048 ):" - read RAM_SIZE - case ${RAM_SIZE} in - "1024") - PROD_ID="0026" - ;; - "2048") - PROD_ID="0025" - ;; - esac - ;; "colibri-imx6") RAM_SIZE=256 echo "Enter the RAM size ( 256 / 512 ):" @@ -160,29 +128,6 @@ else fi fi ;; - "colibri-t20") - RAM_SIZE=256 - echo "Enter the RAM size ( 256 / 512 ):" - read RAM_SIZE - echo "Enter I for IT version, nothing otherwise" - read IT - if [ $RAM_SIZE -eq 512 ] ; then - if [ "$IT"x = "Ix" ] ; then - PROD_ID="0022" - else - PROD_ID="0021" - fi - else - if [ "$IT"x = "Ix" ] ; then - PROD_ID="0024" - else - PROD_ID="0020" - fi - fi - ;; - "colibri-t30") - PROD_ID="0023" - ;; "colibri-vf") VF_TYPE=50 echo "Enter the Module Type (50 for a Colibri VF50 or 61 for a Colibri VF61)" @@ -221,18 +166,7 @@ else fi #write the config block file -if [ "${MODTYPE}" = "colibri-t20" ] ; then - PROD_ID=`echo $PRODUCTNR | awk 'BEGIN{ FIELDWIDTHS = "4 4"} {print $1}'` - CONFIGBLOCK_FILE=${MODTYPE}_bin/configblock_256.bin - if [ ${PROD_ID} = "0021" ] ; then - CONFIGBLOCK_FILE=${MODTYPE}_bin/configblock_512.bin - fi - if [ ${PROD_ID} = "0022" ] ; then - CONFIGBLOCK_FILE=${MODTYPE}_bin/configblock_512.bin - fi -else - CONFIGBLOCK_FILE=${MODTYPE}_bin/configblock.bin -fi +CONFIGBLOCK_FILE=${MODTYPE}_bin/configblock.bin sudo chown ${USER}: `dirname $CONFIGBLOCK_FILE` sudo rm -f $CONFIGBLOCK_FILE #file header diff --git a/recipes-images/images/files/library/fwd_blk.scr b/recipes-images/images/files/library/fwd_blk.scr index 7af72e6..0c961dd 100644 --- a/recipes-images/images/files/library/fwd_blk.scr +++ b/recipes-images/images/files/library/fwd_blk.scr @@ -4,7 +4,6 @@ test -n ${drive} || setenv drive 1 test -z "${board_name}" && test "${soc}" = "vf500" && setenv board_name colibri_vf test -z "${board_name}" && test "${soc}" = "vf610" && setenv board_name colibri_vf test "${board_name}" = "colibri_imx7" && setenv drive 0 -test "${board_name}" = "colibri_t20" && setenv drive 0 test "${board_name}" = "colibri_vf" && setenv drive 0 test -n ${board_name} || echo "board_name env not set!" && exit diff --git a/recipes-images/images/files/library/tegra/update.sh b/recipes-images/images/files/library/tegra/update.sh deleted file mode 100755 index cb55dfc..0000000 --- a/recipes-images/images/files/library/tegra/update.sh +++ /dev/null @@ -1,477 +0,0 @@ -#!/bin/sh -# Prepare files needed for flashing an Apalis/Colibri T20/T30/TK1 module and -# copy them to a convenient location for using from a running U-Boot - -# exit on error -set -e - -Flash() -{ - echo "To flash the Apalis/Colibri T20/T30/TK1 module a running U-Boot is required. Boot" - echo "the module to the U-Boot prompt and" - echo "" - echo "insert the SD card, USB flash drive or when using TFTP connect Ethernet only" - echo "and enter:" - echo "'run setupdate'" - echo "" - echo "then to update all components enter:" - echo "'run update'" - echo "" - echo "Alternatively, to update U-Boot enter:" - echo "'run update_uboot'" - echo "to update a component stored in UBI enter:" - echo "'run prepare_ubi' (for Colibri T20)" - echo "followed by one of:" - echo "'run update_kernel'" - echo "'run update_fdt' (for device tree enabled kernels)" - echo "'run update_rootfs'" - echo "" - echo "" - echo "If you don't have a working U-Boot anymore, connect your PC to the module's USB" - echo "client port, bring the module into the recovery mode and start the update.sh" - echo "script with the -d option. This will copy U-Boot into the module's RAM and" - echo "execute it." -} - -Usage() -{ - echo "" - echo "Prepares and copies files for flashing internal eMMC/NAND of Apalis T30/TK1 and" - echo "Colibri T20/T30" - echo "" - echo "Will require a running U-Boot on the target. Either one already flashed on the" - echo "eMMC/NAND or one copied over USB into the module's RAM" - echo "" - echo "-b : T20: selects boot device (hsmmc/nand) (default: nand)" - echo "-d : use USB recovery mode to copy/execute U-Boot to/from module's RAM" - echo "-f : flash instructions" - echo "-h : prints this message" - echo "-m : module type: 0: autodetect from ./rootfs/etc/issues (default)" - echo " 1: Apalis T30" - echo " 2: Apalis TK1" - echo " 3: Colibri T20" - echo " 4: Colibri T30" - echo "-o directory : output directory" - echo "-r : T20 recovery mode: select RAM size (256 | 512)" - echo "-s : T20: optimise file system for V1.1 or 256MB V1.2 modules," - echo " increases usable space a little, but limits 512MB V1.2 modules" - echo " to 512MB usable NAND space" - echo "-v : T20 recovery mode: select Colibri version (V1_1 | V1_2)" - echo "" - echo "Example \"./update.sh -o /srv/tftp/\" copies the required files to /srv/tftp/" - echo "" - echo "*** For detailed recovery/update procedures, refer to the following website: ***" - echo "http://developer.toradex.com/knowledge-base/flashing-linux-on-tegra-modules" - echo "" -} - -# initialise options -BOOT_DEVICE=nand -EMMC_PARTS="mbr.bin boot.vfat" -# no devicetree by default -KERNEL_DEVICETREE="" -KERNEL_IMAGETYPE="zImage" -MIN_PARTITION_FREE_SIZE=300 -MODTYPE_DETECT=0 - -# NAND parameters -BLOCK="248KiB 504KiB" -MAXLEB=4084 -PAGE="4KiB" - -OUT_DIR="" -ROOTFSPATH=rootfs -SPLIT=1 -UBOOT_RECOVERY=0 - -# don't provide working defaults which may lead to wrong HW/SW combination -MODVERSION=Add_Version_-v -RAM_SIZE=Add_RAMsize_-r - -while getopts "b:dfhm:o:r:sv:" Option ; do - case $Option in - b) BOOT_DEVICE=$OPTARG - ;; - d) UBOOT_RECOVERY=1 - ;; - f) Flash - exit 0 - ;; - h) Usage - exit 0 - ;; - m) MODTYPE_DETECT=$OPTARG - ;; - o) OUT_DIR=$OPTARG - ;; - r) RAM_SIZE=$OPTARG - ;; - s) MAXLEB=2042 - ;; - v) if [ "${OPTARG}" = "V1_1" ] ; then MODVERSION=v11; fi - if [ "${OPTARG}" = "V1_2" ] ; then MODVERSION=v12; fi - ;; - esac -done - -if [ "$OUT_DIR" = "" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then - Usage - exit 1 -fi - -# is OUT_DIR an existing directory? -if [ ! -d "$OUT_DIR" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then - echo "$OUT_DIR" "does not exist, exiting" - exit 1 -fi - -case $MODTYPE_DETECT in - 0) # auto detect MODTYPE from rootfs directory - if [ -f rootfs/etc/issue ] ; then - CNT=`grep -ic "apalis" rootfs/etc/issue || true` - if [ "$CNT" -ge 1 ] ; then - CNT=`grep -ic "t30" rootfs/etc/issue || true` - if [ "$CNT" -ge 1 ] ; then - echo "Apalis T30 rootfs detected" - MODTYPE=apalis-t30 - else - CNT=`grep -ic "tk1" rootfs/etc/issue || true` - if [ "$CNT" -ge 1 ] ; then - echo "Apalis TK1 rootfs detected" - MODTYPE=apalis-tk1 - - CNT=`grep -ic "mainline" rootfs/etc/issue || true` - if [ "$CNT" -ge 1 ] ; then - echo "Mainline variant" - MODTYPE=apalis-tk1-mainline - fi - fi - - fi - else - CNT=`grep -ic "colibri" rootfs/etc/issue || true` - if [ "$CNT" -ge 1 ] ; then - CNT=`grep -ic "t20" rootfs/etc/issue || true` - if [ "$CNT" -ge 1 ] ; then - echo "Colibri T20 rootfs detected" - MODTYPE=colibri-t20 - else - CNT=`grep -ic "t30" rootfs/etc/issue || true` - if [ "$CNT" -ge 1 ] ; then - echo "Colibri T30 rootfs detected" - MODTYPE=colibri-t30 - fi - fi - fi - fi - fi - if [ -e $MODTYPE ] ; then - echo "can not detect module type from ./rootfs/etc/issue" - echo "please specify the module type with the -m parameter" - echo "see help: '$ ./update.sh -h'" - echo "exiting" - exit 1 - fi - ;; - 1) MODTYPE=apalis-t30 - echo "Apalis T30 rootfs specified" - ;; - 2) MODTYPE=apalis-tk1 - echo "Apalis TK1 rootfs specified" - ;; - 3) MODTYPE=colibri-t20 - echo "Colibri T20 rootfs specified" - ;; - 4) MODTYPE=colibri-t30 - echo "Colibri T30 rootfs specified" - ;; - *) echo "-m paramter specifies an unknown value" - exit 1 - ;; -esac - -case "$MODTYPE" in - "apalis-t30") - # note: requires changing apalis-t30_bin/apalis_t30.img.cfg as well -# BCT=apalis_t30_12MHz_MT41K512M8RH-125_533MHz.bct - BCT=Apalis_T30_2GB_800Mhz.bct - CBOOT_IMAGE=apalis_t30.img - CBOOT_IMAGE_TARGET=tegra30 - # assumed minimal eMMC size [in sectors of 512] - EMMC_SIZE=$(expr 1024 \* 7450 \* 2) - IMAGEFILE=root.ext3 - KERNEL_DEVICETREE="%kernel_device_trees%" - LOCPATH="tegra-uboot-flasher" - OUT_DIR="$OUT_DIR/apalis_t30" - U_BOOT_BINARY=u-boot-dtb-tegra.bin - ;; - "apalis-tk1" | "apalis-tk1-mainline") - BCT=PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct - CBOOT_IMAGE=apalis-tk1.img - CBOOT_IMAGE_TARGET=tegra124 - # assumed minimal eMMC size [in sectors of 512] - EMMC_SIZE=$(expr 1024 \* 15020 \* 2) - IMAGEFILE=root.ext4 - KERNEL_DEVICETREE="%kernel_device_trees%" - LOCPATH="tegra-uboot-flasher" - OUT_DIR="$OUT_DIR/apalis-tk1" - U_BOOT_BINARY=u-boot-dtb-tegra.bin - ;; - "colibri-t20") - BCT=colibri_t20-${RAM_SIZE}-${MODVERSION}-${BOOT_DEVICE}.bct - CBOOT_IMAGE="colibri_t20-256-v11-nand.img colibri_t20-256-v12-nand.img colibri_t20-512-v11-nand.img colibri_t20-512-v12-nand.img" - CBOOT_IMAGE_TARGET=tegra20 - EMMC_PARTS="" - IMAGEFILE=ubifs - KERNEL_DEVICETREE="%kernel_device_trees%" - KERNEL_IMAGETYPE="zImage" - LOCPATH="tegra-uboot-flasher" - OUT_DIR="$OUT_DIR/colibri_t20" - U_BOOT_BINARY=u-boot-dtb-tegra.bin - ;; - "colibri-t30") - # with new kernel, boot with 400MHz, then switch between 400 & 800 - # note: requires changing colibri-t30_bin/colibri_t30.img.cfg as well - BCT=colibri_t30_12MHz_NT5CC256M16CP-DI_400MHz.bct -# BCT=colibri_t30_12MHz_NT5CC256M16CP-DI_533MHz.bct - CBOOT_IMAGE=colibri_t30.img - CBOOT_IMAGE_TARGET=tegra30 - EMMC_SIZE=$(expr 1024 \* 3640 \* 2) - IMAGEFILE=root.ext3 - KERNEL_DEVICETREE="%kernel_device_trees%" - LOCPATH="tegra-uboot-flasher" - OUT_DIR="$OUT_DIR/colibri_t30" - U_BOOT_BINARY=u-boot-dtb-tegra.bin - ;; - *) echo "script internal error, unknown module type set" - exit 1 - ;; -esac - -BINARIES=${MODTYPE}_bin - -#is only U-Boot to be copied to RAM? -if [ "$UBOOT_RECOVERY" -eq 1 ] ; then - if [ "${MODTYPE}" = "colibri-t20" ] ; then - #some sanity test, we really need RAM_SIZE and MODVERSION set - echo "" - SANITY_CHECK=1 - if [ "256" != ${RAM_SIZE} ] && [ "512" != ${RAM_SIZE} ]; then - printf "\033[1mplease specify your RAM size with the -r parameter\033[0m\n" - SANITY_CHECK=0 - fi - - if [ "v11" != ${MODVERSION} ] && [ "v12" != ${MODVERSION} ]; then - printf "\033[1mplease specify your module version with the -v parameter\033[0m\n" - SANITY_CHECK=0 - fi - - if [ ${SANITY_CHECK} -eq 0 ] ; then - Usage - exit 1 - fi - fi - - cd ${LOCPATH} - sudo ./tegrarcm --bct=../${BINARIES}/${BCT} --bootloader=../${BINARIES}/${U_BOOT_BINARY} --loadaddr=0x80108000 --usb-timeout=5000 - exit -fi - -#sanity check for awk programs -AWKTEST=`echo 100000000 | awk -v min=100 -v f=10000 '{rootfs_size=$1+f*512;rootfs_size=int(rootfs_size/1024/985); print (rootfs_size+min) }'` || true -[ "${AWKTEST}x" = "204x" ] || { echo >&2 "Program awk not available. Aborting."; exit 1; } - -#sanity check for correct untared rootfs -DEV_OWNER=`ls -ld rootfs/dev | awk '{print $3}'` -if [ "${DEV_OWNER}x" != "rootx" ] -then - printf "rootfs/dev is not owned by root, but it should!\n" - printf "\033[1mPlease unpack the tarball with root rights.\033[0m\n" - printf "e.g. sudo tar xjvf Apalis_T30_LinuxImageV2.6Beta1_20160331.tar.bz2\n" - exit 1 -fi - -#sanity check for existence of U-Boot and kernel -[ -e ${BINARIES}/${U_BOOT_BINARY} ] || { echo "${BINARIES}/${U_BOOT_BINARY} does not exist"; exit 1; } -[ -e ${BINARIES}/${KERNEL_IMAGETYPE} ] || { echo "${BINARIES}/${KERNEL_IMAGETYPE} does not exist"; exit 1; } - -#Sanity check for some programs. Some distros have fs tools only in root's path -MCOPY=`command -v mcopy` || { echo >&2 "Program mcopy not available. Aborting."; exit 1; } -PARTED=`command -v parted` || PARTED=`sudo -s command -v parted` || { echo >&2 "Program parted not available. Aborting."; exit 1; } -MKFSVFAT=`command -v mkfs.fat` || MKFSVFAT=`sudo -s command -v mkfs.fat` || { echo >&2 "Program mkfs.fat not available. Aborting."; exit 1; } -MKFSEXT3=`command -v mkfs.ext3` || MKFSEXT3=`sudo -s command -v mkfs.ext3` || { echo >&2 "Program mkfs.ext3 not available. Aborting."; exit 1; } -MKFSEXT4=`command -v mkfs.ext4` || MKFSEXT4=`sudo -s command -v mkfs.ext4` || { echo >&2 "Program mkfs.ext4 not available. Aborting."; exit 1; } -dd --help >/dev/null 2>&1 || { echo >&2 "Program dd not available. Aborting."; exit 1; } - -CBOOT_CNT=`tegra-uboot-flasher/cbootimage -h | grep -c outputimage || true` -[ "$CBOOT_CNT" -gt 0 ] || { echo >&2 "Program cbootimage not available. 32bit compatibility libs? Aborting."; exit 1; } - -if [ "${MODTYPE}" = "colibri-t20" ] ; then - #sanity check, can we execute mkfs.ubifs, e.g. see the help text? - CNT=`sudo $LOCPATH/mkfs.ubifs -h | grep -c space-fixup || true` - if [ "$CNT" -eq 0 ] ; then - echo "The program mkfs.ubifs can not be executed or does not provide --space-fixup" - echo "option." - echo "Are you on a 64-bit Linux host without installed 32-bit execution environment?" - printf "\033[1mPlease install e.g. ia32-libs on 64-bit Ubuntu\033[0m\n" - printf "\033[1mMaybe others are needed e.g. liblzo2:i386 on 64-bit Ubuntu\033[0m\n" - exit 1 - fi -fi - -#Install trap to write a sensible message in case any of the commands below -#exit premature... -trap '{ printf "\033[31mScript aborted unexpectedly...\033[0m\n"; }' EXIT - -#make the directory with the outputfiles writable -sudo chown $USER: ${BINARIES} - -#make a file with the used versions for U-Boot, kernel and rootfs -sudo touch ${BINARIES}/versions.txt -sudo chmod ugo+w ${BINARIES}/versions.txt -echo "Component Versions" > ${BINARIES}/versions.txt -basename "`readlink -e ${BINARIES}/${U_BOOT_BINARY}`" >> ${BINARIES}/versions.txt -basename "`readlink -e ${BINARIES}/${KERNEL_IMAGETYPE}`" >> ${BINARIES}/versions.txt -ROOTFSVERSION=`egrep -i 't([2-3]0|k1)' rootfs/etc/issue || echo "Version Unknown"` -echo "Rootfs ${ROOTFSVERSION}" >> ${BINARIES}/versions.txt - -#create subdirectory for this module type -sudo mkdir -p "$OUT_DIR" - -# The eMMC layout used is: -# -# boot area partition 1 aka primary eMMC boot sector: -# with cbootimage containing BCT and U-Boot boot loader and the U-Boot -# environment before the configblock at the end of that boot area partition -# -# boot area partition 2 aka secondary eMMC boot sector: -# reserved -# -# user area aka general purpose eMMC region: -# -# 0 -> IMAGE_ROOTFS_ALIGNMENT - reserved (not partitioned) -# IMAGE_ROOTFS_ALIGNMENT -> BOOT_SPACE - kernel and other data -# BOOT_SPACE -> SDIMG_SIZE - rootfs -# -# 4MiB 16MiB SDIMG_ROOTFS -# <-----------------------> <----------> <----------------------> -# ------------------------ ------------ ------------------------ -# | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE | -# ------------------------ ------------ ------------------------ -# ^ ^ ^ ^ -# | | | | -# 0 4MiB 4MiB + 16MiB EMMC_SIZE - -# generate cbootimage(s) containing BCT(s) and U-Boot boot loader -cd ${BINARIES} -for cbootimage in ${CBOOT_IMAGE}; do - sudo ../${LOCPATH}/cbootimage -s ${CBOOT_IMAGE_TARGET} ${cbootimage}.cfg ${cbootimage} -done -cd .. - -if [ "${MODTYPE}" = "colibri-t20" ] ; then - # Prepare full flashing - #build ${IMAGEFILE} if it does not exist - for blocksize in ${BLOCK}; do - sudo $LOCPATH/mkfs.ubifs --space-fixup -c ${MAXLEB} -e ${blocksize} -m ${PAGE} -o ${BINARIES}/${IMAGEFILE}_${blocksize}.img -r rootfs/ -v - done - - echo "" - echo "UBI image of root file system generated, copying data to target folder..." -else - if [ "${MODTYPE}" = "apalis-t30" ] || [ "${MODTYPE}" = "apalis-tk1" ] || [ "${MODTYPE}" = "apalis-tk1-mainline" ] || [ "${MODTYPE}" = "colibri-t30" ] ; then - # Boot partition [in sectors of 512] - BOOT_START=$(expr 4096 \* 2) - # Rootfs partition [in sectors of 512] - ROOTFS_START=$(expr 20480 \* 2) - # Boot partition volume id - BOOTDD_VOLUME_ID="boot" - - echo "" - echo "Creating MBR file and do the partitioning" - # Initialize a sparse file - dd if=/dev/zero of=${BINARIES}/mbr.bin bs=512 count=0 seek=${EMMC_SIZE} - ${PARTED} -s ${BINARIES}/mbr.bin mklabel msdos - ${PARTED} -a none -s ${BINARIES}/mbr.bin unit s mkpart primary fat32 ${BOOT_START} $(expr ${ROOTFS_START} - 1 ) - # the partition spans to the end of the disk, even though the fs size will be smaller - # on the target the fs is then grown to the full size - if [ "${IMAGEFILE}" = "root.ext3" ] ; then - ${PARTED} -a none -s ${BINARIES}/mbr.bin unit s mkpart primary ext3 ${ROOTFS_START} $(expr ${EMMC_SIZE} \- ${ROOTFS_START} \- 1) - else - ${PARTED} -a none -s ${BINARIES}/mbr.bin unit s mkpart primary ext4 ${ROOTFS_START} $(expr ${EMMC_SIZE} \- ${ROOTFS_START} \- 1) - fi - ${PARTED} -s ${BINARIES}/mbr.bin unit s print - # get the size of the VFAT partition - BOOT_BLOCKS=$(LC_ALL=C ${PARTED} -s ${BINARIES}/mbr.bin unit b print \ - | awk '/ 1 / { print int(substr($4, 1, length($4 -1)) / 1024) }') - # now crop the file to only the MBR size - IMG_SIZE=512 - truncate -s $IMG_SIZE ${BINARIES}/mbr.bin - - - echo "" - echo "Creating VFAT partition image with the kernel" - rm -f ${BINARIES}/boot.vfat - ${MKFSVFAT} -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${BINARIES}/boot.vfat $BOOT_BLOCKS - export MTOOLS_SKIP_CHECK=1 - mcopy -i ${BINARIES}/boot.vfat -s ${BINARIES}/${KERNEL_IMAGETYPE} ::/${KERNEL_IMAGETYPE} - - # Copy device tree file - COPIED=false - if test -n "${KERNEL_DEVICETREE}"; then - for DTB_FILE in ${KERNEL_DEVICETREE}; do - if [ -e "${BINARIES}/${DTB_FILE}" ]; then - mcopy -i ${BINARIES}/boot.vfat -s ${BINARIES}/${DTB_FILE} ::/${DTB_FILE} - #copy also to out_dir - sudo cp ${BINARIES}/${DTB_FILE} "$OUT_DIR/" - COPIED=true - fi - done - ([ "${MODTYPE}" = "apalis-tk1" ] || [ "${MODTYPE}" = "apalis-tk1-mainline" ]) && ([ $COPIED = true ] || { echo "Did not find the devicetrees from KERNEL_DEVICETREE, ${KERNEL_DEVICETREE}. Aborting."; exit 1; }) - fi - - echo "" - echo "Creating rootfs partition image" - #make the partition size size(rootfs used + MIN_PARTITION_FREE_SIZE) - #add about 4% to the rootfs to account for fs overhead. (/1024/985 instead of /1024/1024). - #add 512 bytes per file to account for small files - #(resize it later on target to fill the size of the partition it lives in) - NUMBER_OF_FILES=`sudo find ${ROOTFSPATH} | wc -l` - EXT_SIZE=`sudo du -DsB1 ${ROOTFSPATH} | awk -v min=$MIN_PARTITION_FREE_SIZE -v f=${NUMBER_OF_FILES} \ - '{rootfs_size=$1+f*512;rootfs_size=int(rootfs_size/1024/985); print (rootfs_size+min) }'` - - rm -f ${BINARIES}/${IMAGEFILE} - if [ "${IMAGEFILE}" = "root.ext3" ] ; then - sudo $LOCPATH/genext3fs.sh -d rootfs -b ${EXT_SIZE} ${BINARIES}/${IMAGEFILE} || exit 1 - else - sudo $LOCPATH/genext4fs.sh -d rootfs -b ${EXT_SIZE} ${BINARIES}/${IMAGEFILE} || exit 1 - fi - fi -fi - -#copy to $OUT_DIR -OUT_DIR=`readlink -f $OUT_DIR` -cd ${BINARIES} -sudo cp ${CBOOT_IMAGE} ${KERNEL_IMAGETYPE} ${EMMC_PARTS} flash*.img versions.txt "$OUT_DIR" -sudo cp fwd_blk.img "$OUT_DIR/../flash_blk.img" -sudo cp fwd_eth.img "$OUT_DIR/../flash_eth.img" -sudo cp fwd_mmc.img "$OUT_DIR/../flash_mmc.img" - -if [ "${IMAGEFILE}" = "root.ext3" ] || [ "${IMAGEFILE}" = "root.ext4" ] ; then - if [ "$SPLIT" -ge 1 ] ; then - sudo split -a 3 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=100 ${IMAGEFILE} "${OUT_DIR}/${IMAGEFILE}-" - fi -else - sudo cp ${IMAGEFILE}* "$OUT_DIR" -fi - -#cleanup intermediate files -sudo rm ${CBOOT_IMAGE} ${EMMC_PARTS} ${IMAGEFILE}* versions.txt -cd .. -sync - -#Remove trap and report success! -trap - EXIT -printf "\033[32mSuccessfully copied data to target folder.\033[0m\n\n" - -Flash diff --git a/recipes-images/images/tdx-extra.inc b/recipes-images/images/tdx-extra.inc index 13e4d82..1dca69b 100644 --- a/recipes-images/images/tdx-extra.inc +++ b/recipes-images/images/tdx-extra.inc @@ -15,30 +15,6 @@ add_rootfs_version () { # add the rootfs version to the welcome banner ROOTFS_POSTPROCESS_COMMAND += " add_rootfs_version;" -IMAGE_INSTALL_append_tegra = " \ - u-boot-toradex-fw-utils \ - tegrastats \ - tdx-nv-binaries \ - tdx-nv-binaries-nv-gstapps \ - tdx-nv-binaries-restricted-codecs \ - usb-rndis-systemd \ - hdmi-hotplug \ - \ - file \ - aspell \ - kernel-modules \ -" - -IMAGE_INSTALL_append_tegra3 = " \ - fs-init \ - e2fsprogs \ - e2fsprogs-mke2fs \ - e2fsprogs-resize2fs \ - e2fsprogs-tune2fs \ - nv-conf-systemd \ - perf \ -" - IMAGE_INSTALL_append_tegra124 = " \ aspell \ e2fsprogs \ @@ -74,17 +50,6 @@ IMAGE_INSTALL_append_tegra124m = " \ perf \ " -IMAGE_INSTALL_append_apalis-t30 = " \ - linuxptp \ - pciutils \ - ptpd \ - lvds-ctrl \ -" - -IMAGE_INSTALL_append_colibri-t20 = " \ - mtd-utils-ubifs \ -" - #note that the kernel-modules meta package gets installed from #meta-fsl-arm/conf/machine/include/imx-base.inc IMAGE_INSTALL-MX6QDL = " \ @@ -250,14 +215,6 @@ IMAGE_INSTALL_remove_apalis-tk1-mainline = " \ backports \ " -IMAGE_INSTALL_remove_colibri-t20 = " \ - linux-firmware-ath10k \ -" - -IMAGE_INSTALL_append_apalis-t30 = " \ - ${BACKPORTS_WIFI_EXTRA} \ -" - IMAGE_INSTALL_append_apalis-imx6 = " \ ${BACKPORTS_WIFI_EXTRA} \ " diff --git a/recipes-images/images/tdx-image-fstype.inc b/recipes-images/images/tdx-image-fstype.inc index 8062284..fb0191f 100644 --- a/recipes-images/images/tdx-image-fstype.inc +++ b/recipes-images/images/tdx-image-fstype.inc @@ -13,13 +13,11 @@ UBOOT_EXT_colibri-imx6ull = "imx" UBOOT_EXT_mx7 = "imx" UBOOT_EXT_vf = "imx" UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_EXT}" -UBOOT_SYMLINK_tegra = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_EXT}" UBOOT_SYMLINK_tegra124 = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_EXT}" UBOOT_SYMLINK_tegra124m = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_EXT}" UBOOT_BINARY = "u-boot.${UBOOT_EXT}" UBOOT_BINARY_colibri-imx7 = "u-boot-nand.${UBOOT_EXT}" UBOOT_BINARY_colibri-imx6ull = "u-boot-nand.${UBOOT_EXT}" -UBOOT_BINARY_tegra = "u-boot-dtb-tegra.${UBOOT_EXT}" UBOOT_BINARY_tegra124 = "u-boot-dtb-tegra.${UBOOT_EXT}" UBOOT_BINARY_tegra124m = "u-boot-dtb-tegra.${UBOOT_EXT}" @@ -29,10 +27,8 @@ DEPENDS_append_mx6 = " imx-loader-native" DEPENDS_append_use-mainline-bsp = " imx-loader-native" DEPENDS_append_mx6ull = " mtd-utils-native imx-loader-native" DEPENDS_append_mx7 = " mtd-utils-native imx-loader-native" -DEPENDS_append_tegra = " cbootimage-native tegrarcm-native" DEPENDS_append_tegra124 = " cbootimage-native tegrarcm-native" DEPENDS_append_tegra124m = " cbootimage-native tegrarcm-native" -DEPENDS_append_tegra2 = " mtd-utils-native" DEPENDS_append_vf = " mtd-utils-native imx-loader-native" #we need mkimage to produce the U-Boot scripts even if not building a uImage kernel DEPENDS_append_arm = " virtual/bootloader u-boot-mkimage-native" @@ -115,23 +111,6 @@ imagedeploytools_append_mx7() { cp ${MACHINE_BIN}/${UBOOT_BINARY} ${MACHINE_BIN}/u-boot.imx } -imagedeploytools_append_tegra() { - IMAGE_ROOT="${IMAGE_ROOTFS}/../tegra-uboot-flasher/" - mkdir -p ${IMAGE_ROOT} - - # add cbootimage and tegrarcm - cp ${STAGING_BINDIR_NATIVE}/cbootimage ${IMAGE_ROOT}/ - cp ${STAGING_BINDIR_NATIVE}/tegrarcm ${IMAGE_ROOT}/ - ${BUILD_STRIP} ${IMAGE_ROOT}/cbootimage - ${BUILD_STRIP} ${IMAGE_ROOT}/tegrarcm -} - -imagedeploytools_append_tegra2() { - # add the mkfs.ubifs binary - cp ${STAGING_DIR_NATIVE}/usr/sbin/mkfs.ubifs ${IMAGE_ROOT}/ - ${BUILD_STRIP} ${IMAGE_ROOT}/mkfs.ubifs -} - imagedeploytools_append_tegra124() { IMAGE_ROOT="${IMAGE_ROOTFS}/../tegra-uboot-flasher/" mkdir -p ${IMAGE_ROOT} |