From 771790141c2b62b44afdb89e611407a78b5d3b57 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 3 Mar 2008 22:48:56 +0000 Subject: [PATCH] simpad-linux-2.6.24: Fix building of the linux-kernel for 2.6.24 *fix collie-kexec.patch contains the same patch threetimes *move patches to packages/linux/linux/simpad *add modified defconfig under packages/linux/linux-2.6.24/simpad --- .../{ => linux-2.6.24}/simpad/.mtn2git_empty | 0 .../linux/{ => linux-2.6.24}/simpad/defconfig | 149 ++++++------------ .../linux/linux/simpad/collie-kexec.patch | 13 ++ .../{ => linux}/simpad/export_atags-r2.patch | 0 .../linux-2.6.24-SIMpad-GPIO-MMC-mod.patch | 0 ...-battery-old-way-but-also-with-sysfs.patch | 0 .../linux-2.6.24-SIMpad-cs3-simpad.patch | 0 ...x-2.6.24-SIMpad-hostap_cs-shared-irq.patch | 0 .../simpad/linux-2.6.24-SIMpad-mq200.patch | 0 ...-2.6.24-SIMpad-orinoco_cs-shared-irq.patch | 0 .../simpad/linux-2.6.24-SIMpad-pcmcia.patch | 0 ...4-SIMpad-serial-gpio_keys-and-cs3-ro.patch | 0 ...linux-2.6.24-SIMpad-ucb1x00-switches.patch | 0 ...IMpad-ucb1x00-ts-supend-and-accuracy.patch | 0 packages/linux/simpad/collie-kexec.patch | 39 ----- 15 files changed, 61 insertions(+), 140 deletions(-) rename packages/linux/{ => linux-2.6.24}/simpad/.mtn2git_empty (100%) rename packages/linux/{ => linux-2.6.24}/simpad/defconfig (94%) create mode 100644 packages/linux/linux/simpad/collie-kexec.patch rename packages/linux/{ => linux}/simpad/export_atags-r2.patch (100%) rename packages/linux/{ => linux}/simpad/linux-2.6.24-SIMpad-GPIO-MMC-mod.patch (100%) rename packages/linux/{ => linux}/simpad/linux-2.6.24-SIMpad-battery-old-way-but-also-with-sysfs.patch (100%) rename packages/linux/{ => linux}/simpad/linux-2.6.24-SIMpad-cs3-simpad.patch (100%) rename packages/linux/{ => linux}/simpad/linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch (100%) rename packages/linux/{ => linux}/simpad/linux-2.6.24-SIMpad-mq200.patch (100%) rename packages/linux/{ => linux}/simpad/linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch (100%) rename packages/linux/{ => linux}/simpad/linux-2.6.24-SIMpad-pcmcia.patch (100%) rename packages/linux/{ => linux}/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch (100%) rename packages/linux/{ => linux}/simpad/linux-2.6.24-SIMpad-ucb1x00-switches.patch (100%) rename packages/linux/{ => linux}/simpad/linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch (100%) delete mode 100644 packages/linux/simpad/collie-kexec.patch diff --git a/packages/linux/simpad/.mtn2git_empty b/packages/linux/linux-2.6.24/simpad/.mtn2git_empty similarity index 100% rename from packages/linux/simpad/.mtn2git_empty rename to packages/linux/linux-2.6.24/simpad/.mtn2git_empty diff --git a/packages/linux/simpad/defconfig b/packages/linux/linux-2.6.24/simpad/defconfig similarity index 94% rename from packages/linux/simpad/defconfig rename to packages/linux/linux-2.6.24/simpad/defconfig index 971c354133..fb88e108fb 100644 --- a/packages/linux/simpad/defconfig +++ b/packages/linux/linux-2.6.24/simpad/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24 -# Mon Mar 3 12:52:14 2008 +# Mon Mar 3 22:58:54 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -254,10 +254,6 @@ CONFIG_ATAGS_PROC=y # CPU Frequency scaling # # CONFIG_CPU_FREQ is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set # # Floating point emulation @@ -395,7 +391,7 @@ CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m -# CONFIG_IPV6_MIP6 is not set +CONFIG_IPV6_MIP6=m CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m @@ -541,11 +537,6 @@ CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_RAW=m -# -# DECnet: Netfilter Configuration -# -CONFIG_DECNET_NF_GRABULATOR=m - # # Bridge: Netfilter Configuration # @@ -596,85 +587,20 @@ CONFIG_SCTP_HMAC_MD5=y CONFIG_TIPC=m # CONFIG_TIPC_ADVANCED is not set # CONFIG_TIPC_DEBUG is not set -CONFIG_ATM=y -CONFIG_ATM_CLIP=y -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set +# CONFIG_ATM is not set CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m -# CONFIG_DECNET_ROUTER is not set +# CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -# CONFIG_COPS is not set -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -CONFIG_X25=m -CONFIG_LAPB=m -CONFIG_ECONET=m -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y -CONFIG_WAN_ROUTER=m -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_RR=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_INGRESS=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_SCHED is not set CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_TEXT=m -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=y -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_IPT=m -# CONFIG_NET_ACT_NAT is not set -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set CONFIG_NET_SCH_FIFO=y # @@ -733,7 +659,33 @@ CONFIG_IRPORT_SIR=m # CONFIG_SIGMATEL_FIR is not set CONFIG_SA1100_FIR=m # CONFIG_MCS_FIR is not set -# CONFIG_BT is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m # CONFIG_AF_RXRPC is not set CONFIG_FIB_RULES=y @@ -874,28 +826,28 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_MISC_DEVICES is not set -CONFIG_IDE=y +CONFIG_IDE=m CONFIG_IDE_MAX_HWIFS=4 -CONFIG_BLK_DEV_IDE=y +CONFIG_BLK_DEV_IDE=m # # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=y +CONFIG_BLK_DEV_IDEDISK=m CONFIG_IDEDISK_MULTI_MODE=y -CONFIG_BLK_DEV_IDECS=y +CONFIG_BLK_DEV_IDECS=m # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set CONFIG_IDE_TASK_IOCTL=y -CONFIG_IDE_PROC_FS=y +# CONFIG_IDE_PROC_FS is not set # # IDE chipset support/bugfixes # -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_PLATFORM=y +CONFIG_IDE_GENERIC=m +CONFIG_BLK_DEV_PLATFORM=m # CONFIG_IDE_ARM is not set # @@ -926,7 +878,6 @@ CONFIG_IDE_ARCH_OBSOLETE_INIT=y # CONFIG_MD is not set CONFIG_NETDEVICES=y # CONFIG_NETDEVICES_MULTIQUEUE is not set -CONFIG_IFB=m CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_MACVLAN=m @@ -1009,7 +960,6 @@ CONFIG_PCMCIA_SMC91C92=m CONFIG_PCMCIA_XIRC2PS=m CONFIG_PCMCIA_AXNET=m # CONFIG_WAN is not set -# CONFIG_ATM_DRIVERS is not set CONFIG_PPP=m CONFIG_PPP_MULTILINK=y CONFIG_PPP_FILTER=y @@ -1019,7 +969,6 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOE=m -CONFIG_PPPOATM=m CONFIG_PPPOL2TP=m CONFIG_SLIP=m CONFIG_SLIP_COMPRESSED=y @@ -1320,16 +1269,14 @@ CONFIG_FONT_MINI_4x6=y CONFIG_FONT_SUN8x16=y # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set # # Sound # # CONFIG_SOUND is not set # CONFIG_HID_SUPPORT is not set +CONFIG_HID=m CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set @@ -1410,7 +1357,6 @@ CONFIG_USB_MON=y # # USB DSL modem support # -# CONFIG_USB_ATM is not set # # USB Gadget Support @@ -1558,6 +1504,7 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_JFFS2_CMODE_FAVOURLZO is not set CONFIG_CRAMFS=m +# CONFIG_SQUASHFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set diff --git a/packages/linux/linux/simpad/collie-kexec.patch b/packages/linux/linux/simpad/collie-kexec.patch new file mode 100644 index 0000000000..2c8fa9352b --- /dev/null +++ b/packages/linux/linux/simpad/collie-kexec.patch @@ -0,0 +1,13 @@ +--- linux-2.6.20.4.orig/include/asm-arm/kexec.h 2007-04-10 19:16:39.000000000 +0200 ++++ linux-2.6.20.4/include/asm-arm/kexec.h 2007-04-03 05:01:09.000000000 +0200 +@@ -8,8 +8,8 @@ + /* Maximum address we can reach in physical address mode */ + #define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL) + /* Maximum address we can use for the control code buffer */ +-#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE +- ++//#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE ++#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL) + #define KEXEC_CONTROL_CODE_SIZE 4096 + + #define KEXEC_ARCH KEXEC_ARCH_ARM diff --git a/packages/linux/simpad/export_atags-r2.patch b/packages/linux/linux/simpad/export_atags-r2.patch similarity index 100% rename from packages/linux/simpad/export_atags-r2.patch rename to packages/linux/linux/simpad/export_atags-r2.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-GPIO-MMC-mod.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-GPIO-MMC-mod.patch similarity index 100% rename from packages/linux/simpad/linux-2.6.24-SIMpad-GPIO-MMC-mod.patch rename to packages/linux/linux/simpad/linux-2.6.24-SIMpad-GPIO-MMC-mod.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-battery-old-way-but-also-with-sysfs.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-battery-old-way-but-also-with-sysfs.patch similarity index 100% rename from packages/linux/simpad/linux-2.6.24-SIMpad-battery-old-way-but-also-with-sysfs.patch rename to packages/linux/linux/simpad/linux-2.6.24-SIMpad-battery-old-way-but-also-with-sysfs.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-cs3-simpad.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-cs3-simpad.patch similarity index 100% rename from packages/linux/simpad/linux-2.6.24-SIMpad-cs3-simpad.patch rename to packages/linux/linux/simpad/linux-2.6.24-SIMpad-cs3-simpad.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch similarity index 100% rename from packages/linux/simpad/linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch rename to packages/linux/linux/simpad/linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-mq200.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-mq200.patch similarity index 100% rename from packages/linux/simpad/linux-2.6.24-SIMpad-mq200.patch rename to packages/linux/linux/simpad/linux-2.6.24-SIMpad-mq200.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch similarity index 100% rename from packages/linux/simpad/linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch rename to packages/linux/linux/simpad/linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-pcmcia.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-pcmcia.patch similarity index 100% rename from packages/linux/simpad/linux-2.6.24-SIMpad-pcmcia.patch rename to packages/linux/linux/simpad/linux-2.6.24-SIMpad-pcmcia.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch similarity index 100% rename from packages/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch rename to packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-switches.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-switches.patch similarity index 100% rename from packages/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-switches.patch rename to packages/linux/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-switches.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch similarity index 100% rename from packages/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch rename to packages/linux/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch diff --git a/packages/linux/simpad/collie-kexec.patch b/packages/linux/simpad/collie-kexec.patch deleted file mode 100644 index 3473b87c6d..0000000000 --- a/packages/linux/simpad/collie-kexec.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- linux-2.6.20.4.orig/include/asm-arm/kexec.h 2007-04-10 19:16:39.000000000 +0200 -+++ linux-2.6.20.4/include/asm-arm/kexec.h 2007-04-03 05:01:09.000000000 +0200 -@@ -8,8 +8,8 @@ - /* Maximum address we can reach in physical address mode */ - #define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL) - /* Maximum address we can use for the control code buffer */ --#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -- -+//#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -+#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL) - #define KEXEC_CONTROL_CODE_SIZE 4096 - - #define KEXEC_ARCH KEXEC_ARCH_ARM ---- linux-2.6.20.4.orig/include/asm-arm/kexec.h 2007-04-10 19:16:39.000000000 +0200 -+++ linux-2.6.20.4/include/asm-arm/kexec.h 2007-04-03 05:01:09.000000000 +0200 -@@ -8,8 +8,8 @@ - /* Maximum address we can reach in physical address mode */ - #define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL) - /* Maximum address we can use for the control code buffer */ --#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -- -+//#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -+#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL) - #define KEXEC_CONTROL_CODE_SIZE 4096 - - #define KEXEC_ARCH KEXEC_ARCH_ARM ---- linux-2.6.20.4.orig/include/asm-arm/kexec.h 2007-04-10 19:16:39.000000000 +0200 -+++ linux-2.6.20.4/include/asm-arm/kexec.h 2007-04-03 05:01:09.000000000 +0200 -@@ -8,8 +8,8 @@ - /* Maximum address we can reach in physical address mode */ - #define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL) - /* Maximum address we can use for the control code buffer */ --#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -- -+//#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -+#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL) - #define KEXEC_CONTROL_CODE_SIZE 4096 - - #define KEXEC_ARCH KEXEC_ARCH_ARM -- 2.39.5