clean up mtu handling in ppp init scripts

[openwrt.git] / openwrt / target / linux / linux-2.6 / Makefile

diff --git a/openwrt/target/linux/linux-2.6/Makefile b/openwrt/target/linux/linux-2.6/Makefile
index 5631735..544b5c5 100644 (file)
--- a/openwrt/target/linux/linux-2.6/Makefile
+++ b/openwrt/target/linux/linux-2.6/Makefile
@@ -1,15 +1,12 @@
-#############################################################

 # $Id$
 # $Id$

-#

 # Linux 2.6 kernel target for the OpenWRT project
 # Linux 2.6 kernel target for the OpenWRT project

-#
-#############################################################

 
 include $(TOPDIR)/rules.mk
 include ../rules.mk
 
 
 include $(TOPDIR)/rules.mk
 include ../rules.mk
 

+KERNEL:=2.6

 LINUX_VERSION:=2.6.12.5
 LINUX_VERSION:=2.6.12.5

-LINUX_KERNEL_MD5SUM:=x
+LINUX_KERNEL_MD5SUM:=076f0dc714112c764c790fbaef19e228

 LINUX_SITE=http://www.fi.kernel.org/pub/linux/kernel/v2.6 \
            http://www.fr.kernel.org/pub/linux/kernel/v2.6 \
            http://www.kernel.org/pub/linux/kernel/v2.6 \
 LINUX_SITE=http://www.fi.kernel.org/pub/linux/kernel/v2.6 \
            http://www.fr.kernel.org/pub/linux/kernel/v2.6 \
            http://www.kernel.org/pub/linux/kernel/v2.6 \


@@ -62,7 +59,7 @@ $(eval $(call KMOD_template,PPPOATM,pppoatm,\
        $(MODULES_DIR)/kernel/net/atm/pppoatm.ko \
 ,CONFIG_PPPOATM))
 $(eval $(call KMOD_template,USB_ACM,usb-acm,\
        $(MODULES_DIR)/kernel/net/atm/pppoatm.ko \
 ,CONFIG_PPPOATM))
 $(eval $(call KMOD_template,USB_ACM,usb-acm,\

-       $(MODULES_DIR)/kernel/drivers/usb/acm.ko \
+       $(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \

 ,CONFIG_USB_ACM))
 $(eval $(call KMOD_template,B44,b44,\
        $(MODULES_DIR)/kernel/drivers/net/b44.ko \
 ,CONFIG_USB_ACM))
 $(eval $(call KMOD_template,B44,b44,\
        $(MODULES_DIR)/kernel/drivers/net/b44.ko \


@@ -96,14 +93,14 @@ $(eval $(call KMOD_template,NFS,nfs,\
        $(MODULES_DIR)/kernel/net/sunrpc/*.ko \
 ,CONFIG_NFS_FS,,30,sunrpc lockd nfs))
 $(eval $(call KMOD_template,USB,usb-core,\
        $(MODULES_DIR)/kernel/net/sunrpc/*.ko \
 ,CONFIG_NFS_FS,,30,sunrpc lockd nfs))
 $(eval $(call KMOD_template,USB,usb-core,\

-       $(MODULES_DIR)/kernel/drivers/usb/usbcore.ko \
+       $(MODULES_DIR)/kernel/drivers/usb/core/usbcore.ko \

 ,CONFIG_USB,,50,usbcore))
 $(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
        $(MODULES_DIR)/kernel/drivers/usb/host/uhci.ko \
 ,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci))
 $(eval $(call KMOD_template,USB_OHCI,usb-ohci,\
 ,CONFIG_USB,,50,usbcore))
 $(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
        $(MODULES_DIR)/kernel/drivers/usb/host/uhci.ko \
 ,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci))
 $(eval $(call KMOD_template,USB_OHCI,usb-ohci,\

-       $(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.ko \
-,CONFIG_USB_OHCI,kmod-usb-core,60,ohci))
+       $(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd.ko \
+,CONFIG_USB_OHCI_HCD,kmod-usb-core,60,ohci-hcd))

 $(eval $(call KMOD_template,USB2,usb2,\
        $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.ko \
 ,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd))
 $(eval $(call KMOD_template,USB2,usb2,\
        $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.ko \
 ,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd))


@@ -112,8 +109,8 @@ $(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
        $(MODULES_DIR)/kernel/drivers/usb/storage/*.ko \
 ,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage))
 $(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
        $(MODULES_DIR)/kernel/drivers/usb/storage/*.ko \
 ,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage))
 $(eval $(call KMOD_template,USB_PRINTER,usb-printer,\

-       $(MODULES_DIR)/kernel/drivers/usb/printer.ko \
-,CONFIG_USB_PRINTER,kmod-usb-core,60,printer))
+       $(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \
+,CONFIG_USB_PRINTER,kmod-usb-core,60,usblp))

 $(eval $(call KMOD_template,IDE,ide,\
        $(MODULES_DIR)/kernel/drivers/ide/*.ko \
        $(MODULES_DIR)/kernel/drivers/ide/*/*.ko \
 $(eval $(call KMOD_template,IDE,ide,\
        $(MODULES_DIR)/kernel/drivers/ide/*.ko \
        $(MODULES_DIR)/kernel/drivers/ide/*/*.ko \


@@ -137,7 +134,23 @@ $(eval $(call KMOD_template,HFSPLUS,hfsplus,\
 $(eval $(call KMOD_template,VFAT,vfat,\
        $(MODULES_DIR)/kernel/fs/vfat/vfat.ko \
        $(MODULES_DIR)/kernel/fs/fat/fat.ko \
 $(eval $(call KMOD_template,VFAT,vfat,\
        $(MODULES_DIR)/kernel/fs/vfat/vfat.ko \
        $(MODULES_DIR)/kernel/fs/fat/fat.ko \

+       $(MODULES_DIR)/kernel/fs/nls/nls_base.ko \

 ,CONFIG_VFAT_FS,,30,fat vfat))
 ,CONFIG_VFAT_FS,,30,fat vfat))

+$(eval $(call KMOD_template,NLS_BASE,nls-base,\
+       $(MODULES_DIR)/kernel/fs/nls/nls_base.ko \
+,CONFIG_NLS,,20,nls_base))
+$(eval $(call KMOD_template,NLS_UTF8,nls-utf8,\
+       $(MODULES_DIR)/kernel/fs/nls/nls_utf8.ko \
+,CONFIG_NLS_UTF8,,20,nls_utf8))
+$(eval $(call KMOD_template,NLS_ISO8859_1,nls-iso8859-1,\
+       $(MODULES_DIR)/kernel/fs/nls/nls_iso8859-1.ko \
+,CONFIG_NLS_ISO8859_1,,20,nls_iso8859-1))
+$(eval $(call KMOD_template,NLS_CP437,nls-cp437,\
+       $(MODULES_DIR)/kernel/fs/nls/nls_cp437.ko \
+,CONFIG_NLS_CODEPAGE_437,,20,nls_cp437))
+$(eval $(call KMOD_template,NLS_CP850,nls-cp850,\
+       $(MODULES_DIR)/kernel/fs/nls/nls_cp850.ko \
+,CONFIG_NLS_CODEPAGE_850,,20,nls_cp850))

 $(eval $(call KMOD_template,CRYPTO,crypto,\
        $(MODULES_DIR)/kernel/crypto/*.ko \
 ))
 $(eval $(call KMOD_template,CRYPTO,crypto,\
        $(MODULES_DIR)/kernel/crypto/*.ko \
 ))


@@ -198,8 +211,8 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
        
 $(LINUX_DIR)/.modules_done: $(LINUX_KERNEL) $(LINUX_IMAGE)
        rm -rf $(LINUX_BUILD_DIR)/modules
        
 $(LINUX_DIR)/.modules_done: $(LINUX_KERNEL) $(LINUX_IMAGE)
        rm -rf $(LINUX_BUILD_DIR)/modules

-       $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules
-       $(MAKE) -C $(LINUX_DIR) DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install
+       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules
+       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install

        touch $(LINUX_DIR)/.modules_done
 
 $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
        touch $(LINUX_DIR)/.modules_done
 
 $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured