Skip to content
Snippets Groups Projects
Unverified Commit 9444bb30 authored by Minecrell's avatar Minecrell
Browse files

wileyfox-crackling: remove downstream kernel (MR 1125) 

The device port gets increasingly hard to maintain with all the differences
between the downstream and the mainline kernel. Especially deviceinfo
has quite some duplication only because the downstream kernel needs to be
handled as well.

The mainline port has much more features working. The only limitation
compared to the downstream kernel is the lack of a proper charging driver.
But even on downstream postmarketOS the battery driver is not working
properly for some reason.

For charging, a downstream installation in recovery seems more suitable
at the moment. Eventually we will build some functionality into the
bootloader to load a simple downstream initramfs when the device gets
booted for charging.
parent 7282dcdc
Branches
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 4148 deletions
device/testing/device-wileyfox-crackling/APKBUILD
+ 5
− 18
View file @ 9444bb30
......@@ -9,45 +9,33 @@ url="https://postmarketos.org"
license="MIT"
arch="aarch64"
options="!check !archcheck"
depends="postmarketos-base mkbootimg"
depends="postmarketos-base mkbootimg soc-qcom-msm8916"
makedepends="devicepkg-dev"
source="deviceinfo"
subpackages="
$pkgname-kernel-mainline:kernel_mainline
$pkgname-kernel-mainline-modem:kernel_mainline_modem
$pkgname-kernel-downstream:kernel_downstream
$pkgname-nonfree-firmware:nonfree_firmware
$pkgname-nonfree-firmware-modem:nonfree_firmware_modem
"
source="
deviceinfo
fb.modes
"
build() {
devicepkg_build $startdir $pkgname
}
package() {
devicepkg_package $startdir $pkgname
install -Dm544 "$srcdir"/fb.modes "$pkgdir"/etc/fb.modes
}
kernel_mainline() {
pkgdesc="Mainline kernel (no charging, no modem, audio routed directly)"
depends="linux-postmarketos-qcom-msm8916 soc-qcom-msm8916"
depends="linux-postmarketos-qcom-msm8916"
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
}
kernel_mainline_modem() {
pkgdesc="Mainline kernel (no charging, non-free modem, audio routed through ADSP)"
depends="linux-postmarketos-qcom-msm8916 soc-qcom-msm8916 soc-qcom-msm8916-modem"
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
}
kernel_downstream() {
pkgdesc="For charging/debugging only (prefer mainline)"
depends="linux-wileyfox-crackling mesa-dri-swrast mdss-fb-init-hack"
depends="linux-postmarketos-qcom-msm8916 soc-qcom-msm8916-modem"
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
}
......@@ -64,5 +52,4 @@ nonfree_firmware_modem() {
mkdir "$subpkgdir"
}
sha512sums="4f307c36c23994ad11f5f4af3209415993f3e5b134a0f05a4b1694a02d2d83cea7a395eb33958650162f3d13e2f6dde35ada7d22c15c195705bdc8ac7da83ccf deviceinfo
587be41a15f5738c6f55c52f760e08810185a00af886e84864f77ce38675bdf65893779a4ea88c9811023746895818ce5829a1b060e158f2cdae87d13e13f07d fb.modes"
sha512sums="1dc287097cee0119c3610d6ff26dacb2a3a7a8fa981e9c331e536810985fe189c59170c2c440c21aaea09e6c84dfdf0dcbfbbaf272005b261c8d2cfdbf5c5efe deviceinfo"
device/testing/device-wileyfox-crackling/deviceinfo
+ 3
− 10
View file @ 9444bb30
......@@ -8,11 +8,8 @@ deviceinfo_codename="wileyfox-crackling"
deviceinfo_year="2015"
deviceinfo_dtb_mainline="qcom/msm8916-longcheer-l8150"
deviceinfo_dtb_mainline_modem="qcom/msm8916-longcheer-l8150-modem"
deviceinfo_append_dtb_mainline="true"
deviceinfo_append_dtb_mainline_modem="true"
deviceinfo_modules_initfs_downstream=""
deviceinfo_modules_initfs_mainline="panel-booyi-otm1287 msm rmi_i2c qcom-spmi-vadc dumb-adc-battery"
deviceinfo_modules_initfs_mainline_modem="panel-booyi-otm1287 msm rmi_i2c qcom-spmi-vadc dumb-adc-battery"
deviceinfo_append_dtb="true"
deviceinfo_modules_initfs="panel-booyi-otm1287 msm rmi_i2c qcom-spmi-vadc dumb-adc-battery"
deviceinfo_arch="aarch64"
# Device related
......@@ -20,15 +17,11 @@ deviceinfo_keyboard="false"
deviceinfo_external_storage="true"
deviceinfo_screen_width="720"
deviceinfo_screen_height="1280"
deviceinfo_dev_touchscreen="/dev/input/event3"
# Bootloader related
deviceinfo_flash_method="fastboot"
deviceinfo_kernel_cmdline_mainline="earlycon=msm_serial_dm,0x78b0000 console=ttyMSM0,115200,n8 PMOS_NO_OUTPUT_REDIRECT"
deviceinfo_kernel_cmdline_mainline_modem="earlycon=msm_serial_dm,0x78b0000 console=ttyMSM0,115200,n8 PMOS_NO_OUTPUT_REDIRECT"
deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 loop.max_part=7 buildvariant=userdebug"
deviceinfo_kernel_cmdline="earlycon=msm_serial_dm,0x78b0000 console=ttyMSM0,115200,n8 PMOS_NO_OUTPUT_REDIRECT"
deviceinfo_generate_bootimg="true"
deviceinfo_bootimg_qcdt_downstream="true"
deviceinfo_flash_offset_base="0x80000000"
deviceinfo_flash_offset_kernel="0x00080000"
deviceinfo_flash_offset_ramdisk="0x02000000"
......
device/testing/device-wileyfox-crackling/fb.modes deleted 100644 → 0
+ 0
− 8
View file @ 7282dcdc
mode "720x1280-50"
# D: 60.002 MHz, H: 65.937 kHz, V: 49.952 Hz
geometry 720 1280 720 1280 16
timings 16666 90 90 16 20 10 4
accel false
rgba 8/0,8/8,8/16,8/24
endmode
device/testing/linux-wileyfox-crackling/01_fix_gcc6_errors.patch deleted 100644 → 0
+ 0
− 68
View file @ 7282dcdc
From 44f841be2a223d672eaf9fa3029fd9249aeca583 Mon Sep 17 00:00:00 2001
From: MOVZX <movzx@yahoo.com>
Date: Tue, 25 Apr 2017 17:04:40 +0300
Subject: [PATCH] prima: Fix GCC6 Warnings
Signed-off-by: MOVZX <movzx@yahoo.com>
---
drivers/staging/prima/CORE/MAC/src/include/utilsApi.h | 2 +-
drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c | 2 +-
drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c | 2 +-
drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c | 5 ++---
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/prima/CORE/MAC/src/include/utilsApi.h b/drivers/staging/prima/CORE/MAC/src/include/utilsApi.h
index 3a175473378..798a05cd2b4 100644
--- a/drivers/staging/prima/CORE/MAC/src/include/utilsApi.h
+++ b/drivers/staging/prima/CORE/MAC/src/include/utilsApi.h
@@ -705,7 +705,7 @@ halRoundS32(tANI_S32 p)
else
k = p;
- return(k);
+ return(k);
}
// New functions for endianess conversion
diff --git a/drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c b/drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c
index 0fc798995ae..6427a04e108 100644
--- a/drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c
+++ b/drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c
@@ -60,7 +60,7 @@
// Temporarily (maybe for all of Alpha-1), assuming TIM = 0
//
-const tANI_U8 P2pOui[] = {0x50, 0x6F, 0x9A, 0x9};
+tANI_U8 P2pOui[] = {0x50, 0x6F, 0x9A, 0x9};
tSirRetStatus schGetP2pIeOffset(tANI_U8 *pExtraIe, tANI_U32 extraIeLen, tANI_U16 *pP2pIeOffset)
diff --git a/drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c b/drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c
index 23ab858c355..b4f26def1d1 100644
--- a/drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c
+++ b/drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c
@@ -5698,7 +5698,7 @@ static tANI_BOOLEAN csrScanProcessScanResults( tpAniSirGlobal pMac, tSmeCmd *pCo
if (eHAL_STATUS_SUCCESS != status)
smsLog(pMac, LOGE,
FL( "failed to update the supported channel list"));
- pMac->scan.defer_update_channel_list = false;
+ pMac->scan.defer_update_channel_list = false;
}
#ifdef WLAN_AP_STA_CONCURRENCY
diff --git a/drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c b/drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c
index 14c6eadf524..e26b697f793 100644
--- a/drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c
+++ b/drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c
@@ -587,9 +587,8 @@ _NV_TEMPLATE_TABLE NvTablesBuiltIn[/*TABLES_MAX*/][TABLE_ENTRIES_MAX] = {
((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) -
(char *)&nvDefaults.tables.hwCalValues.calData),"psSlpTimeOvrHdxLNA5G"},
{"ed",_ID_U8,SINGULAR,0,0,0,
- (((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) +
- sizeof(uint16)) - (char *)&nvDefaults.tables.hwCalValues.calData),
- "nv_TxBBFSel9MHz"},
+ ((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) -
+ (char *)&nvDefaults.tables.hwCalValues.calData),"nv_TxBBFSel9MHz"},
{"ee",_ID_U8,SINGULAR,0,0,0,
((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam2) -
(char *)&nvDefaults.tables.hwCalValues.calData),"hwParam2"},
device/testing/linux-wileyfox-crackling/APKBUILD deleted 100644 → 0
+ 0
− 62
View file @ 7282dcdc
# Reference: <https://postmarketos.org/vendorkernel>
# Kernel config based on: arch/arm64/configs/lineageos_crackling_defconfig
pkgname="linux-wileyfox-crackling"
pkgver=3.10.108
pkgrel=0
pkgdesc="Wileyfox Swift kernel fork"
arch="aarch64"
_carch="arm64"
_flavor="wileyfox-crackling"
url="https://kernel.org"
license="GPL-2.0-only"
options="!strip !check !tracedeps"
makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool gcc6"
# Compiler: GCC 6 (doesn't boot when compiled with newer versions)
if [ "${CC:0:5}" != "gcc6-" ]; then
CC="gcc6-$CC"
HOSTCC="gcc6-gcc"
CROSS_COMPILE="gcc6-$CROSS_COMPILE"
fi
# Source
_repository="android_kernel_cyanogen_msm8916"
_commit="7ac9a15c55f441060e83a3b0b6a9b4573cefeea7"
_config="config-$_flavor.$arch"
source="
$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
$_config
01_fix_gcc6_errors.patch
mdss_fb_refresh_rate.patch
"
builddir="$srcdir/$_repository-$_commit"
prepare() {
default_prepare
. downstreamkernel_prepare
}
build() {
unset LDFLAGS
make ARCH="$_carch" CC="${CC:-gcc}" \
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
# Generate master DTB
dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/"
}
package() {
downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
# Master DTB
install -Dm644 "$builddir/arch/arm/boot/dt.img" \
"$pkgdir/boot/dt.img"
}
sha512sums="7787047fc72da32e3dd5daa1d867be5e47035e76fe35ae681bc8456222bd891dd39915bcbd139a301a1e2ebb7d9acfae5f4130451c23d3654b18f3b707b2d51c linux-wileyfox-crackling-7ac9a15c55f441060e83a3b0b6a9b4573cefeea7.tar.gz
b23b0223c60b3a98051b70ce7f5839ffa41ca0f37a1cc14860a7ac2193063334302a49704fd7b9e60aa38d44bb7a5553ce9831bb36538d5d88081fa3655d5772 config-wileyfox-crackling.aarch64
972e98523d6ef06342e69a09e979bdd86904cf7f9a843b519b37791e531b680182564a2ab537c94629c3589f4e775b2c39de04c64e210a0f8b6f10745c3596f1 01_fix_gcc6_errors.patch
a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8 mdss_fb_refresh_rate.patch"
device/testing/linux-wileyfox-crackling/mdss_fb_refresh_rate.patch deleted 100644 → 0
+ 0
− 13
View file @ 7282dcdc
diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
index b37fd1e07ac1..1f091a261d22 100644
--- a/drivers/video/msm/mdss/mdss_fb.c
+++ b/drivers/video/msm/mdss/mdss_fb.c
@@ -2668,7 +2668,7 @@ static int mdss_fb_register(struct msm_fb_data_type *mfd)
var->left_margin = panel_info->lcdc.h_back_porch;
var->right_margin = panel_info->lcdc.h_front_porch;
var->hsync_len = panel_info->lcdc.h_pulse_width;
- var->pixclock = panel_info->clk_rate / 1000;
+ var->pixclock = 1000000 / 60;
/*
* Store the cont splash state in the var reserved[3] field.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment