bq-paella: new device (BQ Aquaris X5 Cyanogen Edition) (MR 1159)

bq-paella: new device (BQ Aquaris X5 Cyanogen Edition)

bq-paella: new device (BQ Aquaris X5 Cyanogen Edition)

bq-paella: new device (BQ Aquaris X5 Cyanogen Edition)

bq-paella: new device (BQ Aquaris X5 Cyanogen Edition)

device/testing/device-bq-paella/APKBUILD

@@ -0,0 +1,31 @@
+# Contributor: Jonathan Albrieux <jonathan.albrieux@gmail.com>
+# Maintainer: Jonathan Albrieux <jonathan.albrieux@gmail.com>
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname="device-bq-paella"
+pkgdesc="BQ Aquaris X5 Cyanogen Edition"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 soc-qcom-msm8916"
+makedepends="devicepkg-dev"
+source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="GPU/WiFi/BT/Video firmware"
+	depends="linux-firmware-qcom firmware-bq-picmt-venus firmware-bq-picmt-wcnss"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="e813ad9c744845b0520830bc14fe9ca603999d6b7fbc8309fa7a3a6816ebb102310ec99d7cf163fe2d5735ac65f8f7f43b3f584a7ec2d556d414ee88275facb5  deviceinfo"

device/testing/device-bq-paella/deviceinfo

@@ -0,0 +1,34 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="BQ Aquaris X5 Cyanogen Edition"
+deviceinfo_manufacturer="BQ"
+deviceinfo_codename="bq-paella"
+deviceinfo_year="2015"
+deviceinfo_dtb="qcom/msm8916-bq-paella"
+deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs=""
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="720"
+deviceinfo_screen_height="1280"
+deviceinfo_getty="ttyMSM0;115200"
+
+# MSM DRM cannot take over the framebuffer from the bootloader at the moment
+deviceinfo_no_framebuffer="true"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_generate_bootimg="true"
+deviceinfo_flash_offset_base="0x80000000"
+deviceinfo_flash_offset_kernel="0x00080000"
+deviceinfo_flash_offset_ramdisk="0x02000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x01e00000"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_flash_sparse="true"

device/testing/device-bq-picmt/APKBUILD

@@ -4,15 +4,15 @@
 pkgname="device-bq-picmt"
 pkgdesc="BQ Aquaris X5"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-bq-picmt mkbootimg qemu mesa-dri-swrast msm-fb-refresher"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -23,8 +23,8 @@ package() {
 }
 
 nonfree_firmware() {
-	pkgdesc="Wifi(/Modem in progress)/Adreno firmware"
-	depends="firmware-bq-picmt-wcnss firmware-bq-picmt-modem msm-modem-downstream firmware-bq-picmt-adreno"
+	pkgdesc="Wifi(/Modem in progress)"
+	depends="firmware-bq-picmt-wcnss wcnss-wlan firmware-bq-picmt-modem msm-modem-downstream"
 	mkdir "$subpkgdir"
 }
 

firmware/firmware-bq-picmt/APKBUILD

@@ -1,10 +1,10 @@
 pkgname=firmware-bq-picmt
-pkgver=0.1
+pkgver=1
 pkgrel=0
-pkgdesc="Firmware for Samsung Aquaris X5"
+pkgdesc="Firmware for BQ Aquaris X5"
 url="https://github.com/JonnyMe/picmt-firmware"
-subpackages="$pkgname-adreno $pkgname-modem $pkgname-wcnss"
-arch="armv7"
+subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
+arch="aarch64 armv7"
 license="proprietary"
 options="!check !strip !archcheck"
 source="https://github.com/JonnyMe/picmt-firmware/raw/master/picmt_firmware_files.tar.xz"
@@ -12,33 +12,27 @@ source="https://github.com/JonnyMe/picmt-firmware/raw/master/picmt_firmware_file
 _fwdir="/lib/firmware/postmarketos"
 
 package() {
+	# parent package is empty
 	mkdir -p "$pkgdir"
-	mkdir -p "$pkgdir"/lib/firmware/postmarketos
-	mkdir -p "$pkgdir"/lib/firmware/postmarketos/wlan/prima
 }
 
 modem() {
-	pkgdesc="Aquaris X5 modem firmware"
+	pkgdesc="BQ Aquaris X5 modem firmware"
 	cd "$srcdir"
-	install -D -m644 modem.* -t "$subpkgdir"/lib/firmware/postmarketos
-	install -D -m644 mba.* -t "$subpkgdir"/lib/firmware/postmarketos
+	install -Dm644 "$srcdir"/modem.* -t "$subpkgdir/$_fwdir"
+	install -Dm644 "$srcdir"/mba.* -t "$subpkgdir/$_fwdir"
 }
 
-adreno() {
-	pkgdesc="Aquaris X5 adreno gpu firmware"
-	cd "$srcdir"
-	install -D -m644 tz* -t "$subpkgdir"/lib/firmware/postmarketos
-	install -D -m644 a225* -t "$subpkgdir"/lib/firmware/qcom
-	install -D -m644 a330* -t "$subpkgdir"/lib/firmware/qcom
-	install -D -m644 a420* -t "$subpkgdir"/lib/firmware/qcom
+venus() {
+	pkgdesc="BQ Aquaris X5 video firmware"
+	install -Dm644 "$srcdir"/venus.* -t "$subpkgdir/$_fwdir"/qcom/venus-1.8
 }
 
 wcnss() {
-	pkgdesc="Aquaris X5 WiFi/BT firmware"
-	depends="wcnss-wlan"
+	pkgdesc="BQ Aquaris X5 WiFi/BT firmware"
 	cd "$srcdir"
-	install -D -m644 wcnss.* -t "$subpkgdir"/lib/firmware/postmarketos
-	install -D -m644 WCNSS_* -t "$subpkgdir"/lib/firmware/postmarketos/wlan/prima
+	install -Dm644 "$srcdir"/wcnss.* -t "$subpkgdir/$_fwdir"
+	install -Dm644 "$srcdir"/WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima
 }
 
-sha512sums="986f32ac33b895ca80abfe476cd1abd47a778ae8ddc6593ed4a6a91a244c5fe7ced6766b98ea2a3bdb4720fbabc40a50a8972106e6be2227f5ed8d7ffcdf2c0d  picmt_firmware_files.tar.xz"
+sha512sums="7f426e5fdb20319ed22c16be1ce13d069532bdfb8dc754a735c2a019342758b1f0210614dfeaa1d850802083a550ec8a6931d3572d203267cae8ec59f6613d82  picmt_firmware_files.tar.xz"