2.4 Firmware Loader does not work builtin

2.4 Firmware Loader does not work builtin

[Margit Schubert-While]

Either it is not supposed to work builtin, in which case, the make
should only offer it as a module, - or , somebody forgot to adjust
lib/Makefile and kernel/ksyms.c
(Copied to maintainer)

Margit

Re: 2.4 Firmware Loader does not work builtin

[Marcel Holtmann]

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

Hi Margit,

> Either it is not supposed to work builtin, in which case, the make
> should only offer it as a module, - or , somebody forgot to adjust
> lib/Makefile and kernel/ksyms.c

the attached patch should fix this problem. Please confirm it and I
resend it to Marcelo.

Regards

Marcel


[-- Attachment #2: patch-2.4.23-pre9-fix-builtin-fw-loader --]
[-- Type: text/x-patch, Size: 1211 bytes --]

diff -urN linux-2.4.23-pre9/kernel/ksyms.c linux-2.4.23-pre9-mh/kernel/ksyms.c
--- linux-2.4.23-pre9/kernel/ksyms.c	Thu Nov  6 12:55:27 2003
+++ linux-2.4.23-pre9-mh/kernel/ksyms.c	Thu Nov  6 12:57:17 2003
@@ -49,6 +49,7 @@
 #include <linux/seq_file.h>
 #include <linux/dnotify.h>
 #include <linux/crc32.h>
+#include <linux/firmware.h>
 #include <asm/checksum.h>
 
 #if defined(CONFIG_PROC_FS)
@@ -572,6 +573,13 @@
 EXPORT_SYMBOL(crc32_le);
 EXPORT_SYMBOL(crc32_be);
 EXPORT_SYMBOL(bitreverse);
+#endif
+
+#ifdef CONFIG_FW_LOADER
+EXPORT_SYMBOL(release_firmware);
+EXPORT_SYMBOL(request_firmware);
+EXPORT_SYMBOL(request_firmware_nowait);
+EXPORT_SYMBOL(register_firmware);
 #endif
 
 /* software interrupts */
diff -urN linux-2.4.23-pre9/lib/firmware_class.c linux-2.4.23-pre9-mh/lib/firmware_class.c
--- linux-2.4.23-pre9/lib/firmware_class.c	Thu Nov  6 12:55:27 2003
+++ linux-2.4.23-pre9-mh/lib/firmware_class.c	Thu Nov  6 12:56:11 2003
@@ -565,7 +565,9 @@
 module_init(firmware_class_init);
 module_exit(firmware_class_exit);
 
+#ifndef CONFIG_FW_LOADER
 EXPORT_SYMBOL(release_firmware);
 EXPORT_SYMBOL(request_firmware);
 EXPORT_SYMBOL(request_firmware_nowait);
 EXPORT_SYMBOL(register_firmware);
+#endif

Re: 2.4 Firmware Loader does not work builtin

[Margit Schubert-While]

I can confirm this works in 2.4.23rc1.
Tested with Prism54 ( Wlan 802.11g driver - http://prism54.org )

Margit