Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

8 files changed, 115 insertions, 4 deletions

diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index c95c373d2c..78c63019ae 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -32,6 +32,21 @@ UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 UBOOT_MACHINE = "omap3_beagle_config"
 
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# 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"
+
 
 PREFERRED_VERSION_u-boot = "git"
 EXTRA_IMAGEDEPENDS += "u-boot x-load"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index b26df9dfea..6d09406375 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -13,7 +13,7 @@ SERIAL_CONSOLE = "115200 ttySA0"
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
 XSERVER ?= "xserver-kdrive-fbdev"
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc
index c8656bb117..1835af4727 100644
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/kexecboot.inc
@@ -13,4 +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"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"
diff --git a/conf/machine/include/orion.inc b/conf/machine/include/orion.inc
index c6fe6e3678..9e16805bd2 100644
--- a/conf/machine/include/orion.inc
+++ b/conf/machine/include/orion.inc
@@ -10,7 +10,7 @@ USE_DEVFS = "0"
 
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-orion"
-PREFERRED_VERSION_linux-orion = "2.6.27.10"
+PREFERRED_VERSION_linux-orion = "2.6.28.4"
 
 IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 IMAGE_FSTYPES = "tar.gz"
diff --git a/conf/machine/om-gta03.conf b/conf/machine/om-gta03.conf
new file mode 100644
index 0000000000..3bbb21e5e6
--- /dev/null
+++ b/conf/machine/om-gta03.conf
@@ -0,0 +1,35 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Machine
+#@NAME: Openmoko GTA03 (XXX)
+#@DESCRIPTION: Machine configuration for the Openmoko XXX GSM phone
+#-----------------------------------------------------------------------------
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone vfat ext2"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "285"
+XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
+
+# package machine specific modules
+MACHINE_EXTRA_RRECOMMENDS = "\
+  kernel-modules \
+"
+
+# no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0
+SERIAL_CONSOLE = "115200 ttySAC2"
+USE_VT = "0"
+
+# used by some images
+ROOT_FLASH_SIZE = "256"
+
+# boots only from SD
+IMAGE_FSTYPES = "tar.bz2"
+
+# tune for S3C6410
+include conf/machine/include/tune-arm1176jzf-s.inc
diff --git a/conf/machine/overo.conf b/conf/machine/overo.conf
index 91413ec903..2a93ab069d 100644
--- a/conf/machine/overo.conf
+++ b/conf/machine/overo.conf
@@ -29,4 +29,17 @@ XSERVER = "xserver-xorg \
 
 GUI_MACHINE_CLASS = "bigscreen"
 
-
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# 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"
diff --git a/conf/machine/ronetix-pm9261.conf b/conf/machine/ronetix-pm9261.conf
new file mode 100644
index 0000000000..5af1e721a7
--- /dev/null
+++ b/conf/machine/ronetix-pm9261.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@Name: Ronetix PM9261 CPU Module
+#@DESCRIPTION: Machine.configuration for the Ronetix evaluation board with PM9261 CPU module
+#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+KERNEL_IMAGETYPE = "uImage"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget screen touchscreen"
+
+# 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/ronetix-pm9263.conf b/conf/machine/ronetix-pm9263.conf
new file mode 100644
index 0000000000..96acbe25dd
--- /dev/null
+++ b/conf/machine/ronetix-pm9263.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@Name: Ronetix PM9263 CPU Module
+#@DESCRIPTION: Machine.configuration for the Ronetix evaluation board with PM9263 CPU module
+#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+KERNEL_IMAGETYPE = "uImage"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget screen touchscreen"
+
+# 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
+