From: Koen Kooi <koen@openembedded.org>
Date: Mon, 16 Oct 2006 13:27:29 +0000 (+0000)
Subject: h2200, h4000: s/include/require/ and add some comments
X-Git-Tag: Release-2010-05/1~9453^2~567^2~156^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80bc39cd688f77492b7cec4ede1536705aa6720f;p=openembedded.git

h2200, h4000: s/include/require/ and add some comments
---

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