diff options
author | Matthias Hentges <oe@hentges.net> | 2007-06-05 02:30:41 +0000 |
---|---|---|
committer | Matthias Hentges <oe@hentges.net> | 2007-06-05 02:30:41 +0000 |
commit | 8a55be921673301bbc0150e5313c8b2b6b28d07e (patch) | |
tree | af5f15b4c016dafd39afe6b52749755a0ae27fab /packages/linux | |
parent | accb9b8ad19a19ff84d4476175119f01bf528144 (diff) | |
parent | 89ccdc8961e9239340d0c9241ec89095729670e6 (diff) |
merge of '93c76dabe575881b7335e6aca044cb6fb6aceffe'
and 'fa1c000d2eb11e81b0552935ffbdfcbf497dde8a'
Diffstat (limited to 'packages/linux')
-rw-r--r-- | packages/linux/linux-omap1-2.6.20-omap1/defconfig.eabi | 102 | ||||
-rw-r--r-- | packages/linux/linux-rp-2.6.20/defconfig-collie | 4 | ||||
-rw-r--r-- | packages/linux/linux-rp_2.6.20.bb | 8 | ||||
-rw-r--r-- | packages/linux/xanadux-ba-2.6_2.6.12.bb | 1 | ||||
-rw-r--r-- | packages/linux/xanadux-un-2.6_2.6.12.bb | 2 |
5 files changed, 110 insertions, 7 deletions
diff --git a/packages/linux/linux-omap1-2.6.20-omap1/defconfig.eabi b/packages/linux/linux-omap1-2.6.20-omap1/defconfig.eabi index a47a7b004d..640e5e349a 100644 --- a/packages/linux/linux-omap1-2.6.20-omap1/defconfig.eabi +++ b/packages/linux/linux-omap1-2.6.20-omap1/defconfig.eabi @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.20-omap1 -# Thu Mar 1 14:34:27 2007 +# Mon Apr 30 16:19:37 2007 # CONFIG_ARM=y CONFIG_GENERIC_TIME=y @@ -520,6 +520,7 @@ 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_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set # @@ -535,8 +536,52 @@ CONFIG_BLK_DEV_IDECS=m # SCSI device support # # CONFIG_RAID_ATTRS is not set -# CONFIG_SCSI is not set +CONFIG_SCSI=m +# CONFIG_SCSI_TGT is not set # CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set +# CONFIG_PCMCIA_SYM53C500 is not set # # Serial ATA (prod) and Parallel ATA (experimental) drivers @@ -1017,6 +1062,18 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # # may also be needed; see USB_STORAGE Help for more information # +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_LIBUSUAL is not set # @@ -1046,6 +1103,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # USB Imaging devices # # CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set # # USB Network Adapters @@ -1065,7 +1123,45 @@ CONFIG_USB_MON=y # # USB Serial Converter support # -# CONFIG_USB_SERIAL is not set +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +# CONFIG_USB_SERIAL_AIRPRIME is not set +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_WHITEHEAT=m +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_FUNSOFT is not set +# CONFIG_USB_SERIAL_VISOR is not set +# CONFIG_USB_SERIAL_IPAQ is not set +CONFIG_USB_SERIAL_IR=m +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_EDGEPORT_TI is not set +# CONFIG_USB_SERIAL_GARMIN is not set +# CONFIG_USB_SERIAL_IPW is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_KOBIL_SCT is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_MOS7720 is not set +# CONFIG_USB_SERIAL_MOS7840 is not set +# CONFIG_USB_SERIAL_NAVMAN is not set +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_HP4X is not set +# CONFIG_USB_SERIAL_SAFE is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set +CONFIG_USB_SERIAL_TI=m +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OPTION is not set +# CONFIG_USB_SERIAL_OMNINET is not set +# CONFIG_USB_SERIAL_DEBUG is not set +CONFIG_USB_EZUSB=y # # USB Miscellaneous drivers diff --git a/packages/linux/linux-rp-2.6.20/defconfig-collie b/packages/linux/linux-rp-2.6.20/defconfig-collie index 945f2fb39c..1c6c0be8cc 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-collie +++ b/packages/linux/linux-rp-2.6.20/defconfig-collie @@ -254,7 +254,7 @@ CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set # CONFIG_PM_SYSFS_DEPRECATED is not set -CONFIG_APM=m +CONFIG_APM=y # # Networking @@ -1394,7 +1394,7 @@ CONFIG_USB_EZUSB=y # # USB Gadget Support # -CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb index 8da37cbcd6..9ef9413641 100644 --- a/packages/linux/linux-rp_2.6.20.bb +++ b/packages/linux/linux-rp_2.6.20.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r16" +PR = "r17" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -80,7 +80,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ SRC_URI_append_collie = "\ ${TKSRC}/mtd-sharp-flash-hack-r2.patch;patch=1 \ - ${TKSRC}/collie-r3.patch;patch=1 \ ${TKSRC}/ucb1x00-touch-audio-r1.patch;patch=1 \ ${TKSRC}/mcp-sa11x0-r0.patch;patch=1 \ ${TKSRC}/sa1100-udc-r2.patch;patch=1 \ @@ -88,6 +87,11 @@ SRC_URI_append_collie = "\ ${TKSRC}/locomo-r0.patch;patch=1 \ ${TKSRC}/collie-kexec.patch;patch=1 \ ${TKSRC}/locomo_spi-r3.patch;patch=1 \ + ${TKSRC}/sharpsl_pm.patch;patch=1 \ + ${TKSRC}/collie_pm-2.patch;patch=1 \ + ${TKSRC}/locomokeyb_suspendkey.patch;patch=1 \ + ${TKSRC}/pcmcia_suspend.patch;patch=1 \ + ${TKSRC}/ucb1x00_suspend.patch;patch=1 \ " SRC_URI_append_tosa = "\ diff --git a/packages/linux/xanadux-ba-2.6_2.6.12.bb b/packages/linux/xanadux-ba-2.6_2.6.12.bb index c7f73fb37b..ee58d36434 100644 --- a/packages/linux/xanadux-ba-2.6_2.6.12.bb +++ b/packages/linux/xanadux-ba-2.6_2.6.12.bb @@ -6,6 +6,7 @@ SRC_URI = "cvs://anonymous@xanadux.cvs.sourceforge.net/cvsroot/xanadux;method=ps S = "${WORKDIR}/linux-2.6-xda" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "blueangel" inherit kernel diff --git a/packages/linux/xanadux-un-2.6_2.6.12.bb b/packages/linux/xanadux-un-2.6_2.6.12.bb index a82e0abd3e..4a0f5265f1 100644 --- a/packages/linux/xanadux-un-2.6_2.6.12.bb +++ b/packages/linux/xanadux-un-2.6_2.6.12.bb @@ -8,6 +8,8 @@ SRC_URI = "cvs://anonymous@xanadux.cvs.sourceforge.net/cvsroot/xanadux;method=ps S = "${WORKDIR}/linux-2.6-xda" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "htc-universal" + inherit kernel |