clockworkpi-uconsole-cm4: Removed dts overlay lines breaking WiFi. Change boot to FAT32

device/testing/device-clockworkpi-uconsole-cm4/APKBUILD

@@ -42,8 +42,8 @@ nonfree_firmware() {
 }
 
 sha512sums="
-7f55d08220fc48bd357b84c8df0112fe74890e69382c67c9e2b1954c77ed50abf804d7d816fef908e3b4f4c6968fe3c065f3a27a95ab2c75a6348b1ffbbb5e01  deviceinfo
-fa524da11da136f6784b54aff5efc75b33bde79e633cef5b459f7b5fa64a3bb02bd1b44d4a0ab4e52b464c5d7946a91a7bfe83625bd5162b386556acdbccb4f2  modules-initfs
+383a9c02baa860ec1062a275e5cf053809e96bf38e8f7c0e6b450cc19e3089c1f3270051b87dc2967a8236b1babddd6e3be7bb4750b1397afc2b62e3f30c7e38  deviceinfo
+9ef3af8376fdb42299c1ee67f28a1f3ef22b22968f30e74998b4b6661f9fb08cd941498081e2401d98e18757315cc306db964f1811e3a6fe93cd636da9d0ad3e  modules-initfs
 4526fef346201166bd28d75fb4f970ce6a165fe9a0793a6110502484aaea5f16ea73e037bf0e53090a1f9081785f40dc9a169b2f0776be557695b7f06daa540c  usercfg.txt
 b77676076cb150b71f791fffe3117f55598fa8b96d4895da80d72abc45d4e1db267c16e063ab5ed567eed088ce51a7cb2684f5b72acc8ac5d6fdf17b974a4f26  cmdline.txt
 7e5505cb07d5b4a81bd28443d508336b5c547356538f1c06f91ed93ad0d7d456d4f74f1d24df5a2e08c17e74f0a66607352ac4874e967e9a91dfec9522d2d58d  95-vchiq-permissions.rules

device/testing/device-clockworkpi-uconsole-cm4/deviceinfo

@@ -20,4 +20,4 @@ deviceinfo_mesa_driver="vc4"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_boot_filesystem="fat16"
+deviceinfo_boot_filesystem="fat32"

device/testing/device-clockworkpi-uconsole-cm4/modules-initfs

-# Remove this file if unnecessary (CHANGEME!)
 # This file shall contain a list of modules to be included in the initramfs,
 # so that they are available in early boot stages. In general, it should
 # include modules to support unlocking FDE (touchscreen, panel, etc),

device/testing/linux-clockworkpi-uconsole-cm4/0004-arm-dts-overlays-add-uconsole-cm4.patch

-Overlay taken from https://github.com/PotatoMania/uconsole-cm3/blob/dev/PKGBUILDs/linux-uconsole-cm3-rpi64/0004-arm-dts-overlays-add-uconsole.patch
-and adapted from Raspberry Pi CM3 to CM4, by disabling ClockworkPi uConsole WiFi/BT module to use CM4 one.
+Original patch: https://github.com/PotatoMania/uconsole-cm3/blob/dev/PKGBUILDs/linux-uconsole-cm3-rpi64/0004-arm-dts-overlays-add-uconsole.patch
+Adapted from Raspberry Pi CM3 to Raspberry Pi CM4
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
 index 04a9c9a8ab90..ddd90f3f087d 100644
@@ -15,10 +15,10 @@ index 04a9c9a8ab90..ddd90f3f087d 100644
  	upstream.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/uconsole.dts b/arch/arm/boot/dts/overlays/uconsole.dts
 new file mode 100644
-index 000000000000..1c5c7df360be
+index 000000000000..bfc12f7a029b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uconsole.dts
-@@ -0,0 +1,237 @@
+@@ -0,0 +1,233 @@
 +/dts-v1/;
 +/plugin/;
 +
@@ -33,10 +33,6 @@ index 000000000000..1c5c7df360be
 +		target-path = "/aliases";
 +		__overlay__ {
 +			i2c_uconsole = "/i2c@0";
-+			mmc1 = "/soc/mmc@7e300000";
-+			/* switch 0&1, I don't know why not use a cmdline parameter instead */
-+			serial1 = "/soc/serial@7e201000";
-+			serial0 = "/soc/serial@7e215040";
 +		};
 +	};
 +

device/testing/linux-clockworkpi-uconsole-cm4/APKBUILD

@@ -82,7 +82,7 @@ sha512sums="
 764faf249f98ba7a2299cf318bbd8e0922ab3a283dab8331710eccf83e4cc0088b4aa27894c196a2da5a08942c42ee173ca585844fa6abe36f9402095d845287  0001-video-backlight-Add-OCP8178-backlight-driver.patch
 3b4eb2cbf11d4b094d75070bd8ab7926f495c3bfc1b1ecc3ddd4b7a5e2355120eaf1fca4e4fe1884de4249808525f5271a1a8db14f583f89b096d0000ca01eac  0002-drm-panel-add-clockwork-cwu50.patch
 523ebd73d069c7e2ee55cefdcc9d2132264148dc13dfd79606cf87868ba86136d9df3dd7f54b130440544f51bbf8822a0a3c50eec34d54c996d867e260afa28c  0003-driver-staging-add-uconsole-simple-amplifier-switch.patch
-e17e9c593c52ddc3b28ecd06e366d7de37a84d5802569dc3337cb1226ff096c34dc746de9616b0dca5a48c908abcc87fe98d7c6ab5bf71a9bef5616c57018a83  0004-arm-dts-overlays-add-uconsole-cm4.patch
+9cf45723ede7eee7f3b6548e0e424db9403a4c863b22c4b63063370042ac1385b5b005be9e52d3e7fb8d3a6ca71c775b2f4f1ca328f8c3ad226abf88a11f0d01  0004-arm-dts-overlays-add-uconsole-cm4.patch
 46cdb2bd144168c28cabbf235f4d0e23016a89a434670e12414e26422200ee3ff692168a9506a3989f93b60aac15903f6a641685cfe7d52193bc711bc648f6a0  0005-drivers-power-axp20x-customize-PMU.patch
 f86fb6e30e64c3594b9a9dcd855e962265ea642cc72a79404ae9f939a0122543d3cf4c462cc5b19d8f37dc9558276d1747285149b3e96caf7fff2a1bdc0a5295  0006-power-axp20x_battery-implement-calibration.patch
 "