summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-06-03 11:41:30 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-06-03 11:41:30 +0000
commit972f72f4e47196817b8a3fc62a9e9dd188490f81 (patch)
tree77d115be3d0a03cf9b86de1a70d30330e4d236dc /conf/machine
parentb4db5d7f3e1a0470f2111508e2b701acee95055e (diff)
parent915c1e3654c4be1667a9390c3671d1a3601e2a56 (diff)
merge of '6c9b3832ef2260eb1b3a74e74b1d73166ab79d89'
and 'f275c97e2c93f0e846205b213e997b28ed0b148e'
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/beagleboard.conf2
-rw-r--r--conf/machine/neuros-osd.conf5
-rw-r--r--conf/machine/neuros-osd2.conf28
3 files changed, 34 insertions, 1 deletions
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 824ab2b7b3..6842897dd1 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -18,7 +18,7 @@ include conf/machine/include/tune-arm1136jf-s.inc
#include conf/machine/include/tune-cortexa8.inc
-IMAGE_FSTYPES ?= "tar.bz2"
+IMAGE_FSTYPES += "tar.bz2 jffs2"
# Guesswork
SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/neuros-osd.conf b/conf/machine/neuros-osd.conf
index f88379aa2a..09a71535c6 100644
--- a/conf/machine/neuros-osd.conf
+++ b/conf/machine/neuros-osd.conf
@@ -9,6 +9,11 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-neuros"
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
PREFERRED_VERSION_u-boot = "git"
#UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
new file mode 100644
index 0000000000..b327d8f8b6
--- /dev/null
+++ b/conf/machine/neuros-osd2.conf
@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: neuros OSD2
+#@DESCRIPTION: neuros OSD2
+
+TARGET_ARCH = "arm"
+
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+PREFERRED_VERSION_u-boot = "git"
+#UBOOT_MACHINE = "davinci_dvevm_config"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+ROOT_FLASH_SIZE = "29"
+
+MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
+
+require conf/machine/include/tune-arm926ejs.inc
+