From 62a8beacecd40dd69ba9cecb52fc9a54980f6524 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 5 Sep 2024 15:37:34 +0200 Subject: [PATCH] Add building inform-reboot Tizen specific module Move Tizen specific inform-reboot module to linux-tizen-modules repository instead of duplicating it in each board specific kernel repository. Enable inform-reboot module for the platforms that had it earlier compiled into the kernel: rpi4 and vf2 as well as the new RISC-V based ones: lpi4a and bpif3. Signed-off-by: Marek Szyprowski Change-Id: Ie46796b390ac554cc340e6ce4550d918833e374c --- conf/tizen-modules-bpif3.conf | 1 + conf/tizen-modules-lpi4a.conf | 1 + conf/tizen-modules-rpi4.conf | 1 + conf/tizen-modules-visionfive2.conf | 1 + packaging/linux-tizen-modules.spec | 16 ++++++++++++++++ 5 files changed, 20 insertions(+) diff --git a/conf/tizen-modules-bpif3.conf b/conf/tizen-modules-bpif3.conf index 7c82fcf..00c70c7 100644 --- a/conf/tizen-modules-bpif3.conf +++ b/conf/tizen-modules-bpif3.conf @@ -1 +1,2 @@ +inform-reboot logger diff --git a/conf/tizen-modules-lpi4a.conf b/conf/tizen-modules-lpi4a.conf index 7c82fcf..00c70c7 100644 --- a/conf/tizen-modules-lpi4a.conf +++ b/conf/tizen-modules-lpi4a.conf @@ -1 +1,2 @@ +inform-reboot logger diff --git a/conf/tizen-modules-rpi4.conf b/conf/tizen-modules-rpi4.conf index fd72b2b..cd88664 100644 --- a/conf/tizen-modules-rpi4.conf +++ b/conf/tizen-modules-rpi4.conf @@ -1,2 +1,3 @@ +inform-reboot logger kdbus diff --git a/conf/tizen-modules-visionfive2.conf b/conf/tizen-modules-visionfive2.conf index 7c82fcf..00c70c7 100644 --- a/conf/tizen-modules-visionfive2.conf +++ b/conf/tizen-modules-visionfive2.conf @@ -1 +1,2 @@ +inform-reboot logger diff --git a/packaging/linux-tizen-modules.spec b/packaging/linux-tizen-modules.spec index f2b1744..5dbea58 100644 --- a/packaging/linux-tizen-modules.spec +++ b/packaging/linux-tizen-modules.spec @@ -129,8 +129,10 @@ export LOGGER_EVENTS_BUFFER_SIZE=256 export LOGGER_RADIO_BUFFER_SIZE=256 export LOGGER_SYSTEM_BUFFER_SIZE=256 +export TIZEN_INFORM_PATH="/mnt/inform/reboot-param.bin" %ifarch %{arm} aarch64 +export BUILD_inform_reboot=m export BUILD_kdbus=m export BUILD_logger=m export BUILD_proc_tsm=m @@ -146,6 +148,7 @@ make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-%{build %endif %ifarch riscv64 +export BUILD_inform_reboot=n export BUILD_kdbus=n export BUILD_logger=m export BUILD_proc_tsm=n @@ -155,6 +158,12 @@ make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-riscv-qemu make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-riscv-qemu make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-riscv-qemu INSTALL_MOD_STRIP=1 INSTALL_MOD_DIR=extra +export BUILD_inform_reboot=m +export BUILD_kdbus=n +export BUILD_logger=m +export BUILD_proc_tsm=n +export BUILD_zlogger=m + make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-riscv-visionfive2 make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-riscv-visionfive2 make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-riscv-visionfive2 INSTALL_MOD_STRIP=1 INSTALL_MOD_DIR=extra @@ -225,11 +234,13 @@ RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`)) %license COPYING %ifarch aarch64 %{KMOD_PATH}/*rpi4-v8/extra/proc-tsm.ko +%{KMOD_PATH}/*rpi4-v8/extra/inform-reboot.ko %{KMOD_PATH}/*rpi4-v8/extra/kdbus/kdbus.ko %{KMOD_PATH}/*rpi4-v8/extra/logger.ko %{KMOD_PATH}/*rpi4-v8/extra/zlogger/zlogger.ko %else %{KMOD_PATH}/*rpi4-v7l/extra/proc-tsm.ko +%{KMOD_PATH}/*rpi4-v7l/extra/inform-reboot.ko %{KMOD_PATH}/*rpi4-v7l/extra/kdbus/kdbus.ko %{KMOD_PATH}/*rpi4-v7l/extra/logger.ko %{KMOD_PATH}/*rpi4-v7l/extra/zlogger/zlogger.ko @@ -242,11 +253,13 @@ RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`)) %license COPYING %ifarch aarch64 %{KMOD_PATH}/*rpi4-rt-v8/extra/proc-tsm.ko +%{KMOD_PATH}/*rpi4-rt-v8/extra/inform-reboot.ko %{KMOD_PATH}/*rpi4-rt-v8/extra/kdbus/kdbus.ko %{KMOD_PATH}/*rpi4-rt-v8/extra/logger.ko %{KMOD_PATH}/*rpi4-rt-v8/extra/zlogger/zlogger.ko %else %{KMOD_PATH}/*rpi4-rt-v7l/extra/proc-tsm.ko +%{KMOD_PATH}/*rpi4-rt-v7l/extra/inform-reboot.ko %{KMOD_PATH}/*rpi4-rt-v7l/extra/kdbus/kdbus.ko %{KMOD_PATH}/*rpi4-rt-v7l/extra/logger.ko %{KMOD_PATH}/*rpi4-rt-v7l/extra/zlogger/zlogger.ko @@ -266,6 +279,7 @@ RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`)) %manifest %{name}.manifest %license COPYING %{KMOD_PATH}/*-riscv-visionfive2/extra/logger.ko +%{KMOD_PATH}/*-riscv-visionfive2/extra/inform-reboot.ko %{KMOD_PATH}/*-riscv-visionfive2/extra/zlogger/zlogger.ko %{KMOD_PATH}/modules-load.d/tizen-modules-visionfive2.conf @@ -273,6 +287,7 @@ RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`)) %manifest %{name}.manifest %license COPYING %{KMOD_PATH}/*-riscv-lpi4a/extra/logger.ko +%{KMOD_PATH}/*-riscv-lpi4a/extra/inform-reboot.ko %{KMOD_PATH}/*-riscv-lpi4a/extra/zlogger/zlogger.ko %{KMOD_PATH}/modules-load.d/tizen-modules-lpi4a.conf @@ -280,6 +295,7 @@ RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`)) %manifest %{name}.manifest %license COPYING %{KMOD_PATH}/*-riscv-bpif3/extra/logger.ko +%{KMOD_PATH}/*-riscv-bpif3/extra/inform-reboot.ko %{KMOD_PATH}/*-riscv-bpif3/extra/zlogger/zlogger.ko %{KMOD_PATH}/modules-load.d/tizen-modules-bpif3.conf -- 2.34.1