[oe-commits] org.oe.dev conf/machine: Various tweaks from Poky

[rpurdie commit]

conf/machine: Various tweaks from Poky

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: c34acf5b611b91cf6be74330c549676a8e0ba4f3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c34acf5b611b91cf6be74330c549676a8e0ba4f3
Files:
1
conf/machine/akita.conf
conf/machine/include/qemu.inc
conf/machine/include/zaurus-2.6.inc
conf/machine/poodle.conf
conf/machine/qemuarm.conf
conf/machine/qemux86.conf
conf/machine/tosa.conf
Diffs:

#
# mt diff -rfb528deec2df2704e3e13ce123c36ef1e6d04770 -rc34acf5b611b91cf6be74330c549676a8e0ba4f3
#
# 
# 
# patch "conf/machine/akita.conf"
#  from [2df3dcb96666cf8cfca46aa0e7decce2a2a0fa1f]
#    to [d78f90a2a5e1ad9b362e5152e6132f227e1e8839]
# 
# patch "conf/machine/include/qemu.inc"
#  from [822cfa4ccc59e353b0a4c3b38015b20e6135aa0b]
#    to [298c9ee68a35039a8a520bff72b70c1f9f939c4a]
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [1081aed4f8ad4c58ab3a0c1b0aca200b55a69c62]
#    to [7baf3e010a9649ace2bc8172df240209ae4c83f0]
# 
# patch "conf/machine/poodle.conf"
#  from [0b40f507ee0f80a83a9a703e3d6eda6a5809bcdb]
#    to [be86de2248e7e614a23c124951f705243e722665]
# 
# patch "conf/machine/qemuarm.conf"
#  from [59c4fde7c8de049e8a66122d3907540a14a72549]
#    to [9d829ed37055c73b8739a7dafa41fe3ab19aea08]
# 
# patch "conf/machine/qemux86.conf"
#  from [fae6351fecc4e1c763de72322a9f928d8d6ddc00]
#    to [2aa871c692f0a5205e3b06714b12e27b7bc978c1]
# 
# patch "conf/machine/tosa.conf"
#  from [54214b8163032fe25dd47a730267cd2c643d74cb]
#    to [c4618a42bc1f0559d10723f0315b08046bfc97f4]
# 
============================================================
--- conf/machine/akita.conf	2df3dcb96666cf8cfca46aa0e7decce2a2a0fa1f
+++ conf/machine/akita.conf	d78f90a2a5e1ad9b362e5152e6132f227e1e8839
@@ -6,5 +6,6 @@ PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 require conf/machine/include/zaurus-clamshell.inc
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
+IMAGE_FSTYPES ?= "jffs2"
 
 ROOT_FLASH_SIZE = "58"
============================================================
--- conf/machine/include/qemu.inc	822cfa4ccc59e353b0a4c3b38015b20e6135aa0b
+++ conf/machine/include/qemu.inc	298c9ee68a35039a8a520bff72b70c1f9f939c4a
@@ -7,5 +7,8 @@ IMAGE_FSTYPES ?= "tar.bz2 ext2"
 
 IMAGE_FSTYPES ?= "tar.bz2 ext2"
 
+ROOT_FLASH_SIZE = "230"
+IMAGE_ROOTFS_SIZE_ext2 ?= "230000"
+
+# Don't include kernels in standard images
+RDEPENDS_kernel-base = ""
-ROOT_FLASH_SIZE = "200"
-IMAGE_ROOTFS_SIZE_ext2 = "200000"
============================================================
--- conf/machine/include/zaurus-2.6.inc	1081aed4f8ad4c58ab3a0c1b0aca200b55a69c62
+++ conf/machine/include/zaurus-2.6.inc	7baf3e010a9649ace2bc8172df240209ae4c83f0
@@ -1,5 +1,5 @@
 # Zaurus Clamshell specific configuration for kernel 2.6
-# Don't forget to include zaurus-clamshell.conf as well
+# Don't forget to include zaurus-clamshell.inc as well
 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
@@ -15,8 +15,6 @@ EXTRA_IMAGEDEPENDS += "zaurus-updater"
 
 EXTRA_IMAGEDEPENDS += "zaurus-updater"
 
-IMAGE_FSTYPES ?= "jffs2 tar.gz"
-
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.inc
 
@@ -39,6 +37,7 @@ GUI_MACHINE_CLASS = "bigscreen"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
 
 GUI_MACHINE_CLASS = "bigscreen"
+GUI_MACHINE_CLASS_collie = "smallscreen"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
 
 MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
@@ -70,3 +69,4 @@ RDEPENDS_kernel-base = ""
 
 # Don't include kernels in standard images for Zaurus machines
 RDEPENDS_kernel-base = ""
+KERNEL_IMAGETYPE = "zImage"
============================================================
--- conf/machine/poodle.conf	0b40f507ee0f80a83a9a703e3d6eda6a5809bcdb
+++ conf/machine/poodle.conf	be86de2248e7e614a23c124951f705243e722665
@@ -1,7 +1,9 @@ require conf/machine/include/zaurus-2.6.
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
 require conf/machine/include/zaurus-2.6.inc
 
+IMAGE_FSTYPES ?= "jffs2"
+
 ROOT_FLASH_SIZE = "22"
============================================================
--- conf/machine/qemuarm.conf	59c4fde7c8de049e8a66122d3907540a14a72549
+++ conf/machine/qemuarm.conf	9d829ed37055c73b8739a7dafa41fe3ab19aea08
@@ -8,6 +8,8 @@ require conf/machine/include/tune-arm926
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-arm926ejs.inc
 
+KERNEL_IMAGETYPE = "zImage"
+
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
============================================================
--- conf/machine/qemux86.conf	fae6351fecc4e1c763de72322a9f928d8d6ddc00
+++ conf/machine/qemux86.conf	2aa871c692f0a5205e3b06714b12e27b7bc978c1
@@ -7,6 +7,8 @@ require conf/machine/include/qemu.inc
 
 require conf/machine/include/qemu.inc
 
+KERNEL_IMAGETYPE = "bzImage"
+
 SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
============================================================
--- conf/machine/tosa.conf	54214b8163032fe25dd47a730267cd2c643d74cb
+++ conf/machine/tosa.conf	c4618a42bc1f0559d10723f0315b08046bfc97f4
@@ -1,9 +1,11 @@ require conf/machine/include/zaurus-2.6.
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-6000
 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
 
 require conf/machine/include/zaurus-2.6.inc
 
+IMAGE_FSTYPES ?= "jffs2"
+
 # newer kernels does not build
 PREFERRED_VERSION_linux-rp = "2.6.17"