device: tolino-* add extlinux support (MR 5067)

makes u-boot env / script installation  unnecessary.
This commit is contained in:
Andreas Kemnade 2024-04-25 12:09:10 +02:00 committed by Robert Eckelmann
parent af97a4bea3
commit 2d1f6bd541
No known key found for this signature in database
GPG key ID: 30C0D50BEF63BF54
12 changed files with 47 additions and 76 deletions

View file

@ -1,7 +1,7 @@
# Reference: <https://postmarketos.org/devicepkg>
pkgname=device-tolino-shine2hd
pkgdesc="Tolino Shine 2 HD"
pkgver=1
pkgver=2
pkgrel=0
url="https://postmarketos.org"
license="MIT"
@ -13,7 +13,6 @@ depends="
perl
postmarketos-base
u-boot-tolino-shine2hd
u-boot-tools
"
makedepends="devicepkg-dev"
subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@ -21,7 +20,6 @@ subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
source="
deviceinfo
modules-initfs
uboot-script.cmd
"
build() {
@ -30,9 +28,6 @@ build() {
package() {
devicepkg_package $startdir $pkgname
mkimage -A arm -O linux -T script -n postmarketOS \
-d "$srcdir/uboot-script.cmd" "$srcdir/boot.scr"
install -Dm644 "$srcdir/boot.scr" "$pkgdir/boot/boot.scr"
}
nonfree_firmware() {
@ -42,7 +37,6 @@ nonfree_firmware() {
}
sha512sums="
e4888a03a32e4543cb05b6ff1ecc04ad4ab521c11a39207243166e125a6553b373d19b890c09e3787785bc2929ef07d2434a8cc9b2e6def97b2ced96693a53b1 deviceinfo
5cd2564af554277cfa5ec5d191ed3841ca15c1a5eeb34cfba3ae3e4f8d8eb3dea5ab4c1b7382344bcb2dc782475690b3b78b62ecf7e2eb1d563a40ea587e665d deviceinfo
5d53ee902538e53c4fe79eaef8e3800b9d3f73ec70d2a9887ddb11a6715ca76ce17128e3c02c2b6f2f575fb86f15c2415c24466d4b1a031f7a346d0db186dcb1 modules-initfs
3b5c33ffa9b81d55451fd4fa0c9ed69149304b88fb85752cead4d34b5467112029cc4883a91e7daa38f8cba55d90a814711b2c55a8d462d115b62f752ce311b7 uboot-script.cmd
"

View file

@ -12,7 +12,8 @@ deviceinfo_codename="tolino-shine2hd"
deviceinfo_year="2015"
deviceinfo_arch="armv7"
deviceinfo_dtb="imx6sl-tolino-shine2hd"
deviceinfo_kernel_cmdline="console=ttymxc0,115200"
deviceinfo_generate_extlinux_config="true"
# Device related
deviceinfo_chassis="tablet"
deviceinfo_keyboard="false"
@ -24,8 +25,7 @@ deviceinfo_screen_height="1448"
deviceinfo_flash_method="none"
deviceinfo_boot_part_start="49152"
deviceinfo_getty="ttymxc0;115200"
deviceinfo_generate_legacy_uboot_initfs="true"
deviceinfo_no_framebuffer="true"
deviceinfo_sd_embed_firmware_step_size="512"
deviceinfo_sd_embed_firmware="u-boot/tolino-shine2hd/u-boot.imx:2,u-boot/tolino-shine2hd/u-boot-env.bin:1536"
deviceinfo_sd_embed_firmware="u-boot/tolino-shine2hd/u-boot.imx:2"

View file

@ -1,14 +0,0 @@
led tolinoshine2hd:white:on on
setenv bootargs console=ttymxc0,115200
echo Loading kernel
load mmc 0:1 0x80800000 vmlinuz
echo Loading DTB
load mmc 0:1 0x83000000 imx6sl-tolino-shine2hd.dtb
echo Loading initrd
load mmc 0:1 0x85000000 uInitrd
echo Booting kernel
bootz 0x80800000 0x85000000 0x83000000

View file

@ -1,7 +1,7 @@
# Reference: <https://postmarketos.org/devicepkg>
pkgname=device-tolino-shine3
pkgdesc="Tolino Shine 3"
pkgver=1
pkgver=2
pkgrel=0
url="https://postmarketos.org"
license="MIT"
@ -13,14 +13,12 @@ depends="
perl
postmarketos-base
u-boot-tolino-shine3
u-boot-tools
"
makedepends="devicepkg-dev"
source="
deviceinfo
modules-initfs
uboot-script.cmd
"
build() {
@ -29,13 +27,9 @@ build() {
package() {
devicepkg_package $startdir $pkgname
mkimage -A arm -O linux -T script -n postmarketOS \
-d "$srcdir/uboot-script.cmd" "$srcdir/boot.scr"
install -Dm644 "$srcdir/boot.scr" "$pkgdir/boot/boot.scr"
}
sha512sums="
9f58b75c127cb823859dc8bfa4997c58ea3d7192919b257e6c26bc8c1ddec105943cca4193bc2c5058357a64fe1395b99dbb69a0b1a95fe008d710da40b21744 deviceinfo
73515b117808d883ce54c7526fdc9a63c67f5ecedc4be6fff6022dca1df9a4f3bdfae95184078368ce5962dd2538083ae6a27c877f77079abba9694a3feeb5b0 deviceinfo
5d53ee902538e53c4fe79eaef8e3800b9d3f73ec70d2a9887ddb11a6715ca76ce17128e3c02c2b6f2f575fb86f15c2415c24466d4b1a031f7a346d0db186dcb1 modules-initfs
86827d4464def94006105841000ed934326d814d49aa03292937228a37b1120ebb84f04cd23946feaca16c8eb8d847d671bef0ae98f2c5632fd01abb46bb033d uboot-script.cmd
"

View file

@ -12,7 +12,8 @@ deviceinfo_codename="tolino-shine3"
deviceinfo_year="2018"
deviceinfo_arch="armv7"
deviceinfo_dtb="imx6sl-tolino-shine3"
deviceinfo_kernel_cmdline="console=ttymxc0,115200"
deviceinfo_generate_extlinux_config="true"
# Device related
deviceinfo_chassis="tablet"
deviceinfo_keyboard="false"
@ -24,8 +25,7 @@ deviceinfo_screen_height="1448"
deviceinfo_flash_method="none"
deviceinfo_boot_part_start="49152"
deviceinfo_getty="ttymxc0;115200"
deviceinfo_generate_legacy_uboot_initfs="true"
deviceinfo_no_framebuffer="true"
deviceinfo_sd_embed_firmware_step_size="512"
deviceinfo_sd_embed_firmware="u-boot/tolino-shine3/u-boot.imx:2,u-boot/tolino-shine3/u-boot-env.bin:1536"
deviceinfo_sd_embed_firmware="u-boot/tolino-shine3/u-boot.imx:2"

View file

@ -1,14 +0,0 @@
led e60k02:white:on on
setenv bootargs console=ttymxc0,115200
echo Loading kernel
load mmc 0:1 0x80800000 vmlinuz
echo Loading DTB
load mmc 0:1 0x83000000 imx6sl-tolino-shine3.dtb
echo Loading initrd
load mmc 0:1 0x85000000 uInitrd
echo Booting kernel
bootz 0x80800000 0x85000000 0x83000000

View file

@ -1,37 +1,39 @@
# Maintainer: Andreas Kemnade <andreas@kemnade.info>
# Reference: <https://postmarketos.org/devicepkg>
pkgname=u-boot-tolino-shine2hd
pkgver=2020.10
pkgver=2023.10
pkgrel=0
pkgdesc="U-Boot for Tolino Shine 2 HD, based on freescale fork"
pkgdesc="U-Boot for Tolino Shine 2 HD"
arch="armv7"
_carch="arm"
license="GPL-2.0"
url="https://github.com/akemnade/u-boot-fslc"
makedepends="$depends_dev bc dtc bison flex"
options="!check"
makedepends="bash bc dtc bison flex openssl-dev"
options="!check !tracedeps pmb:cross-native"
install="$pkgname.post-upgrade"
_repository="u-boot-fslc"
_commit="fcf25705fc8b57cb22c81b2d352e9a06269911be"
_commit="4518da106aae1a8ce97d8ca41c248b79fcec63ed"
source="
$pkgname-$_commit.tar.gz::https://github.com/akemnade/$_repository/archive/$_commit.tar.gz
u-boot-env.txt
"
builddir="$srcdir/$_repository-$_commit"
build() {
make ARCH="$_carch" mx6sltolinoshine3_defconfig
scripts/config -e ENV_IS_IN_EXT4
scripts/config -d ENV_IS_IN_MMC
scripts/config --set-str ENV_EXT4_INTERFACE "mmc"
scripts/config --set-str ENV_EXT4_DEVICE_AND_PART "0:1"
scripts/config --set-str ENV_EXT4_FILE "/uboot.env"
make ARCH="$_carch" DEVICE_TREE=imx6sl-tolino-shine2hd
tools/mkenvimage -p 0 -s 8192 -o u-boot-env.bin "$srcdir/u-boot-env.txt"
}
package() {
install -D -m644 "$builddir/u-boot-dtb.bin" "$pkgdir/usr/share/u-boot/tolino-shine2hd/u-boot.bin"
install -D -m644 "$builddir/u-boot-dtb.imx" "$pkgdir/usr/share/u-boot/tolino-shine2hd/u-boot.imx"
install -D -m644 "$builddir/u-boot-env.bin" "$pkgdir/usr/share/u-boot/tolino-shine2hd/u-boot-env.bin"
}
sha512sums="
6a9c3f5d2ad806ab9529f0c8fc19213098aae620c5bf34e5cc273453bf007266a674489deff18ffa82e8826280192dbc443b024a3f878836021ae6c062be4189 u-boot-tolino-shine2hd-fcf25705fc8b57cb22c81b2d352e9a06269911be.tar.gz
ca8237a86da93dfea62355cfbb8dbe4104c2f3aea71b4c36d5418e6aef6ead32e9d23e4731b8ff64b4a73ca563b0323087384de10d4946afd657dce4cc7c6fee u-boot-env.txt
664c2780aad4ae86e411fe71a8d0e0cf98ca7ef98c3daed9e20b4e88e930bb3f0ca2073052d0481338505c29e7641c0fa54efb320398acf7f659c57193fcd7e7 u-boot-tolino-shine2hd-4518da106aae1a8ce97d8ca41c248b79fcec63ed.tar.gz
"

View file

@ -1,2 +0,0 @@
# Load actual boot script from the boot partition
bootcmd=load mmc 0:1 0x80800000 boot.scr ; source 0x80800000

View file

@ -0,0 +1,6 @@
#!/bin/sh
DEV=`mount | sed -n -E 's:.*(/dev/mmcblk[0-9])p[0-9] on /boot .*:\1:p'`
if [ -n "$DEV" ] ; then
dd if=/usr/share/u-boot/tolino-shine2hd/u-boot.imx bs=512 seek=2 of="$DEV"
fi

View file

@ -1,37 +1,38 @@
# Reference: <https://postmarketos.org/devicepkg>
pkgname=u-boot-tolino-shine3
pkgver=2020.10
pkgver=2023.10
pkgrel=0
pkgdesc="U-Boot for Tolino Shine 3, based on freescale fork"
pkgdesc="U-Boot for Tolino Shine 3"
arch="armv7"
_carch="arm"
license="GPL-2.0"
url="https://github.com/akemnade/u-boot-fslc"
makedepends="$depends_dev bc dtc bison flex"
options="!check"
makedepends="bash bc dtc bison flex openssl-dev"
options="!check !tracedeps pmb:cross-native"
install="$pkgname.post-upgrade"
_repository="u-boot-fslc"
_commit="fcf25705fc8b57cb22c81b2d352e9a06269911be"
_commit="4518da106aae1a8ce97d8ca41c248b79fcec63ed"
source="
$pkgname-$_commit.tar.gz::https://github.com/akemnade/$_repository/archive/$_commit.tar.gz
u-boot-env.txt
"
builddir="$srcdir/$_repository-$_commit"
build() {
make ARCH="$_carch" mx6sltolinoshine3_defconfig
scripts/config -e ENV_IS_IN_EXT4
scripts/config -d ENV_IS_IN_MMC
scripts/config --set-str ENV_EXT4_INTERFACE "mmc"
scripts/config --set-str ENV_EXT4_DEVICE_AND_PART "0:1"
scripts/config --set-str ENV_EXT4_FILE "/uboot.env"
make ARCH="$_carch"
tools/mkenvimage -p 0 -s 8192 -o u-boot-env.bin "$srcdir/u-boot-env.txt"
}
package() {
install -D -m644 "$builddir/u-boot-dtb.bin" "$pkgdir/usr/share/u-boot/tolino-shine3/u-boot.bin"
install -D -m644 "$builddir/u-boot-dtb.imx" "$pkgdir/usr/share/u-boot/tolino-shine3/u-boot.imx"
install -D -m644 "$builddir/u-boot-env.bin" "$pkgdir/usr/share/u-boot/tolino-shine3/u-boot-env.bin"
}
sha512sums="
6a9c3f5d2ad806ab9529f0c8fc19213098aae620c5bf34e5cc273453bf007266a674489deff18ffa82e8826280192dbc443b024a3f878836021ae6c062be4189 u-boot-tolino-shine3-fcf25705fc8b57cb22c81b2d352e9a06269911be.tar.gz
ca8237a86da93dfea62355cfbb8dbe4104c2f3aea71b4c36d5418e6aef6ead32e9d23e4731b8ff64b4a73ca563b0323087384de10d4946afd657dce4cc7c6fee u-boot-env.txt
664c2780aad4ae86e411fe71a8d0e0cf98ca7ef98c3daed9e20b4e88e930bb3f0ca2073052d0481338505c29e7641c0fa54efb320398acf7f659c57193fcd7e7 u-boot-tolino-shine3-4518da106aae1a8ce97d8ca41c248b79fcec63ed.tar.gz
"

View file

@ -1,2 +0,0 @@
# Load actual boot script from the boot partition
bootcmd=load mmc 0:1 0x80800000 boot.scr ; source 0x80800000

View file

@ -0,0 +1,6 @@
#!/bin/sh
DEV=`mount | sed -n -E 's:.*(/dev/mmcblk[0-9])p[0-9] on /boot .*:\1:p'`
if [ -n "$DEV" ] ; then
dd if=/usr/share/u-boot/tolino-shine3/u-boot.imx bs=512 seek=2 of="$DEV"
fi