From 50ca7110d76f3b5b01f2fce2e0bf24a1c7ff2fdd Mon Sep 17 00:00:00 2001 From: Anton Bambura Date: Thu, 29 Jun 2023 11:19:28 +0300 Subject: [PATCH] google-snow: switch to depthcharge (MR 4206) --- device/testing/device-google-snow/APKBUILD | 24 ++++---------------- device/testing/device-google-snow/deviceinfo | 9 ++++---- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/device/testing/device-google-snow/APKBUILD b/device/testing/device-google-snow/APKBUILD index 320297464..bb6305b7b 100644 --- a/device/testing/device-google-snow/APKBUILD +++ b/device/testing/device-google-snow/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jenneron pkgname=device-google-snow pkgdesc="Samsung Chromebook" -pkgver=2 +pkgver=3 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -10,8 +10,10 @@ arch="armv7" options="!check !archcheck" depends=" alsa-ucm-conf + depthcharge-tools + linux-postmarketos-exynos5 postmarketos-base - u-boot-snow + postmarketos-update-depthcharge-kernel " makedepends="devicepkg-dev" source=" @@ -27,8 +29,6 @@ source=" " subpackages=" $pkgname-i3wm - $pkgname-kernel-rev4:kernel_rev4 - $pkgname-kernel-rev5:kernel_rev5 $pkgname-mpv-wayland:mpv_wayland $pkgname-mpv-xorg:mpv_xorg $pkgname-nonfree-firmware:nonfree_firmware @@ -59,20 +59,6 @@ i3wm() { "$subpkgdir"/etc/X11/xorg.conf.d/90-tap-to-click.conf } -# Kernel subpackages to copy correct DTB - -kernel_rev4() { - pkgdesc="Google Snow Rev 4" - depends="linux-postmarketos-exynos5" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_rev5() { - pkgdesc="Google Snow Rev 5" - depends="linux-postmarketos-exynos5" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - mpv_wayland() { # Looks like wayland libs are installed with some x11 UIs too, so match wlroots here install_if="$pkgname=$pkgver-r$pkgrel mpv wlroots" @@ -101,7 +87,7 @@ sway() { } sha512sums=" -6bdd7571b754757369bf202837613de1461e3f7c3acafe80074f2d3923358f524abf7781f850271ede1fd6c9fbd3665008d647b919c8a7b8ae2fbf6ff648ae8d deviceinfo +b0a0d7b0cfaa13541efab6b34253bab5ae879b2dfec2a3f2c998ad4f5b8724bd21598ed5ffedb50ca0b53ea9d5795ac8b629fe025e9f93d65752a5b12a34e8d3 deviceinfo e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da 90-tap-to-click.conf c5fdd5a39a41044343d937a1ad31cc6bb893f19a329beb4ce09249064cac066d643c84ffcbfcd794113c228c5a56e28c82812092751546b49ab31142dc8245b1 mali.conf 8a8f593694528a9323ef4a0aff7e9c6ad45608957eb042d425663f682885c2f95eb01db4fe87b7c43a90de48f3e5f8b10cab4b13c547b5b0d31b924fcb083cad HiFi.conf diff --git a/device/testing/device-google-snow/deviceinfo b/device/testing/device-google-snow/deviceinfo index b14ea2d7e..61d239b25 100644 --- a/device/testing/device-google-snow/deviceinfo +++ b/device/testing/device-google-snow/deviceinfo @@ -7,8 +7,7 @@ deviceinfo_name="Samsung Chromebook" deviceinfo_manufacturer="Samsung" deviceinfo_codename="google-snow" deviceinfo_year="2011" -deviceinfo_dtb_rev4="exynos5250-snow" -deviceinfo_dtb_rev5="exynos5250-snow-rev5" +deviceinfo_dtb="exynos5250-snow exynos5250-snow-rev5" deviceinfo_modules_initfs="drm-dp-aux-bus panel-edp drm-kms-helper cros-ec-keyb sbs-battery tps65090-charger" deviceinfo_arch="armv7" @@ -24,8 +23,10 @@ deviceinfo_gpu_accelerated="true" # Bootloader related deviceinfo_flash_method="none" -deviceinfo_cgpt_kpart="/usr/share/u-boot/google-snow/u-boot-dtb.img.kpart" +deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" -deviceinfo_cgpt_kpart_size="32768" +deviceinfo_cgpt_kpart_size="16384" deviceinfo_kernel_cmdline="console=null" +deviceinfo_depthcharge_board="snow" +deviceinfo_generate_depthcharge_image="true" deviceinfo_generate_extlinux_config="true"