From da2aa4fa0b100d18801f6b8b5b6a66e42286369d Mon Sep 17 00:00:00 2001
From: Adrian Chelaru <che.adrian@yahoo.com>
Date: Thu, 23 Feb 2023 11:37:10 +0000
Subject: [PATCH] samsung-goyawifi: Fix CMA cmdline and bluetooth module -
 kconfig (MR 3912)

---
 device/testing/linux-samsung-goyawifi/APKBUILD        |  2 +-
 .../config-samsung-goyawifi.armv7                     | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/device/testing/linux-samsung-goyawifi/APKBUILD b/device/testing/linux-samsung-goyawifi/APKBUILD
index 2ae48fadd..a65371d93 100644
--- a/device/testing/linux-samsung-goyawifi/APKBUILD
+++ b/device/testing/linux-samsung-goyawifi/APKBUILD
@@ -68,7 +68,7 @@ package() {
 
 sha512sums="
 acaa8d554c7c51c5365e98e3c19eedd2b2a24b877ca8ed9d84e547339e9b055165f53d62be47be04e1be5967f14c859254633fd9bd5b9052f428e5e55e8793bf  linux-samsung-goyawifi-fb2f8b6cd86864c0fcac790e97a372b1772003c7.tar.gz
-31ae72862ea9c10cc27ff8e7dbb4a557a845fb776da35f637acebbcf3e577d04e308a4d34f66de71a8fadd1d41089c8476282f60badf02832986d12445b95b6f  config-samsung-goyawifi.armv7
+6c073463ace46d0cd0d4210c6838716996db45c79315f4cf027c3f3d56a596b3bc6bf174797a59f2d67f22a29bb7ac81c3914d766ef1ea7607d5b43fd3bed872  config-samsung-goyawifi.armv7
 efd1641c0892fddb9c5feea3e49e534fed311b01f0576688b5af766e0160850822d0eb8e296b08c5f82b586d5d0336a98e8e86707ba9af7fcf36fc89f0b288eb  fix_memset-related_crashes.patch
 5c080c27716d124616e4e684fc63bffb2665f00de06e894dfd78f58588feec2fec858fe8234b054061e3db14d28cb90fbac53f4b54c4fac5946d843cf038386c  fix_the_memset_fix.patch
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
diff --git a/device/testing/linux-samsung-goyawifi/config-samsung-goyawifi.armv7 b/device/testing/linux-samsung-goyawifi/config-samsung-goyawifi.armv7
index 3015fdeb8..eb850686b 100644
--- a/device/testing/linux-samsung-goyawifi/config-samsung-goyawifi.armv7
+++ b/device/testing/linux-samsung-goyawifi/config-samsung-goyawifi.armv7
@@ -530,10 +530,10 @@ CONFIG_USE_OF=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 # CONFIG_ARM_APPENDED_DTB is not set
-CONFIG_CMDLINE="initrd=0x01100000,1m rw androidboot.console=ttyS1 console=ttyS1,115200 panic_debug"
+CONFIG_CMDLINE="initrd=0x01100000,1m rw androidboot.console=ttyS1 console=ttyS1,115200 panic_debug initrd=0x01100000,16m uart_dma vmalloc=0xF000000 qhd_lcd=1 ioncarv=80M@0x09000000 reserve_gpu=64M ddr_mode=1 lcd_id=0x00000000 board_id=0x02 disp_start_addr=0x17000000"
 # CONFIG_CMDLINE_FROM_BOOTLOADER is not set
-CONFIG_CMDLINE_EXTEND=y
-# CONFIG_CMDLINE_FORCE is not set
+# CONFIG_CMDLINE_EXTEND is not set
+CONFIG_CMDLINE_FORCE=y
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
@@ -920,7 +920,8 @@ CONFIG_BT_HIDP=y
 # CONFIG_BT_HCIBTSDIO is not set
 # CONFIG_BT_HCIUART is not set
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_MRVL is not set
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
 # CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
@@ -985,7 +986,7 @@ CONFIG_CMA_DEBUG=y
 #
 # Default contiguous memory area size:
 #
-CONFIG_CMA_SIZE_MBYTES=128
+CONFIG_CMA_SIZE_MBYTES=256
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 # CONFIG_CMA_SIZE_SEL_MIN is not set