diff --git a/device/testing/device-xiaomi-beryllium/APKBUILD b/device/community/device-xiaomi-beryllium/APKBUILD
similarity index 76%
rename from device/testing/device-xiaomi-beryllium/APKBUILD
rename to device/community/device-xiaomi-beryllium/APKBUILD
index d7ae1b50c677e9340509c475fdbbf8093ec08401..8dc0bedf084734c9162ae86c458bd3ee01637149 100644
--- a/device/testing/device-xiaomi-beryllium/APKBUILD
+++ b/device/community/device-xiaomi-beryllium/APKBUILD
@@ -4,13 +4,19 @@
# Reference: <https://postmarketos.org/devicepkg>
pkgname=device-xiaomi-beryllium
pkgdesc="Xiaomi Poco F1"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
options="!check !archcheck"
-depends="postmarketos-base mkbootimg soc-qcom-sdm845 soc-qcom-sdm845-ucm"
+depends="
+ postmarketos-base
+ mkbootimg
+ soc-qcom-sdm845
+ soc-qcom-sdm845-ucm
+ postmarketos-update-kernel
+"
makedepends="devicepkg-dev"
subpackages="
$pkgname-nonfree-firmware:nonfree_firmware
@@ -22,7 +28,6 @@ subpackages="
source="
deviceinfo
rootston.ini
- xiaomi,beryllium.json
"
build() {
@@ -55,12 +60,9 @@ phosh() {
install_if="$pkgname=$pkgver-r$pkgrel phosh"
install -Dm644 "$srcdir"/rootston.ini \
"$subpkgdir"/etc/phosh/rootston.ini
- install -Dm644 "$srcdir"/xiaomi,beryllium.json \
- "$subpkgdir"/usr/share/feedbackd/themes/xiaomi,beryllium.json
}
sha512sums="
-bdd7f2b3405cca7887d12a842baf7d2ee1ee27d315ee71f74cfa17d19618aa1dec3e0a446b09d3e0c4b1904555cbc62e19ba001b61b66f547d30f65688941ea2 deviceinfo
+5602f92d1f405931b81c0e281348d78f2abf7361a76764897b15f7621bed9720fb543e52cecab7e28d0f1d6a1e2a5ba13fb8a7b1b9d25aa6c84b4c4be8b35d21 deviceinfo
e0bbe6210198ec37a0f18fb7dec5dead4ad41693ad5b3c20731e68d4f9d8fdff393dcbd110e87564030f1326e12da8af58c020e9bc14eb9ca2c54224b962df7e rootston.ini
-db78af5be2a08109962fa2511d6e84efe9a425e1d45c7e0e75bf0be383cfc1c5fca5d79f3d7bd2f146e8a62460c88b214819ad522316c0c2e08783a80d8ceb05 xiaomi,beryllium.json
"
diff --git a/device/testing/device-xiaomi-beryllium/deviceinfo b/device/community/device-xiaomi-beryllium/deviceinfo
similarity index 82%
rename from device/testing/device-xiaomi-beryllium/deviceinfo
rename to device/community/device-xiaomi-beryllium/deviceinfo
index 2abb4b0fc54024786f217ecab6a6f15811125b58..9e6b4022480530c1f0e39445c4701e22660727d0 100644
--- a/device/testing/device-xiaomi-beryllium/deviceinfo
+++ b/device/community/device-xiaomi-beryllium/deviceinfo
@@ -6,11 +6,11 @@ deviceinfo_name="Xiaomi Poco F1"
deviceinfo_manufacturer="Xiaomi"
deviceinfo_codename="xiaomi-beryllium"
deviceinfo_year="2018"
+deviceinfo_arch="aarch64"
deviceinfo_dtb_tianma="qcom/sdm845-xiaomi-beryllium-tianma"
deviceinfo_dtb_ebbg="qcom/sdm845-xiaomi-beryllium-ebbg"
deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs_mainline="ufs_qcom"
-deviceinfo_arch="aarch64"
+deviceinfo_flash_kernel_on_update="true"
# Device related
deviceinfo_chassis="handset"
@@ -18,12 +18,11 @@ deviceinfo_keyboard="false"
deviceinfo_external_storage="true"
deviceinfo_screen_width="1080"
deviceinfo_screen_height="2246"
-deviceinfo_no_framebuffer="true"
deviceinfo_rootfs_image_sector_size="4096"
# Bootloader related
deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_kernel_cmdline="console=null PMOS_NO_OUTPUT_REDIRECT"
deviceinfo_generate_bootimg="true"
deviceinfo_bootimg_qcdt="false"
deviceinfo_bootimg_mtk_mkimage="false"
@@ -35,3 +34,7 @@ deviceinfo_flash_offset_second="0x00f00000"
deviceinfo_flash_offset_tags="0x00000100"
deviceinfo_flash_pagesize="4096"
deviceinfo_flash_sparse="true"
+
+# osk-sdl
+deviceinfo_modules_initfs_tianma="gpi i2c_qcom_geni nt36xxx"
+deviceinfo_modules_initfs_ebbg="gpi i2c_qcom_geni focaltech_ft8719"
diff --git a/device/testing/device-xiaomi-beryllium/rootston.ini b/device/community/device-xiaomi-beryllium/rootston.ini
similarity index 100%
rename from device/testing/device-xiaomi-beryllium/rootston.ini
rename to device/community/device-xiaomi-beryllium/rootston.ini
diff --git a/device/testing/firmware-xiaomi-beryllium/APKBUILD b/device/community/firmware-xiaomi-beryllium/APKBUILD
similarity index 100%
rename from device/testing/firmware-xiaomi-beryllium/APKBUILD
rename to device/community/firmware-xiaomi-beryllium/APKBUILD
diff --git a/device/testing/firmware-xiaomi-beryllium/firmware.files b/device/community/firmware-xiaomi-beryllium/firmware.files
similarity index 100%
rename from device/testing/firmware-xiaomi-beryllium/firmware.files
rename to device/community/firmware-xiaomi-beryllium/firmware.files
diff --git a/device/testing/device-xiaomi-beryllium/xiaomi,beryllium.json b/device/testing/device-xiaomi-beryllium/xiaomi,beryllium.json
deleted file mode 100644
index fcc377701bb4d777a6715c6abcc1aa7264c8cad7..0000000000000000000000000000000000000000
--- a/device/testing/device-xiaomi-beryllium/xiaomi,beryllium.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
- "name": "default",
- "profiles": [
- {
- "name": "full",
- "feedbacks": [
- {
- "event-name": "alarm-clock-elapsed",
- "type": "Sound",
- "effect": "alarm-clock-elapsed"
- },
- {
- "event-name": "message-new-email",
- "type": "Sound",
- "effect": "message-new-email"
- },
- {
- "event-name": "message-new-instant",
- "type": "Sound",
- "effect": "message-new-instant"
- },
- {
- "event-name": "message-new-sms",
- "type": "Sound",
- "effect": "message-new-instant"
- },
- {
- "event-name": "phone-incoming-call",
- "type": "Sound",
- "effect": "phone-incoming-call"
- },
- {
- "event-name": "timeout-completed",
- "type": "Sound",
- "effect": "complete"
- },
- {
- "event-name": "theme-demo",
- "type": "Sound",
- "effect": "theme-demo"
- },
- {
- "event-name": "window-close",
- "type": "Sound",
- "effect": "theme-demo"
- }
- ]
- },
- {
- "name": "quiet",
- "feedbacks": [
- {
- "event-name": "alarm-clock-elapsed",
- "type": "VibraPeriodic",
- "magnitude": 32767,
- "duration": 10000,
- "fade-in-time": 10000,
- "fade-in-level": 4096
- },
- {
- "event-name": "bell-terminal",
- "type": "VibraRumble",
- "duration": 100
- },
- {
- "event-name": "message-new-email",
- "type": "VibraRumble",
- "duration": 750,
- "count": 3,
- "pause": 100
- },
- {
- "event-name": "message-new-instant",
- "type": "VibraRumble",
- "duration": 750
- },
- {
- "event-name": "message-new-sms",
- "type": "VibraRumble",
- "duration": 1250,
- "count": 2,
- "pause": 250
- },
- {
- "event-name": "message-sent-instant",
- "type": "VibraRumble",
- "duration": 250
- },
- {
- "event-name": "phone-incoming-call",
- "type": "VibraPeriodic",
- "duration": 10000
- },
- {
- "event-name": "timeout-completed",
- "type": "VibraRumble",
- "duration": 500
- },
- {
- "event-name": "theme-demo",
- "type": "VibraPeriodic",
- "magnitude": 32767,
- "duration": 5000
- },
- {
- "event-name": "window-close",
- "type": "VibraRumble",
- "duration": 75
- }
- ]
- },
- {
- "name": "silent",
- "feedbacks": [
- {
- "event-name": "battery-caution",
- "type": "Led",
- "color": "red",
- "frequency": 5000
- },
- {
- "event-name": "phone-missed-call",
- "type": "Led",
- "color": "blue",
- "frequency": 3000
- },
- {
- "event-name": "message-missed-email",
- "type": "Led",
- "color": "blue",
- "frequency": 2000
- },
- {
- "event-name": "message-missed-instant",
- "type": "Led",
- "color": "blue",
- "frequency": 1000
- },
- {
- "event-name": "message-missed-notification",
- "type": "Led",
- "color": "blue",
- "frequency": 500
- },
- {
- "event-name": "message-missed-sms",
- "type": "Led",
- "color": "blue",
- "frequency": 2000
- }
- ]
- }
- ]
-}
\ No newline at end of file