From dd34e4672d3bd5e3c9327a39295221b37a20b1f7 Mon Sep 17 00:00:00 2001
From: INSUN PYO <insun.pyo@samsung.com>
Date: Fri, 9 Jul 2021 12:24:14 +0900
Subject: [PATCH] Separate configuration files for each target

Change-Id: Iaed004d48d4d0fad16d396ce95b26e37edb66ffb
---
 conf/{modprobe.conf => tizen-modprobe-rpi3.conf} |  0
 conf/tizen-modprobe-rpi4.conf                    |  1 +
 conf/tizen-modprobe-tw3.conf                     |  1 +
 conf/{logger.conf => tizen-modules-rpi3.conf}    |  0
 conf/tizen-modules-rpi4.conf                     |  1 +
 conf/tizen-modules-tw3.conf                      |  1 +
 packaging/linux-tizen-modules.spec               | 28 +++++++++++++++---------
 7 files changed, 22 insertions(+), 10 deletions(-)
 rename conf/{modprobe.conf => tizen-modprobe-rpi3.conf} (100%)
 create mode 100644 conf/tizen-modprobe-rpi4.conf
 create mode 100644 conf/tizen-modprobe-tw3.conf
 rename conf/{logger.conf => tizen-modules-rpi3.conf} (100%)
 create mode 100644 conf/tizen-modules-rpi4.conf
 create mode 100644 conf/tizen-modules-tw3.conf

diff --git a/conf/modprobe.conf b/conf/tizen-modprobe-rpi3.conf
similarity index 100%
rename from conf/modprobe.conf
rename to conf/tizen-modprobe-rpi3.conf
diff --git a/conf/tizen-modprobe-rpi4.conf b/conf/tizen-modprobe-rpi4.conf
new file mode 100644
index 0000000..b65f476
--- /dev/null
+++ b/conf/tizen-modprobe-rpi4.conf
@@ -0,0 +1 @@
+options proc-tsm blacklist=System::TEF
diff --git a/conf/tizen-modprobe-tw3.conf b/conf/tizen-modprobe-tw3.conf
new file mode 100644
index 0000000..b65f476
--- /dev/null
+++ b/conf/tizen-modprobe-tw3.conf
@@ -0,0 +1 @@
+options proc-tsm blacklist=System::TEF
diff --git a/conf/logger.conf b/conf/tizen-modules-rpi3.conf
similarity index 100%
rename from conf/logger.conf
rename to conf/tizen-modules-rpi3.conf
diff --git a/conf/tizen-modules-rpi4.conf b/conf/tizen-modules-rpi4.conf
new file mode 100644
index 0000000..7c82fcf
--- /dev/null
+++ b/conf/tizen-modules-rpi4.conf
@@ -0,0 +1 @@
+logger
diff --git a/conf/tizen-modules-tw3.conf b/conf/tizen-modules-tw3.conf
new file mode 100644
index 0000000..7c82fcf
--- /dev/null
+++ b/conf/tizen-modules-tw3.conf
@@ -0,0 +1 @@
+logger
diff --git a/packaging/linux-tizen-modules.spec b/packaging/linux-tizen-modules.spec
index e99dc12..2f4355b 100644
--- a/packaging/linux-tizen-modules.spec
+++ b/packaging/linux-tizen-modules.spec
@@ -80,15 +80,23 @@ find -name "*.ko" -exec cp -a --parents {} %{buildroot}/%{KMOD_PATH}/ \;
 popd
 
 # module load config
-install -D -m 644 conf/logger.conf %{buildroot}/%{KMOD_PATH}/modules-load.d/logger.conf
 mkdir -p %{buildroot}/%{KMOD_PATH}/modprobe.d
-install -D conf/modprobe.conf %{buildroot}/%{KMOD_PATH}/modprobe.d/linux-tizen-modules.conf
+install -m 644 conf/tizen-modprobe-rpi3.conf %{buildroot}/%{KMOD_PATH}/modprobe.d
+install -m 644 conf/tizen-modprobe-rpi4.conf %{buildroot}/%{KMOD_PATH}/modprobe.d
+
+mkdir -p %{buildroot}/%{KMOD_PATH}/modules-load.d
+install -m 644 conf/tizen-modules-rpi3.conf %{buildroot}/%{KMOD_PATH}/modules-load.d
+install -m 644 conf/tizen-modules-rpi4.conf %{buildroot}/%{KMOD_PATH}/modules-load.d
 
 %ifarch aarch64
 mkdir -p %{buildroot}/aarch64/modules
 mv %{buildroot}/%{KMOD_PATH}/4.9.59 %{buildroot}/aarch64/modules/
-cp -r %{buildroot}/%{KMOD_PATH}/modules-load.d %{buildroot}/aarch64/modules/
-cp -r %{buildroot}/%{KMOD_PATH}/modprobe.d %{buildroot}/aarch64/modules/
+
+mkdir -p %{buildroot}/aarch64/modules/modprobe.d
+install -m 644 conf/tizen-modprobe-tw3.conf %{buildroot}/aarch64/modules/modprobe.d
+
+mkdir -p %{buildroot}/aarch64/modules/modules-load.d
+install -m 644 conf/tizen-modules-tw3.conf %{buildroot}/aarch64/modules/modules-load.d
 %endif
 
 %clean
@@ -107,21 +115,21 @@ RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`))
 %manifest %{name}.manifest
 %license COPYING
 %{KMOD_PATH}/*rpi3*/extra
-%{KMOD_PATH}/modules-load.d/logger.conf
-%{KMOD_PATH}/modprobe.d/*.conf
+%{KMOD_PATH}/modprobe.d/tizen-modprobe-rpi3.conf
+%{KMOD_PATH}/modules-load.d/tizen-modules-rpi3.conf
 
 %files rpi4
 %manifest %{name}.manifest
 %license COPYING
 %{KMOD_PATH}/*rpi4*/extra
-%{KMOD_PATH}/modules-load.d/logger.conf
-%{KMOD_PATH}/modprobe.d/*.conf
+%{KMOD_PATH}/modprobe.d/tizen-modprobe-rpi4.conf
+%{KMOD_PATH}/modules-load.d/tizen-modules-rpi4.conf
 
 %ifarch aarch64
 %files tw3
 %manifest %{name}.manifest
 %license COPYING
 /aarch64/modules/4.9.59/extra
-/aarch64/modules/modules-load.d
-/aarch64/modules/modprobe.d/*.conf
+/aarch64/modules/modprobe.d/tizen-modprobe-tw3.conf
+/aarch64/modules/modules-load.d/tizen-modules-tw3.conf
 %endif
-- 
2.7.4