kernel: Compile RNG drivers into the kernel

The kernel will try to gather entropy really early in the boot process
where those device drivers might not have been loaded yet. They are
small and can therefore be compiled into the kernel like we already do
on ARM.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 4cf2076afac3276d73b1a090cd3975e0ed0d756b..0903d48d628e96f6fa6bb8c69b085a5f42356f51 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -3428,14 +3428,14 @@ CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_BA431=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_HW_RANDOM_TIMERIOMEM=y
+CONFIG_HW_RANDOM_INTEL=y
+CONFIG_HW_RANDOM_AMD=y
+CONFIG_HW_RANDOM_BA431=y
+CONFIG_HW_RANDOM_GEODE=y
+CONFIG_HW_RANDOM_VIA=y
+CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_HW_RANDOM_XIPHERA=y
 # CONFIG_DTLK is not set
 # CONFIG_APPLICOM is not set
 CONFIG_SONYPI=m

diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index b11115315b7bc6ab0d5caf4793a31f259b920a29..deda2add826c98e55bc848eacf2ddcb151fc2515 100644 (file)
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -3399,13 +3399,13 @@ CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_BA431=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_HW_RANDOM_TIMERIOMEM=y
+CONFIG_HW_RANDOM_INTEL=y
+CONFIG_HW_RANDOM_AMD=y
+CONFIG_HW_RANDOM_BA431=y
+CONFIG_HW_RANDOM_VIA=y
+CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_HW_RANDOM_XIPHERA=y
 # CONFIG_APPLICOM is not set
 
 #

diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index d377e6f9c2fdcab95c3f35e42345388246450241..d93cfb2d483c860e0f61a9a77ad01aa4c445626e 100644 (file)
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -20692,15 +20692,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/bus/mhi/core/mhi.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char
 #lib/modules/KVER-ipfire/kernel/drivers/char/hangcheck-timer.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/amd-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/ba431-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/geode-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/intel-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/timeriomem-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/via-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/virtio-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/xiphera-trng.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi/ipmi_devintf.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi/ipmi_msghandler.ko.xz

diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index d0e40d7b86b8d6e88094fd969b2b78f684e65f18..b1a3e13216395c9d45ba31a7f2b0f192ac695108 100644 (file)
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -20579,14 +20579,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/bus/mhi/core/mhi.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char
 #lib/modules/KVER-ipfire/kernel/drivers/char/hangcheck-timer.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/amd-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/ba431-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/intel-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/timeriomem-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/via-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/virtio-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/xiphera-trng.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi/ipmi_devintf.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi/ipmi_msghandler.ko.xz