[oe-commits] org.oe.dev conf/machine: general machine config clean-up for Zaurus as discussed on oe-devel

[Laibsch commit]

conf/machine: general machine config clean-up for Zaurus as discussed on oe-devel

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 65fbfb9dd8770a45ce93446888e70c955e6b11d1
ViewMTN: http://monotone.openembedded.org/revision/info/65fbfb9dd8770a45ce93446888e70c955e6b11d1
Files:
1
conf/machine/include/collie-2.6.inc
conf/machine/include/poodle-2.6.inc
conf/machine/collie.conf
conf/machine/include/zaurus-2.6.inc
conf/machine/include/zaurus-clamshell.inc
Diffs:

#
# mt diff -r8856cc5052dc582654d6535159b1712758db4148 -r65fbfb9dd8770a45ce93446888e70c955e6b11d1
#
# 
# 
# delete "conf/machine/include/collie-2.6.inc"
# 
# delete "conf/machine/include/poodle-2.6.inc"
# 
# patch "conf/machine/collie.conf"
#  from [a0553e914a9461a2f8f27c4cf8972dcebb056d0d]
#    to [7c673b43c50f37bbb2d12b14434564b0e9613ec3]
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [7d4d7255328d5d3f3d61e09ec7b527085533b4d6]
#    to [0baab00ebcdca461a1c5f13d5bcba53c6099622a]
# 
# patch "conf/machine/include/zaurus-clamshell.inc"
#  from [460b6649ab7636b92a7031abd0f2850fcb6700f5]
#    to [75189b78d2f98b4b5156904ea7515f88fcd23b77]
# 
============================================================
--- conf/machine/collie.conf	a0553e914a9461a2f8f27c4cf8972dcebb056d0d
+++ conf/machine/collie.conf	7c673b43c50f37bbb2d12b14434564b0e9613ec3
@@ -6,18 +6,13 @@ MACHINE_KERNEL_VERSION ?= "2.6"
 TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
-require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
+require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-# This is needed for the ramdisk script to work
-MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
-
 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
-
-GUI_MACHINE_CLASS_poodle = "smallscreen"
============================================================
--- conf/machine/include/zaurus-2.6.inc	7d4d7255328d5d3f3d61e09ec7b527085533b4d6
+++ conf/machine/include/zaurus-2.6.inc	0baab00ebcdca461a1c5f13d5bcba53c6099622a
@@ -1,8 +1,9 @@
-# Zaurus Clamshell specific configuration for kernel 2.6
-# Don't forget to include zaurus-clamshell.inc as well
+# Zaurus specific configuration for kernel 2.6
+# Additionally, clamshell specific stuff in zaurus-clamshell.inc
 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+PACKAGE_EXTRA_ARCHS_collie = ""
 
 MACHINE_KERNEL_VERSION = "2.6"
 
@@ -10,20 +11,15 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian 
 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}"
-
 EXTRA_IMAGEDEPENDS += "zaurus-updater"
 
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.inc
-
 SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE_collie = "115200 ttySA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
-
 PCMCIA_MANAGER ?= "pcmciautils"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
============================================================
--- conf/machine/include/zaurus-clamshell.inc	460b6649ab7636b92a7031abd0f2850fcb6700f5
+++ conf/machine/include/zaurus-clamshell.inc	75189b78d2f98b4b5156904ea7515f88fcd23b77
@@ -1,3 +1,6 @@
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/include/tune-xscale.inc
+
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \