summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-01-10 11:23:56 (GMT)
committerRichard Purdie <richard@openedhand.com>2007-01-10 11:23:56 (GMT)
commitc7e1d674858ddadd6f34bb07715654f376025f59 (patch)
treefa67e3c4a8722743f87e621439eeb67a3cf45c5d
parentcf7090c981d632583ee2a7cbeca3d3eee3789e45 (diff)
downloadpoky-c7e1d674858ddadd6f34bb07715654f376025f59.tar.gz
linux-rp: Fix defconfigs for qemuarm/qemux86
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1138 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemuarm5
-rw-r--r--meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemux8620
-rw-r--r--meta/packages/linux/linux-rp_2.6.19+2.6.20-rc4.bb2
3 files changed, 10 insertions, 17 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemuarm
index abb6726..e34fe5c 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemuarm
+++ b/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemuarm
@@ -616,10 +616,7 @@ CONFIG_INPUT=y
616# 616#
617# Userland interfaces 617# Userland interfaces
618# 618#
619CONFIG_INPUT_MOUSEDEV=y 619# CONFIG_INPUT_MOUSEDEV is not set
620CONFIG_INPUT_MOUSEDEV_PSAUX=y
621CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
622CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
623# CONFIG_INPUT_JOYDEV is not set 620# CONFIG_INPUT_JOYDEV is not set
624# CONFIG_INPUT_TSDEV is not set 621# CONFIG_INPUT_TSDEV is not set
625CONFIG_INPUT_EVDEV=y 622CONFIG_INPUT_EVDEV=y
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemux86
index fb66874..6fe2809 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemux86
+++ b/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemux86
@@ -39,7 +39,7 @@ CONFIG_INITRAMFS_SOURCE=""
39CONFIG_UID16=y 39CONFIG_UID16=y
40CONFIG_VM86=y 40CONFIG_VM86=y
41# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 41# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
42# CONFIG_EMBEDDED is not set 42CONFIG_EMBEDDED=y
43CONFIG_KALLSYMS=y 43CONFIG_KALLSYMS=y
44# CONFIG_KALLSYMS_EXTRA_PASS is not set 44# CONFIG_KALLSYMS_EXTRA_PASS is not set
45CONFIG_HOTPLUG=y 45CONFIG_HOTPLUG=y
@@ -812,13 +812,10 @@ CONFIG_INPUT=y
812# 812#
813# Userland interfaces 813# Userland interfaces
814# 814#
815CONFIG_INPUT_MOUSEDEV=y 815# CONFIG_INPUT_MOUSEDEV is not set
816CONFIG_INPUT_MOUSEDEV_PSAUX=y
817CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
818CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
819# CONFIG_INPUT_JOYDEV is not set 816# CONFIG_INPUT_JOYDEV is not set
820# CONFIG_INPUT_TSDEV is not set 817# CONFIG_INPUT_TSDEV is not set
821# CONFIG_INPUT_EVDEV is not set 818CONFIG_INPUT_EVDEV=y
822# CONFIG_INPUT_EVBUG is not set 819# CONFIG_INPUT_EVBUG is not set
823# CONFIG_INPUT_POWER is not set 820# CONFIG_INPUT_POWER is not set
824 821
@@ -831,8 +828,8 @@ CONFIG_KEYBOARD_ATKBD=y
831# CONFIG_KEYBOARD_LKKBD is not set 828# CONFIG_KEYBOARD_LKKBD is not set
832# CONFIG_KEYBOARD_XTKBD is not set 829# CONFIG_KEYBOARD_XTKBD is not set
833# CONFIG_KEYBOARD_NEWTON is not set 830# CONFIG_KEYBOARD_NEWTON is not set
834CONFIG_INPUT_MOUSE=y 831# CONFIG_INPUT_MOUSE is not set
835CONFIG_MOUSE_PS2=y 832# CONFIG_MOUSE_PS2 is not set
836# CONFIG_MOUSE_SERIAL is not set 833# CONFIG_MOUSE_SERIAL is not set
837# CONFIG_MOUSE_INPORT is not set 834# CONFIG_MOUSE_INPORT is not set
838# CONFIG_MOUSE_LOGIBM is not set 835# CONFIG_MOUSE_LOGIBM is not set
@@ -880,8 +877,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
880CONFIG_SERIAL_CORE=y 877CONFIG_SERIAL_CORE=y
881# CONFIG_SERIAL_JSM is not set 878# CONFIG_SERIAL_JSM is not set
882CONFIG_UNIX98_PTYS=y 879CONFIG_UNIX98_PTYS=y
883CONFIG_LEGACY_PTYS=y 880# CONFIG_LEGACY_PTYS is not set
884CONFIG_LEGACY_PTY_COUNT=256
885CONFIG_PRINTER=y 881CONFIG_PRINTER=y
886# CONFIG_LP_CONSOLE is not set 882# CONFIG_LP_CONSOLE is not set
887# CONFIG_PPDEV is not set 883# CONFIG_PPDEV is not set
@@ -1224,7 +1220,7 @@ CONFIG_USB_EHCI_HCD=y
1224# CONFIG_USB_EHCI_SPLIT_ISO is not set 1220# CONFIG_USB_EHCI_SPLIT_ISO is not set
1225# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1221# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1226# CONFIG_USB_ISP116X_HCD is not set 1222# CONFIG_USB_ISP116X_HCD is not set
1227# CONFIG_USB_OHCI_HCD is not set 1223CONFIG_USB_OHCI_HCD=y
1228CONFIG_USB_UHCI_HCD=y 1224CONFIG_USB_UHCI_HCD=y
1229# CONFIG_USB_SL811_HCD is not set 1225# CONFIG_USB_SL811_HCD is not set
1230 1226
@@ -1263,7 +1259,7 @@ CONFIG_USB_HIDINPUT=y
1263# CONFIG_HID_FF is not set 1259# CONFIG_HID_FF is not set
1264# CONFIG_USB_HIDDEV is not set 1260# CONFIG_USB_HIDDEV is not set
1265# CONFIG_USB_AIPTEK is not set 1261# CONFIG_USB_AIPTEK is not set
1266# CONFIG_USB_WACOM is not set 1262CONFIG_USB_WACOM=y
1267# CONFIG_USB_ACECAD is not set 1263# CONFIG_USB_ACECAD is not set
1268# CONFIG_USB_KBTAB is not set 1264# CONFIG_USB_KBTAB is not set
1269# CONFIG_USB_POWERMATE is not set 1265# CONFIG_USB_POWERMATE is not set
diff --git a/meta/packages/linux/linux-rp_2.6.19+2.6.20-rc4.bb b/meta/packages/linux/linux-rp_2.6.19+2.6.20-rc4.bb
index 1e3836a..ef1d0bd 100644
--- a/meta/packages/linux/linux-rp_2.6.19+2.6.20-rc4.bb
+++ b/meta/packages/linux/linux-rp_2.6.19+2.6.20-rc4.bb
@@ -1,6 +1,6 @@
1require linux-rp.inc 1require linux-rp.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5# Handy URLs 5# Handy URLs
6# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 6# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046