summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/packages/linux/linux-gta01.inc24
-rw-r--r--meta/packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01 (renamed from meta/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01)90
-rw-r--r--meta/packages/linux/linux-gta01/fix-EVIOCGRAB-semantics.patch97
-rw-r--r--meta/packages/linux/linux-gta01/udc-nomodule-misccr.patch22
-rw-r--r--meta/packages/linux/linux-gta01_2.6.21.1.bb10
-rw-r--r--meta/packages/linux/linux-gta01_2.6.21.6.bb10
6 files changed, 179 insertions, 74 deletions
diff --git a/meta/packages/linux/linux-gta01.inc b/meta/packages/linux/linux-gta01.inc
index ee3c09e908..909d7459b7 100644
--- a/meta/packages/linux/linux-gta01.inc
+++ b/meta/packages/linux/linux-gta01.inc
@@ -13,7 +13,8 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-gta01"
13# source and patches 13# source and patches
14# 14#
15SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ 15SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
16 file://defconfig-${VANILLA_VERSION}-${MACHINE}" 16 file://defconfig-${VANILLA_VERSION}-${MACHINE} \
17 file://logo_linux_clut224.ppm"
17S = "${WORKDIR}/linux-${VANILLA_VERSION}" 18S = "${WORKDIR}/linux-${VANILLA_VERSION}"
18 19
19############################################################## 20##############################################################
@@ -37,24 +38,32 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDL
37############################################################### 38###############################################################
38# module configs specific to this kernel 39# module configs specific to this kernel
39# 40#
41
42# usb
40module_autoload_ohci-hcd = "ohci-hcd" 43module_autoload_ohci-hcd = "ohci-hcd"
44module_autoload_hci_usb = "hci_usb"
41module_autoload_g_ether = "g_ether" 45module_autoload_g_ether = "g_ether"
42#module_autoload_snd-pcm-oss = "snd-pcm-oss" 46# audio
43#module_autoload_snd-soc-corgi_c7x0 = "snd-soc-s3c24xx" 47module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
48# sd/mmc
49module_autoload_s3cmci = "s3cmci"
44 50
45do_prepatch() { 51do_prepatch() {
46 mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av 52 mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
47 rm -Rf patches .pc 53 mv patches patches.openmoko
54 mv .pc .pc.old
48} 55}
49 56
50do_configure() { 57do_configure() {
58 install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
59
51 if [ ! -e ${WORKDIR}/defconfig-${VANILLA_VERSION}-${MACHINE} ]; then 60 if [ ! -e ${WORKDIR}/defconfig-${VANILLA_VERSION}-${MACHINE} ]; then
52 die "No default configuration for ${MACHINE} available." 61 die "No default configuration for ${MACHINE} available."
53 fi 62 fi
54 63
55 echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config 64 echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
56 65
57 if [ "${TARGET_OS}" == "linux-gnueabi" ]; then 66 if [ "${TARGET_OS}" = "linux-gnueabi" ]; then
58 echo "CONFIG_AEABI=y" >> ${S}/.config 67 echo "CONFIG_AEABI=y" >> ${S}/.config
59 echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config 68 echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
60 else 69 else
@@ -84,7 +93,8 @@ do_deploy() {
84 ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin 93 ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
85 rm -f linux.bin.gz 94 rm -f linux.bin.gz
86 gzip -9 linux.bin 95 gzip -9 linux.bin
87 uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin 96 ${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
97 ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}-latest.bin
88 rm -f linux.bin.gz 98 rm -f linux.bin.gz
89} 99}
90 100
diff --git a/meta/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01 b/meta/packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01
index 9f2ff3de21..7851fbe19d 100644
--- a/meta/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
+++ b/meta/packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21.1 3# Linux kernel version: 2.6.21.3
4# Fri May 18 12:58:24 2007 4# Mon Jun 11 18:32:32 2007
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -33,7 +33,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
33# 33#
34# General setup 34# General setup
35# 35#
36CONFIG_LOCALVERSION="-moko10" 36CONFIG_LOCALVERSION="-moko11"
37# CONFIG_LOCALVERSION_AUTO is not set 37# CONFIG_LOCALVERSION_AUTO is not set
38CONFIG_SWAP=y 38CONFIG_SWAP=y
39CONFIG_SYSVIPC=y 39CONFIG_SYSVIPC=y
@@ -44,8 +44,7 @@ CONFIG_SYSVIPC_SYSCTL=y
44# CONFIG_TASKSTATS is not set 44# CONFIG_TASKSTATS is not set
45# CONFIG_UTS_NS is not set 45# CONFIG_UTS_NS is not set
46# CONFIG_AUDIT is not set 46# CONFIG_AUDIT is not set
47CONFIG_IKCONFIG=y 47# CONFIG_IKCONFIG is not set
48CONFIG_IKCONFIG_PROC=y
49# CONFIG_SYSFS_DEPRECATED is not set 48# CONFIG_SYSFS_DEPRECATED is not set
50# CONFIG_RELAY is not set 49# CONFIG_RELAY is not set
51CONFIG_BLK_DEV_INITRD=y 50CONFIG_BLK_DEV_INITRD=y
@@ -167,7 +166,7 @@ CONFIG_S3C2410_CLOCK=y
167# CONFIG_MACH_OTOM is not set 166# CONFIG_MACH_OTOM is not set
168# CONFIG_MACH_AML_M5900 is not set 167# CONFIG_MACH_AML_M5900 is not set
169# CONFIG_MACH_VR1000 is not set 168# CONFIG_MACH_VR1000 is not set
170# CONFIG_MACH_QT2410 is not set 169CONFIG_MACH_QT2410=y
171CONFIG_MACH_NEO1973_GTA01=y 170CONFIG_MACH_NEO1973_GTA01=y
172 171
173# 172#
@@ -188,6 +187,7 @@ CONFIG_ARCH_S3C2440=y
188# CONFIG_MACH_NEXCODER_2440 is not set 187# CONFIG_MACH_NEXCODER_2440 is not set
189CONFIG_SMDK2440_CPU2440=y 188CONFIG_SMDK2440_CPU2440=y
190CONFIG_MACH_HXD8=y 189CONFIG_MACH_HXD8=y
190CONFIG_MACH_NEO1973_GTA02=y
191 191
192# 192#
193# S3C2442 Machines 193# S3C2442 Machines
@@ -257,7 +257,7 @@ CONFIG_ALIGNMENT_TRAP=y
257# 257#
258CONFIG_ZBOOT_ROM_TEXT=0x0 258CONFIG_ZBOOT_ROM_TEXT=0x0
259CONFIG_ZBOOT_ROM_BSS=0x0 259CONFIG_ZBOOT_ROM_BSS=0x0
260CONFIG_CMDLINE=" ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off debug" 260CONFIG_CMDLINE="console=ttySAC0,115200n8 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off debug"
261# CONFIG_XIP_KERNEL is not set 261# CONFIG_XIP_KERNEL is not set
262CONFIG_KEXEC=y 262CONFIG_KEXEC=y
263 263
@@ -268,22 +268,24 @@ CONFIG_KEXEC=y
268# 268#
269# At least one emulation must be selected 269# At least one emulation must be selected
270# 270#
271# CONFIG_FPE_NWFPE is not set 271CONFIG_FPE_NWFPE=y
272CONFIG_FPE_FASTFPE=y 272# CONFIG_FPE_FASTFPE is not set
273 273
274# 274#
275# Userspace binary formats 275# Userspace binary formats
276# 276#
277CONFIG_BINFMT_ELF=y 277CONFIG_BINFMT_ELF=y
278# CONFIG_BINFMT_AOUT is not set 278# CONFIG_BINFMT_AOUT is not set
279CONFIG_BINFMT_MISC=m 279# CONFIG_BINFMT_MISC is not set
280# CONFIG_ARTHUR is not set
280 281
281# 282#
282# Power management options 283# Power management options
283# 284#
284CONFIG_PM=y 285CONFIG_PM=y
285# CONFIG_PM_LEGACY is not set 286CONFIG_PM_LEGACY=y
286# CONFIG_PM_DEBUG is not set 287CONFIG_PM_DEBUG=y
288CONFIG_DISABLE_CONSOLE_SUSPEND=y
287# CONFIG_PM_SYSFS_DEPRECATED is not set 289# CONFIG_PM_SYSFS_DEPRECATED is not set
288CONFIG_APM_EMULATION=y 290CONFIG_APM_EMULATION=y
289 291
@@ -314,7 +316,10 @@ CONFIG_IP_FIB_HASH=y
314CONFIG_IP_MULTIPLE_TABLES=y 316CONFIG_IP_MULTIPLE_TABLES=y
315# CONFIG_IP_ROUTE_MULTIPATH is not set 317# CONFIG_IP_ROUTE_MULTIPATH is not set
316# CONFIG_IP_ROUTE_VERBOSE is not set 318# CONFIG_IP_ROUTE_VERBOSE is not set
317# CONFIG_IP_PNP is not set 319CONFIG_IP_PNP=y
320# CONFIG_IP_PNP_DHCP is not set
321# CONFIG_IP_PNP_BOOTP is not set
322# CONFIG_IP_PNP_RARP is not set
318CONFIG_NET_IPIP=m 323CONFIG_NET_IPIP=m
319CONFIG_NET_IPGRE=m 324CONFIG_NET_IPGRE=m
320# CONFIG_NET_IPGRE_BROADCAST is not set 325# CONFIG_NET_IPGRE_BROADCAST is not set
@@ -838,6 +843,8 @@ CONFIG_NET_ETHERNET=y
838CONFIG_MII=m 843CONFIG_MII=m
839# CONFIG_SMC91X is not set 844# CONFIG_SMC91X is not set
840# CONFIG_DM9000 is not set 845# CONFIG_DM9000 is not set
846CONFIG_NET_PCI=y
847CONFIG_CS89x0=m
841 848
842# 849#
843# Ethernet (1000 Mbit) 850# Ethernet (1000 Mbit)
@@ -911,6 +918,7 @@ CONFIG_INPUT_KEYBOARD=y
911CONFIG_KEYBOARD_STOWAWAY=m 918CONFIG_KEYBOARD_STOWAWAY=m
912CONFIG_KEYBOARD_GPIO=m 919CONFIG_KEYBOARD_GPIO=m
913CONFIG_KEYBOARD_GTA01=y 920CONFIG_KEYBOARD_GTA01=y
921CONFIG_KEYBOARD_QT2410=y
914CONFIG_INPUT_MOUSE=y 922CONFIG_INPUT_MOUSE=y
915# CONFIG_MOUSE_PS2 is not set 923# CONFIG_MOUSE_PS2 is not set
916# CONFIG_MOUSE_SERIAL is not set 924# CONFIG_MOUSE_SERIAL is not set
@@ -1005,9 +1013,9 @@ CONFIG_I2C_CHARDEV=y
1005# 1013#
1006# I2C Algorithms 1014# I2C Algorithms
1007# 1015#
1008CONFIG_I2C_ALGOBIT=m 1016# CONFIG_I2C_ALGOBIT is not set
1009CONFIG_I2C_ALGOPCF=m 1017# CONFIG_I2C_ALGOPCF is not set
1010CONFIG_I2C_ALGOPCA=m 1018# CONFIG_I2C_ALGOPCA is not set
1011 1019
1012# 1020#
1013# I2C Hardware Bus support 1021# I2C Hardware Bus support
@@ -1025,11 +1033,12 @@ CONFIG_I2C_S3C2410=y
1025# CONFIG_SENSORS_DS1374 is not set 1033# CONFIG_SENSORS_DS1374 is not set
1026# CONFIG_SENSORS_EEPROM is not set 1034# CONFIG_SENSORS_EEPROM is not set
1027CONFIG_SENSORS_PCF50606=y 1035CONFIG_SENSORS_PCF50606=y
1036CONFIG_SENSORS_PCF50633=y
1028# CONFIG_SENSORS_PCF8574 is not set 1037# CONFIG_SENSORS_PCF8574 is not set
1029# CONFIG_SENSORS_PCA9539 is not set 1038# CONFIG_SENSORS_PCA9539 is not set
1030# CONFIG_SENSORS_PCF8591 is not set 1039# CONFIG_SENSORS_PCF8591 is not set
1031# CONFIG_SENSORS_MAX6875 is not set 1040# CONFIG_SENSORS_MAX6875 is not set
1032# CONFIG_SENSORS_TSL256X is not set 1041CONFIG_SENSORS_TSL256X=m
1033# CONFIG_I2C_DEBUG_CORE is not set 1042# CONFIG_I2C_DEBUG_CORE is not set
1034# CONFIG_I2C_DEBUG_ALGO is not set 1043# CONFIG_I2C_DEBUG_ALGO is not set
1035# CONFIG_I2C_DEBUG_BUS is not set 1044# CONFIG_I2C_DEBUG_BUS is not set
@@ -1126,7 +1135,7 @@ CONFIG_LEDS_CLASS=y
1126# 1135#
1127# LED drivers 1136# LED drivers
1128# 1137#
1129# CONFIG_LEDS_S3C24XX is not set 1138CONFIG_LEDS_S3C24XX=m
1130CONFIG_LEDS_GTA01=y 1139CONFIG_LEDS_GTA01=y
1131 1140
1132# 1141#
@@ -1134,7 +1143,7 @@ CONFIG_LEDS_GTA01=y
1134# 1143#
1135CONFIG_LEDS_TRIGGERS=y 1144CONFIG_LEDS_TRIGGERS=y
1136CONFIG_LEDS_TRIGGER_TIMER=y 1145CONFIG_LEDS_TRIGGER_TIMER=y
1137CONFIG_LEDS_TRIGGER_HEARTBEAT=m 1146# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
1138 1147
1139# 1148#
1140# Multimedia devices 1149# Multimedia devices
@@ -1172,6 +1181,10 @@ CONFIG_FB_CFB_IMAGEBLIT=y
1172# CONFIG_FB_S1D13XXX is not set 1181# CONFIG_FB_S1D13XXX is not set
1173CONFIG_FB_S3C2410=y 1182CONFIG_FB_S3C2410=y
1174CONFIG_FB_S3C2410_DEBUG=y 1183CONFIG_FB_S3C2410_DEBUG=y
1184CONFIG_GLAMO=y
1185CONFIG_FB_GLAMO=y
1186CONFIG_GLAMO_SPI_GPIO=y
1187CONFIG_FB_GLAMO_SPI=y
1175# CONFIG_FB_VIRTUAL is not set 1188# CONFIG_FB_VIRTUAL is not set
1176 1189
1177# 1190#
@@ -1196,10 +1209,10 @@ CONFIG_FONT_6x11=y
1196# 1209#
1197# Logo configuration 1210# Logo configuration
1198# 1211#
1199CONFIG_LOGO=y 1212# CONFIG_LOGO is not set
1200# CONFIG_LOGO_LINUX_MONO is not set 1213# CONFIG_LOGO_LINUX_MONO is not set
1201# CONFIG_LOGO_LINUX_VGA16 is not set 1214# CONFIG_LOGO_LINUX_VGA16 is not set
1202CONFIG_LOGO_LINUX_CLUT224=y 1215# CONFIG_LOGO_LINUX_CLUT224 is not set
1203 1216
1204# 1217#
1205# Sound 1218# Sound
@@ -1266,11 +1279,11 @@ CONFIG_SND_SOC=y
1266# 1279#
1267# SoC Audio for the Samsung S3C24XX 1280# SoC Audio for the Samsung S3C24XX
1268# 1281#
1269CONFIG_SND_S3C24XX_SOC=y 1282CONFIG_SND_S3C24XX_SOC=m
1270CONFIG_SND_S3C24XX_SOC_I2S=y 1283CONFIG_SND_S3C24XX_SOC_I2S=m
1271CONFIG_SND_S3C24XX_SOC_SMDK2440=m 1284CONFIG_SND_S3C24XX_SOC_SMDK2440=m
1272CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y 1285CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
1273CONFIG_SND_SOC_WM8753=y 1286CONFIG_SND_SOC_WM8753=m
1274CONFIG_SND_SOC_UDA1380=m 1287CONFIG_SND_SOC_UDA1380=m
1275 1288
1276# 1289#
@@ -1515,14 +1528,15 @@ CONFIG_USB_ETH_RNDIS=y
1515CONFIG_MMC=y 1528CONFIG_MMC=y
1516# CONFIG_MMC_DEBUG is not set 1529# CONFIG_MMC_DEBUG is not set
1517CONFIG_MMC_BLOCK=y 1530CONFIG_MMC_BLOCK=y
1518CONFIG_MMC_S3C=y 1531CONFIG_MMC_S3C=m
1519 1532
1520# 1533#
1521# Real Time Clock 1534# Real Time Clock
1522# 1535#
1523CONFIG_RTC_LIB=y 1536CONFIG_RTC_LIB=y
1524CONFIG_RTC_CLASS=y 1537CONFIG_RTC_CLASS=y
1525# CONFIG_RTC_HCTOSYS is not set 1538CONFIG_RTC_HCTOSYS=y
1539CONFIG_RTC_HCTOSYS_DEVICE=rtc0
1526CONFIG_RTC_DEBUG=y 1540CONFIG_RTC_DEBUG=y
1527 1541
1528# 1542#
@@ -1566,11 +1580,7 @@ CONFIG_JBD=y
1566# CONFIG_REISERFS_FS is not set 1580# CONFIG_REISERFS_FS is not set
1567# CONFIG_JFS_FS is not set 1581# CONFIG_JFS_FS is not set
1568CONFIG_FS_POSIX_ACL=y 1582CONFIG_FS_POSIX_ACL=y
1569CONFIG_XFS_FS=m 1583# CONFIG_XFS_FS is not set
1570# CONFIG_XFS_QUOTA is not set
1571# CONFIG_XFS_SECURITY is not set
1572# CONFIG_XFS_POSIX_ACL is not set
1573# CONFIG_XFS_RT is not set
1574# CONFIG_GFS2_FS is not set 1584# CONFIG_GFS2_FS is not set
1575# CONFIG_OCFS2_FS is not set 1585# CONFIG_OCFS2_FS is not set
1576# CONFIG_MINIX_FS is not set 1586# CONFIG_MINIX_FS is not set
@@ -1623,7 +1633,16 @@ CONFIG_CONFIGFS_FS=m
1623# CONFIG_BEFS_FS is not set 1633# CONFIG_BEFS_FS is not set
1624# CONFIG_BFS_FS is not set 1634# CONFIG_BFS_FS is not set
1625# CONFIG_EFS_FS is not set 1635# CONFIG_EFS_FS is not set
1626# CONFIG_YAFFS_FS is not set 1636CONFIG_YAFFS_FS=y
1637CONFIG_YAFFS_YAFFS1=y
1638# CONFIG_YAFFS_DOES_ECC is not set
1639CONFIG_YAFFS_YAFFS2=y
1640CONFIG_YAFFS_AUTO_YAFFS2=y
1641# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
1642CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
1643# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
1644# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
1645CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
1627CONFIG_JFFS2_FS=y 1646CONFIG_JFFS2_FS=y
1628CONFIG_JFFS2_FS_DEBUG=0 1647CONFIG_JFFS2_FS_DEBUG=0
1629CONFIG_JFFS2_FS_WRITEBUFFER=y 1648CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -1653,6 +1672,7 @@ CONFIG_NFSD_V3=y
1653# CONFIG_NFSD_V3_ACL is not set 1672# CONFIG_NFSD_V3_ACL is not set
1654CONFIG_NFSD_V4=y 1673CONFIG_NFSD_V4=y
1655CONFIG_NFSD_TCP=y 1674CONFIG_NFSD_TCP=y
1675CONFIG_ROOT_NFS=y
1656CONFIG_LOCKD=y 1676CONFIG_LOCKD=y
1657CONFIG_LOCKD_V4=y 1677CONFIG_LOCKD_V4=y
1658CONFIG_EXPORTFS=m 1678CONFIG_EXPORTFS=m
@@ -1749,7 +1769,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
1749# CONFIG_SCHEDSTATS is not set 1769# CONFIG_SCHEDSTATS is not set
1750CONFIG_TIMER_STATS=y 1770CONFIG_TIMER_STATS=y
1751# CONFIG_DEBUG_SLAB is not set 1771# CONFIG_DEBUG_SLAB is not set
1752# CONFIG_DEBUG_PREEMPT is not set 1772CONFIG_DEBUG_PREEMPT=y
1753# CONFIG_DEBUG_RT_MUTEXES is not set 1773# CONFIG_DEBUG_RT_MUTEXES is not set
1754# CONFIG_RT_MUTEX_TESTER is not set 1774# CONFIG_RT_MUTEX_TESTER is not set
1755# CONFIG_DEBUG_SPINLOCK is not set 1775# CONFIG_DEBUG_SPINLOCK is not set
@@ -1758,7 +1778,7 @@ CONFIG_TIMER_STATS=y
1758# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1778# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1759# CONFIG_DEBUG_KOBJECT is not set 1779# CONFIG_DEBUG_KOBJECT is not set
1760CONFIG_DEBUG_BUGVERBOSE=y 1780CONFIG_DEBUG_BUGVERBOSE=y
1761# CONFIG_DEBUG_INFO is not set 1781CONFIG_DEBUG_INFO=y
1762# CONFIG_DEBUG_VM is not set 1782# CONFIG_DEBUG_VM is not set
1763# CONFIG_DEBUG_LIST is not set 1783# CONFIG_DEBUG_LIST is not set
1764CONFIG_FRAME_POINTER=y 1784CONFIG_FRAME_POINTER=y
diff --git a/meta/packages/linux/linux-gta01/fix-EVIOCGRAB-semantics.patch b/meta/packages/linux/linux-gta01/fix-EVIOCGRAB-semantics.patch
new file mode 100644
index 0000000000..3c96faa271
--- /dev/null
+++ b/meta/packages/linux/linux-gta01/fix-EVIOCGRAB-semantics.patch
@@ -0,0 +1,97 @@
1diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
2index 12c7ab8..c7e741b 100644
3--- a/drivers/input/evdev.c
4+++ b/drivers/input/evdev.c
5@@ -29,7 +29,7 @@ struct evdev {
6 char name[16];
7 struct input_handle handle;
8 wait_queue_head_t wait;
9- struct evdev_list *grab;
10+ int grab;
11 struct list_head list;
12 };
13
14@@ -37,6 +37,7 @@ struct evdev_list {
15 struct input_event buffer[EVDEV_BUFFER_SIZE];
16 int head;
17 int tail;
18+ int grab;
19 struct fasync_struct *fasync;
20 struct evdev *evdev;
21 struct list_head node;
22@@ -49,8 +50,7 @@ static void evdev_event(struct input_han
23 struct evdev *evdev = handle->private;
24 struct evdev_list *list;
25
26- if (evdev->grab) {
27- list = evdev->grab;
28+ list_for_each_entry(list, &evdev->list, node) {
29
30 do_gettimeofday(&list->buffer[list->head].time);
31 list->buffer[list->head].type = type;
32@@ -59,17 +59,7 @@ static void evdev_event(struct input_han
33 list->head = (list->head + 1) & (EVDEV_BUFFER_SIZE - 1);
34
35 kill_fasync(&list->fasync, SIGIO, POLL_IN);
36- } else
37- list_for_each_entry(list, &evdev->list, node) {
38-
39- do_gettimeofday(&list->buffer[list->head].time);
40- list->buffer[list->head].type = type;
41- list->buffer[list->head].code = code;
42- list->buffer[list->head].value = value;
43- list->head = (list->head + 1) & (EVDEV_BUFFER_SIZE - 1);
44-
45- kill_fasync(&list->fasync, SIGIO, POLL_IN);
46- }
47+ }
48
49 wake_up_interruptible(&evdev->wait);
50 }
51@@ -104,9 +94,10 @@ static int evdev_release(struct inode *
52 {
53 struct evdev_list *list = file->private_data;
54
55- if (list->evdev->grab == list) {
56- input_release_device(&list->evdev->handle);
57- list->evdev->grab = NULL;
58+ if (list->grab) {
59+ if(!--list->evdev->grab && list->evdev->exist)
60+ input_release_device(&list->evdev->handle);
61+ list->grab = 0;
62 }
63
64 evdev_fasync(-1, file, 0);
65@@ -483,17 +474,19 @@ static long evdev_ioctl_handler(struct f
66
67 case EVIOCGRAB:
68 if (p) {
69- if (evdev->grab)
70- return -EBUSY;
71- if (input_grab_device(&evdev->handle))
72+ if (list->grab)
73 return -EBUSY;
74- evdev->grab = list;
75+ if (!evdev->grab++)
76+ if (input_grab_device(&evdev->handle))
77+ return -EBUSY;
78+ list->grab = 0;
79 return 0;
80 } else {
81- if (evdev->grab != list)
82+ if (!list->grab)
83 return -EINVAL;
84- input_release_device(&evdev->handle);
85- evdev->grab = NULL;
86+ if (!--evdev->grab)
87+ input_release_device(&evdev->handle);
88+ list->grab = 0;
89 return 0;
90 }
91
92-
93To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
94the body of a message to majordomo@vger.kernel.org
95More majordomo info at http://vger.kernel.org/majordomo-info.html
96Please read the FAQ at http://www.tux.org/lkml/
97
diff --git a/meta/packages/linux/linux-gta01/udc-nomodule-misccr.patch b/meta/packages/linux/linux-gta01/udc-nomodule-misccr.patch
deleted file mode 100644
index 0f84b56c2a..0000000000
--- a/meta/packages/linux/linux-gta01/udc-nomodule-misccr.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Index: linux-2.6.17.14-fic1/drivers/usb/gadget/s3c2410_udc.c
2===================================================================
3--- linux-2.6.17.14-fic1.orig/drivers/usb/gadget/s3c2410_udc.c 2006-11-03 01:22:14.000000000 +0100
4+++ linux-2.6.17.14-fic1/drivers/usb/gadget/s3c2410_udc.c 2006-11-03 12:41:52.000000000 +0100
5@@ -1492,7 +1492,7 @@
6 return -ENODEV;
7 if (udc->driver)
8 return -EBUSY;
9- if (!driver->bind || !driver->unbind || !driver->setup
10+ if (!driver->bind || !driver->setup
11 || driver->speed == USB_SPEED_UNKNOWN)
12 return -EINVAL;
13
14@@ -1700,6 +1700,8 @@
15 }
16 dprintk(DEBUG_VERBOSE, "%s: got irq %i\n", gadget_name, IRQ_USBD);
17
18+ s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST|S3C2410_MISCCR_USBSUSPND0|S3C2410_MISCCR_USBSUSPND1, 0);
19+
20 #ifdef ENABLE_SYSFS
21 /* create device files */
22 device_create_file(&pdev->dev, &dev_attr_regs);
diff --git a/meta/packages/linux/linux-gta01_2.6.21.1.bb b/meta/packages/linux/linux-gta01_2.6.21.1.bb
deleted file mode 100644
index f033638663..0000000000
--- a/meta/packages/linux/linux-gta01_2.6.21.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require linux-gta01.inc
2
3DEFAULT_PREFERENCE = "-6"
4
5MOKOR = "moko10"
6PR = "${MOKOR}-r0"
7VANILLA_VERSION = "2.6.21.1"
8
9SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http;rev=2688"
10
diff --git a/meta/packages/linux/linux-gta01_2.6.21.6.bb b/meta/packages/linux/linux-gta01_2.6.21.6.bb
new file mode 100644
index 0000000000..89dc7200fe
--- /dev/null
+++ b/meta/packages/linux/linux-gta01_2.6.21.6.bb
@@ -0,0 +1,10 @@
1require linux-gta01.inc
2
3SRC_URI += "svn://svn.openmoko.org/branches/src/target/kernel/2.6.21.x;module=patches;proto=http;rev=2832"
4SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1"
5
6MOKOR = "moko11"
7PR = "${MOKOR}-r2"
8
9VANILLA_VERSION = "2.6.21.6"
10
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-25 17:18:32 +0000