diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-05-21 19:20:44 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-21 19:20:44 +0000 |
| commit | 7b58691d3939afaeb888705a142023befcced6e8 (patch) | |
| tree | d51176cdc148fd77ed5a8d7cd6e65ab7b03dc11a | |
| parent | d33ef936c3c4673112d0fa91a3d9e507b97be663 (diff) | |
| parent | e1d33d3cc457eb262b5343f8985e8c5ca3415715 (diff) | |
merge of 33f5c37d2f8c2a6f5a242f167516efbcbc9ecf41
and dbb8f5536fbc6e50532ff14d6db8e58ae21b0398
| -rw-r--r-- | packages/linux/linux-ezx/defconfig-a780 | 19 | ||||
| -rw-r--r-- | packages/linux/linux-ezx/defconfig-e680 | 23 | ||||
| -rw-r--r-- | packages/linux/linux-ezx_2.6.16.13.bb | 2 |
3 files changed, 23 insertions, 21 deletions
diff --git a/packages/linux/linux-ezx/defconfig-a780 b/packages/linux/linux-ezx/defconfig-a780 index 560530a1ce..1ca94e23a9 100644 --- a/packages/linux/linux-ezx/defconfig-a780 +++ b/packages/linux/linux-ezx/defconfig-a780 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.13 -# Thu May 18 19:40:25 2006 +# Sun May 21 21:07:54 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -122,7 +122,7 @@ CONFIG_PXA27x=y CONFIG_IWMMXT=y CONFIG_PXA_SPI=y CONFIG_PXA_EZX_PCAP=y -CONFIG_PXA_EZX_PCAP_EMU=m +CONFIG_PXA_EZX_PCAP_EMU=y # # Processor Type @@ -171,7 +171,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=32M root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=1 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off console=ttyS2,115200n8 console=tty0" +CONFIG_CMDLINE="console=ttyS2,115200n8 console=tty1 noinitrd root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off debug" # CONFIG_XIP_KERNEL is not set # @@ -672,10 +672,10 @@ CONFIG_INPUT=y # # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set -CONFIG_INPUT_TSDEV=m +CONFIG_INPUT_TSDEV=y CONFIG_INPUT_TSDEV_SCREEN_X=240 CONFIG_INPUT_TSDEV_SCREEN_Y=320 -CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # @@ -699,8 +699,9 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_MK712 is not set -CONFIG_TOUCHSCREEN_PCAP=m -# CONFIG_INPUT_MISC is not set +CONFIG_TOUCHSCREEN_PCAP=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y # # Hardware I/O ports @@ -837,9 +838,9 @@ CONFIG_SPI_BITBANG=m # # Motorola EZX devices # -# CONFIG_KEYPAD_A780 is not set +CONFIG_KEYPAD_A780=y # CONFIG_KEYPAD_E680 is not set -# CONFIG_KEYLIGHT_A780 is not set +CONFIG_KEYLIGHT_A780=y # CONFIG_FMRADIO_E680 is not set # diff --git a/packages/linux/linux-ezx/defconfig-e680 b/packages/linux/linux-ezx/defconfig-e680 index 560530a1ce..365a34df23 100644 --- a/packages/linux/linux-ezx/defconfig-e680 +++ b/packages/linux/linux-ezx/defconfig-e680 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.13 -# Thu May 18 19:40:25 2006 +# Sun May 21 21:11:16 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -116,13 +116,13 @@ CONFIG_PXA_EZX=y # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set # CONFIG_PXA_SHARPSL is not set -# CONFIG_PXA_EZX_E680 is not set -CONFIG_PXA_EZX_A780=y +CONFIG_PXA_EZX_E680=y +# CONFIG_PXA_EZX_A780 is not set CONFIG_PXA27x=y CONFIG_IWMMXT=y CONFIG_PXA_SPI=y CONFIG_PXA_EZX_PCAP=y -CONFIG_PXA_EZX_PCAP_EMU=m +CONFIG_PXA_EZX_PCAP_EMU=y # # Processor Type @@ -171,7 +171,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=32M root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=1 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off console=ttyS2,115200n8 console=tty0" +CONFIG_CMDLINE="console=ttyS2,115200n8 console=tty1 noinitrd root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off debug" # CONFIG_XIP_KERNEL is not set # @@ -672,10 +672,10 @@ CONFIG_INPUT=y # # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set -CONFIG_INPUT_TSDEV=m +CONFIG_INPUT_TSDEV=y CONFIG_INPUT_TSDEV_SCREEN_X=240 CONFIG_INPUT_TSDEV_SCREEN_Y=320 -CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # @@ -699,8 +699,9 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_MK712 is not set -CONFIG_TOUCHSCREEN_PCAP=m -# CONFIG_INPUT_MISC is not set +CONFIG_TOUCHSCREEN_PCAP=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y # # Hardware I/O ports @@ -838,9 +839,9 @@ CONFIG_SPI_BITBANG=m # Motorola EZX devices # # CONFIG_KEYPAD_A780 is not set -# CONFIG_KEYPAD_E680 is not set +CONFIG_KEYPAD_E680=y # CONFIG_KEYLIGHT_A780 is not set -# CONFIG_FMRADIO_E680 is not set +CONFIG_FMRADIO_E680=y # # Multimedia Capabilities Port drivers diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb index 8ef702ef0d..29d7faf04e 100644 --- a/packages/linux/linux-ezx_2.6.16.13.bb +++ b/packages/linux/linux-ezx_2.6.16.13.bb @@ -6,7 +6,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>" LICENSE = "GPL" DEPENDS += "quilt-native" EZX = "ezx6" -PR = "${EZX}-r1" +PR = "${EZX}-r2" inherit kernel |