[oe-commits] org.oe.dev linux-rp-2.6.17: Tweak qemuarm/qemux86 defconfigs (use wacom tablet), make linux-rp.inc sh complient, fix whitespace (from poky)
rpurdie commit
openembedded-commits at lists.openembedded.org
Tue Jun 26 22:35:32 UTC 2007
linux-rp-2.6.17: Tweak qemuarm/qemux86 defconfigs (use wacom tablet), make linux-rp.inc sh complient, fix whitespace (from poky)
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 7695b52b6fd3e3c9802eead22d39f996533773a4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7695b52b6fd3e3c9802eead22d39f996533773a4
Files:
1
packages/linux/linux-rp-2.6.17/defconfig-qemuarm
packages/linux/linux-rp-2.6.17/defconfig-qemux86
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.17.bb
Diffs:
#
# mt diff -rd72fa246605254239149443c0370a9aba6beb58a -r7695b52b6fd3e3c9802eead22d39f996533773a4
#
#
#
# patch "packages/linux/linux-rp-2.6.17/defconfig-qemuarm"
# from [36e062b8c6c2b0063470f7e6403a2a9c28f05dcf]
# to [6b1bcde8c59d611c10508b0a9a91276ff7ff25b3]
#
# patch "packages/linux/linux-rp-2.6.17/defconfig-qemux86"
# from [bb674d4578e839e4cdb227031855f584ba839d71]
# to [e02ed1f8e86ad48145d9b3f41819f9f8f10d7f38]
#
# patch "packages/linux/linux-rp.inc"
# from [7c1c17fd5a0b698d1ce66735ba5eee19608e2e4b]
# to [1c25123c193c3cb5946c408a2ddf1cb156ab9e84]
#
# patch "packages/linux/linux-rp_2.6.17.bb"
# from [a6bf5780ec1865762e199131f01a6a302814c164]
# to [ea0105a316dbe4408097cf1703fe732ef86a8a7b]
#
============================================================
--- packages/linux/linux-rp-2.6.17/defconfig-qemuarm 36e062b8c6c2b0063470f7e6403a2a9c28f05dcf
+++ packages/linux/linux-rp-2.6.17/defconfig-qemuarm 6b1bcde8c59d611c10508b0a9a91276ff7ff25b3
@@ -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
============================================================
--- packages/linux/linux-rp-2.6.17/defconfig-qemux86 bb674d4578e839e4cdb227031855f584ba839d71
+++ packages/linux/linux-rp-2.6.17/defconfig-qemux86 e02ed1f8e86ad48145d9b3f41819f9f8f10d7f38
@@ -39,7 +39,7 @@ CONFIG_VM86=y
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_UNIX98_PTYS=y
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
============================================================
--- packages/linux/linux-rp.inc 7c1c17fd5a0b698d1ce66735ba5eee19608e2e4b
+++ packages/linux/linux-rp.inc 1c25123c193c3cb5946c408a2ddf1cb156ab9e84
@@ -70,9 +70,9 @@ do_configure() {
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_deploy() {
}
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}"
============================================================
--- packages/linux/linux-rp_2.6.17.bb a6bf5780ec1865762e199131f01a6a302814c164
+++ packages/linux/linux-rp_2.6.17.bb ea0105a316dbe4408097cf1703fe732ef86a8a7b
@@ -1,6 +1,6 @@ require linux-rp.inc
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
${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 \
More information about the Openembedded-commits
mailing list