summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-05-21 18:54:46 +0400
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-05-21 18:54:46 +0400
commita53685701e5295b9ba67988e998274e9c2656060 (patch)
tree894b9550663c70c54990796656afc696f5705d88 /conf/machine
parentc22323a1c78047580e2c2c2e96e02dd6467f1910 (diff)
parentd18dc6fd33261ab005d3195c7d26e224081f5e0b (diff)
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/geodegx.conf4
-rw-r--r--conf/machine/geodelx.conf15
-rw-r--r--conf/machine/include/tune-geode.inc (renamed from conf/machine/include/tune-geodegx.inc)3
-rw-r--r--conf/machine/include/tune-geodelx.inc9
4 files changed, 11 insertions, 20 deletions
diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf
index 6fe6a830e6..0ec6782076 100644
--- a/conf/machine/geodegx.conf
+++ b/conf/machine/geodegx.conf
@@ -4,7 +4,7 @@
TARGET_ARCH = "i486"
-require conf/machine/include/tune-geodegx.inc
+require conf/machine/include/tune-geode.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
@@ -14,4 +14,4 @@ udevdir = "/dev"
KERNEL_IMAGETYPE = "bzImage"
GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf
index de4d9ca16e..f8874fd966 100644
--- a/conf/machine/geodelx.conf
+++ b/conf/machine/geodelx.conf
@@ -1,14 +1,15 @@
-TARGET_ARCH = "i486"
+# Machine file for devices with the AMD Geode LX processor
+# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
-require conf/machine/include/tune-geodelx.inc
+TARGET_ARCH = "i486"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+require conf/machine/include/tune-geode.inc
-PREFERRED_PROVIDER_virtual/kernel="linux-geodelx"
-
-SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-geodelx"
KERNEL_IMAGETYPE = "bzImage"
GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
+SELECTED_OPTIMIZATION_pn-glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"
diff --git a/conf/machine/include/tune-geodegx.inc b/conf/machine/include/tune-geode.inc
index cae285a91c..eda332a74e 100644
--- a/conf/machine/include/tune-geodegx.inc
+++ b/conf/machine/include/tune-geode.inc
@@ -1,6 +1,5 @@
-TARGET_CC_ARCH = "-march=geode"
+TARGET_CC_ARCH = "-march=geode -mtune=geode"
BASE_PACKAGE_ARCH = "geode"
PACKAGE_EXTRA_ARCHS += "x86 i386 geode"
FEED_ARCH = "geode"
-
diff --git a/conf/machine/include/tune-geodelx.inc b/conf/machine/include/tune-geodelx.inc
deleted file mode 100644
index 63e6678947..0000000000
--- a/conf/machine/include/tune-geodelx.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Geode CPU has it's own target in GCC 4.3
-# in older versions k6-2 is closest
-#
-TARGET_CC_ARCH = "-march=geode"
-BASE_PACKAGE_ARCH = "geode"
-PACKAGE_EXTRA_ARCHS += "x86 i386 geode"
-
-FEED_ARCH = "geode"
-