summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/collie.conf25
-rw-r--r--conf/machine/h2200.conf1
-rw-r--r--conf/machine/hx4700.conf1
-rw-r--r--conf/machine/include/kexecboot.inc1
-rw-r--r--conf/machine/include/zaurus-2.6.inc15
-rw-r--r--conf/machine/overo.conf32
-rw-r--r--conf/machine/oxnas.conf (renamed from conf/machine/oxe810.conf)0
7 files changed, 53 insertions, 22 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 92651f60f1..b26df9dfea 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,18 +3,29 @@
#@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
TARGET_ARCH = "arm"
-
-MACHINE_KERNEL_VERSION ?= "2.6"
-require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
require conf/machine/include/tune-strongarm.inc
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+MACHINE_KERNEL_VERSION = "2.6"
+KERNEL_IMAGE_MAXSIZE = "1048576"
+KERNEL_IMAGETYPE = "zImage"
+SERIAL_CONSOLE = "115200 ttySA0"
+
+ROOT_FLASH_SIZE = "14"
+# actually 14680064, see EXTRA_IMAGECMD
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+XSERVER ?= "xserver-kdrive-fbdev"
EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
IMAGE_LINGUAS ?= ""
IMAGE_FSTYPES ?= "jffs2 tar.gz"
-ROOT_FLASH_SIZE = "14"
-# actually 14680064, see EXTRA_IMAGECMD above
+PCMCIA_MANAGER ?= "pcmciautils"
-XSERVER ?= "xserver-kdrive-fbdev"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
+
+require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 6ccdc5070e..abc17728b5 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -45,5 +45,4 @@ module_autoload_g_ether = "g_ether"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
-IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt"
require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 4906f87e76..ab532e33ff 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -73,5 +73,4 @@ module_autoload_pxa27x_udc = "pxa27x_udc"
#FIXME: this should be controlled by a userspace utility later.
module_autoload_g_ether = "g_ether"
-IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt"
SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc
index 0a9f209fe2..c8656bb117 100644
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/kexecboot.inc
@@ -13,3 +13,4 @@ RDEPENDS_kernel-base = "kernel-image"
# we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
DONT_CHECK_KERNELSIZE ?= "1"
+MACHINE_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 8fb36f78be..aeba16b67c 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -2,7 +2,6 @@
# Additionally, clamshell specific stuff in zaurus-clamshell.inc
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS_collie = ""
MACHINE_KERNEL_VERSION = "2.6"
@@ -10,14 +9,11 @@ ERASEBLOCKSIZE = "0x4000"
ERASEBLOCKSIZE_akita = "0x20000"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n"
-IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
-ZAURUS-UPDATER_collie = ""
ZAURUS-UPDATER = "zaurus-updater"
EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}"
SERIAL_CONSOLE = "115200 ttyS0"
-SERIAL_CONSOLE_collie = "115200 ttySA0"
PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
@@ -35,16 +31,11 @@ MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-px
MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
-MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
- kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd kernel-module-mmc-spi \
- kernel-module-power"
GUI_MACHINE_CLASS = "bigscreen"
-GUI_MACHINE_CLASS_collie = "smallscreen"
GUI_MACHINE_CLASS_poodle = "smallscreen"
KERNEL_IMAGE_MAXSIZE = "1294336"
-KERNEL_IMAGE_MAXSIZE_collie = "1048576"
MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
@@ -69,10 +60,8 @@ zaurus_make_installkit () {
[ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
fi
- # All zaurus machines except collie need updater.sh
- if [ "${MACHINE}" != "collie" ]; then
- cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
- fi
+ cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+
tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
diff --git a/conf/machine/overo.conf b/conf/machine/overo.conf
new file mode 100644
index 0000000000..91413ec903
--- /dev/null
+++ b/conf/machine/overo.conf
@@ -0,0 +1,32 @@
+#@TYPE: Machine
+#@NAME: overo machine
+#@DESCRIPTION: Machine configuration for the Gumstix Overo
+
+include conf/machine/include/tune-cortexa8.inc
+
+TARGET_ARCH = "arm"
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_MACHINE_overo = "omap3_overo_config"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
+
+KERNEL_IMAGETYPE = "uImage"
+SERIAL_CONSOLE = "115200 ttyS2"
+
+IMAGE_FSTYPES += "tar.bz2"
+EXTRA_IMAGEDEPENDS += " u-boot-omap3 x-load"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+ xf86-input-evdev \
+ xf86-input-mouse \
+ xf86-input-tslib \
+ xf86-video-omapfb \
+ xf86-input-keyboard"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+
diff --git a/conf/machine/oxe810.conf b/conf/machine/oxnas.conf
index 08213297c8..08213297c8 100644
--- a/conf/machine/oxe810.conf
+++ b/conf/machine/oxnas.conf