summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/tune-arm1136jf-s.conf2
-rw-r--r--conf/machine/mx31ads.conf18
-rw-r--r--packages/linux/mainstone-kernel_2.6.18.bb4
-rw-r--r--packages/xorg-xserver/xserver-kdrive_git.bb15
4 files changed, 25 insertions, 14 deletions
diff --git a/conf/machine/include/tune-arm1136jf-s.conf b/conf/machine/include/tune-arm1136jf-s.conf
new file mode 100644
index 0000000000..9b4174018c
--- /dev/null
+++ b/conf/machine/include/tune-arm1136jf-s.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=armv6 -mtune=arm1136jf-s -mfpu=vfp"
+PACKAGE_ARCH = "armv6" \ No newline at end of file
diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf
new file mode 100644
index 0000000000..2215af3239
--- /dev/null
+++ b/conf/machine/mx31ads.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@Name: Freescale MX31ADS
+#@DESCRIPTION: Machine configuration for Freescale MX31ADS
+
+TARGET_ARCH = "arm"
+
+GUI_MACHINE_CLASS = "smallscreen"
+IPKG_EXTRA_ARCHS = "armv6"
+
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+include conf/machine/include/tune-arm1136jf-s.conf
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "32"
diff --git a/packages/linux/mainstone-kernel_2.6.18.bb b/packages/linux/mainstone-kernel_2.6.18.bb
index 6b90f73f3e..d17b6097b8 100644
--- a/packages/linux/mainstone-kernel_2.6.18.bb
+++ b/packages/linux/mainstone-kernel_2.6.18.bb
@@ -2,12 +2,12 @@ SECTION = "kernel"
DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)"
LICENSE = "GPL"
MAINTAINER = "Cliff Brake <cliff.brake@gmail.com>"
-PR = "r0
+PR = "r0"
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
file://mainstone_defconfig"
-S = "${WORKDIR}/linux-2.6.18
+S = "${WORKDIR}/linux-2.6.18"
COMPATIBLE_HOST = 'arm.*-linux'
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index 27632f628c..198556c58d 100644
--- a/packages/xorg-xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -62,19 +62,10 @@ EXTRA_OECONF = "--enable-composite --enable-sdl --enable-kdrive \
--disable-xorg --disable-xorgcfg \
--disable-xkb --disable-xnest --disable-xvfb \
--disable-xevie --disable-xprint --disable-xtrap \
- --disable-dmx --enable-w100 \
+ --disable-dmx \
--with-default-font-path=built-ins \
--enable-tslib --enable-xcalibrate \
ac_cv_file__usr_share_X11_sgml_defs_ent=no"
-# w100 doesn't build for x86
-EXTRA_OECONF_x86 = "--enable-composite --enable-sdl --enable-kdrive \
- --disable-dga --disable-dri --disable-xinerama \
- --disable-xf86misc --disable-xf86vidmode \
- --disable-xorg --disable-xorgcfg \
- --disable-xkb --disable-xnest --disable-xvfb \
- --disable-xevie --disable-xprint --disable-xtrap \
- --disable-dmx --disable-w100 \
- --with-default-font-path=built-ins \
- --enable-tslib --enable-xcalibrate \
- ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+EXTRA_OECONF_append_arm = " --enable-w100"
+EXTRA_OECONF_append_x86 = " --disable-w100"