Skip to contentSkip to conversation

redwood-5 compile fixes for linuxppc-2.5

PATCH Felix von Leitner 2 participants 2 messages Jun 13, 2003

Subsystems (2)
Network drivers PCI
lore
Share & tools
lore

Felix von Leitner

author
#0 lore raw

Here is a small diff that makes the kernel compile for me. Can't say whether it works, but at least it compiles ;-)

If anyone is working with such a board, please contact me!

Felix

drivers/net/Kconfig +19 -0
@@ -868,6 +868,25 @@
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
+config SMC91111
+	tristate "SMC 91111 support"
+
+config SMC91111_ADVANCED
+	bool "  Advanced configuration options for SMC91111"
+	depends on SMC91111
+
+config SMC91111_BYTE_SWAP
+	bool "      Byte swap device accesses"
+	depends on SMC91111
+
+config SMC91111_USE_8_BIT
+	bool "      Allow 8 bit device accesses"
+	depends on SMC91111
+
+config SMC91111_USE_32_BIT
+	bool "      Allow 32 bit device accesses"
+	depends on SMC91111
+
 config NET_VENDOR_RACAL
 	bool "Racal-Interlan (Micom) NI cards"
 	depends on NET_ETHERNET && ISA
drivers/net/Makefile +1 -0
@@ -76,6 +76,7 @@
 obj-$(CONFIG_SK_G16) += sk_g16.o
 obj-$(CONFIG_HP100) += hp100.o
 obj-$(CONFIG_SMC9194) += smc9194.o
+obj-$(CONFIG_SMC91111) += smc91111.o
 obj-$(CONFIG_FEC) += fec.o
 obj-$(CONFIG_68360_ENET) += 68360enet.o
 obj-$(CONFIG_ARM_ETHERH) += 8390.o
include/linux/pci.h +2 -0
@@ -806,9 +806,11 @@
  * configuration space.
  */
 
+#ifdef CONFIG_PCI
 #ifndef CONFIG_PCI_DOMAINS
 static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
 #endif
+#endif
 
 #endif /* __KERNEL__ */
 #endif /* LINUX_PCI_H */
arch/ppc/kernel/ppc_ksyms.c +2 -0
@@ -273,8 +273,10 @@
 #ifdef CONFIG_NVRAM
 EXPORT_SYMBOL(nvram_read_byte);
 EXPORT_SYMBOL(nvram_write_byte);
+#ifdef CONFIG_PMAC
 EXPORT_SYMBOL(pmac_xpram_read);
 EXPORT_SYMBOL(pmac_xpram_write);
+#endif
 #endif /* CONFIG_NVRAM */
 EXPORT_SYMBOL(to_tm);
arch/ppc/kernel/misc.S +6 -0
@@ -1324,9 +1324,15 @@
 	.long sys_stat64	/* 195 */
 	.long sys_lstat64
 	.long sys_fstat64
+#ifdef CONFIG_PCI
 	.long sys_pciconfig_read
 	.long sys_pciconfig_write
 	.long sys_pciconfig_iobase 	/* 200 */
+#else
+	.long sys_ni_syscall
+	.long sys_ni_syscall
+	.long sys_ni_syscall
+#endif
 	.long sys_ni_syscall		/* 201 - reserved - MacOnLinux - new */
 	.long sys_getdents64
 	.long sys_pivot_root
arch/ppc/boot/simple/misc-embedded.c +2 -0
@@ -262,7 +262,9 @@
 		rec = (struct bi_record *)((unsigned long)rec + rec->size);
 	}
 	puts("Now booting the kernel\n");
+#if 0
 	serial_close(com_port);
+#endif
 
 	return (unsigned long)hold_residual;
 }
#1 lore raw
Quoted 2 lines · Felix von Leitner

Here is a small diff that makes the kernel compile for me. Can't say whether it works, but at least it compiles ;-)

That's probably not a good idea. Loudly broken > Silently broken.

And:

Quoted 2 lines
drivers/net/Kconfig +0 -0

[snip]

drivers/net/Makefile

Quoted 2 lines
drivers/net/Makefile +0 -0

[snip]

Looks alright, but I've seen / heard rumblings of a better net driver for that family of chipsets, I think...

Quoted 4 lines
include/linux/pci.h +0 -0
@@ -806,9 +806,11 @@
  * configuration space.

include/linux/pci.h line 816

Quoted 10 lines
include/linux/pci.h +2 -0
  */
 
+#ifdef CONFIG_PCI
 #ifndef CONFIG_PCI_DOMAINS
 static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
 #endif
+#endif
 
 #endif /* __KERNEL__ */
 #endif /* LINUX_PCI_H */

Er, why is this needed?

arch/ppc/kernel/ppc_ksyms.c line 281

Quoted 12 lines
arch/ppc/kernel/ppc_ksyms.c +2 -0
@@ -273,8 +273,10 @@
 #ifdef CONFIG_NVRAM
 EXPORT_SYMBOL(nvram_read_byte);
 EXPORT_SYMBOL(nvram_write_byte);
+#ifdef CONFIG_PMAC
 EXPORT_SYMBOL(pmac_xpram_read);
 EXPORT_SYMBOL(pmac_xpram_write);
+#endif
 #endif /* CONFIG_NVRAM */
 EXPORT_SYMBOL(to_tm);

It's CONFIG_PPC_PMAC, and I'll look into this one, thanks.

Quoted 8 lines
arch/ppc/kernel/misc.S +1 -0
@@ -1324,9 +1324,15 @@
 	.long sys_stat64	/* 195 */
 	.long sys_lstat64
 	.long sys_fstat64
+#ifdef CONFIG_PCI
 	.long sys_pciconfig_read

arch/ppc/kernel/misc.S line 1338

Quoted 10 lines
arch/ppc/kernel/misc.S +5 -0
 	.long sys_pciconfig_write
 	.long sys_pciconfig_iobase 	/* 200 */
+#else
+	.long sys_ni_syscall
+	.long sys_ni_syscall
+	.long sys_ni_syscall
+#endif
 	.long sys_ni_syscall		/* 201 - reserved - MacOnLinux - new */
 	.long sys_getdents64
 	.long sys_pivot_root

There should be a conditional_syscall thingy to take care of this..

arch/ppc/boot/simple/misc-embedded.c line 270

Quoted 12 lines
arch/ppc/boot/simple/misc-embedded.c +2 -0
@@ -262,7 +262,9 @@
 		rec = (struct bi_record *)((unsigned long)rec + rec->size);
 	}
 	puts("Now booting the kernel\n");
+#if 0
 	serial_close(com_port);
+#endif
 
 	return (unsigned long)hold_residual;
 }

This shouldn't be needed either.

--
Tom Rini
http://gate.crashing.org/~trini/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/