diff --git a/device/testing/device-google-veyron-jerry/APKBUILD b/device/testing/device-google-veyron-jerry/APKBUILD index 167a77602..4de18e33a 100644 --- a/device/testing/device-google-veyron-jerry/APKBUILD +++ b/device/testing/device-google-veyron-jerry/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Jenneron pkgname=device-google-veyron-jerry pkgdesc="Google Veyron Jerry Chromebook" -pkgver=1 +pkgver=2 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -12,14 +12,11 @@ options="!check !archcheck" depends=" alsa-ucm-conf>=1.2.7.1-r0 linux-google-veyron - postmarketos-base + postmarketos-base>=25-r1 " makedepends="devicepkg-dev" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" -source=" - deviceinfo - extlinux.conf -" +source="deviceinfo" build() { devicepkg_build $startdir $pkgname @@ -27,8 +24,6 @@ build() { package() { devicepkg_package $startdir $pkgname - install -D -m644 "$srcdir"/extlinux.conf \ - "$pkgdir"/boot/extlinux/extlinux.conf } nonfree_firmware() { @@ -38,6 +33,5 @@ nonfree_firmware() { } sha512sums=" -f03a663bdf5af04b0270a4c004877cc80496e9a11c6a144e62f5bffb93f8eaef0a0b9b55c6b3a85e13e2539f0e24781148c9676e1c8be50961aaf49fed224424 deviceinfo -9a61a6c2fa0ef67db8d745f6db1ffc9ebcd6275279fd42a1466bf8d96b2b4a73c366a41d3986b535f8d287b70a76970f89fbd60ef3da773c2f7aaf02937fdcbe extlinux.conf +fafce2bd9112e99d061bb8fda44501aecc68ab8010a49607cdf2257bf97143d5a53087b535626d2c28bfde6724879cabb27f6f94717745c17d03672562132967 deviceinfo " diff --git a/device/testing/device-google-veyron-jerry/deviceinfo b/device/testing/device-google-veyron-jerry/deviceinfo index feb1d0e44..0c72b60a7 100644 --- a/device/testing/device-google-veyron-jerry/deviceinfo +++ b/device/testing/device-google-veyron-jerry/deviceinfo @@ -7,6 +7,7 @@ deviceinfo_name="Google Veyron Jerry Chromebook" deviceinfo_manufacturer="Google" deviceinfo_codename="google-veyron-jerry" deviceinfo_year="2015" +deviceinfo_dtb="rk3288-veyron-jerry" deviceinfo_modules_initfs="panel_simple 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 cros-ec cros-ec-spi sbs-battery cros-ec-keyb" deviceinfo_arch="armv7" @@ -20,3 +21,5 @@ deviceinfo_gpu_accelerated="true" # Bootloader related deviceinfo_flash_method="none" +deviceinfo_kernel_cmdline="console=ttyS2,115200n8 earlyprintk=ttyS2,115200n8 console=tty1 nosplash panic=10 loglevel=5" +deviceinfo_generate_extlinux_config="true" diff --git a/device/testing/device-google-veyron-jerry/extlinux.conf b/device/testing/device-google-veyron-jerry/extlinux.conf deleted file mode 100644 index 6d6c65760..000000000 --- a/device/testing/device-google-veyron-jerry/extlinux.conf +++ /dev/null @@ -1,11 +0,0 @@ -timeout 10 -default POSTMARKETOS -menu title boot prev kernel - -label POSTMARKETOS - kernel /vmlinuz - fdt /dtbs/rk3288-veyron-jerry.dtb - initrd /initramfs - append console=ttyS2,115200n8 earlyprintk=ttyS2,115200n8 console=tty1 nosplash panic=10 loglevel=5 - -