I have a 2.6.24.6 kernel version, with Freescale patches, for a MPC5121. I'm trying to patch the latest SocketCan into this kernel, and I'm having some difficulties. I now got it to patch and build, but I want to make sure I haven't missed anything.
I pulled the latest trunk code (http://svn.berlios.de/svnroot/repos/socketcan/trunk/), rev 1096 at the time. I had to make some changes to get it to make a usable patch. I've added my changes in the following diff. After these changes I could then run 'make patch26all' to get a patch that would apply and build. I haven't tested if anything works yet. I'm curious if this is expected to get a workable patch or if I missed something. Thanks. Index: kernel/2.6/drivers/net/can/cc770/Kconfig =================================================================== --- kernel/2.6/drivers/net/can/cc770/Kconfig (revision 1096) +++ kernel/2.6/drivers/net/can/cc770/Kconfig (working copy) @@ -4,12 +4,6 @@ if CAN_CC770 -config CAN_CC770 - tristate "Bosch CC770 and Intel AN82527" - ---help--- - Driver for the Bosch CC770 and the compatible Intel AN82527 - CAN controllers. - config CAN_CC770_ISA depends on CAN_CC770 && ISA tristate "ISA Bus based legacy CC770 driver" Index: strip-src =================================================================== --- strip-src (revision 1096) +++ strip-src (working copy) @@ -47,7 +47,7 @@ if (defined($opt_v)) { strip_kversion($opt_v); - replace_socketcan($opt_v); +# replace_socketcan($opt_v); if (defined($opt_m)) { replace_macros($opt_v); Index: FILES-2.6-ALL =================================================================== --- FILES-2.6-ALL (revision 1096) +++ FILES-2.6-ALL (working copy) @@ -1,72 +1,103 @@ -kernel/2.6/Documentation/networking/can.txt -kernel/2.6/net/can/compat.h +kernel/2.6/net/can/Kconfig +kernel/2.6/net/can/Makefile kernel/2.6/net/can/proc.c +kernel/2.6/net/can/bcm-prior-2-6-22.c +kernel/2.6/net/can/Makefile.kernel kernel/2.6/net/can/af_can.h kernel/2.6/net/can/af_can.c -kernel/2.6/net/can/Makefile -kernel/2.6/net/can/Kconfig +kernel/2.6/net/can/bcm.c +kernel/2.6/net/can/compat.h +kernel/2.6/net/can/isotp.c kernel/2.6/net/can/raw.c -kernel/2.6/net/can/bcm.c -kernel/2.6/include/linux/can/version.h -kernel/2.6/include/linux/can/platform/sja1000.h -kernel/2.6/include/linux/can/platform/mcp251x.h -kernel/2.6/include/linux/can/core.h -kernel/2.6/include/linux/can/bcm.h -kernel/2.6/include/linux/can/dev.h -kernel/2.6/include/linux/can/raw.h -kernel/2.6/include/linux/can/error.h -kernel/2.6/include/linux/can/ioctl.h -kernel/2.6/include/linux/can.h -kernel/2.6/drivers/net/can/slcan.c -kernel/2.6/drivers/net/can/sysfs.c -kernel/2.6/drivers/net/can/softing/softing_cs.c -kernel/2.6/drivers/net/can/softing/softing_fw.c -kernel/2.6/drivers/net/can/softing/softing_main.c -kernel/2.6/drivers/net/can/softing/softing.h -kernel/2.6/drivers/net/can/softing/Makefile +kernel/2.6/drivers/net/can/Kconfig +kernel/2.6/drivers/net/can/Makefile +kernel/2.6/drivers/net/can/esd_pci331.c +kernel/2.6/drivers/net/can/vcan.c +kernel/2.6/drivers/net/can/usb/Kconfig +kernel/2.6/drivers/net/can/usb/Makefile +kernel/2.6/drivers/net/can/usb/ems_usb.c kernel/2.6/drivers/net/can/dev.c -kernel/2.6/drivers/net/can/sysfs.h +kernel/2.6/drivers/net/can/at91_can.c kernel/2.6/drivers/net/can/mcp251x.c -kernel/2.6/drivers/net/can/at91_can.c -kernel/2.6/drivers/net/can/Makefile -kernel/2.6/drivers/net/can/mscan/mscan.c +kernel/2.6/drivers/net/can/slcan.c +kernel/2.6/drivers/net/can/cc770/Kconfig +kernel/2.6/drivers/net/can/cc770/cc770_isa.c +kernel/2.6/drivers/net/can/cc770/Makefile +kernel/2.6/drivers/net/can/cc770/cc770_of_platform.c +kernel/2.6/drivers/net/can/cc770/cc770.h +kernel/2.6/drivers/net/can/cc770/cc770.c +kernel/2.6/drivers/net/can/mscan/Kconfig +kernel/2.6/drivers/net/can/mscan/mpc5xxx_can.c +kernel/2.6/drivers/net/can/mscan/Makefile kernel/2.6/drivers/net/can/mscan/mpc52xx_can.c -kernel/2.6/drivers/net/can/mscan/Makefile kernel/2.6/drivers/net/can/mscan/mscan.h +kernel/2.6/drivers/net/can/mscan/mscan.c +kernel/2.6/drivers/net/can/Makefile.kernel +kernel/2.6/drivers/net/can/sja1000/Kconfig +kernel/2.6/drivers/net/can/sja1000/kvaser_pci.c +kernel/2.6/drivers/net/can/sja1000/Makefile kernel/2.6/drivers/net/can/sja1000/ixxat_pci.c -kernel/2.6/drivers/net/can/sja1000/peak_pci.c -kernel/2.6/drivers/net/can/sja1000/sja1000_platform.c +kernel/2.6/drivers/net/can/sja1000/sja1000_isa.c +kernel/2.6/drivers/net/can/sja1000/sja1000.c +kernel/2.6/drivers/net/can/sja1000/sja1000_of_platform.c +kernel/2.6/drivers/net/can/sja1000/sja1000.h +kernel/2.6/drivers/net/can/sja1000/esd_pci.c +kernel/2.6/drivers/net/can/sja1000/ems_104m.c kernel/2.6/drivers/net/can/sja1000/ems_pcmcia.c kernel/2.6/drivers/net/can/sja1000/pipcan.c -kernel/2.6/drivers/net/can/sja1000/sja1000.c -kernel/2.6/drivers/net/can/sja1000/sja1000.h -kernel/2.6/drivers/net/can/sja1000/kvaser_pci.c -kernel/2.6/drivers/net/can/sja1000/Makefile +kernel/2.6/drivers/net/can/sja1000/sja1000_platform.c +kernel/2.6/drivers/net/can/sja1000/peak_pci.c kernel/2.6/drivers/net/can/sja1000/ems_pci.c -kernel/2.6/drivers/net/can/vcan.c -kernel/2.6/drivers/net/can/Kconfig -kernel/2.6/drivers/net/can/old/i82527/i82527.h -kernel/2.6/drivers/net/can/old/i82527/proc.c -kernel/2.6/drivers/net/can/old/i82527/i82527.c -kernel/2.6/drivers/net/can/old/i82527/Makefile +kernel/2.6/drivers/net/can/softing/Makefile +kernel/2.6/drivers/net/can/softing/softing_main.c +kernel/2.6/drivers/net/can/softing/softing_cs.c +kernel/2.6/drivers/net/can/softing/softing.h +kernel/2.6/drivers/net/can/softing/softing_fw.c +kernel/2.6/drivers/net/can/softing/softing_sysfs.c +kernel/2.6/drivers/net/can/sysfs.c +kernel/2.6/drivers/net/can/old/Kconfig kernel/2.6/drivers/net/can/old/ccan/h7202_can.c kernel/2.6/drivers/net/can/old/ccan/ccan.c kernel/2.6/drivers/net/can/old/ccan/Makefile kernel/2.6/drivers/net/can/old/ccan/ccan.h -kernel/2.6/drivers/net/can/old/mscan/mscan.c +kernel/2.6/drivers/net/can/old/mscan/Makefile kernel/2.6/drivers/net/can/old/mscan/mpc52xx_can.c -kernel/2.6/drivers/net/can/old/mscan/Makefile kernel/2.6/drivers/net/can/old/mscan/mscan.h -kernel/2.6/drivers/net/can/old/hal/c200.c +kernel/2.6/drivers/net/can/old/mscan/mscan.c +kernel/2.6/drivers/net/can/old/sja1000/Makefile +kernel/2.6/drivers/net/can/old/sja1000/proc.c +kernel/2.6/drivers/net/can/old/sja1000/sja1000.c +kernel/2.6/drivers/net/can/old/sja1000/sja1000.h kernel/2.6/drivers/net/can/old/hal/hal.h -kernel/2.6/drivers/net/can/old/hal/io.c -kernel/2.6/drivers/net/can/old/hal/esdio.c kernel/2.6/drivers/net/can/old/hal/pc7io.c kernel/2.6/drivers/net/can/old/hal/iomem.c +kernel/2.6/drivers/net/can/old/hal/iomux.c kernel/2.6/drivers/net/can/old/hal/gw2.c -kernel/2.6/drivers/net/can/old/hal/iomux.c -kernel/2.6/drivers/net/can/old/sja1000/proc.c -kernel/2.6/drivers/net/can/old/sja1000/sja1000.c -kernel/2.6/drivers/net/can/old/sja1000/sja1000.h -kernel/2.6/drivers/net/can/old/sja1000/Makefile -kernel/2.6/drivers/net/can/old/Kconfig +kernel/2.6/drivers/net/can/old/hal/io.c +kernel/2.6/drivers/net/can/old/hal/c200.c +kernel/2.6/drivers/net/can/old/hal/esdio.c +kernel/2.6/drivers/net/can/old/i82527/i82527.c +kernel/2.6/drivers/net/can/old/i82527/Makefile +kernel/2.6/drivers/net/can/old/i82527/proc.c +kernel/2.6/drivers/net/can/old/i82527/i82527.h +kernel/2.6/drivers/net/can/sysfs.h +kernel/2.6/drivers/net/can/Kconfig.kernel +kernel/2.6/include/socketcan/can/netlink.h +kernel/2.6/include/socketcan/can/platform/sja1000.h +kernel/2.6/include/socketcan/can/platform/mcp251x.h +kernel/2.6/include/socketcan/can/version.h +kernel/2.6/include/socketcan/can/dev.h +kernel/2.6/include/socketcan/can/error.h +kernel/2.6/include/socketcan/can/raw.h +kernel/2.6/include/socketcan/can/bcm.h +kernel/2.6/include/socketcan/can/ioctl.h +kernel/2.6/include/socketcan/can/isotp.h +kernel/2.6/include/socketcan/can/core.h +kernel/2.6/include/socketcan/can.h +kernel/2.6/include/linux/can/netlink.h +kernel/2.6/include/linux/can/error.h +kernel/2.6/include/linux/can/raw.h +kernel/2.6/include/linux/can/bcm.h +kernel/2.6/include/linux/can/isotp.h +kernel/2.6/include/linux/can.h +kernel/2.6/Documentation/networking/can.txt _______________________________________________ Socketcan-users mailing list [email protected] https://lists.berlios.de/mailman/listinfo/socketcan-users
