forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

oneplus-bacon: enable mainline kernel (MR 1137)

Browse source 
The dts for oneplus bacon was already present in linux-postmarketos.

I adjusted the APKBUILD and deviceinfo to be able to use both downstream and mainline kernels
This commit is contained in:
Federico Amedeo Izzo 2020-04-12 09:28:30 +02:00 committed by Daniele Debernardi
parent 424266950b
commit 41735b5190
No known key found for this signature in database
GPG key ID: 5782FCF5DAE9AF60
2 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
device/testing/device-oneplus-bacon/APKBUILD
View file

@ -2,14 +2,19 @@
# Contributor: Jean Lucas <jean@4ray.co>
pkgname=device-oneplus-bacon
pkgver=1
pkgrel=20
pkgrel=21
pkgdesc="OnePlus One"
url="https://postmarketos.org"
arch="armv7"
license="MIT"
depends="postmarketos-base linux-oneplus-bacon mkbootimg mesa-dri-swrast msm-fb-refresher"
depends="postmarketos-base mkbootimg"
makedepends="devicepkg-dev"
subpackages="$pkgname-weston"
subpackages="
$pkgname-kernel-downstream:kernel_downstream
$pkgname-kernel-mainline:kernel_mainline
$pkgname-nonfree-firmware:nonfree_firmware
$pkgname-weston
"
source="deviceinfo 90-android-touch-dev.rules weston.ini"
options="!check !archcheck"
@ -23,12 +28,30 @@ package() {
"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
}
kernel_downstream() {
pkgdesc="Downstream kernel"
depends="linux-oneplus-bacon mesa-dri-swrast msm-fb-refresher"
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
}
kernel_mainline() {
pkgdesc="Mainline kernel"
depends="linux-postmarketos-qcom-msm8974 mesa-dri-freedreno"
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
}
nonfree_firmware() {
pkgdesc="GPU firmware"
depends="firmware-adreno"
mkdir "$subpkgdir"
}
weston() {
install_if="$pkgname weston"
install -Dm644 "$srcdir"/weston.ini \
"$subpkgdir"/etc/xdg/weston/weston.ini
}
sha512sums="a3c21cc2fe3f9b84619f1fbc1e3a06c3b3110ddee9e4769ccfcda5ccfbe89f9f5ae25be277950270ad96de5443fba1e7e2c5c0bb667cc5eb0f2b54aa7fe45762 deviceinfo
sha512sums="4d1cca1b904922024e3ab9f08ee465ecc3cbeac0684a8ce0f8225c33dfb54e1bff52e954801623b9492ceda985ab7babc984f1add1852169ba313a0a37ac45d1 deviceinfo
65e9ee7352b1dc39d99ea411eb0ed9c56f9975230907db5add3a1b4146cdf6f227c934052dab38a1937ed67d67585f28fb7410f10a1bec9dd5e4eb69d7253515 90-android-touch-dev.rules
86a0c08720225e4532f797ad69307dfff66867e4a35de1aacceefc48f19721caf93f9a17a268e58f1f5a7e947f157d6984676837c2b5b835b0caf6ee9821bb5a weston.ini"

20
device/testing/device-oneplus-bacon/deviceinfo
View file

@ -6,24 +6,26 @@ deviceinfo_name="OnePlus One"
deviceinfo_manufacturer="OnePlus"
deviceinfo_codename="oneplus-bacon"
deviceinfo_year="2014"
deviceinfo_keyboard="false"
deviceinfo_dtb=""
deviceinfo_modules_initfs=""
deviceinfo_external_storage="false"
deviceinfo_flash_method="fastboot"
deviceinfo_dtb_mainline="qcom-msm8974-oneplus-bacon"
deviceinfo_append_dtb_mainline="true"
deviceinfo_modules_initfs_mainline="pm8941_pwrkey qnoc_msm8974 rmi_i2c"
deviceinfo_arch="armv7"
# Splash screen
# Device related
deviceinfo_keyboard="false"
deviceinfo_external_storage="false"
deviceinfo_screen_width="1080"
deviceinfo_screen_height="1920"
# Fastboot related
# Bootloader related
deviceinfo_flash_method="fastboot"
deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=bacon user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1 buildvariant=userdebug"
deviceinfo_kernel_cmdline_mainline="PMOS_NO_OUTPUT_REDIRECT"
deviceinfo_generate_bootimg="true"
deviceinfo_bootimg_qcdt="true"
deviceinfo_bootimg_qcdt_downstream="true"
deviceinfo_flash_offset_kernel="0x00008000"
deviceinfo_flash_offset_ramdisk="0x02000000"
deviceinfo_flash_offset_second="0x00f00000"
deviceinfo_flash_offset_tags="0x01e00000"
deviceinfo_flash_offset_base="0"
deviceinfo_flash_pagesize="2048"
deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=bacon user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1 buildvariant=userdebug"