summaryrefslogtreecommitdiff
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-03-05 15:53:32 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-03-05 15:53:32 +0000
commit25f62c40403d8e481d8b06ff95ec6b56019e6a49 (patch)
treedbebf7b0fe3266e6d9cbd074bab4198f3e02897c /meta/conf/machine
parent75b40f10777138681f21e5216b9a1e5821542b4c (diff)
downloadopenembedded-core-25f62c40403d8e481d8b06ff95ec6b56019e6a49.tar.gz
openembedded-core-25f62c40403d8e481d8b06ff95ec6b56019e6a49.tar.bz2
openembedded-core-25f62c40403d8e481d8b06ff95ec6b56019e6a49.tar.xz
openembedded-core-25f62c40403d8e481d8b06ff95ec6b56019e6a49.zip
armv6 machines: use armv6 tuning
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3950 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/mx31ads.conf3
-rw-r--r--meta/conf/machine/mx31litekit.conf2
-rw-r--r--meta/conf/machine/mx31phy.conf3
-rw-r--r--meta/conf/machine/nokia800.conf3
4 files changed, 4 insertions, 7 deletions
diff --git a/meta/conf/machine/mx31ads.conf b/meta/conf/machine/mx31ads.conf
index bd24b0fa7..5356e5d52 100644
--- a/meta/conf/machine/mx31ads.conf
+++ b/meta/conf/machine/mx31ads.conf
@@ -13,5 +13,4 @@ SERIAL_CONSOLE = "-L 115200 ttymxc0"
EXTRA_IMAGECMD_jffs2_mx31ads = "--pad --little-endian --eraseblock=0x20000 -n"
-require conf/machine/include/tune-arm926ejs.inc
-# v6 tune
+require conf/machine/include/tune-arm1136jf-s.inc
diff --git a/meta/conf/machine/mx31litekit.conf b/meta/conf/machine/mx31litekit.conf
index ec18df68f..70faa5131 100644
--- a/meta/conf/machine/mx31litekit.conf
+++ b/meta/conf/machine/mx31litekit.conf
@@ -11,4 +11,4 @@ MACHINE_FEATURES = "kernel26 apm alsa bluetooth irda screen touchscreen"
IMAGE_FSTYPES ?= "tar.gz"
SERIAL_CONSOLE = "-L 115200 ttymxc0"
-require conf/machine/include/tune-arm926ejs.inc
+require conf/machine/include/tune-arm1136jf-s.inc
diff --git a/meta/conf/machine/mx31phy.conf b/meta/conf/machine/mx31phy.conf
index c7940b72a..aa77cb5d5 100644
--- a/meta/conf/machine/mx31phy.conf
+++ b/meta/conf/machine/mx31phy.conf
@@ -14,5 +14,4 @@ UBOOT_ENTRYPOINT = "80008000"
SERIAL_CONSOLE = "-L 115200 ttymxc0"
EXTRA_IMAGECMD_jffs2_mx31phy = "--pad --little-endian --eraseblock=0x20000 -n"
-require conf/machine/include/tune-arm926ejs.inc
-# v6 tune
+require conf/machine/include/tune-arm1136jf-s.inc
diff --git a/meta/conf/machine/nokia800.conf b/meta/conf/machine/nokia800.conf
index 56886a077..9c4de8f96 100644
--- a/meta/conf/machine/nokia800.conf
+++ b/meta/conf/machine/nokia800.conf
@@ -9,8 +9,7 @@ XSERVER = "xserver-kdrive-xomap"
GUI_MACHINE_CLASS = "bigscreen"
-# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-arm926ejs.inc
+require conf/machine/include/tune-arm1136jf-s.inc
ROOT_FLASH_SIZE = "174"
EXTRA_IMAGECMD_jffs2_nokia800 = "--pad --little-endian --eraseblock=0x20000 -n"