summaryrefslogtreecommitdiff
path: root/conf/machine/include
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2009-06-02 20:46:42 +0200
committerStefan Schmidt <stefan@datenfreihafen.org>2009-06-02 20:46:42 +0200
commite3bf7220f003f0c0f60f648885f08652e19a0f13 (patch)
treecd28fa52529f06a0244bec2d03674c3a7e7f4130 /conf/machine/include
parentcc2eccd9c67c534a3fb8184148d57a5d22540217 (diff)
parent1679705e3c22180b39126fdfa8a39c02e550b450 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine/include')
-rw-r--r--conf/machine/include/omap3.inc2
-rw-r--r--conf/machine/include/tune-ep9312.inc9
-rw-r--r--conf/machine/include/zaurus-kernel.inc2
3 files changed, 8 insertions, 5 deletions
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 1b47888ab7..1249837ddb 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
require conf/machine/include/tune-cortexa8.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r35"
+MACHINE_KERNEL_PR = "r36"
KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/include/tune-ep9312.inc b/conf/machine/include/tune-ep9312.inc
index cf3de9c56f..c8770e0783 100644
--- a/conf/machine/include/tune-ep9312.inc
+++ b/conf/machine/include/tune-ep9312.inc
@@ -1,11 +1,14 @@
-TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312"
-# add "-mfp=maverick" for newer gcc versions > 4.0
+TARGET_CC_ARCH = "-mcpu=ep9312 -mfpu=maverick -mfloat-abi=softfp"
#set arch to ep9312 for all generated packages
-PACKAGE_EXTRA_ARCHS += "armv4 armv4t ep9312"
+PACKAGE_EXTRA_ARCHS += "armv4t ep9312"
BASE_PACKAGE_ARCH = "ep9312"
FEED_ARCH = "ep9312"
# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish
require conf/machine/include/tune-thumb.inc
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O -fno-signed-zeros"
+DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer -g"
+SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][bb.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}"
+BUILD_OPTIMIZATION = "-O"
diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc
index 415f8a4d68..2ca00da9c7 100644
--- a/conf/machine/include/zaurus-kernel.inc
+++ b/conf/machine/include/zaurus-kernel.inc
@@ -11,7 +11,7 @@ MACHINE_KERNEL_PR = "r11"
MACHINE_KERNEL_PR_collie = "r8"
MACHINE_KERNEL_PR_tosa = "r4"
-MACHINE_KERNEL_PR_pn-linux-kexecboot = "r12"
+MACHINE_KERNEL_PR_pn-linux-kexecboot = "r13"
KERNEL_IMAGE_MAXSIZE = "1294336"
KERNEL_IMAGE_MAXSIZE_collie = "1048576"