summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/akita.conf4
-rw-r--r--conf/machine/at91sam9g45ek.conf29
-rw-r--r--conf/machine/ben-nanonote.conf5
-rw-r--r--conf/machine/bug.conf8
-rw-r--r--conf/machine/c7x0.conf2
-rw-r--r--conf/machine/collie.conf2
-rw-r--r--conf/machine/dm365-evm.conf2
-rw-r--r--conf/machine/include/AT91-LCD.inc15
-rw-r--r--conf/machine/include/AT91.inc51
-rw-r--r--conf/machine/include/davinci.inc2
-rw-r--r--conf/machine/include/kirkwood.inc2
-rw-r--r--conf/machine/include/omap3.inc2
-rw-r--r--conf/machine/include/zaurus-2.6.inc19
-rw-r--r--conf/machine/jornada6xx.conf13
-rw-r--r--conf/machine/mtcdp-embedded.conf29
-rw-r--r--conf/machine/mtcdp.conf29
-rw-r--r--conf/machine/om-gta02.conf6
-rw-r--r--conf/machine/qemumips.conf4
-rw-r--r--conf/machine/spitz.conf4
19 files changed, 203 insertions, 25 deletions
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 6f71787fa1..9930c89c6a 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -21,7 +21,3 @@ MACHINE_DISPLAY_PPI = "216"
UBOOT_MACHINE = "akita_config"
UBOOT_ENTRYPOINT = "0xA1000000"
UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
-# xserver-kdrive 1.3.0.0 is still the only working version:
-XSERVER = "xserver-kdrive-1300-fbdev"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
diff --git a/conf/machine/at91sam9g45ek.conf b/conf/machine/at91sam9g45ek.conf
new file mode 100644
index 0000000000..98fd7113c0
--- /dev/null
+++ b/conf/machine/at91sam9g45ek.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Atmel AT91SAM9G45EK Development Platform
+#@DESCRIPTION: Machine configuration for the at91sam9g45ek development board with a at91sam9g45-ES2 processor
+# Once a at91sam9g45ek development board with a production at91sam9g45 processor
+# is available we should change the recipe to use the at91sam9m10g45ek_defconfig
+
+include conf/machine/include/AT91-LCD.inc
+
+# Has linux config file in OpenEmbedded
+#
+# LINUX26_DEFCONFIG = "at91sam9g45ek_defconfig"
+# LINUX26_DEFCONFIG = "at91sam9m10g45ek_defconfig"
+
+# Supported u-boot machines
+#UBOOT_MACHINE = "at91sam9m10g45ek_nandflash_config"
+#UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_config"
+UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config"
+#UBOOT_MACHINE = "at91sam9m10g45ek_config"
+#UBOOT_MACHINE = "at91sam9g45ekes_nandflash_config"
+#UBOOT_MACHINE = "at91sam9g45ekes_dataflash_config"
+#UBOOT_MACHINE = "at91sam9g45ekes_dataflash_cs0_config"
+#UBOOT_MACHINE = "at91sam9g45ekes_config"
+
+# Boot from Dataflash, so we do not have to reprogram
+# At91bootstrap/U-Boot everytime we erase the NAND flash
+AT91BOOTSTRAP_BOARD = "at91sam9g45df"
+
+MACHINE_FEATURES += "usbhost"
+
diff --git a/conf/machine/ben-nanonote.conf b/conf/machine/ben-nanonote.conf
index 391f4a542d..08bcdea3e5 100644
--- a/conf/machine/ben-nanonote.conf
+++ b/conf/machine/ben-nanonote.conf
@@ -1,8 +1,11 @@
#@TYPE: Machine
#@NAME: Ben Nanonote
#@DESCRIPTION: Machine configuration for the Qi-Hardware's Ben Nanonote
+
TARGET_ARCH = "mipsel"
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+require conf/machine/include/tune-mips32.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-ben"
KERNEL_IMAGETYPE = "uImage"
IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf
index 3e0389a6ba..d79cf15129 100644
--- a/conf/machine/bug.conf
+++ b/conf/machine/bug.conf
@@ -14,3 +14,11 @@ CPU_FEATURES += "vfp"
require conf/machine/include/tune-arm1136jf-s.inc
KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+ xf86-input-evdev \
+ xf86-input-tslib \
+ xf86-input-mouse \
+ xf86-video-fbdev \
+ xf86-input-keyboard"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 16073fee82..4daedde482 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -15,8 +15,6 @@ require conf/machine/include/zaurus-clamshell.inc
# please set the right value in your local.conf
ROOT_FLASH_SIZE = "25"
-XSERVER = "xserver-kdrive-imageon"
-
MACHINE_GUI_CLASS = "bigscreen"
MACHINE_DISPLAY_WIDTH_PIXELS = "640"
MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 47f6e30dfd..66995e9b09 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -9,8 +9,6 @@ ROOT_FLASH_SIZE = "14"
# actually 14680064
EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-XSERVER = "xserver-kdrive-fbdev"
-
MACHINE_GUI_CLASS = "smallscreen"
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf
index 1fd51234e2..5a5161673b 100644
--- a/conf/machine/dm365-evm.conf
+++ b/conf/machine/dm365-evm.conf
@@ -5,4 +5,4 @@
require conf/machine/include/davinci.inc
require conf/machine/include/dm365.inc
-UBOOT_MACHINE = "davinci_dm365evm_config"
+UBOOT_MACHINE = "davinci_dm365_evm_config"
diff --git a/conf/machine/include/AT91-LCD.inc b/conf/machine/include/AT91-LCD.inc
new file mode 100644
index 0000000000..3036295f48
--- /dev/null
+++ b/conf/machine/include/AT91-LCD.inc
@@ -0,0 +1,15 @@
+# Common description for Atmel ARM processors with LCD controller
+
+include conf/machine/include/AT91.inc
+
+MACHINE_FEATURES += "screen touchscreen keyboard"
+
+# Some options we disable for now
+# MACHINE_FEATURES += "apm"
+# MACHINE_FEATURES += "lcd"
+# MACHINE_FEATURES += "bluetooth wifi irda phone gps"
+# MACHINE_FEATURES += "mmc mmcroot fat"
+# MACHINE_FEATURES += "i2c spi serial"
+# MACHINE_FEATURES += "sound libogg libvorbis"
+
+
diff --git a/conf/machine/include/AT91.inc b/conf/machine/include/AT91.inc
new file mode 100644
index 0000000000..6c0f8f04ac
--- /dev/null
+++ b/conf/machine/include/AT91.inc
@@ -0,0 +1,51 @@
+# Common description for Atmel ARM processors
+
+TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+CPU_FAMILY = "at91"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.32"
+
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+#PREFERRED_PROVIDER_xserver = "xserver-xorg"
+#PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+#XSERVER = "xserver-kdrive-fbdev"
+# Angstrom defines:
+#PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+#PREFERRED_VERSION_xserver-kdrive = "1.6.1"
+
+PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13"
+PREFERRED_VERSION_at91bootstrap = "2.13"
+
+PREFERRED_PROVIDER_u-boot = "u-boot_2009.08"
+PREFERRED_VERSION_u-boot = "2009.08"
+
+KERNEL_IMAGETYPE = "uImage"
+
+# PREFERRED_VERSION_mplayer = "svn"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = " kernel26 alsa ext2 usbgadget vfat uboot "
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "at91bootstrap"
+
+MACHINE_EXTRA_RDEPENDS += " kernel-modules "
+#MACHINE_EXTRA_RDEPENDS += " atmel-fixes "
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+#
+# Uncomment or add kernel modules that should be autoloaded
+#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_file_storage', '',d)}
+#module_autoload_g_ether = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_ether', '',d)}
+module_autoload_g_serial = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_serial', '',d)}
+
+require conf/machine/include/tune-arm926ejs.inc
+
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index d4cacb9c44..a262059d45 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
require conf/machine/include/tune-arm926ejs.inc
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r30"
+MACHINE_KERNEL_PR = "r32"
TARGET_ARCH = "arm"
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 2d48c8b7d6..c3c59aa48b 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
PREFERRED_PROVIDER_virtual/bootloader = ""
PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
-MACHINE_KERNEL_PR = "r13"
+MACHINE_KERNEL_PR = "r14"
IMAGE_FSTYPES += "tar.gz ubi"
SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 9ff7b91ad9..dd1188b7c5 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -3,7 +3,7 @@ SOC_FAMILY = "omap3"
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 = "r50"
+MACHINE_KERNEL_PR = "r51"
KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index cd83a7b5a6..02a48629c8 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -17,9 +17,28 @@ EXTRA_IMAGEDEPENDS += "zaurus-installer"
SERIAL_CONSOLE = "115200 ttyS0"
SERIAL_CONSOLE_collie = "115200 ttySA0"
+# FIXME: xserver-xorg is in testing
+
+# deprecated defaults
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+# c7x0 uses kdrive-imageon (W100)
PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
+XSERVER_c7x0 = "xserver-kdrive-imageon"
+
+# collie uses kdrive-fbdev
PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev"
+XSERVER_collie = "xserver-kdrive-fbdev"
+
+# FIXME xserver-kdrive 1.3.0.0 is still the only working version ?
+PREFERRED_PROVIDER_virtual/xserver_akita = "xserver-kdrive-1300"
+XSERVER_akita = "xserver-kdrive-1300-fbdev"
+
+# spitz uses xserver-xorg
+PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg"
+XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
+PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri"
PCMCIA_MANAGER ?= "pcmciautils"
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index c5249d94ef..f709f51c09 100644
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -6,9 +6,16 @@ TARGET_ARCH = "sh3"
require conf/machine/include/tune-sh3.inc
+MACHINE_FEATURES = "kernel26 alsa pcmcia irda keyboard touchscreen screen vfat"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+
PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx"
-PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.17"
+PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.32"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+ xf86-input-evdev \
+ xf86-input-tslib \
+ xf86-video-fbdev"
-MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen vfat"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
PCMCIA_MANAGER = "pcmciautils" \ No newline at end of file
diff --git a/conf/machine/mtcdp-embedded.conf b/conf/machine/mtcdp-embedded.conf
new file mode 100644
index 0000000000..f571f2d8f0
--- /dev/null
+++ b/conf/machine/mtcdp-embedded.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Multi-Tech MTCDP Embedded
+#@DESCRIPTION: Machine configuration for the Embedded MTCDP (Cellular Development Platform)
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+PREFERRED_VERSION_linux = "2.6.32"
+PREFERRED_VERSION_mts-io ?= "0.4.1"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_MACHINE = "at91sam9g20ek_nandflash_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.13"
+PREFERRED_VERSION_u-boot = "1.3.4"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget"
+EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/mtcdp.conf b/conf/machine/mtcdp.conf
new file mode 100644
index 0000000000..336e31b182
--- /dev/null
+++ b/conf/machine/mtcdp.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Multi-Tech MTCDP
+#@DESCRIPTION: Machine configuration for the MTCDP (Cellular Development Platform)
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+PREFERRED_VERSION_linux = "2.6.32"
+PREFERRED_VERSION_mts-io ?= "0.4.1"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_MACHINE = "at91sam9g20ek_nandflash_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.13"
+PREFERRED_VERSION_u-boot = "1.3.4"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget"
+EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 12cea679a8..ca4c050af3 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -52,7 +52,7 @@ USE_VT = "0"
# used by some images
ROOT_FLASH_SIZE = "256"
-IMAGE_FSTYPES += "tar.gz jffs2 ubifs ubi"
+IMAGE_FSTYPES += "tar.gz jffs2 ubi"
# extra jffs2 tweaks
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
@@ -71,14 +71,14 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
# UBI: logical eraseblock size: 129024 bytes
# from ubiattach stdout:
# UBI device number 0, total 1996 LEBs
-MKUBIFS_ARGS = "-m 2048 -e 129024 -c 2047"
+MKUBIFS_ARGS = "-m 2048 -e 126976 -c 2047"
# do ubiattach /dev/ubi_ctrl -m 4
# from dmesg:
# UBI: smallest flash I/O unit: 2048
# UBI: physical eraseblock size: 131072 bytes (128 KiB)
# UBI: sub-page size: 512
-UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048"
# build / upload tools
EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
diff --git a/conf/machine/qemumips.conf b/conf/machine/qemumips.conf
index 27f96480b5..aa9c0cb2ed 100644
--- a/conf/machine/qemumips.conf
+++ b/conf/machine/qemumips.conf
@@ -7,8 +7,8 @@ TARGET_ARCH = "mips"
require conf/machine/include/qemu.inc
require conf/machine/include/tune-mips32.inc
-KERNEL_IMAGETYPE = "vmlinux.bin"
-
+KERNEL_IMAGETYPE = "vmlinux"
+KERNEL_OUTPUT = "vmlinux"
SERIAL_CONSOLE = "115200 ttyS0"
PREFERRED_PROVIDER_virtual/kernel = "linux"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 0d79977180..4fe62b5f43 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -27,7 +27,3 @@ MACHINE_DISPLAY_PPI = "216"
UBOOT_MACHINE = "akita_config"
UBOOT_ENTRYPOINT = "0xA1000000"
UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
-XSERVER = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-07 17:27:13 +0000