From 4a594d22b188fb3054ae481d63dc2c7360029745 Mon Sep 17 00:00:00 2001 From: Bobby The Builder Date: Tue, 29 Jun 2021 17:54:37 -0400 Subject: [PATCH] device-pine64-pinetab: 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/community/device-pine64-pinetab/APKBUILD | 4 ++-- device/community/device-pine64-pinetab/uboot-script.cmd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device/community/device-pine64-pinetab/APKBUILD b/device/community/device-pine64-pinetab/APKBUILD index 7734e3dea..aea7e85ff 100644 --- a/device/community/device-pine64-pinetab/APKBUILD +++ b/device/community/device-pine64-pinetab/APKBUILD @@ -4,7 +4,7 @@ pkgname=device-pine64-pinetab pkgdesc="PINE64 PineTab" pkgver=0.10 -pkgrel=3 +pkgrel=4 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -172,7 +172,7 @@ sha512sums=" 38827d9636c48b133eb333764a6799a6e93454e01ecb0cfde1ecad3ee149606ba59eb1a5e6c8366e3b3891e54bd664a0a5acdd89d38ac3a3551260e9b9a6d3fc rootston.ini 9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2 sway.conf f4b5509fd6a8b23f3667f5e7262b3a19c607a37cb9eaf7d0e93eb826d45c26ec12df4810879bacb8e4042bb83cc80b2b436224c8d47b6d67361369a724bbf7ee sysrq.conf -0e3f69170072f150f449cd9ccd9897728558a98acf2d5b85484ae8104b97f84e77760d7a30eeeccaf37d12cf870b3107ee34cefe55bdb033f3c7ac87d2093d24 uboot-script.cmd +5a81dfb755bd4029a734cf1a46244117f4eec8fe767c77da31e96a826849f3065070bace91d54558f6824959bcd49397714d37c7b938bfcd141a3ed5530a1de5 uboot-script.cmd a2fd8037c9a1af000f31c7005436d791525317f818c553d1e2f472b4df76c71d769ecbf67b369a478bea720a6215eaa9fb6a26ba218ac9410513e2345ebe7b4c HiFi.conf 3bdf9d4c41058680d488d9b4a2ac5fd693ceddc5f319a577480546f8af7d9d64c9d3196e73cb0c00e793697eef4ad075c88c3d274702a5387c15945bc749d844 PineTab.conf 9c472065b19141dd4c7555869b955de2e679b36e597f9fa3bdac18d0e9460986b0e2fffe1e04751301305f1b6474c1375803afb7d6212eeae91b4905d0bf8ff8 pulse-pinetab.conf diff --git a/device/community/device-pine64-pinetab/uboot-script.cmd b/device/community/device-pine64-pinetab/uboot-script.cmd index 0cebd8505..67a055a30 100644 --- a/device/community/device-pine64-pinetab/uboot-script.cmd +++ b/device/community/device-pine64-pinetab/uboot-script.cmd @@ -7,7 +7,7 @@ else fi; # This is close to the max env size, https://unix.stackexchange.com/questions/530762/max-line-length-for-u-boot-setenv -setenv bootargs init=/init.sh rw console=tty0 console=ttyS0,115200 earlycon=uart,mmio32,0x01c28000 panic=10 consoleblank=0 loglevel=1 cma=256M fbcon=rotate:1 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 fbcon=rotate:1 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE pmos_boot=/dev/mmcblk${bootdev}p1 pmos_root=/dev/mmcblk${bootdev}p2 printenv