diff --git a/aports/device/device-asus-flo/APKBUILD b/aports/device/device-asus-flo/APKBUILD index 8236f79f..ef371ebb 100644 --- a/aports/device/device-asus-flo/APKBUILD +++ b/aports/device/device-asus-flo/APKBUILD @@ -1,22 +1,26 @@ pkgname=device-asus-flo pkgver=0 -pkgrel=1 +pkgrel=2 pkgdesc="Google Nexus 7 2013 flo" url="https://github.com/postmarketOS" arch="noarch" license="MIT" -depends="linux-asus-flo mkbootimg" +depends="linux-asus-flo mkbootimg firmware-asus-flo mesa mesa-dri-freedreno" makedepends="" install="" subpackages="" -source="deviceinfo 90-android-touch-dev.rules" +source="deviceinfo 90-android-touch-dev.rules wpa_supplicant.conf" + options="!check" package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" + install -D -m644 "$srcdir/wpa_supplicant.conf" \ + "$pkgdir/etc/wpa_supplicant/wpa_supplicant.conf" install -D -m644 "$srcdir/90-android-touch-dev.rules" \ "$pkgdir/lib/udev/rules.d/90-android-touch-dev.rules" } -sha512sums="8a46d52cf77c3be4f81b28ce680bf7c3382eadf35998876ba348337f73ef6c90e1a0d16d0bf6369113c243467a978ef3f7912ad026dc49ab9ac95df00e2e9a71 deviceinfo -a02db4e1bdb622cc4616b750dc5c3248081f5124cc49ef18f25b430c921c80004eff9f6a9b84a76ce04785c256e71776ff90e0f60140e4cce6860ba8d80cf4d2 90-android-touch-dev.rules" +sha512sums="8e66731d71e703a92d57df154623946fbe1d01457fa0ff32a223c8a6c30148f9b2123071377ddab6ceae292fab11439ada0355121009a67ba780cab8edf44c93 deviceinfo +a02db4e1bdb622cc4616b750dc5c3248081f5124cc49ef18f25b430c921c80004eff9f6a9b84a76ce04785c256e71776ff90e0f60140e4cce6860ba8d80cf4d2 90-android-touch-dev.rules +3278921cc1617d10fdd13dfbeaf213cda0078d069e727acd8cfac10bd8ade6f373be1e22fd1e4b50ae71cd2eae09f7d6aad5de42338d9ea9f8c1a34f0b60cb69 wpa_supplicant.conf" diff --git a/aports/device/device-asus-flo/deviceinfo b/aports/device/device-asus-flo/deviceinfo index 36b965b4..3119e435 100644 --- a/aports/device/device-asus-flo/deviceinfo +++ b/aports/device/device-asus-flo/deviceinfo @@ -23,7 +23,7 @@ deviceinfo_screen_height="1920" # Fastboot related deviceinfo_generate_bootimg="true" deviceinfo_flash_offset_base="0x80200000" -deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 vmalloc=340M" +deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 vmalloc=340M" deviceinfo_flash_offset_kernel="0x00008000" deviceinfo_flash_offset_ramdisk="0x02000000" deviceinfo_flash_offset_second="0x00f00000" diff --git a/aports/device/device-asus-flo/wpa_supplicant.conf b/aports/device/device-asus-flo/wpa_supplicant.conf new file mode 100644 index 00000000..f20de2ce --- /dev/null +++ b/aports/device/device-asus-flo/wpa_supplicant.conf @@ -0,0 +1,8 @@ +update_config=1 +eapol_version=1 +ap_scan=1 +fast_reauth=1 +pmf=1 +disable_scan_offload=1 +tdls_external_control=1 +no_ctrl_interface= diff --git a/aports/device/linux-asus-flo/APKBUILD b/aports/device/linux-asus-flo/APKBUILD index f4373f89..8cb5600f 100644 --- a/aports/device/linux-asus-flo/APKBUILD +++ b/aports/device/linux-asus-flo/APKBUILD @@ -9,7 +9,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=0 +pkgrel=1 arch="armhf" pkgdesc="Nexus 7 2013 WIFI mainline kernel" url="https://git.linaro.org/people/john.stultz/flo.git/log/?h=flo-WIP" @@ -76,4 +76,4 @@ package() { || return 1 } sha512sums="b3d3186bf86bcfe6a39690e1c13751aefed2d876b646b93631c1e76c70a56a23adcb2e50fd8d031dfb6e7111919cf116bd9a12a91c26cb5a5042a9e4cffc4bc4 linux-asus-flo-942488347d69700cb84ad79290b7e60d124ac8d5.tar.gz -cb66045ad6253ba0092d9e39b9d8d5be5615ec257890edbe007173051433301855b9e20dee530944d16b4538ace8876073f3ba9093b29c653369e7bc750dd7ca config-asus-flo.armhf" +feea40e7874f5c506d207c6b44e56a2058e945224237ea886d81764403c612547f44bdf4efbbdd8cead51e9647726fc087fb17459fb15899709f154193000013 config-asus-flo.armhf" diff --git a/aports/device/linux-asus-flo/config-asus-flo.armhf b/aports/device/linux-asus-flo/config-asus-flo.armhf index 0ceb503b..a2cd7098 100644 --- a/aports/device/linux-asus-flo/config-asus-flo.armhf +++ b/aports/device/linux-asus-flo/config-asus-flo.armhf @@ -1075,6 +1075,7 @@ CONFIG_NET_CLS_ACT=y # CONFIG_NET_CLS_IND is not set CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set +# CONFIG_DNS_RESOLVER is not set # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set # CONFIG_VSOCKETS is not set @@ -3741,6 +3742,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ORANGEFS_FS is not set # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_ECRYPT_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set @@ -4038,7 +4040,11 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +# CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_BIG_KEYS is not set +# CONFIG_ENCRYPTED_KEYS is not set +# CONFIG_KEY_DH_OPERATIONS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y # CONFIG_SECURITY_WRITABLE_HOOKS is not set @@ -4056,6 +4062,7 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y # CONFIG_SECURITY_LOADPIN is not set # CONFIG_SECURITY_YAMA is not set CONFIG_INTEGRITY=y +# CONFIG_INTEGRITY_SIGNATURE is not set CONFIG_INTEGRITY_AUDIT=y # CONFIG_IMA is not set # CONFIG_EVM is not set @@ -4112,11 +4119,11 @@ CONFIG_CRYPTO_ECHAINIV=y # CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTR=y -# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_PCBC is not set -# CONFIG_CRYPTO_XTS is not set +CONFIG_CRYPTO_XTS=y # CONFIG_CRYPTO_KEYWRAP is not set # @@ -4197,10 +4204,12 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set # CONFIG_CRYPTO_DEV_QCE is not set CONFIG_CRYPTO_DEV_VIRTIO=y +# CONFIG_ASYMMETRIC_KEY_TYPE is not set # # Certificates for signature checking # +# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set # CONFIG_ARM_CRYPTO is not set CONFIG_BINARY_PRINTF=y @@ -4260,6 +4269,7 @@ CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=y CONFIG_TEXTSEARCH_BM=y CONFIG_TEXTSEARCH_FSM=y +CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y diff --git a/aports/firmware/firmware-asus-flo/APKBUILD b/aports/firmware/firmware-asus-flo/APKBUILD new file mode 100644 index 00000000..0687f1b3 --- /dev/null +++ b/aports/firmware/firmware-asus-flo/APKBUILD @@ -0,0 +1,47 @@ +pkgname=firmware-asus-flo +pkgver=0 +pkgrel=0 +pkgdesc="Firmware for asus-flo" +url="https://github.com/LineageOS/android_device_asus_flo/tree/cm-14.1/wifi/" +url="https://developers.google.com/android/drivers#flomob30x" +arch="noarch" +license="proprietary" +depends="" +makedepends="" +install="" +subpackages="" +options="!check !strip !archcheck" +source="qcom-flo-mob30x-43963492.tgz::https://dl.google.com/dl/android/aosp/qcom-flo-mob30x-43963492.tgz broadcom-flo-mob30x-23c0a6c8.tgz::https://dl.google.com/dl/android/aosp/broadcom-flo-mob30x-23c0a6c8.tgz" + +_files="WCNSS_qcom_cfg.ini WCNSS_cfg.dat WCNSS_qcom_wlan_nv_flo.bin" +for _i in $_files; do source="$source https://github.com/LineageOS/android_device_asus_flo/raw/cm-14.1/wifi/$_i"; done + +package() { + tail -n +276 $srcdir/extract-broadcom-flo.sh | tar zxv + tail -n +315 $srcdir/extract-qcom-flo.sh | tar zxv + + mkdir -p $pkgdir/lib/firmware/ + _files="wcnss.b00 wcnss.b01 wcnss.b02 wcnss.b04 wcnss.b05 wcnss.mdt a300_pfp.fw a300_pm4.fw dsps.b00 dsps.b01 dsps.b02 dsps.b03 dsps.b04 dsps.b05 dsps.mdt gss.b00 gss.b02 gss.b04 gss.b06 gss.b08 gss.b10 gss.mdt gss.b01 gss.b03 gss.b05 gss.b07 gss.b09 gss.b11 q6.b00 q6.b01 q6.b03 q6.b04 q6.b05 q6.b06 q6.mdt tzapps.b00 tzapps.b01 tzapps.b02 tzapps.b03 tzapps.mdt vidc_1080p.fw vidc.b00 vidc.b01 vidc.b02 vidc.b03 vidcfw.elf vidc.mdt" + for _i in $_files; do install -D -m644 "$srcdir/../vendor/qcom/flo/proprietary/$_i" "$pkgdir/lib/firmware/$_i"; done + + _files=" bcm2079x-b5_firmware.ncd bcm2079x-b5_pre_firmware.ncd" + for _i in $_files; do install -D -m644 "$srcdir/../vendor/broadcom/flo/proprietary/$_i" "$pkgdir/lib/firmware/$_i"; done + + mkdir -p $pkgdir/lib/firmware/keymaster + _files="keymaster.b00 keymaster.b01 keymaster.b02 keymaster.b03 keymaster.mdt" + for _i in $_files; do install -D -m644 "$srcdir/../vendor/qcom/flo/proprietary/$_i" "$pkgdir/lib/firmware/keymaster/$_i"; done + + mkdir -p $pkgdir/lib/firmware/discretix + _files="dxhdcp2.b00 dxhdcp2.b01 dxhdcp2.b02 dxhdcp2.b03 dxhdcp2.mdt" + for _i in $_files; do install -D -m644 "$srcdir/../vendor/qcom/flo/proprietary/$_i" "$pkgdir/lib/firmware/discretix/$_i"; done + + mkdir -p $pkgdir/lib/firmware/wlan/prima + mv $srcdir/WCNSS_qcom_wlan_nv_flo.bin $srcdir/WCNSS_qcom_wlan_nv.bin + _files="WCNSS_qcom_cfg.ini WCNSS_cfg.dat WCNSS_qcom_wlan_nv.bin" + for _i in $_files; do install -D -m644 "$srcdir/$_i" "$pkgdir/lib/firmware/wlan/prima/$_i"; done +} +sha512sums="0e36c52300f8e290d6f2c28f7f676fee326cbf843aa00090d50e14f6810856b78cc116c8ca73b2b3d62311faff5ab5f2ef0dcf73929c36f7f6bc9e76460e8f1c qcom-flo-mob30x-43963492.tgz +e18fe860185e2efe2b9b0d1ed17e7ba40c687fdf08667db1358fb8c68cc8632f36942ddccee975eecbc9f0e0a9b5b97abddb837dbd07653298609de09fe5bfce broadcom-flo-mob30x-23c0a6c8.tgz +df8bbc08774c1d8b479955e11e88964a172638934b98aeff3a1a76eeb2a6981f4ab9ef1c5e8abb050812ca2e99f21f661485c0c052f2103c76eccc19857f3f47 WCNSS_qcom_cfg.ini +d9ec98e8fa795383678dc8ffd388d8a5fe2a475559c5996f551f02766bc3397e74c100548dcb06e2a65515c76cf28eac6f156aa805cf81ea3c580c859f4bd0f1 WCNSS_cfg.dat +d734e76a83960e0d6fbc11816417459ec17a72196cde727f7aeba509601965637234101cb17fa168f1cb128f1b63499cb68fe7acdef280654f25d0847a59960a WCNSS_qcom_wlan_nv_flo.bin"