From 3fb4a2042d91343fa8af85e8ea789634a230e246 Mon Sep 17 00:00:00 2001
From: Ashwin Srinivasan <assrinivasan@microsoft.com>
Date: Wed, 13 Sep 2023 21:13:00 +0000
Subject: [PATCH] Cherrypicking prgeor commit
 3412724411a6e3bab1105b87edc447bebeb9babb to 202012 image

---
 device/dell/x86_64-dell_s6100_c2538-r0/installer.conf  | 2 +-
 device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf  | 2 +-
 device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf | 1 +
 platform/marvell-armhf/platform.conf                   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/installer.conf b/device/dell/x86_64-dell_s6100_c2538-r0/installer.conf
index 0932d0637760..0417bb975ba2 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/installer.conf
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/installer.conf
@@ -1,3 +1,3 @@
 CONSOLE_PORT=0x2f8
 CONSOLE_DEV=1
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich nos-config-part=/dev/sda12"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich nos-config-part=/dev/sda12 logs_inram=on"
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf
index c9c9493a5404..eb12e734bb90 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf
@@ -1 +1 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq logs_inram=on"
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf b/device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf
index b138f294e1ea..36696d270385 100644
--- a/device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf
@@ -1 +1,2 @@
 VAR_LOG_SIZE=4096
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="logs_inram=on"
diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
index 23a191adf7b2..1e26fd3c1ecd 100644
--- a/platform/marvell-armhf/platform.conf
+++ b/platform/marvell-armhf/platform.conf
@@ -177,7 +177,7 @@ prepare_boot_menu() {
     BORDER='echo "---------------------------------------------------";echo;'
     fw_setenv ${FW_ARG} print_menu $BORDER $BOOT1 $BOOT2 $BOOT3 $BORDER > /dev/null
 
-    fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4" > /dev/null
+    fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4 ${ONIE_PLATFORM_EXTRA_CMDLINE_LINUX}" > /dev/null
     fw_setenv ${FW_ARG} linuxargs_old "net.ifnames=0 loopfstype=squashfs loop=$image_dir_old/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4" > /dev/null
 
     # Set boot configs