From 24618b26fdd1d37ad03fad3c7b19cc9d6fbbfb3eaa7a5ae9ef6ac35ddead9eed Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Thu, 9 Jan 2020 14:17:35 +0000
Subject: [PATCH] - Remove explicit swiotlb and cma assignments from RPi
cmdline as the defaults are better meanwhile (bsc#1160308)
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=15
---
JeOS.kiwi | 2 +-
kiwi-templates-JeOS.changes | 6 ++++++
kiwi-templates-JeOS.spec | 4 ++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/JeOS.kiwi b/JeOS.kiwi
index 0dd6e6f..4ceb7de 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -235,7 +235,7 @@
fsmountoptions="noatime,compress=lzo"
bootloader="grub2"
firmware="efi"
- kernelcmdline="quiet plymouth.enable=0 swiotlb=512 cma=64M console=ttyS0,115200 console=tty"
+ kernelcmdline="quiet plymouth.enable=0 console=ttyS0,115200 console=tty"
bootpartition="false"
devicepersistency="by-uuid"
btrfs_quota_groups="true"
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index ef91725..7d422a1 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 9 14:16:16 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Remove explicit swiotlb and cma assignments from RPi cmdline
+ as the defaults are better meanwhile (bsc#1160308)
+
-------------------------------------------------------------------
Tue Dec 3 15:31:37 UTC 2019 - Fabian Vogt <fvogt@suse.com>
diff --git a/kiwi-templates-JeOS.spec b/kiwi-templates-JeOS.spec
index d53290d..ee1ab17 100644
--- a/kiwi-templates-JeOS.spec
+++ b/kiwi-templates-JeOS.spec
@@ -1,7 +1,7 @@
#
# spec file for package kiwi-templates-JeOS
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#