[OE stablebranch] [Review] Backport Updates to conf/machine/include/zaurus-2.6.inc to support linux-rp-2.6.24 and up

Hans Henry von Tresckow hvontres at gmail.com
Fri May 30 20:49:48 CEST 2008 

-----------------------------------------------------------------
Revision: cfb7d5ebc09f125eccc955d0f2a4c525cf083f94
Ancestor: a6539db9b232b03e73a487103ab6c4af4cbe61bf
Author: thesing at openembedded.org
Date: 2008-03-28T20:31:26
Branch: org.openembedded.dev

Modified files:
        conf/machine/include/zaurus-2.6.inc

ChangeLog:

zaurus-2.6.inc: add kernel-module-power to collie MACHINE_RRECOMMENDS

============================================================
--- conf/machine/include/zaurus-2.6.inc
ec1dccd443e27cabd637f308fbaa647b5ea3286b
+++ conf/machine/include/zaurus-2.6.inc
f56c5d7f00ad90430d1cfa3e9ff6283245f5e5c6
@@ -33,7 +33,8 @@ MACHINE_EXTRA_RRECOMMENDS_collie = "kern
 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-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"
-----------------------------------------------------------------
Revision: 76c36c8a4fee2e52b7710bd382fd07c390fb8d18
Ancestor: d2c1007682618105ff49ee76ac59d9b164de9572
Author: thesing at openembedded.org
Date: 2008-03-28T16:57:21
Branch: org.openembedded.dev

Modified files:
        conf/machine/include/zaurus-2.6.inc

ChangeLog:

zaurus-2.6.inc: add mmc-spi to collie RRECOMMEND

============================================================
--- conf/machine/include/zaurus-2.6.inc
28f9350146ad28dc16ffd19ca0f09a93374826cb
+++ conf/machine/include/zaurus-2.6.inc
ec1dccd443e27cabd637f308fbaa647b5ea3286b
@@ -33,7 +33,7 @@ MACHINE_EXTRA_RRECOMMENDS_collie = "kern
 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-collie-ts kernel-module-leds-locomo
kernel-module-locomokbd kernel-module-mmc-spi"

 GUI_MACHINE_CLASS = "bigscreen"
 GUI_MACHINE_CLASS_collie = "smallscreen"
-----------------------------------------------------------------
Revision: 6cf1636a08193bc3a77e9606a98b52236b33ede0
Ancestor: 3b86b7575f669fb1f3a8f10c83a56393534f4d28
Author: deller at gmx.de
Date: 2008-02-17T22:17:49
Branch: org.openembedded.dev

Modified files:
        conf/machine/include/zaurus-2.6.inc

ChangeLog:

zaurus-2.6: add pcmcia modules for Poodle

============================================================
--- conf/machine/include/zaurus-2.6.inc
39d33e732bf59736015329814890e175fef292aa
+++ conf/machine/include/zaurus-2.6.inc
28f9350146ad28dc16ffd19ca0f09a93374826cb
@@ -31,7 +31,7 @@ MACHINE_EXTRA_RRECOMMENDS_spitz  = "kern
 MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi
kernel-module-pxa2xx-cs kernel-module-pcmcia"
 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"
+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"

-----------------------------------------------------------------
Revision: dbc92be1fe4742c442c336c46478ebc072b977ed
Ancestor: 5a2bd0882bdfa9ee8a4fae224f66484bf060bc9b
Author: thesing
Date: 2008-01-28T16:06:10
Branch: org.openembedded.dev

Modified files:
        conf/machine/include/zaurus-2.6.inc
        packages/linux/linux-rp-2.6.24/defconfig-collie
        packages/linux/linux-rp.inc
        packages/linux/linux-rp_2.6.24.bb
        packages/tasks/task-base.bb

ChangeLog:

commit latest collie work from thesing (zaurus-2.6.inc, linux-rp*,
task-base)

============================================================
--- conf/machine/include/zaurus-2.6.inc
369ab4994dfbf2ae3f9cedb438e595502fa29ebc
+++ conf/machine/include/zaurus-2.6.inc
39d33e732bf59736015329814890e175fef292aa
@@ -32,6 +32,8 @@ MACHINE_EXTRA_RRECOMMENDS_poodle = "kern
 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"
+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"

 GUI_MACHINE_CLASS = "bigscreen"
 GUI_MACHINE_CLASS_collie = "smallscreen"
-----------------------------------------------------------------
Revision: ecf97ee309a14a16d6d89824678f4cb0d945440a
Ancestor: dc9d175ccb45ba3518889afaa86782f94bdb221a
Author: hrw at openembedded.org
Date: 2008-01-18T15:56:25
Branch: org.openembedded.dev

Modified files:
        conf/machine/include/zaurus-2.6.inc

ChangeLog:

zaurus-2.6: added kernel size for do_sizecheck

============================================================
--- conf/machine/include/zaurus-2.6.inc
0baab00ebcdca461a1c5f13d5bcba53c6099622a
+++ conf/machine/include/zaurus-2.6.inc
369ab4994dfbf2ae3f9cedb438e595502fa29ebc
@@ -37,6 +37,9 @@ GUI_MACHINE_CLASS_poodle = "smallscreen"
 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"

 zaurus_make_installkit () {
-----------------------------------------------------------------
Revision: 65fbfb9dd8770a45ce93446888e70c955e6b11d1
Ancestor: 8856cc5052dc582654d6535159b1712758db4148
Author: Laibsch at openembedded.org
Date: 2008-01-17T09:08:34
Branch: org.openembedded.dev

Deleted entries:
        conf/machine/include/collie-2.6.inc
        conf/machine/include/poodle-2.6.inc
Modified files:
        conf/machine/collie.conf conf/machine/include/zaurus-2.6.inc
        conf/machine/include/zaurus-clamshell.inc

ChangeLog:

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

============================================================
--- 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"
-----------------------------------------------------------------
Revision: 6794aa0dd1ca646be71cc57651a883ac99f55985
Ancestor: daed268af21adef037d9def8d49e4090c6674cae
Author: Laibsch at openembedded.org
Date: 2008-01-11T08:12:11
Branch: org.openembedded.dev

Modified files:
        conf/machine/include/collie-2.6.inc
        conf/machine/include/zaurus-2.6.inc

ChangeLog:

conf/machine/: doing the changes to installkit for collie correctly now.
thanks, koen, for spotting the error in
503b3ade200ad628a4b30fab228c365b8c0cf2ea
I believe, there is further work that can be done after some discussion.

============================================================
--- conf/machine/include/zaurus-2.6.inc
7ecb352669b5b71228489192cdeb5826dc02b46a
+++ conf/machine/include/zaurus-2.6.inc
7d4d7255328d5d3f3d61e09ec7b527085533b4d6
@@ -49,7 +49,7 @@ zaurus_make_installkit () {
     mkdir ${IMAGE_NAME}-installkit/

     # Get the latest kernel using the zImage-<machine>.bin symlink
-    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage

     if [ "${MACHINE}" = "spitz" ]; then
         cp gnu-tar ${IMAGE_NAME}-installkit/
-----------------------------------------------------------------
Revision: e52ff8ea262ab9963525b0a0f6ac0f631d53e597
Ancestor: 503b3ade200ad628a4b30fab228c365b8c0cf2ea
Author: koen at openembedded.org
Date: 2008-01-11T07:31:10
Branch: org.openembedded.dev

Modified files:
        conf/machine/include/collie-2.6.inc
        conf/machine/include/zaurus-2.6.inc

ChangeLog:

disapproval of revision '503b3ade200ad628a4b30fab228c365b8c0cf2ea'
============================================================
--- conf/machine/include/zaurus-2.6.inc
7d4d7255328d5d3f3d61e09ec7b527085533b4d6
+++ conf/machine/include/zaurus-2.6.inc
7ecb352669b5b71228489192cdeb5826dc02b46a
@@ -49,7 +49,7 @@ zaurus_make_installkit () {
     mkdir ${IMAGE_NAME}-installkit/

     # Get the latest kernel using the zImage-<machine>.bin symlink
-    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin

     if [ "${MACHINE}" = "spitz" ]; then
         cp gnu-tar ${IMAGE_NAME}-installkit/
-----------------------------------------------------------------
Revision: 503b3ade200ad628a4b30fab228c365b8c0cf2ea
Ancestor: 6dbb0f5220c722dbdae7ef9a4362860548c71380
Author: Laibsch at openembedded.org
Date: 2008-01-10T17:47:51
Branch: org.openembedded.dev

Modified files:
        conf/machine/include/collie-2.6.inc
        conf/machine/include/zaurus-2.6.inc

ChangeLog:

Zaurus machine config: fix code for creation of installkit for collie
* remove the code from collie config.  It is present in collie-2.6.inc
* collie needs zImage, not zImage.bin.  Other Zaurus devices can handle
  zImage or zImage.bin, so zImage it is for all of them.

============================================================
--- conf/machine/include/zaurus-2.6.inc
7ecb352669b5b71228489192cdeb5826dc02b46a
+++ conf/machine/include/zaurus-2.6.inc
7d4d7255328d5d3f3d61e09ec7b527085533b4d6
@@ -49,7 +49,7 @@ zaurus_make_installkit () {
     mkdir ${IMAGE_NAME}-installkit/

     # Get the latest kernel using the zImage-<machine>.bin symlink
-    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage

     if [ "${MACHINE}" = "spitz" ]; then
         cp gnu-tar ${IMAGE_NAME}-installkit/


-- 
Henry von Tresckow (hvontres)

More information about the Openembedded-stablebranch mailing list