mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
linux-rp: Various fixes including fixing power button suspend
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1811 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
+9
-5
@@ -1119,17 +1119,21 @@ CONFIG_SND_USB_AUDIO=m
|
||||
#
|
||||
CONFIG_SND_SOC=m
|
||||
|
||||
#
|
||||
# Soc Platforms
|
||||
#
|
||||
|
||||
#
|
||||
# SoC Audio for the Intel PXA2xx
|
||||
# Soc Platforms
|
||||
#
|
||||
CONFIG_SND_PXA2xx_SOC=m
|
||||
CONFIG_SND_PXA2xx_SOC_I2S=m
|
||||
CONFIG_SND_PXA2xx_SOC_SPITZ=m
|
||||
# CONFIG_SND_PXA2xx_SOC_MAGICIAN is not set
|
||||
|
||||
#
|
||||
# SoC Audio for the Intel PXA2xx
|
||||
#
|
||||
CONFIG_SND_PXA2XX_SOC=m
|
||||
CONFIG_SND_PXA2XX_SOC_I2S=m
|
||||
CONFIG_SND_PXA2XX_SOC_SPITZ=m
|
||||
# CONFIG_SND_PXA2XX_SOC_MAGICIAN is not set
|
||||
|
||||
#
|
||||
# SoC Audio for the Atmel AT91
|
||||
|
||||
+4
-4
@@ -1181,10 +1181,10 @@ CONFIG_SND_SOC=m
|
||||
#
|
||||
# SoC Audio for the Intel PXA2xx
|
||||
#
|
||||
CONFIG_SND_PXA2xx_SOC=m
|
||||
CONFIG_SND_PXA2xx_SOC_I2S=m
|
||||
CONFIG_SND_PXA2xx_SOC_CORGI=m
|
||||
# CONFIG_SND_PXA2xx_SOC_MAGICIAN is not set
|
||||
CONFIG_SND_PXA2XX_SOC=m
|
||||
CONFIG_SND_PXA2XX_SOC_I2S=m
|
||||
CONFIG_SND_PXA2XX_SOC_CORGI=m
|
||||
# CONFIG_SND_PXA2XX_SOC_MAGICIAN is not set
|
||||
|
||||
#
|
||||
# SoC Audio for the Atmel AT91
|
||||
|
||||
+58
-58
@@ -1,11 +1,14 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.20
|
||||
# Thu Mar 29 12:56:02 2007
|
||||
# Linux kernel version: 2.6.21
|
||||
# Wed May 30 00:16:07 2007
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
# CONFIG_GENERIC_TIME is not set
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
CONFIG_GENERIC_GPIO=y
|
||||
CONFIG_GENERIC_TIME=y
|
||||
CONFIG_MMU=y
|
||||
# CONFIG_NO_IOPORT is not set
|
||||
CONFIG_GENERIC_HARDIRQS=y
|
||||
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
|
||||
CONFIG_HARDIRQS_SW_RESEND=y
|
||||
@@ -15,6 +18,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
|
||||
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
|
||||
CONFIG_GENERIC_HWEIGHT=y
|
||||
CONFIG_GENERIC_CALIBRATE_DELAY=y
|
||||
CONFIG_ZONE_DMA=y
|
||||
CONFIG_ARCH_MTD_XIP=y
|
||||
CONFIG_VECTORS_BASE=0xffff0000
|
||||
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
|
||||
@@ -35,6 +39,7 @@ CONFIG_LOCALVERSION_AUTO=y
|
||||
CONFIG_SWAP=y
|
||||
CONFIG_SYSVIPC=y
|
||||
# CONFIG_IPC_NS is not set
|
||||
CONFIG_SYSVIPC_SYSCTL=y
|
||||
# CONFIG_POSIX_MQUEUE is not set
|
||||
CONFIG_BSD_PROCESS_ACCT=y
|
||||
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
|
||||
@@ -44,7 +49,7 @@ CONFIG_BSD_PROCESS_ACCT=y
|
||||
# CONFIG_IKCONFIG is not set
|
||||
CONFIG_SYSFS_DEPRECATED=y
|
||||
# CONFIG_RELAY is not set
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
# CONFIG_BLK_DEV_INITRD is not set
|
||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||
CONFIG_SYSCTL=y
|
||||
CONFIG_EMBEDDED=y
|
||||
@@ -123,6 +128,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
|
||||
# CONFIG_ARCH_IXP2000 is not set
|
||||
# CONFIG_ARCH_IXP23XX is not set
|
||||
# CONFIG_ARCH_L7200 is not set
|
||||
# CONFIG_ARCH_NS9XXX is not set
|
||||
# CONFIG_ARCH_PNX4008 is not set
|
||||
CONFIG_ARCH_PXA=y
|
||||
# CONFIG_ARCH_RPC is not set
|
||||
@@ -169,6 +175,7 @@ CONFIG_CPU_CP15_MMU=y
|
||||
#
|
||||
CONFIG_ARM_THUMB=y
|
||||
# CONFIG_CPU_DCACHE_DISABLE is not set
|
||||
# CONFIG_OUTER_CACHE is not set
|
||||
CONFIG_IWMMXT=y
|
||||
CONFIG_XSCALE_PMU=y
|
||||
CONFIG_SHARP_PARAM=y
|
||||
@@ -211,6 +218,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
|
||||
# CONFIG_SPARSEMEM_STATIC is not set
|
||||
CONFIG_SPLIT_PTLOCK_CPUS=4096
|
||||
# CONFIG_RESOURCES_64BIT is not set
|
||||
CONFIG_ZONE_DMA_FLAG=1
|
||||
CONFIG_ALIGNMENT_TRAP=y
|
||||
|
||||
#
|
||||
@@ -218,7 +226,7 @@ CONFIG_ALIGNMENT_TRAP=y
|
||||
#
|
||||
CONFIG_ZBOOT_ROM_TEXT=0x0
|
||||
CONFIG_ZBOOT_ROM_BSS=0x0
|
||||
CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw fbcon=rotate:1 dyntick=enable quiet"
|
||||
CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw fbcon=rotate:1 dyntick=enable debug"
|
||||
# CONFIG_XIP_KERNEL is not set
|
||||
CONFIG_KEXEC=y
|
||||
|
||||
@@ -252,7 +260,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=y
|
||||
CONFIG_APM_EMULATION=y
|
||||
|
||||
#
|
||||
# Networking
|
||||
@@ -269,6 +277,7 @@ CONFIG_UNIX=y
|
||||
CONFIG_XFRM=y
|
||||
# CONFIG_XFRM_USER is not set
|
||||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
# CONFIG_XFRM_MIGRATE is not set
|
||||
# CONFIG_NET_KEY is not set
|
||||
CONFIG_INET=y
|
||||
# CONFIG_IP_MULTICAST is not set
|
||||
@@ -283,7 +292,7 @@ CONFIG_SYN_COOKIES=y
|
||||
# CONFIG_INET_ESP is not set
|
||||
# CONFIG_INET_IPCOMP is not set
|
||||
# CONFIG_INET_XFRM_TUNNEL is not set
|
||||
# CONFIG_INET_TUNNEL is not set
|
||||
CONFIG_INET_TUNNEL=m
|
||||
CONFIG_INET_XFRM_MODE_TRANSPORT=y
|
||||
CONFIG_INET_XFRM_MODE_TUNNEL=y
|
||||
CONFIG_INET_XFRM_MODE_BEET=y
|
||||
@@ -329,11 +338,14 @@ CONFIG_NETFILTER=y
|
||||
# IP: Netfilter Configuration
|
||||
#
|
||||
CONFIG_IP_NF_QUEUE=m
|
||||
# CONFIG_IP_NF_IPTABLES is not set
|
||||
# CONFIG_IP_NF_ARPTABLES is not set
|
||||
|
||||
#
|
||||
# IPv6: Netfilter Configuration (EXPERIMENTAL)
|
||||
#
|
||||
# CONFIG_IP6_NF_QUEUE is not set
|
||||
# CONFIG_IP6_NF_IPTABLES is not set
|
||||
|
||||
#
|
||||
# DCCP Configuration (EXPERIMENTAL)
|
||||
@@ -462,6 +474,7 @@ CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_DEBUG_DRIVER is not set
|
||||
# CONFIG_DEBUG_DEVRES is not set
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
|
||||
#
|
||||
@@ -560,6 +573,7 @@ CONFIG_MTD_NAND_SHARPSL=y
|
||||
#
|
||||
# Plug and Play support
|
||||
#
|
||||
# CONFIG_PNPACPI is not set
|
||||
|
||||
#
|
||||
# Block devices
|
||||
@@ -570,7 +584,6 @@ CONFIG_BLK_DEV_LOOP=y
|
||||
# CONFIG_BLK_DEV_NBD is not set
|
||||
# CONFIG_BLK_DEV_UB is not set
|
||||
# CONFIG_BLK_DEV_RAM is not set
|
||||
# CONFIG_BLK_DEV_INITRD is not set
|
||||
# CONFIG_CDROM_PKTCDVD is not set
|
||||
# CONFIG_ATA_OVER_ETH is not set
|
||||
|
||||
@@ -600,7 +613,6 @@ CONFIG_BLK_DEV_IDECS=y
|
||||
CONFIG_IDE_GENERIC=y
|
||||
# CONFIG_IDE_ARM is not set
|
||||
# CONFIG_BLK_DEV_IDEDMA is not set
|
||||
# CONFIG_IDEDMA_AUTO is not set
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
|
||||
#
|
||||
@@ -829,6 +841,7 @@ CONFIG_INPUT_KEYBOARD=y
|
||||
# CONFIG_KEYBOARD_STOWAWAY is not set
|
||||
# CONFIG_KEYBOARD_CORGI is not set
|
||||
CONFIG_KEYBOARD_SPITZ=y
|
||||
# CONFIG_KEYBOARD_GPIO is not set
|
||||
# CONFIG_INPUT_MOUSE is not set
|
||||
# CONFIG_INPUT_JOYSTICK is not set
|
||||
CONFIG_INPUT_TOUCHSCREEN=y
|
||||
@@ -963,7 +976,11 @@ CONFIG_I2C_PXA=y
|
||||
#
|
||||
# Misc devices
|
||||
#
|
||||
# CONFIG_TIFM_CORE is not set
|
||||
|
||||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
|
||||
#
|
||||
# Multi-Function Devices
|
||||
@@ -1003,15 +1020,25 @@ CONFIG_USB_DABUSB=m
|
||||
#
|
||||
# Graphics support
|
||||
#
|
||||
CONFIG_FIRMWARE_EDID=y
|
||||
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
||||
CONFIG_BACKLIGHT_CLASS_DEVICE=y
|
||||
CONFIG_LCD_CLASS_DEVICE=y
|
||||
CONFIG_BACKLIGHT_CORGI=y
|
||||
CONFIG_FB=y
|
||||
CONFIG_FIRMWARE_EDID=y
|
||||
# CONFIG_FB_DDC is not set
|
||||
CONFIG_FB_CFB_FILLRECT=y
|
||||
CONFIG_FB_CFB_COPYAREA=y
|
||||
CONFIG_FB_CFB_IMAGEBLIT=y
|
||||
# CONFIG_FB_SVGALIB is not set
|
||||
# CONFIG_FB_MACMODES is not set
|
||||
# CONFIG_FB_BACKLIGHT is not set
|
||||
# CONFIG_FB_MODE_HELPERS is not set
|
||||
# CONFIG_FB_TILEBLITTING is not set
|
||||
|
||||
#
|
||||
# Frame buffer hardware drivers
|
||||
#
|
||||
# CONFIG_FB_S1D13XXX is not set
|
||||
CONFIG_FB_PXA=y
|
||||
CONFIG_FB_PXA_LCD_QVGA=y
|
||||
@@ -1052,12 +1079,6 @@ CONFIG_LOGO_OHAND_CLUT224=y
|
||||
# CONFIG_LOGO_OZ240_CLUT224 is not set
|
||||
# CONFIG_LOGO_OZ480_CLUT224 is not set
|
||||
# CONFIG_LOGO_OZ640_CLUT224 is not set
|
||||
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
||||
CONFIG_BACKLIGHT_CLASS_DEVICE=y
|
||||
CONFIG_BACKLIGHT_DEVICE=y
|
||||
CONFIG_LCD_CLASS_DEVICE=y
|
||||
CONFIG_LCD_DEVICE=y
|
||||
CONFIG_BACKLIGHT_CORGI=y
|
||||
|
||||
#
|
||||
# Sound
|
||||
@@ -1120,49 +1141,18 @@ CONFIG_SND_USB_AUDIO=m
|
||||
CONFIG_SND_SOC=m
|
||||
|
||||
#
|
||||
# Soc Platforms
|
||||
# SoC Platforms
|
||||
#
|
||||
|
||||
#
|
||||
# SoC Audio for the Intel PXA2xx
|
||||
#
|
||||
CONFIG_SND_PXA2xx_SOC=m
|
||||
CONFIG_SND_PXA2xx_SOC_I2S=m
|
||||
CONFIG_SND_PXA2xx_SOC_SPITZ=m
|
||||
# CONFIG_SND_PXA2xx_SOC_MAGICIAN is not set
|
||||
|
||||
#
|
||||
# SoC Audio for the Atmel AT91
|
||||
#
|
||||
|
||||
#
|
||||
# SoC Audio for the Freescale i.MX
|
||||
# SoC Audio for the Intel PXA2xx
|
||||
#
|
||||
|
||||
#
|
||||
# SoC Audio for the Samsung S3C24XX
|
||||
#
|
||||
|
||||
#
|
||||
# Soc Codecs
|
||||
#
|
||||
# CONFIG_SND_SOC_AC97_CODEC is not set
|
||||
# CONFIG_SND_SOC_WM8711 is not set
|
||||
# CONFIG_SND_SOC_WM8510 is not set
|
||||
# CONFIG_SND_SOC_WM8731 is not set
|
||||
CONFIG_SND_SOC_WM8750=m
|
||||
# CONFIG_SND_SOC_WM8753 is not set
|
||||
# CONFIG_SND_SOC_WM8772 is not set
|
||||
# CONFIG_SND_SOC_WM8971 is not set
|
||||
# CONFIG_SND_SOC_WM8956 is not set
|
||||
# CONFIG_SND_SOC_WM8960 is not set
|
||||
# CONFIG_SND_SOC_WM8976 is not set
|
||||
# CONFIG_SND_SOC_WM8974 is not set
|
||||
# CONFIG_SND_SOC_WM8980 is not set
|
||||
# CONFIG_SND_SOC_WM9713 is not set
|
||||
# CONFIG_SND_SOC_WM9712 is not set
|
||||
# CONFIG_SND_SOC_UDA1380 is not set
|
||||
# CONFIG_SND_SOC_AK4535 is not set
|
||||
CONFIG_SND_PXA2XX_SOC=m
|
||||
CONFIG_SND_PXA2XX_SOC_SPITZ=m
|
||||
|
||||
#
|
||||
# Open Sound System
|
||||
@@ -1174,6 +1164,7 @@ CONFIG_AC97_BUS=m
|
||||
# HID Devices
|
||||
#
|
||||
CONFIG_HID=y
|
||||
# CONFIG_HID_DEBUG is not set
|
||||
|
||||
#
|
||||
# USB support
|
||||
@@ -1188,7 +1179,6 @@ CONFIG_USB=m
|
||||
# Miscellaneous USB options
|
||||
#
|
||||
CONFIG_USB_DEVICEFS=y
|
||||
# CONFIG_USB_BANDWIDTH is not set
|
||||
# CONFIG_USB_DYNAMIC_MINORS is not set
|
||||
# CONFIG_USB_SUSPEND is not set
|
||||
# CONFIG_USB_OTG is not set
|
||||
@@ -1198,7 +1188,8 @@ CONFIG_USB_DEVICEFS=y
|
||||
#
|
||||
# CONFIG_USB_ISP116X_HCD is not set
|
||||
CONFIG_USB_OHCI_HCD=m
|
||||
# CONFIG_USB_OHCI_BIG_ENDIAN is not set
|
||||
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
|
||||
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
|
||||
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
|
||||
CONFIG_USB_SL811_HCD=m
|
||||
CONFIG_USB_SL811_CS=m
|
||||
@@ -1255,6 +1246,7 @@ CONFIG_USB_ATI_REMOTE=m
|
||||
# CONFIG_USB_ATI_REMOTE2 is not set
|
||||
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
||||
# CONFIG_USB_APPLETOUCH is not set
|
||||
# CONFIG_USB_GTCO is not set
|
||||
|
||||
#
|
||||
# USB Imaging devices
|
||||
@@ -1273,6 +1265,7 @@ CONFIG_USB_USBNET_MII=m
|
||||
CONFIG_USB_USBNET=m
|
||||
CONFIG_USB_NET_AX8817X=m
|
||||
CONFIG_USB_NET_CDCETHER=m
|
||||
# CONFIG_USB_NET_DM9601 is not set
|
||||
# CONFIG_USB_NET_GL620A is not set
|
||||
CONFIG_USB_NET_NET1080=m
|
||||
# CONFIG_USB_NET_PLUSB is not set
|
||||
@@ -1352,6 +1345,7 @@ CONFIG_USB_AUERSWALD=m
|
||||
CONFIG_USB_RIO500=m
|
||||
CONFIG_USB_LEGOTOWER=m
|
||||
CONFIG_USB_LCD=m
|
||||
# CONFIG_USB_BERRY_CHARGE is not set
|
||||
CONFIG_USB_LED=m
|
||||
# CONFIG_USB_CYPRESS_CY7C63 is not set
|
||||
CONFIG_USB_CYTHERM=m
|
||||
@@ -1361,6 +1355,7 @@ CONFIG_USB_IDMOUSE=m
|
||||
# CONFIG_USB_APPLEDISPLAY is not set
|
||||
# CONFIG_USB_LD is not set
|
||||
# CONFIG_USB_TRANCEVIBRATOR is not set
|
||||
# CONFIG_USB_IOWARRIOR is not set
|
||||
# CONFIG_USB_TEST is not set
|
||||
|
||||
#
|
||||
@@ -1399,7 +1394,6 @@ CONFIG_MMC=y
|
||||
# CONFIG_MMC_DEBUG is not set
|
||||
CONFIG_MMC_BLOCK=y
|
||||
CONFIG_MMC_PXA=y
|
||||
# CONFIG_MMC_TIFM_SD is not set
|
||||
|
||||
#
|
||||
# Real Time Clock
|
||||
@@ -1421,6 +1415,7 @@ CONFIG_RTC_INTF_DEV=y
|
||||
#
|
||||
# RTC drivers
|
||||
#
|
||||
# CONFIG_RTC_DRV_CMOS is not set
|
||||
# CONFIG_RTC_DRV_X1205 is not set
|
||||
# CONFIG_RTC_DRV_DS1307 is not set
|
||||
# CONFIG_RTC_DRV_DS1553 is not set
|
||||
@@ -1428,7 +1423,6 @@ CONFIG_RTC_INTF_DEV=y
|
||||
# CONFIG_RTC_DRV_DS1672 is not set
|
||||
# CONFIG_RTC_DRV_DS1742 is not set
|
||||
# CONFIG_RTC_DRV_PCF8563 is not set
|
||||
# CONFIG_RTC_DRV_PCF8583 is not set
|
||||
# CONFIG_RTC_DRV_RS5C372 is not set
|
||||
# CONFIG_RTC_DRV_M48T86 is not set
|
||||
CONFIG_RTC_DRV_SA1100=y
|
||||
@@ -1646,16 +1640,17 @@ CONFIG_MAGIC_SYSRQ=y
|
||||
# CONFIG_DEBUG_FS is not set
|
||||
# CONFIG_HEADERS_CHECK is not set
|
||||
CONFIG_DEBUG_KERNEL=y
|
||||
# CONFIG_DEBUG_SHIRQ is not set
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
# CONFIG_DETECT_SOFTLOCKUP is not set
|
||||
# CONFIG_SCHEDSTATS is not set
|
||||
# CONFIG_TIMER_STATS is not set
|
||||
# CONFIG_DEBUG_SLAB is not set
|
||||
# CONFIG_DEBUG_PREEMPT is not set
|
||||
# CONFIG_DEBUG_RT_MUTEXES is not set
|
||||
# CONFIG_RT_MUTEX_TESTER is not set
|
||||
# CONFIG_DEBUG_SPINLOCK is not set
|
||||
# CONFIG_DEBUG_MUTEXES is not set
|
||||
# CONFIG_DEBUG_RWSEMS is not set
|
||||
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
|
||||
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
|
||||
# CONFIG_DEBUG_KOBJECT is not set
|
||||
@@ -1666,6 +1661,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_FRAME_POINTER=y
|
||||
# CONFIG_FORCED_INLINING is not set
|
||||
# CONFIG_RCU_TORTURE_TEST is not set
|
||||
# CONFIG_FAULT_INJECTION is not set
|
||||
# CONFIG_DEBUG_USER is not set
|
||||
CONFIG_DEBUG_ERRORS=y
|
||||
# CONFIG_DEBUG_LL is not set
|
||||
@@ -1697,8 +1693,10 @@ CONFIG_CRYPTO_WP512=m
|
||||
# CONFIG_CRYPTO_GF128MUL is not set
|
||||
CONFIG_CRYPTO_ECB=m
|
||||
CONFIG_CRYPTO_CBC=m
|
||||
CONFIG_CRYPTO_PCBC=m
|
||||
# CONFIG_CRYPTO_LRW is not set
|
||||
CONFIG_CRYPTO_DES=m
|
||||
# CONFIG_CRYPTO_FCRYPT is not set
|
||||
CONFIG_CRYPTO_BLOWFISH=m
|
||||
CONFIG_CRYPTO_TWOFISH=m
|
||||
CONFIG_CRYPTO_TWOFISH_COMMON=m
|
||||
@@ -1714,6 +1712,7 @@ CONFIG_CRYPTO_DEFLATE=m
|
||||
# CONFIG_CRYPTO_LZO is not set
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_CRC32C=m
|
||||
# CONFIG_CRYPTO_CAMELLIA is not set
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
||||
#
|
||||
@@ -1732,4 +1731,5 @@ CONFIG_LZO=m
|
||||
CONFIG_ZLIB_INFLATE=m
|
||||
CONFIG_ZLIB_DEFLATE=m
|
||||
CONFIG_PLIST=y
|
||||
CONFIG_IOMAP_COPY=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT=y
|
||||
|
||||
+30
-20
@@ -5,28 +5,38 @@
|
||||
include/linux/serial_core.h | 1 +
|
||||
4 files changed, 16 insertions(+), 3 deletions(-)
|
||||
|
||||
Index: git/drivers/serial/8250.c
|
||||
Index: linux-2.6.20/drivers/serial/8250.c
|
||||
===================================================================
|
||||
--- git.orig/drivers/serial/8250.c 2006-10-31 16:29:50.000000000 +0000
|
||||
+++ git/drivers/serial/8250.c 2006-10-31 16:29:53.000000000 +0000
|
||||
@@ -2429,7 +2429,12 @@ static struct uart_driver serial8250_reg
|
||||
--- linux-2.6.20.orig/drivers/serial/8250.c 2007-04-27 13:37:26.000000000 +0100
|
||||
+++ linux-2.6.20/drivers/serial/8250.c 2007-04-27 13:38:16.000000000 +0100
|
||||
@@ -2429,7 +2429,12 @@
|
||||
.driver_name = "serial",
|
||||
.dev_name = "ttyS",
|
||||
.major = TTY_MAJOR,
|
||||
+#ifdef CONFIG_SERIAL_PXA
|
||||
+ .minor = 64 + 3,
|
||||
+ .name_base = 3,
|
||||
+ .minor = 64 + 4,
|
||||
+ .name_base = 4,
|
||||
+#else
|
||||
.minor = 64,
|
||||
+#endif
|
||||
.nr = UART_NR,
|
||||
.cons = SERIAL8250_CONSOLE,
|
||||
};
|
||||
Index: git/drivers/serial/serial_core.c
|
||||
Index: linux-2.6.20/drivers/serial/serial_core.c
|
||||
===================================================================
|
||||
--- git.orig/drivers/serial/serial_core.c 2006-10-31 16:09:17.000000000 +0000
|
||||
+++ git/drivers/serial/serial_core.c 2006-10-31 16:29:53.000000000 +0000
|
||||
@@ -2183,6 +2183,7 @@ int uart_register_driver(struct uart_dri
|
||||
--- linux-2.6.20.orig/drivers/serial/serial_core.c 2007-02-04 18:44:54.000000000 +0000
|
||||
+++ linux-2.6.20/drivers/serial/serial_core.c 2007-04-27 13:39:39.000000000 +0100
|
||||
@@ -2068,7 +2068,8 @@
|
||||
printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n",
|
||||
port->dev ? port->dev->bus_id : "",
|
||||
port->dev ? ": " : "",
|
||||
- drv->dev_name, port->line, address, port->irq, uart_type(port));
|
||||
+ drv->dev_name, port->line + drv->name_base, address, port->irq,
|
||||
+ uart_type(port));
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -2183,6 +2184,7 @@
|
||||
normal->owner = drv->owner;
|
||||
normal->driver_name = drv->driver_name;
|
||||
normal->name = drv->dev_name;
|
||||
@@ -34,11 +44,11 @@ Index: git/drivers/serial/serial_core.c
|
||||
normal->major = drv->major;
|
||||
normal->minor_start = drv->minor;
|
||||
normal->type = TTY_DRIVER_TYPE_SERIAL;
|
||||
Index: git/include/linux/serial_core.h
|
||||
Index: linux-2.6.20/include/linux/serial_core.h
|
||||
===================================================================
|
||||
--- git.orig/include/linux/serial_core.h 2006-10-31 16:09:45.000000000 +0000
|
||||
+++ git/include/linux/serial_core.h 2006-10-31 16:30:36.000000000 +0000
|
||||
@@ -339,6 +339,7 @@ struct uart_driver {
|
||||
--- linux-2.6.20.orig/include/linux/serial_core.h 2007-02-04 18:44:54.000000000 +0000
|
||||
+++ linux-2.6.20/include/linux/serial_core.h 2007-04-27 13:37:27.000000000 +0100
|
||||
@@ -341,6 +341,7 @@
|
||||
struct module *owner;
|
||||
const char *driver_name;
|
||||
const char *dev_name;
|
||||
@@ -46,11 +56,11 @@ Index: git/include/linux/serial_core.h
|
||||
int major;
|
||||
int minor;
|
||||
int nr;
|
||||
Index: git/drivers/serial/serial_cs.c
|
||||
Index: linux-2.6.20/drivers/serial/serial_cs.c
|
||||
===================================================================
|
||||
--- git.orig/drivers/serial/serial_cs.c 2006-10-31 16:09:17.000000000 +0000
|
||||
+++ git/drivers/serial/serial_cs.c 2006-10-31 16:29:53.000000000 +0000
|
||||
@@ -390,7 +390,7 @@ static int setup_serial(struct pcmcia_de
|
||||
--- linux-2.6.20.orig/drivers/serial/serial_cs.c 2007-02-04 18:44:54.000000000 +0000
|
||||
+++ linux-2.6.20/drivers/serial/serial_cs.c 2007-04-27 13:40:34.000000000 +0100
|
||||
@@ -390,7 +390,7 @@
|
||||
kio_addr_t iobase, int irq)
|
||||
{
|
||||
struct uart_port port;
|
||||
@@ -59,12 +69,12 @@ Index: git/drivers/serial/serial_cs.c
|
||||
|
||||
memset(&port, 0, sizeof (struct uart_port));
|
||||
port.iobase = iobase;
|
||||
@@ -411,10 +411,16 @@ static int setup_serial(struct pcmcia_de
|
||||
@@ -411,10 +411,16 @@
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
+#if CONFIG_SERIAL_PXA
|
||||
+ linestart = 3;
|
||||
+ linestart = 4;
|
||||
+#else
|
||||
+ linestart = 0;
|
||||
+#endif
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
require linux-rp.inc
|
||||
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
||||
# Handy URLs
|
||||
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
|
||||
@@ -26,7 +26,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
|
||||
${RPSRC}/tsc2101-r16.patch;patch=1 \
|
||||
${RPSRC}/hx2750_test1-r6.patch;patch=1 \
|
||||
${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
|
||||
${RPSRC}/input_power-r6.patch;patch=1 \
|
||||
${RPSRC}/input_power-r7.patch;patch=1 \
|
||||
${RPSRC}/pxa25x_cpufreq-r2.patch;patch=1 \
|
||||
${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
|
||||
${RPSRC}/pm_changes-r1.patch;patch=1 \
|
||||
@@ -36,6 +36,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
|
||||
${RPSRC}/poodle_pm-r3.patch;patch=1 \
|
||||
${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
|
||||
${RPSRC}/w100_extaccel-r0.patch;patch=1 \
|
||||
file://hostap-monitor-mode.patch;patch=1 \
|
||||
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
|
||||
${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
|
||||
${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
|
||||
|
||||
Reference in New Issue
Block a user