diff options
| author |   Rod Whitby <rod@whitby.id.au> | 2006-10-16 13:16:15 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-10-16 13:16:15 +0000 |
| commit | 363463f9eec73fc21c730986c98fbe267f7eca27 (patch) | |
| tree | 391409d1dc78d0e60410e483d2377ddfab48ef90 /conf/machine | |
| parent | 407e40513474291bcc1f508b34dbc9ec7a973af6 (diff) | |
| parent | 1466ef543f66e4ea1268454e7ba205780310c1a6 (diff) | |
| download | openembedded-363463f9eec73fc21c730986c98fbe267f7eca27.tar.gz | |
merge of 64153b2d48a859d15b3243a0e2e761097c866ca6
and c537c01e7d6616ebcada76c38a57714d8994d6e2
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/h2200.conf | 24 | ||||
| -rw-r--r-- | conf/machine/h4000.conf | 22 | ||||
| -rw-r--r-- | conf/machine/include/LAB-settings.conf | 8 |
3 files changed, 27 insertions, 27 deletions
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 1ead1aa919..a074eec4e9 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -3,30 +3,26 @@ #@DESCRIPTION: Machine configuration for the HP iPAQ h22xx +# Hardware-based properties TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +include conf/machine/include/tune-xscale.conf +ROOT_FLASH_SIZE = "32" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" +# Software/package selection +PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" - -ROOT_FLASH_SIZE = "32" -PCMCIA_MANAGER = "pcmciautils" - -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" - MACHINE_EXTRA_RDEPENDS = "mtd-utils h2200-bootloader kernel" +EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" -#autoload on boot: +# Modules autoload and other boot properties module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -GUI_MACHINE_CLASS = "smallscreen" - -include conf/machine/include/tune-xscale.conf - -# LAB can only resolve relative symlinks -ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " +include conf/machine/include/LAB-settings.conf diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index a9adfe4486..cff0a94392 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -2,28 +2,24 @@ #@NAME: HP iPAQ h4xxx #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx - +# Hardware-based properties TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +include conf/machine/include/tune-xscale.conf +ROOT_FLASH_SIZE = "32" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget" +# Software/package selection +PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -ROOT_FLASH_SIZE = "32" -PCMCIA_MANAGER = "pcmciautils" - -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget" - -#autoload on boot: +# Modules autoload and other boot properties module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -GUI_MACHINE_CLASS = "smallscreen" - -include conf/machine/include/tune-xscale.conf - -# LAB can only resolve relative symlinks -ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " +include conf/machine/include/LAB-settings.conf diff --git a/conf/machine/include/LAB-settings.conf b/conf/machine/include/LAB-settings.conf new file mode 100644 index 0000000000..576846fbdf --- /dev/null +++ b/conf/machine/include/LAB-settings.conf @@ -0,0 +1,8 @@ +# +# Settings for LAB (Linux As Bootloader) support. +# Machines which support (or want to support) LAB, +# include this. +# + +# LAB can only resolve relative symlinks +ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " |