diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-10-16 13:47:22 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-10-16 13:47:22 +0000 |
| commit | a2635f262e420e3541fdf53766a558114fee96f5 (patch) | |
| tree | e8b98fac1e8994ccb78f68a52ef2ed5b6cb2e652 | |
| parent | 37a9fc1442f53c519f5c10967b2b018926d1b32e (diff) | |
| parent | f99a4d32a4152d92c296a76ea526140ecc04812e (diff) | |
merge of '47d594be43a773db8f35b058cc2d3113cb26f441'
and '66e89031d52c1b27eb48a89e6155eb9ed5dc352e'
| -rw-r--r-- | conf/machine/h2200.conf | 10 | ||||
| -rw-r--r-- | conf/machine/h4000.conf | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index a074eec4e9..467c0c0e81 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -6,9 +6,15 @@ # Hardware-based properties TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" -include conf/machine/include/tune-xscale.conf + +#Compile with armv5te optimizations, incompatible with armv4(t) cpus +require conf/machine/include/tune-xscale.conf + +#Set some hints for metadata ROOT_FLASH_SIZE = "32" GUI_MACHINE_CLASS = "smallscreen" + +#Set features for task-base MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" # Software/package selection @@ -25,4 +31,4 @@ module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -include conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.conf diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index cff0a94392..17bb47811a 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -5,7 +5,9 @@ # Hardware-based properties TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" -include conf/machine/include/tune-xscale.conf + +require conf/machine/include/tune-xscale.conf + ROOT_FLASH_SIZE = "32" GUI_MACHINE_CLASS = "smallscreen" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget" @@ -22,4 +24,4 @@ module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -include conf/machine/include/LAB-settings.conf +require conf/machine/include/LAB-settings.conf |