From 615cd3f67c4f4612d817898eb081d7ef8e513c90 Mon Sep 17 00:00:00 2001
From: Bobby The Builder <bob@najdan.com>
Date: Tue, 29 Jun 2021 17:13:21 -0400
Subject: [PATCH] device-pine64-pinephone: remove cma from boot args (MR 2371)

default value already defined:
   Symbol: CMA_SIZE_MBYTES [=256]
   Type  : integer
   Defined at kernel/dma/Kconfig:134
---
 device/main/device-pine64-pinephone/APKBUILD         | 4 ++--
 device/main/device-pine64-pinephone/uboot-script.cmd | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/device/main/device-pine64-pinephone/APKBUILD b/device/main/device-pine64-pinephone/APKBUILD
index b3facd353..875a41853 100644
--- a/device/main/device-pine64-pinephone/APKBUILD
+++ b/device/main/device-pine64-pinephone/APKBUILD
@@ -6,7 +6,7 @@
 # Co-Maintainer: Dylan Van Assche <me@dylanvanassche.be>
 pkgname=device-pine64-pinephone
 pkgver=0.30
-pkgrel=1
+pkgrel=2
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -179,7 +179,7 @@ ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd4644
 c5006c38828eb519917d57756f7831c4552feffef2d4922a384073f6a551535f615ad397d784e313818e0b943e1f6212bcca0aff9ce37da60b29547b1631f24b  modemmanager.conf
 fa063e2863afc48e627acc1a5b213a81499ba1dd30325f74f118a44e3964aec7e597b1f4bd318b7cf5bf14f27daf88e6ad9fc277ab106cbbe1189fdcc650d5c1  setup-modem.sh
 f4b5509fd6a8b23f3667f5e7262b3a19c607a37cb9eaf7d0e93eb826d45c26ec12df4810879bacb8e4042bb83cc80b2b436224c8d47b6d67361369a724bbf7ee  sysrq.conf
-9d4bcc02c6c501b3a205516c8f276ef4293d88edea61ac725887ec28f9f6788320e9f9edd7f1cf29bbf6122acfad2ef5b3ad5e4b33763fe867bd23d2ac17ed5c  uboot-script.cmd
+5fd1dba489e994510264c64823c68e183c685d9bbc725a96e3eb6826c0f7e67cd0334efed926304b6b1e8403af92eccc05370b1360660af77529cefb58e843b5  uboot-script.cmd
 f963898fa2ce66bc830e56feeec6ffc9888834e14cc1591d72908ef45ad82532bc3ef5fb32413e07b6722749c9d03e7cf92f06f1fcb859c38b9297cf58e5cedd  HiFi.conf
 e852b48a687f9b2a0eca444aa3d00a1818aead9f5e5d28e070b51c9d6f8ec648e66f1d88e2bfa94d74533f9ffb9aacc1703da2a06693f85fa04ff97fd7528012  PinePhone.conf
 e093f71c37370927468de35a987150a3db3e1cc1c76c144bf58918a09c688c3da84303b5533241e691a6aa0758589e2a6498b1097974117782e909f0bbc6bf71  VoiceCall.conf
diff --git a/device/main/device-pine64-pinephone/uboot-script.cmd b/device/main/device-pine64-pinephone/uboot-script.cmd
index 2a4572466..8639cf82a 100644
--- a/device/main/device-pine64-pinephone/uboot-script.cmd
+++ b/device/main/device-pine64-pinephone/uboot-script.cmd
@@ -9,7 +9,7 @@ else
 	setenv bootdev 2;
 fi;
 
-setenv bootargs init=/init.sh rw console=tty0 console=ttyS0,115200 earlycon=uart,mmio32,0x01c28000 panic=10 consoleblank=0 loglevel=1 cma=256M PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE pmos_boot=/dev/mmcblk${bootdev}p1 pmos_root=/dev/mmcblk${bootdev}p2
+setenv bootargs init=/init.sh rw console=tty0 console=ttyS0,115200 earlycon=uart,mmio32,0x01c28000 panic=10 consoleblank=0 loglevel=1 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE pmos_boot=/dev/mmcblk${bootdev}p1 pmos_root=/dev/mmcblk${bootdev}p2
 
 printenv