device-kobo-clara: use extlinux.conf (MR 4550)

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=6
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,13 +14,11 @@ depends="
 	perl
 	postmarketos-base
 	u-boot-kobo-clara
-	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="
-c1eb7552f3163a6a48b699a6c99010914b75fd84b36b1d1a4ffb83d19cc1bbc3355bbe9b1a568ea2a6c2d0e4a87c4a22b7330c454c215b8f8b1edb2b2bac170d  deviceinfo
+b93b62ac7af499e9170dc78329ae6092fb79a3657a62ea1ee5b383a6ccc596e36382c1156f8d168aa1de89dc7bf3e5b9f266a49f56c51233aac8cc598facde68  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/testing/device-kobo-clara/uboot-script.cmd

@@ -1,13 +0,0 @@
-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

@@ -15,7 +15,6 @@ _repository="u-boot-fslc"
 _commit="a3816f6b51b5dc9083af4142ca5f3a4e4a235336"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/akemnade/$_repository/archive/$_commit.tar.gz
-	u-boot-env.txt
 "
 
 builddir="$srcdir/$_repository-$_commit"
@@ -29,15 +28,12 @@ build() {
 	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.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="
 d1db014fa889e76aeb83099f7573f5ec89c8e6f69a6273b9528fd485ffcbe34e102ee0c492554807e160a5bd669bf799db2b5a906045fea35b16c0677a377989  u-boot-kobo-clara-a3816f6b51b5dc9083af4142ca5f3a4e4a235336.tar.gz
-ca8237a86da93dfea62355cfbb8dbe4104c2f3aea71b4c36d5418e6aef6ead32e9d23e4731b8ff64b4a73ca563b0323087384de10d4946afd657dce4cc7c6fee  u-boot-env.txt
 "

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

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