diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-10-16 13:32:42 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2006-10-16 13:32:42 +0000 |
| commit | 929850f6a2ddba9f7e7c10ddd88b34be8e6b7d3d (patch) | |
| tree | 5ce8db434b12b38ba08cdbffe67af67c0bf2948b /conf | |
| parent | 498da442cc5f9503c7a37376b9da364213c35f77 (diff) | |
| parent | 76fa77c6f13396d5bae79b7e37f27ba8fb207df6 (diff) | |
merge of '12ff563eb00759b6cae9ecfc5c1400f246dcd533'
and '3763af0dd8f9b6f2ec526ab6fcef3a00efd7576e'
Diffstat (limited to 'conf')
| -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; " |