From d819fb93a5dc3a2adb5c3b1bba3b894c03b02896 Mon Sep 17 00:00:00 2001 From: Nikita Travkin Date: Thu, 23 Sep 2021 17:54:00 +0500 Subject: [PATCH] samsung-j5*: squash to j5, use msm-firmware-loader (MR 2431) --- .../APKBUILD | 14 +++---- .../deviceinfo | 4 +- device/testing/device-samsung-j5nlte/APKBUILD | 31 --------------- .../testing/device-samsung-j5nlte/deviceinfo | 35 ----------------- device/testing/firmware-samsung-j5/APKBUILD | 27 +++++++++++++ device/testing/firmware-samsung-j53g/APKBUILD | 39 ------------------- .../testing/firmware-samsung-j5nlte/APKBUILD | 37 ------------------ 7 files changed, 36 insertions(+), 151 deletions(-) rename device/testing/{device-samsung-j53g => device-samsung-j5}/APKBUILD (59%) rename device/testing/{device-samsung-j53g => device-samsung-j5}/deviceinfo (92%) delete mode 100644 device/testing/device-samsung-j5nlte/APKBUILD delete mode 100644 device/testing/device-samsung-j5nlte/deviceinfo create mode 100644 device/testing/firmware-samsung-j5/APKBUILD delete mode 100644 device/testing/firmware-samsung-j53g/APKBUILD delete mode 100644 device/testing/firmware-samsung-j5nlte/APKBUILD diff --git a/device/testing/device-samsung-j53g/APKBUILD b/device/testing/device-samsung-j5/APKBUILD similarity index 59% rename from device/testing/device-samsung-j53g/APKBUILD rename to device/testing/device-samsung-j5/APKBUILD index 915c4db71..d34272d6e 100644 --- a/device/testing/device-samsung-j53g/APKBUILD +++ b/device/testing/device-samsung-j5/APKBUILD @@ -1,8 +1,8 @@ # Reference: -pkgname=device-samsung-j53g -pkgdesc="Samsung Galaxy J5 2015 (SM-J500H)" -pkgver=1 -pkgrel=2 +pkgname=device-samsung-j5 +pkgdesc="Samsung Galaxy J5 (2015)" +pkgver=2 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -21,11 +21,11 @@ package() { } nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Video firmware" - depends="linux-firmware-qcom firmware-samsung-j53g-venus firmware-samsung-j53g-wcnss" + pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware" + depends="linux-firmware-qcom msm-firmware-loader firmware-samsung-j5-wcnss-nv" mkdir "$subpkgdir" } sha512sums=" -d3345a7b6e977d50b19dd10a6cb68a4ed00fed4bbe310572948626f4458cde741508778a9df7dfdb9d4bfd7d3276c25b6a3dea20e7d9c793c901b71bed496325 deviceinfo +cb2adfe1b6d23e3e84448cc1c2f67e0320f61fe9edf735b484070400247393e5c0a6984a14fa3349031f7160e23d49ce80f30e785e2bed9398046a38cba9371f deviceinfo " diff --git a/device/testing/device-samsung-j53g/deviceinfo b/device/testing/device-samsung-j5/deviceinfo similarity index 92% rename from device/testing/device-samsung-j53g/deviceinfo rename to device/testing/device-samsung-j5/deviceinfo index 80d0925aa..7939fe257 100644 --- a/device/testing/device-samsung-j53g/deviceinfo +++ b/device/testing/device-samsung-j5/deviceinfo @@ -2,9 +2,9 @@ # Please use double quotes only. You can source this file in shell scripts. deviceinfo_format_version="0" -deviceinfo_name="Samsung Galaxy J5 2015 (SM-J500H)" +deviceinfo_name="Samsung Galaxy J5 2015" deviceinfo_manufacturer="Samsung" -deviceinfo_codename="samsung-j53g" +deviceinfo_codename="samsung-j5" deviceinfo_year="2015" deviceinfo_dtb="qcom/msm8916-samsung-j5nlte" deviceinfo_append_dtb="true" diff --git a/device/testing/device-samsung-j5nlte/APKBUILD b/device/testing/device-samsung-j5nlte/APKBUILD deleted file mode 100644 index c1532f1be..000000000 --- a/device/testing/device-samsung-j5nlte/APKBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Reference: -pkgname=device-samsung-j5nlte -pkgdesc="Samsung Galaxy J5 2015 (SM-J500FN)" -pkgver=1 -pkgrel=3 -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-samsung-j5nlte-venus firmware-samsung-j5nlte-wcnss" - mkdir "$subpkgdir" -} - -sha512sums=" -def6e20054a7d4e1872d4ebc71e851b3b2f569a025d96baf1a7710973c0d999cf1d48b41fef3f9dccb85606da023968b1e826c3ab1ddc68cf4dbae798d3ffaa6 deviceinfo -" diff --git a/device/testing/device-samsung-j5nlte/deviceinfo b/device/testing/device-samsung-j5nlte/deviceinfo deleted file mode 100644 index 4deccd5c4..000000000 --- a/device/testing/device-samsung-j5nlte/deviceinfo +++ /dev/null @@ -1,35 +0,0 @@ -# Reference: -# Please use double quotes only. You can source this file in shell scripts. - -deviceinfo_format_version="0" -deviceinfo_name="Samsung Galaxy J5 2015 (SM-J500FN)" -deviceinfo_manufacturer="Samsung" -deviceinfo_codename="samsung-j5nlte" -deviceinfo_year="2015" -deviceinfo_dtb="qcom/msm8916-samsung-j5nlte" -deviceinfo_append_dtb="true" -deviceinfo_arch="aarch64" - -# Device related -deviceinfo_gpu_accelerated="true" -deviceinfo_chassis="handset" -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" diff --git a/device/testing/firmware-samsung-j5/APKBUILD b/device/testing/firmware-samsung-j5/APKBUILD new file mode 100644 index 000000000..52fa79c1e --- /dev/null +++ b/device/testing/firmware-samsung-j5/APKBUILD @@ -0,0 +1,27 @@ +pkgname=firmware-samsung-j5 +pkgver=1 +pkgrel=0 +_name="Samsung Galaxy J5 (2015)" +pkgdesc="Firmware for $_name" +url="https://postmarketos.org" +subpackages="$pkgname-wcnss-nv:wcnss_nv" +arch="aarch64" +license="proprietary" +options="!check !strip !archcheck !tracedeps pmb:cross-native" +source="https://github.com/nergzd723/j53g_firmware/raw/master/WCNSS_qcom_wlan_nv.bin" + +_fwdir="/lib/firmware/postmarketos" + +package() { + # parent package is empty + mkdir -p "$pkgdir" +} + +wcnss_nv() { + pkgdesc="$_name WiFi/BT firmware configuration" + install -Dm644 "$srcdir"/WCNSS_qcom_wlan_nv.bin -t "$subpkgdir/$_fwdir"/wlan/prima +} + +sha512sums=" +742ee81d034116cf1ecdfae5f75495e6b10ce5be0c2a999b6c8a2c161b1da8b48d6810d5405edb8c829b96fdf75e45a565c74963c76d1bca4aaedf28572fa91f WCNSS_qcom_wlan_nv.bin +" diff --git a/device/testing/firmware-samsung-j53g/APKBUILD b/device/testing/firmware-samsung-j53g/APKBUILD deleted file mode 100644 index d5ea70862..000000000 --- a/device/testing/firmware-samsung-j53g/APKBUILD +++ /dev/null @@ -1,39 +0,0 @@ -pkgname=firmware-samsung-j53g -pkgver=1 -pkgrel=0 -pkgdesc="Firmware for Samsung Galaxy J5 2015 (SM-J500H)" -url="https://pepethekingprawn.gitlab.io/firmware/" -subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss" -arch="aarch64" -license="proprietary" -options="!check !strip !archcheck !tracedeps pmb:cross-native" -_repository="j53g_firmware" -_commit="70035cb2197bfe99f2d728675ee0c4e295b86d07" -source="$pkgname-$_commit.tar.gz::https://github.com/nergzd723/$_repository/archive/$_commit.tar.gz" - -_fwdir="/lib/firmware/postmarketos" - -builddir="$srcdir/$_repository-$_commit" -package() { - # parent package is empty - mkdir -p "$pkgdir" -} - -venus() { - pkgdesc="Samsung Galaxy J5 2015 (SM-J500H) video firmware" - install -Dm644 "$builddir"/venus.* -t "$subpkgdir/$_fwdir"/qcom/venus-1.8 -} - -wcnss() { - pkgdesc="Samsung Galaxy J5 2015 (SM-J500H) WiFi/BT firmware" - install -Dm644 "$builddir"/wcnss.* -t "$subpkgdir/$_fwdir" - install -Dm644 "$builddir"/WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima -} - -modem() { - pkgdesc="Samsung Galaxy J5 2015 (SM-J500FN) modem firmware" - install -Dm644 "$builddir"/mba.mbn -t "$subpkgdir/$_fwdir" - install -Dm644 "$builddir"/modem.* -t "$subpkgdir/$_fwdir" -} - -sha512sums="96b6da87c5ba67fd053a4c21a2bcc82faa39508d28793f18a9fee2f6b8dd4b0e904b65e98c366dbb76777853c1d936d0cd347bc6cf8c5ca12308a4d6c99b32f3 firmware-samsung-j53g-70035cb2197bfe99f2d728675ee0c4e295b86d07.tar.gz" diff --git a/device/testing/firmware-samsung-j5nlte/APKBUILD b/device/testing/firmware-samsung-j5nlte/APKBUILD deleted file mode 100644 index b5c1c1e28..000000000 --- a/device/testing/firmware-samsung-j5nlte/APKBUILD +++ /dev/null @@ -1,37 +0,0 @@ -pkgname=firmware-samsung-j5nlte -pkgver=1 -pkgrel=0 -pkgdesc="Firmware for Samsung Galaxy J5 2015 (SM-J500FN)" -url="https://pepethekingprawn.gitlab.io/firmware/" -subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss" -arch="aarch64" -license="proprietary" -options="!check !strip !archcheck !tracedeps pmb:cross-native" -source="https://pepethekingprawn.gitlab.io/firmware/SM-J500FN.tar.xz" - -_fwdir="/lib/firmware/postmarketos" - -package() { - # parent package is empty - mkdir -p "$pkgdir" -} - -modem() { - pkgdesc="Samsung Galaxy J5 2015 (SM-J500FN) modem firmware" - install -Dm644 "$srcdir"/mba.mbn -t "$subpkgdir/$_fwdir" - install -Dm644 "$srcdir"/modem.* -t "$subpkgdir/$_fwdir" -} - -venus() { - pkgdesc="Samsung Gelaxy J5 2015 (SM-J500FN) video firmware" - install -Dm644 "$srcdir"/venus.* -t "$subpkgdir/$_fwdir"/qcom/venus-1.8 -} - -wcnss() { - pkgdesc="Samsung Galaxy J5 2015 (SM-J500FN) WiFi/BT firmware" - cd "$srcdir" - install -Dm644 wcnss.* -t "$subpkgdir/$_fwdir" - install -Dm644 WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima -} - -sha512sums="9f332156ca2a72ebf2ffdc741f55dfa3788c51e356e6ad3cc524b2b337f51fa3b24cd0cbbe84118cb0df8916dedb6b0520ee3d2f103e1b8f97c5be1fb2c463a4 SM-J500FN.tar.xz"