summaryrefslogtreecommitdiff
path: root/meta/conf/machine
diff options
context:
space:
mode:
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 bd24b0fa73..5356e5d522 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 ec18df68ff..70faa51311 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 c7940b72a9..aa77cb5d5f 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 56886a0770..9c4de8f969 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"