device-kobo-clara: use extlinux.conf

simplify things by using standard ways to boot.

device/testing/device-kobo-clara/APKBUILD

@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-kobo-clara
 pkgdesc="Kobo Clara HD"
-pkgver=0.7
-pkgrel=4
+pkgver=0.8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,7 +21,6 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	modules-initfs
-	uboot-script.cmd
 "
 
 build() {
@@ -30,13 +29,12 @@ 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"
+	dd if=/dev/zero bs=512 count=1 of="$srcdir/zero"
+	# clear u-boot env, there might be remaints from previous installations
+	install -D -m644 "$srcdir/zero" "$pkgdir/usr/share/device-kobo-clara/zero"
 }
 
 sha512sums="
-c1eb7552f3163a6a48b699a6c99010914b75fd84b36b1d1a4ffb83d19cc1bbc3355bbe9b1a568ea2a6c2d0e4a87c4a22b7330c454c215b8f8b1edb2b2bac170d  deviceinfo
+cc5f3b5267cb2af4ca6381e5655a048ab09ba68a7b1396fe5af590bd81a63595995f2dcd74de6e04762cea34eb7afa662992de32753b768101a769659e8b94a6  deviceinfo
 5d53ee902538e53c4fe79eaef8e3800b9d3f73ec70d2a9887ddb11a6715ca76ce17128e3c02c2b6f2f575fb86f15c2415c24466d4b1a031f7a346d0db186dcb1  modules-initfs
-7bd9c0aa73b67520b8563b9d4453acafa29adcfed1575d96aea3b0d2e2023cbe9cd7d252b97786efb920a6f05e17a913079353ba481428f16c97d82b42051a2c  uboot-script.cmd
 "

device/testing/device-kobo-clara/deviceinfo

@@ -9,6 +9,8 @@ deviceinfo_codename="kobo-clara"
 deviceinfo_year="2018"
 deviceinfo_arch="armv7"
 deviceinfo_dtb="imx6sll-kobo-clarahd"
+deviceinfo_kernel_cmdline="console=ttymxc0,115200"
+deviceinfo_generate_extlinux_config="true"
 
 # Device related
 deviceinfo_chassis="tablet"
@@ -21,8 +23,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/kobo-clara/u-boot.imx:2,u-boot/kobo-clara/u-boot-env.bin:1536"
+deviceinfo_sd_embed_firmware="u-boot/kobo-clara/u-boot.imx:2,device-kobo-clara/zero:1536"

device/testing/device-kobo-clara/uboot-script.cmd

-setenv bootargs console=ttymxc0,115200
-
-echo Loading kernel
-load mmc 0:1 0x80800000 vmlinuz
-
-echo Loading DTB
-load mmc 0:1 0x83000000 imx6sll-kobo-clarahd.dtb
-
-echo Loading initrd
-load mmc 0:1 0x85000000 uInitrd
-
-echo Booting kernel
-bootz 0x80800000 0x85000000 0x83000000

device/testing/u-boot-kobo-clara/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=u-boot-kobo-clara
 pkgver=2020.10
-pkgrel=0
+pkgrel=2
 pkgdesc="U-Boot for Kobo Clara HD"
 arch="armv7"
 _carch="arm"
@@ -12,10 +12,9 @@ makedepends="$depends_dev bc dtc bison flex"
 options="!check !tracedeps pmb:cross-native"
 
 _repository="u-boot-fslc"
-_commit="fcf25705fc8b57cb22c81b2d352e9a06269911be"
+_commit="9172860c011fc6ba5c508db8e3d798031e6986e1"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/akemnade/$_repository/archive/$_commit.tar.gz
-	u-boot-env.txt
 "
 
 builddir="$srcdir/$_repository-$_commit"
@@ -23,15 +22,12 @@ builddir="$srcdir/$_repository-$_commit"
 build() {
 	make ARCH="$_carch" mx6sllclarahd_defconfig
 	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.imx" "$pkgdir/usr/share/u-boot/kobo-clara/u-boot.imx"
-	install -D -m644 "$builddir/u-boot-env.bin" "$pkgdir/usr/share/u-boot/kobo-clara/u-boot-env.bin"
 }
 
 sha512sums="
-6a9c3f5d2ad806ab9529f0c8fc19213098aae620c5bf34e5cc273453bf007266a674489deff18ffa82e8826280192dbc443b024a3f878836021ae6c062be4189  u-boot-kobo-clara-fcf25705fc8b57cb22c81b2d352e9a06269911be.tar.gz
-ca8237a86da93dfea62355cfbb8dbe4104c2f3aea71b4c36d5418e6aef6ead32e9d23e4731b8ff64b4a73ca563b0323087384de10d4946afd657dce4cc7c6fee  u-boot-env.txt
+207d76478f2aa1080450e81507459812c7633397797b397024b9c8a8f250531b296da89b8d69f58ab68038ae1869e924f20bc48ff677dca832c9506b604eb17b  u-boot-kobo-clara-9172860c011fc6ba5c508db8e3d798031e6986e1.tar.gz
 "

device/testing/u-boot-kobo-clara/u-boot-env.txt

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