From d8ceb6b6902a3ccf0ac3185e2d5520eac7131252 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 26 Jun 2007 21:49:51 +0000 Subject: linux-rp-2.6.17: Tweak qemuarm/qemux86 defconfigs (use wacom tablet), make linux-rp.inc sh complient, fix whitespace (from poky) --- packages/linux/linux-rp-2.6.17/defconfig-qemuarm | 5 +---- packages/linux/linux-rp-2.6.17/defconfig-qemux86 | 20 +++++++---------- packages/linux/linux-rp.inc | 28 ++++++++++++------------ packages/linux/linux-rp_2.6.17.bb | 4 ++-- 4 files changed, 25 insertions(+), 32 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-rp-2.6.17/defconfig-qemuarm b/packages/linux/linux-rp-2.6.17/defconfig-qemuarm index abb6726556..e34fe5c090 100644 --- a/packages/linux/linux-rp-2.6.17/defconfig-qemuarm +++ b/packages/linux/linux-rp-2.6.17/defconfig-qemuarm @@ -616,10 +616,7 @@ CONFIG_INPUT=y # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y diff --git a/packages/linux/linux-rp-2.6.17/defconfig-qemux86 b/packages/linux/linux-rp-2.6.17/defconfig-qemux86 index fb66874b90..6fe280985f 100644 --- a/packages/linux/linux-rp-2.6.17/defconfig-qemux86 +++ b/packages/linux/linux-rp-2.6.17/defconfig-qemux86 @@ -39,7 +39,7 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_UID16=y CONFIG_VM86=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -# CONFIG_EMBEDDED is not set +CONFIG_EMBEDDED=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y @@ -812,13 +812,10 @@ CONFIG_INPUT=y # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set -# CONFIG_INPUT_EVDEV is not set +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # CONFIG_INPUT_POWER is not set @@ -831,8 +828,8 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_INPORT is not set # CONFIG_MOUSE_LOGIBM is not set @@ -880,8 +877,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_CORE=y # CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_LEGACY_PTYS is not set CONFIG_PRINTER=y # CONFIG_LP_CONSOLE is not set # CONFIG_PPDEV is not set @@ -1224,7 +1220,7 @@ CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_SPLIT_ISO is not set # CONFIG_USB_EHCI_ROOT_HUB_TT is not set # CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_OHCI_HCD is not set +CONFIG_USB_OHCI_HCD=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set @@ -1263,7 +1259,7 @@ CONFIG_USB_HIDINPUT=y # CONFIG_HID_FF is not set # CONFIG_USB_HIDDEV is not set # CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set +CONFIG_USB_WACOM=y # CONFIG_USB_ACECAD is not set # CONFIG_USB_KBTAB is not set # CONFIG_USB_POWERMATE is not set diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc index 04b95ec813..584f4012dd 100644 --- a/packages/linux/linux-rp.inc +++ b/packages/linux/linux-rp.inc @@ -70,9 +70,9 @@ module_autoload_mmc_block_collie = "mmc_block" do_configure() { rm -f ${S}/.config - if [ "${MACHINE}" == "tosa" ]; then + if [ "${MACHINE}" = "tosa" ]; then gcc_version=`${KERNEL_CC} -dumpversion` - if [ "${gcc_version}" == "4.0.1" ] || [ "${gcc_version}" == "4.0.2" ]; then + if [ "${gcc_version}" = "4.0.1" ] || [ "${gcc_version}" = "4.0.2" ]; then die "tosa kernel wont work with gcc 4.0.x" fi fi @@ -81,12 +81,12 @@ do_configure() { die "No default configuration for ${MACHINE} available." fi - if [ "${MACHINE}" == "collie" ]; then + if [ "${MACHINE}" = "collie" ]; then mempos=`echo "obase=16; $mem * 1024 * 1024" | bc` rdsize=`echo "$rd * 1024" | bc` total=`expr $mem + $rd` addr=`echo "obase=16; ibase=16; C0000000 + $mempos" | bc` - if [ "$rd" == "0" ] + if [ "$rd" = "0" ] then echo "No RAMDISK" echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config @@ -101,7 +101,7 @@ do_configure() { echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config - #if [ "${ENABLE_ELPP}" == "yes" ]; then + #if [ "${ENABLE_ELPP}" = "yes" ]; then # echo "# Enhanced Linux Progress Patch" >> ${S}/.config # echo "CONFIG_FB_ELPP=y" >> ${S}/.config # echo "CONFIG_LOGO=y" >> ${S}/.config @@ -110,7 +110,7 @@ do_configure() { # echo "# CONFIG_FB_ELPP is not set" >> ${S}/.config #fi - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else @@ -118,7 +118,7 @@ do_configure() { echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config fi - if [ "${DISTRO}" == "openzaurus" -a "${MACHINE}" != "collie" ]; then + if [ "${DISTRO}" = "openzaurus" -a "${MACHINE}" != "collie" ]; then case ${MACHINE} in c7x0 | akita | spitz ) echo "CONFIG_LOGO_OZ640_CLUT224=y" >> ${S}/.config @@ -139,7 +139,7 @@ do_configure() { echo "CONFIG_LOGO=y" >> ${S}/.config echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config echo "# CONFIG_LOGO_OHAND_CLUT224 is not set" >> ${S}/.config - elif [ "${DISTRO}" == "poky" -a "${MACHINE}" != "collie" ]; then + elif [ "${DISTRO}" = "poky" -a "${MACHINE}" != "collie" ]; then echo "CONFIG_LOGO=y" >> ${S}/.config echo "CONFIG_LOGO_OHAND_CLUT224=y" >> ${S}/.config echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config @@ -198,12 +198,12 @@ do_compile_append() { } do_deploy() { - - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME} - rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_SYMLINK_NAME} - ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME} ${DEPLOY_DIR_IMAGE}/${KERNEL_SYMLINK_NAME} - tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME} + cd ${DEPLOY_DIR_IMAGE} + rm -f ${KERNEL_SYMLINK_NAME} + ln -s ${KERNEL_DEPLOY_NAME} ${KERNEL_SYMLINK_NAME} + tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib } do_deploy[dirs] = "${S}" diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb index 717ef5a523..211c5a43cf 100644 --- a/packages/linux/linux-rp_2.6.17.bb +++ b/packages/linux/linux-rp_2.6.17.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r33" +PR = "r35" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -27,7 +27,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/spectrumcs_fix-r0.patch;patch=1 \ file://00-hostap.patch;patch=1;status=merged \ file://10-pcnet.patch;patch=1;status=merged \ - file://asoc-v0.12.4_2.6.17.patch;patch=1 \ + file://asoc-v0.12.4_2.6.17.patch;patch=1 \ ${RPSRC}/hx2750_base-r27.patch;patch=1 \ ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ -- cgit v1.2.3