From 09859348d8cdbb38c2230f1440776b0865503b70 Mon Sep 17 00:00:00 2001 From: Jason Chen CJ Date: Tue, 10 Jul 2018 09:24:30 +0800 Subject: [PATCH] samples: add cma reservation into sos cmdline it's needed for trusty memory reservation. Tracked-on: ccm0001001-242199 Signed-off-by: Jason Chen CJ Acked-by: Eddie Dong --- devicemodel/samples/apl-mrb/sos_bootargs_debug.txt | 2 +- devicemodel/samples/apl-mrb/sos_bootargs_release.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt b/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt index 6136ef014..bcdac70f3 100644 --- a/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt +++ b/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt @@ -1 +1 @@ -pci_devices_ignore=(0:18:2) maxcpus=1 console=tty0 console=ttyS0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait quiet loglevel=3 no_timer_check consoleblank=0 i915.enable_initial_modeset=1 i915.tsd_init=7 i915.tsd_delay=2000 video=DP-1:d video=DP-2:d video=HDMI-A-1:e video=HDMI-A-2:e i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 hvlog=2M@0x6de00000 reboot_panic=p,w +pci_devices_ignore=(0:18:2) maxcpus=1 console=tty0 console=ttyS0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait quiet loglevel=3 no_timer_check consoleblank=0 i915.enable_initial_modeset=1 i915.tsd_init=7 i915.tsd_delay=2000 video=DP-1:d video=DP-2:d video=HDMI-A-1:e video=HDMI-A-2:e i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 hvlog=2M@0x6de00000 reboot_panic=p,w cma=32M@0- diff --git a/devicemodel/samples/apl-mrb/sos_bootargs_release.txt b/devicemodel/samples/apl-mrb/sos_bootargs_release.txt index dbd514ee2..57c8de361 100644 --- a/devicemodel/samples/apl-mrb/sos_bootargs_release.txt +++ b/devicemodel/samples/apl-mrb/sos_bootargs_release.txt @@ -1 +1 @@ -maxcpus=1 console=tty0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait quiet loglevel=3 no_timer_check consoleblank=0 i915.enable_initial_modeset=1 i915.tsd_init=7 i915.tsd_delay=2000 video=DP-1:d video=DP-2:d video=HDMI-A-1:e video=HDMI-A-2:e i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 +maxcpus=1 console=tty0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait quiet loglevel=3 no_timer_check consoleblank=0 i915.enable_initial_modeset=1 i915.tsd_init=7 i915.tsd_delay=2000 video=DP-1:d video=DP-2:d video=HDMI-A-1:e video=HDMI-A-2:e i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 cma=32M@0-