diff options
| -rw-r--r-- | conf/machine/htcuniversal.conf | 26 | ||||
| -rw-r--r-- | packages/base-files/base-files/htcuniversal/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/base-files/base-files/htcuniversal/fstab | 12 | ||||
| -rw-r--r-- | packages/base-files/base-files_3.0.14.bb | 2 | ||||
| -rw-r--r-- | packages/linux/handhelds-un-2.6_2.6.16.bb | 30 | ||||
| -rw-r--r-- | packages/tslib/tslib/htcuniversal/tslib.sh | 4 | ||||
| -rw-r--r-- | packages/tslib/tslib_20060703.bb | 3 |
7 files changed, 62 insertions, 15 deletions
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index b8368f32c9..0e377a151f 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -6,18 +6,17 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa htcuniversal" #use this for a HTC Universal PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "xanadux-un-2.6" - +#PREFERRED_PROVIDER_virtual/kernel = "xanadux-un-2.6" +PREFERRED_PROVIDER_virtual/kernel = "handhelds-un-2.6" MODUTILS = "26" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" +#BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus" BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" -PXA270_MODULES = "g_ether g_serial snd_pcm_oss snd_mixer_oss hidp i2c-core i2c-pxa i2c-sensor" - -SERIAL_CONSOLE = "115200 tts/0" +PXA270_MODULES = "g_ether hidp i2c-core i2c-pxa i2c-sensor" include conf/machine/include/smartphone-common.conf @@ -30,21 +29,22 @@ include conf/machine/include/tune-xscale.conf #include conf/machine/include/tune-iwmmxt.conf BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}" -UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_acx acx htcuniversal_bt htcuniversal_leds firmware-class" +UN_MODULES = " htcuniversal_acx acx" -module_autoload_htcuniversal_power = "htcuniversal_power" -module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal" -module_autoload_snd-pcm-oss = "snd-pcm-oss" -module_autoload_snd-mixer-oss = "snd-mixer-oss" -module_autoload_firmware-class = "firmware-class" +#module_autoload_htcuniversal_power = "htcuniversal_power" +#module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal" +#module_autoload_snd-pcm-oss = "snd-pcm-oss" +#module_autoload_snd-mixer-oss = "snd-mixer-oss" +#module_autoload_firmware-class = "firmware-class" module_autoload_acx = "acx" module_autoload_htcuniversal-acx = "htcuniversal_acx" -module_autoload_htcuniversal-bt = "htcuniversal_bt" +#module_autoload_htcuniversal-bt = "htcuniversal_bt" +#module_autoload_htcuniversal-power = "htcuniversal_power" #module_autoload_pxa27x_udc = "pxa27x_udc" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" -GPE_EXTRA_DEPENDS += " gomunicator" +#GPE_EXTRA_DEPENDS += " gomunicator" diff --git a/packages/base-files/base-files/htcuniversal/.mtn2git_empty b/packages/base-files/base-files/htcuniversal/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/base-files/base-files/htcuniversal/.mtn2git_empty diff --git a/packages/base-files/base-files/htcuniversal/fstab b/packages/base-files/base-files/htcuniversal/fstab new file mode 100644 index 0000000000..b776dc0641 --- /dev/null +++ b/packages/base-files/base-files/htcuniversal/fstab @@ -0,0 +1,12 @@ +# stock fstab - you probably want to override this with a machine specific one + +rootfs / auto defaults 1 1 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 +#usbfs /proc/bus/usb usbfs noauto 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /media/ram tmpfs defaults 0 0 + +# uncomment this if your device has a SD/MMC/Transflash slot +#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 + diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index f7a0a66b03..d30df061b7 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r51" +PR = "r52" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/linux/handhelds-un-2.6_2.6.16.bb b/packages/linux/handhelds-un-2.6_2.6.16.bb new file mode 100644 index 0000000000..b261d30a7e --- /dev/null +++ b/packages/linux/handhelds-un-2.6_2.6.16.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Handhelds HTC-PXA phones kernel based on the hh 2.6.16" +MAINTAINER = "goxboxlive <goxboxlive@gmail.com>" +LICENSE = "GPL" +PR="r0" + +SRC_URI = "cvs -d :pserver:anoncvs@anoncvs.handhelds.org:/cvs checkout -d linux-2.6.16-hh2 linux/kernel26" +S = "${WORKDIR}/linux-2.6.16-hh2" + +COMPATIBLE_HOST = "arm.*-linux" + +inherit kernel + +do_configure() { + cp arch/arm/configs/htcuniversal_defconfig .config || die "No default configuration for ${MACHINE} available." + yes '' | oe_runmake oldconfig +} + + +############################################################### +# put into deploy directory +# +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin + tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_package after do_install diff --git a/packages/tslib/tslib/htcuniversal/tslib.sh b/packages/tslib/tslib/htcuniversal/tslib.sh index c19d3491cb..9ac2ecb0e9 100644 --- a/packages/tslib/tslib/htcuniversal/tslib.sh +++ b/packages/tslib/tslib/htcuniversal/tslib.sh @@ -3,3 +3,7 @@ TSLIB_TSDEVICE=`detect-stylus --device` TSLIB_CONFFILE=/etc/ts.conf +# this one is for making opie happy... +QWS_MOUSE_PROTO=TPanel:`detect-stylus --device` +export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO + diff --git a/packages/tslib/tslib_20060703.bb b/packages/tslib/tslib_20060703.bb index 93ff37f956..d756a5c576 100644 --- a/packages/tslib/tslib_20060703.bb +++ b/packages/tslib/tslib_20060703.bb @@ -6,7 +6,7 @@ LICENSE = "LGPL" RV := "${PV}" PV = "0.1+cvs-${RV}" -PR = "r1" +PR = "r2" SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${RV} \ file://usec_fix.patch;patch=1 \ @@ -81,6 +81,7 @@ RDEPENDS_tslib-conf_h3600 = "detect-stylus" RDEPENDS_tslib-conf_h3900 = "detect-stylus" RDEPENDS_tslib-conf_h6300 = "detect-stylus" RDEPENDS_tslib-conf_blueangel = "detect-stylus" +RDEPENDS_tslib-conf_htcuniversal = "detect-stylus" RDEPENDS_tslib-conf_h4000 = "detect-stylus" PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" |