diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-04-05 22:07:14 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-04-05 22:07:14 +0000 |
| commit | bf39bb6e3fabae6da5f9b8084f8d478f07e4836c (patch) | |
| tree | fa86a0ab3b29ca6e78f34c99ba3b649d8e6a344a /conf/machine | |
| parent | 2b5295d1ca8c5f876e8b6a5592706b751f03a401 (diff) | |
| parent | 58ec003f0bbcaaa89c6080b675726bac9b952e29 (diff) | |
merge of '2bc71b9b93f22417784c3a4ed3576a76841878f2'
and 'edac95232b05ccd8efaeee530e0442683d1ef50a'
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/beagleboard.conf | 9 | ||||
| -rw-r--r-- | conf/machine/include/tune-cortexa8.inc | 7 | ||||
| -rw-r--r-- | conf/machine/include/tune-strongarm.inc | 1 | ||||
| -rw-r--r-- | conf/machine/include/tune-x86.inc | 3 | ||||
| -rw-r--r-- | conf/machine/x86.conf | 2 |
5 files changed, 14 insertions, 8 deletions
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index 76c27b153e..ee074f641c 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -2,14 +2,17 @@ #@NAME: Beagleboard machine #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7-a" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap" -XSERVER = "xserver-kdrive-xomap" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" # Only has DVI connector for external screen GUI_MACHINE_CLASS = "bigscreen" +#Ship all kernel modules till the board support has matured enough +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" + TARGET_FPU = "hard" include conf/machine/include/tune-arm1136jf-s.inc # requires gcc 4.3.0: diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc index 2da31ecd35..03e2e86a5f 100644 --- a/conf/machine/include/tune-cortexa8.inc +++ b/conf/machine/include/tune-cortexa8.inc @@ -1,4 +1,3 @@ -# valid options for -march: `armv7', `armv7-a' -TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp" -FEED_ARCH = "armv7" -PACKAGE_ARCH = "armv7" +TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp" +FEED_ARCH = "armv7a" +PACKAGE_ARCH = "armv7a" diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc index 448b28c91f..0a773149ff 100644 --- a/conf/machine/include/tune-strongarm.inc +++ b/conf/machine/include/tune-strongarm.inc @@ -2,5 +2,6 @@ # gcc does not differentiate between the different Strongarm versions, so neither do we # http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html +ARM_ABI = "oabi" TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm" diff --git a/conf/machine/include/tune-x86.inc b/conf/machine/include/tune-x86.inc new file mode 100644 index 0000000000..a536bbb6e5 --- /dev/null +++ b/conf/machine/include/tune-x86.inc @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-march=i486" + + diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf index 0ee69c2869..cce5868313 100644 --- a/conf/machine/x86.conf +++ b/conf/machine/x86.conf @@ -22,4 +22,4 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -#require conf/machine/include/tune-x86.inc +require conf/machine/include/tune-x86.inc |