diff --git a/device/testing/device-google-veyron-minnie/APKBUILD b/device/testing/device-google-veyron-minnie/APKBUILD index dcc827c66..da04ff28b 100644 --- a/device/testing/device-google-veyron-minnie/APKBUILD +++ b/device/testing/device-google-veyron-minnie/APKBUILD @@ -3,62 +3,35 @@ # Co-Maintainer: Jenneron pkgname=device-google-veyron-minnie pkgdesc="ASUS Chromebook Flip C100" -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-minnie 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 pointercal " -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 - install -Dm644 "$srcdir"/pointercal \ "$pkgdir"/etc/pointercal } @@ -83,9 +56,8 @@ phosh() { } sha512sums=" -d41d4e356cb8723a5cb5d3bd7f221f0892bc0d8a5b7daece67058f8308a7edd9ca8ac16a1305b4667b2964ec5685d7dadbf2a96f4ea81789f8a885a4ec6f3525 deviceinfo +150b9cb7c5fad3542c7786c540c9aaa325f73081828e7021d2067accaa056fc7ba69cdb4f675f18f0ee9ea850109612664809148a95655022f7bd149267c1a10 deviceinfo e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da 90-tap-to-click.conf -21624192f017b03ce0619deab6eb743592b7dd12dc4e288068c7354e887169e2a4cb3b2f069e95728ec4dfa3d5304a031a961cb247b4efc3ee31a4ce6a08f505 grub.cfg bd63cfc97d37e81dd9559dad60f330c10dc280afd20081495c6302960fcacf32954e3edab53294fcd5278e86c53c47a95b345a8d9e18807d88fe4313d519d259 phoc.ini 754eb3c09aadf552aaea3ade7cddf737769f800ddeafbf0665b61141397a58bea4595652ec3d7d1803863257cd163114a330f040a3f2352051b2215f7efa46a6 pointercal " diff --git a/device/testing/device-google-veyron-minnie/deviceinfo b/device/testing/device-google-veyron-minnie/deviceinfo index 4ee82cea5..c46d88564 100644 --- a/device/testing/device-google-veyron-minnie/deviceinfo +++ b/device/testing/device-google-veyron-minnie/deviceinfo @@ -8,6 +8,7 @@ deviceinfo_manufacturer="ASUS" deviceinfo_codename="google-veyron-minnie" deviceinfo_year="2015" deviceinfo_arch="armv7" +deviceinfo_dtb="rk3288-veyron-minnie" 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 elants-i2c" # 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-minnie/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="minnie" +deviceinfo_generate_depthcharge_image="true" +deviceinfo_generate_extlinux_config="true" diff --git a/device/testing/device-google-veyron-minnie/grub.cfg b/device/testing/device-google-veyron-minnie/grub.cfg deleted file mode 100644 index e0997cee0..000000000 --- a/device/testing/device-google-veyron-minnie/grub.cfg +++ /dev/null @@ -1,7 +0,0 @@ -timeout=0 - -menuentry "postmarketOS" { - linux /vmlinuz console=null - initrd /initramfs - devicetree /dtbs/rk3288-veyron-minnie.dtb -}