diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-12-27 10:47:22 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-12-27 10:47:22 +0000 |
| commit | 6b4889bacd232c98fec16c930c3b39fb65499e7d (patch) | |
| tree | 73b79cfb26437bb7031eba18f4dc58b779c3a742 | |
| parent | 597566ddafa8bce9b6dee03b5a82bc6064f7bd45 (diff) | |
| parent | 9eb5713a68d810c6dc2ccbf13dc43dbd817e3f99 (diff) | |
merge of 0fcc0eb9ebe0187095f35e237c3bd3a2093a4ef3
and 5d3b23f0c6195c7b5918319e8a2676f3c767a0ab
| -rw-r--r-- | conf/machine/h1940.conf | 11 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_2.6.16-hh8.bb | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index abae748589..37f61433c7 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -5,22 +5,19 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" TARGET_ARCH = "arm" +# Set preferred providers PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" -#BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools" # Set features for task-base -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen" # Empty modules list for now HANDHELD_MODULES = "" -#BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" -#BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}" - -#INHERIT += "linux-kernel-base" - # Some extra configuration +VOLATILE_STORAGE_SIZE = "64" +ROOT_FLASH_SIZE = "32" GUI_MACHINE_CLASS = "smallscreen" SERIAL_CONSOLE = "115200 ttySAC2 vt100" USE_VT = "0" diff --git a/packages/linux/linux-handhelds-2.6_2.6.16-hh8.bb b/packages/linux/linux-handhelds-2.6_2.6.16-hh8.bb index 5e07a08733..bdfc876a94 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.16-hh8.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.16-hh8.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r0" +PR = "r1" # Override where to look for defconfigs and patches, # we have per-kernel-release sets. @@ -10,6 +10,7 @@ FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.16/${MACHINE}:${FILE_DIRNAM SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://24-hostap_cs_id.diff;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ + http://www.handhelds.org/hypermail/kernel-discuss/att-2217/h5400-udc-mod-from-milan.patch;patch=1;pnum=0 \ file://defconfig" require linux-handhelds-2.6.inc |