[oe-commits] org.oe.dev h2200, h4000: s/include/require/ and add some comments
koen commit
openembedded-commits at lists.openembedded.org
Mon Oct 16 13:46:46 UTC 2006
h2200, h4000: s/include/require/ and add some comments
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 425d05a68460efe35fd3aa32789666be49ecd3cf
ViewMTN: http://monotone.openembedded.org/revision.psp?id=425d05a68460efe35fd3aa32789666be49ecd3cf
Files:
1
conf/machine/h2200.conf
conf/machine/h4000.conf
Diffs:
#
# mt diff -re0e172417a535d66421c1162b0128d5a3c457316 -r425d05a68460efe35fd3aa32789666be49ecd3cf
#
#
#
# patch "conf/machine/h2200.conf"
# from [9feec4cb4b618d686bcd849236ddabae2f71f6c5]
# to [dd62ab8ee2274e5742328fee2a1888a6ae4d622b]
#
# patch "conf/machine/h4000.conf"
# from [798433896a0dac6185e7e4eef053ff6a177c8365]
# to [283709e95f154dcf07c2ff21a63c28623e23efae]
#
============================================================
--- conf/machine/h2200.conf 9feec4cb4b618d686bcd849236ddabae2f71f6c5
+++ conf/machine/h2200.conf dd62ab8ee2274e5742328fee2a1888a6ae4d622b
@@ -6,9 +6,15 @@ IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e
# 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 @@ USE_VT = "0"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
+require conf/machine/include/LAB-settings.conf
-include conf/machine/include/LAB-settings.conf
============================================================
--- conf/machine/h4000.conf 798433896a0dac6185e7e4eef053ff6a177c8365
+++ conf/machine/h4000.conf 283709e95f154dcf07c2ff21a63c28623e23efae
@@ -5,7 +5,9 @@ IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e
# 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 @@ USE_VT = "0"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
+require conf/machine/include/LAB-settings.conf
-include conf/machine/include/LAB-settings.conf
More information about the Openembedded-commits
mailing list