summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/davinci-dvevm.conf (renamed from conf/machine/davinci_dvevm.conf)3
-rw-r--r--conf/machine/htcuniversal.conf4
-rw-r--r--conf/machine/include/tune-arm1136jf-s.conf2
-rw-r--r--conf/machine/nokia770.conf2
-rw-r--r--conf/machine/omap2430sdp.conf16
5 files changed, 23 insertions, 4 deletions
diff --git a/conf/machine/davinci_dvevm.conf b/conf/machine/davinci-dvevm.conf
index 57afed1550..8deaa092e8 100644
--- a/conf/machine/davinci_dvevm.conf
+++ b/conf/machine/davinci-dvevm.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI Davinci EVM board
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
HOTPLUG = "udev"
@@ -12,6 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
PREFERRED_VERSION_u-boot = "git"
+UBOOT_MACHINE = "davinci_dvevm"
SERIAL_CONSOLE ?= "115200 ttyS0"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index bd2e1439a5..a33510290f 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -38,13 +38,15 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \
kernel-module-acx \
kernel-module-i2c-algo-bit \
kernel-module-htcuniversal-ts2 \
+ kernel-module-htcuniversal-phone \
kernel-module-ts-adc-debounce \
+ kernel-module-htcuniversal-bt \
"
#
# Modules autoload and other boot properties
#
-module_autoload_acx = "acx"
+#module_autoload_acx = "acx"
module_autoload_htcuniversal_acx = "htcuniversal_acx"
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
diff --git a/conf/machine/include/tune-arm1136jf-s.conf b/conf/machine/include/tune-arm1136jf-s.conf
index 9b4174018c..68316f36bf 100644
--- a/conf/machine/include/tune-arm1136jf-s.conf
+++ b/conf/machine/include/tune-arm1136jf-s.conf
@@ -1,2 +1,2 @@
-TARGET_CC_ARCH = "-march=armv6 -mtune=arm1136jf-s -mfpu=vfp"
+TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
PACKAGE_ARCH = "armv6" \ No newline at end of file
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 070cdcdd05..1affae1389 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -25,7 +25,7 @@ IMAGE_FSTYPES ?= "jffs2"
# serial console port on devboard rev. B3
SERIAL_CONSOLE = "115200 ttyS0"
-PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
+PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800"
#use this if you are using the nokia initfs
ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
diff --git a/conf/machine/omap2430sdp.conf b/conf/machine/omap2430sdp.conf
new file mode 100644
index 0000000000..f13fa7def2
--- /dev/null
+++ b/conf/machine/omap2430sdp.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: ARM 1136 cpu on OMAP2430 SDP board
+#@DESCRIPTION: Machine configuration for the OMAP 2430 SDP development board with a arm1136 processor.
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te armv6"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
+PREFERRED_VERSION_u-boot = "1.1.4"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+
+MACHINE_FEATURES = "kernel26"
+
+require conf/machine/include/tune-arm1136jf-s.conf