diff --git a/device/testing/device-google-veyron-speedy/APKBUILD b/device/testing/device-google-veyron-speedy/APKBUILD index 0a15ec9e4..94a4e043e 100644 --- a/device/testing/device-google-veyron-speedy/APKBUILD +++ b/device/testing/device-google-veyron-speedy/APKBUILD @@ -2,60 +2,33 @@ # Maintainer: Jenneron pkgname=device-google-veyron-speedy pkgdesc="ASUS Chromebook C201" -pkgver=3 +pkgver=4 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" -# pmb:strict: avoid grub-related install error during build with pmbootstrap -options="!check !archcheck pmb:strict" +options="!check !archcheck" depends=" alsa-ucm-conf>=1.2.7.1-r0 + depthcharge-tools linux-google-veyron - u-boot-veyron-speedy postmarketos-base + postmarketos-update-depthcharge-kernel " subpackages=" $pkgname-i3wm $pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh " -makedepends="devicepkg-dev grub grub-efi" +makedepends="devicepkg-dev" source=" deviceinfo i3wm/xorg.conf.d/90-tap-to-click.conf - grub.cfg phoc.ini " -build() { - devicepkg_build $startdir $pkgname - - grub-mkimage \ - --prefix="/grub" \ - --output="bootarm.efi" \ - --format="arm-efi" \ - --compression="xz" \ - \ - all_video \ - disk \ - efi_gop \ - fat \ - gzio \ - iso9660 \ - linux \ - normal \ - part_gpt \ - part_msdos -} - package() { devicepkg_package $startdir $pkgname - - install -D "$srcdir"/grub.cfg \ - "$pkgdir"/boot/grub/grub.cfg - install -D "$srcdir"/bootarm.efi \ - "$pkgdir"/boot/EFI/Boot/bootarm.efi } # The only way to right click on this device @@ -78,8 +51,7 @@ phosh() { } sha512sums=" -104a29143e44713c28ef576c96f3ae856041fd2e05dbff0505fcc85da3a1931f79e6854fbc9dd3e48182d08bb152194d1e4077d1c6a05fda3b10928c8b2bb789 deviceinfo +a4a5f381ae311ca167ca22fbe184bd3f281a47b48972c6df8916d93740e7da05b2cfe2b18c23af4b9433b3b5eed9c8cd58ca399e44aed1b02ef11734d42b971a deviceinfo e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da 90-tap-to-click.conf -8c40a36932830871dcc406efc35fc7535c834ece0a0540cd0af6b57795b9ed0aff7d41d765ef83b38c1bcd3f215827244b9d74bc29e65f33dc1dafc96416ceeb grub.cfg bd63cfc97d37e81dd9559dad60f330c10dc280afd20081495c6302960fcacf32954e3edab53294fcd5278e86c53c47a95b345a8d9e18807d88fe4313d519d259 phoc.ini " diff --git a/device/testing/device-google-veyron-speedy/deviceinfo b/device/testing/device-google-veyron-speedy/deviceinfo index 2592c3a02..00ae5bc0c 100644 --- a/device/testing/device-google-veyron-speedy/deviceinfo +++ b/device/testing/device-google-veyron-speedy/deviceinfo @@ -8,6 +8,7 @@ deviceinfo_manufacturer="ASUS" deviceinfo_codename="google-veyron-speedy" deviceinfo_year="2015" deviceinfo_arch="armv7" +deviceinfo_dtb="rk3288-veyron-speedy" deviceinfo_modules_initfs="pwm-bl rockchipdrm dw-mipi-dsi drm-kms-helper gpu-sched phy-rockchip-dp pwm-rockchip dw-wdt videobuf2-dma-sg analogix-dp drm-dp-aux-bus panel-edp gpio-charger sbs-battery cros-ec cros-ec-spi cros-ec-keyb" # Device related @@ -20,7 +21,10 @@ deviceinfo_gpu_accelerated="true" # Bootloader related deviceinfo_flash_method="none" -deviceinfo_boot_filesystem="fat32" -deviceinfo_cgpt_kpart="/usr/share/u-boot/google-veyron-speedy/u-boot-dtb.img.kpart" +deviceinfo_kernel_cmdline="console=null" +deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="24576" deviceinfo_cgpt_kpart_size="32768" +deviceinfo_depthcharge_board="speedy" +deviceinfo_generate_depthcharge_image="true" +deviceinfo_generate_extlinux_config="true" diff --git a/device/testing/device-google-veyron-speedy/grub.cfg b/device/testing/device-google-veyron-speedy/grub.cfg deleted file mode 100644 index df0f897cb..000000000 --- a/device/testing/device-google-veyron-speedy/grub.cfg +++ /dev/null @@ -1,7 +0,0 @@ -timeout=0 - -menuentry "postmarketOS" { - linux /vmlinuz console=null - initrd /initramfs - devicetree /dtbs/rk3288-veyron-speedy.dtb -}