[oe-commits] org.oe.dev merge of '16870ac6a3db7be6fbf7b3822f05293c360ca11a'
pfalcon commit
openembedded-commits at lists.openembedded.org
Fri Feb 15 01:31:40 UTC 2008
merge of '16870ac6a3db7be6fbf7b3822f05293c360ca11a'
and '6d8388a3331ac09ba7e6c0f3cf6688f303afd4e1'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 205ba7953e2fae9d4cc1fe12f0b39193c146bb42
ViewMTN: http://monotone.openembedded.org/revision/info/205ba7953e2fae9d4cc1fe12f0b39193c146bb42
Files:
1
packages/initrdscripts/initramfs-image-ipk_1.0.bb
classes/image.bbclass
packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/linux/linux-rp-2.6.24/spitz_h_rewrite.patch
packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
packages/swt/swt3.4-gtk_3.3+3.4M5.bb
packages/tasks/task-java-gtk.bb
MAINTAINERS
conf/local.conf.sample
packages/anki/anki_0.4.3.bb
packages/images/x11-gpe-java-image.bb
packages/linux/linux-rp_2.6.24.bb
packages/swt/files/swt-hildon.patch
packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
packages/tasks/task-java.bb
Diffs:
#
# mt diff -r16870ac6a3db7be6fbf7b3822f05293c360ca11a -r205ba7953e2fae9d4cc1fe12f0b39193c146bb42
#
#
#
# add_file "packages/initrdscripts/initramfs-image-ipk_1.0.bb"
# content [c7fc476faa3c9774365bfc327d27d115bab2153e]
#
# patch "classes/image.bbclass"
# from [6eeae6a01c36465bc36cc737d42ea6b8ab09b152]
# to [73120c465f8175c72d4001b3985cab785ee72ced]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig"
# from [90a93f46c5489e0ccfb819e76f3dbcaf1dd8c7fd]
# to [a44cdd59955b9b47b9fe122eb0e66ddbf67e9446]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig"
# from [afd12a3af4f106f7aed0d17aa11d57ad1926ba67]
# to [facc0a48b60afe66867b27098484b0c6cf604086]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig"
# from [4e01e38b76d921efe1287fa89dedcf60f4be9c60]
# to [2030b990d38c7a8f16b19ba8cd7f1d5a7efb1a76]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig"
# from [c1987ac5e14751d61e0d555c0e2e361362e72c7f]
# to [8c7b1b1dc3117b5d2551a48f0e214b3f42713c06]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig"
# from [dda584217bf23dc94bbc30cfacdbe56087d9fee1]
# to [9df58234eb8066ea2f25d18ae5db1a0c05e23cee]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig"
# from [f92a949985835df6b375a1c419aea95096316c60]
# to [971e7cc0b77f0096a7e40064c28bba3037c67293]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig"
# from [da563aa584be8a2be72ee32964d85d16175fd562]
# to [13a3f2d1e37ef33a2baef9120b25617c5e8ea53d]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig"
# from [99b053b8acb4395312d738a99a6516c987d5d409]
# to [21ccaec9a02606d6585ed044589763f4eb225f84]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig"
# from [460627dfb8addd52f278ba98c63d263a1fcc2784]
# to [44effc433e89914a9e2a81bad3fe8ea96c854e0c]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig"
# from [2040c8752a6f755a6a20d9ff042c5912eb32bb0f]
# to [d6534c5a049859c9f6fd78ba44c6512b98418e69]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig"
# from [32750cd6ada179a51ca03416acd45d51a32ea145]
# to [a184b532adf07f5fd4a9548e62b3a32d5fb14c7f]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig"
# from [85ae080bc9ddf4014b97cd550558c09bfd9ba085]
# to [b92667f679aeccd03cf1856a05836a4403b0950e]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig"
# from [7372bed084e45ce719cdc23451424de4a9893ee0]
# to [4025521a75f7df7170d9c19821753ced9d1ece60]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig"
# from [3585f1fc62fc9915c0103ac0650f5bada27c2146]
# to [c39affce90233491258ab0a533f6ec4c8aa9d0a2]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig"
# from [02bef9c1024f8dbc325f9d13a4f1d05f4d02ef90]
# to [3c614466e5001317f9bc3eb278336536206fe379]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig"
# from [15c4be5203c9d6af61b980beca140c9c48ab1934]
# to [183ef43ab299f3421a7552d24e9d1a6ae56b0381]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig"
# from [cc5addab0c771671efb084b73ad6608304bac4d9]
# to [0dca322f98670b09686524d776ef72e8b14b1560]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig"
# from [473005b7a9ca078839e7f3c06e1d0dbe7b5ce651]
# to [eb20dffd9686d493a6b983d13f732933ba461e68]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig"
# from [ed1fef91e7b0071878107a770c28b2d9157564da]
# to [bdc1aec0b869819a69f168dfd6aa58af9dbf4a4c]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig"
# from [35f12816e4e84ebff59a17593f63de3cca783b9e]
# to [50ce9c68d453f6faec44e7d9d1913bb06f76f319]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig"
# from [0c13f7fa7358c4fd3b369ac0d6398842b4a2f1f5]
# to [feebc34d47aaf9d70f0d7323acdc7d0e7f2a919d]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig"
# from [eb78f0beed41b147084e0b6ab6173d5af624b25f]
# to [a9a9229bc135d7cea280c9e93d409b7fa00e8266]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig"
# from [0037f3ae4cf65609124f84757a2b6b6398b12261]
# to [e6a911fcadb4cd9fbde3720a4e43cc4e28688e66]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig"
# from [013956ef6b10d21772c7e6c1567c4c7771e7fc30]
# to [d27179c31f550470d418bfc0be9ad1b2dfc0fd92]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
# from [bc3e654644b8b48dce3d66dc216f76289a3ec5f7]
# to [3889ec5d5287ff88902fa3d5cc7a4c87cdfde3c7]
#
============================================================
--- packages/initrdscripts/initramfs-image-ipk_1.0.bb c7fc476faa3c9774365bfc327d27d115bab2153e
+++ packages/initrdscripts/initramfs-image-ipk_1.0.bb c7fc476faa3c9774365bfc327d27d115bab2153e
@@ -0,0 +1,15 @@
+DESCRIPTION = "Boot initramfs as a package"
+PR = "r1"
+
+do_compile() {
+ cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} ANGSTROM_MODE=uclibc IMAGE_FSTYPES=cpio.gz DEPLOY_TO=${D}/boot/initramfs.bin bitbake initramfs-image
+}
+
+do_install() {
+ install -d ${D}/boot/
+ cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} ANGSTROM_MODE=uclibc IMAGE_FSTYPES=cpio.gz DEPLOY_TO=${D}/boot/initramfs.bin bitbake initramfs-image -c deploy_to
+}
+
+FILES_${PN} += "/boot/*"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- classes/image.bbclass 6eeae6a01c36465bc36cc737d42ea6b8ab09b152
+++ classes/image.bbclass 73120c465f8175c72d4001b3985cab785ee72ced
@@ -110,6 +110,14 @@ fakeroot do_rootfs () {
${MACHINE_POSTPROCESS_COMMAND}
}
+do_deploy_to[nostamp] = "1"
+do_deploy_to () {
+ # A standalone task to deploy built image to the location specified
+ # by DEPLOY_TO variable (likely passed via environment).
+ # Assumes ${IMAGE_FSTYPES} is a single value!
+ cp "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${IMAGE_FSTYPES}" ${DEPLOY_TO}
+}
+
insert_feed_uris () {
echo "Building feeds for [${DISTRO}].."
@@ -202,3 +210,4 @@ addtask rootfs before do_build after do_
EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs make_zimage_symlink_relative set_image_autologin rootfs_update_timestamp
addtask rootfs before do_build after do_install
+addtask deploy_to after do_rootfs
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig 90a93f46c5489e0ccfb819e76f3dbcaf1dd8c7fd
+++ packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig a44cdd59955b9b47b9fe122eb0e66ddbf67e9446
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:48 2008
+# Fri Feb 15 01:08:05 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -258,6 +258,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig afd12a3af4f106f7aed0d17aa11d57ad1926ba67
+++ packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig facc0a48b60afe66867b27098484b0c6cf604086
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:48 2008
+# Fri Feb 15 01:08:05 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -264,6 +264,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig 4e01e38b76d921efe1287fa89dedcf60f4be9c60
+++ packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig 2030b990d38c7a8f16b19ba8cd7f1d5a7efb1a76
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:49 2008
+# Fri Feb 15 01:08:05 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -258,6 +258,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig c1987ac5e14751d61e0d555c0e2e361362e72c7f
+++ packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig 8c7b1b1dc3117b5d2551a48f0e214b3f42713c06
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:49 2008
+# Fri Feb 15 01:08:06 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -265,6 +265,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# Floating point emulation
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig dda584217bf23dc94bbc30cfacdbe56087d9fee1
+++ packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig 9df58234eb8066ea2f25d18ae5db1a0c05e23cee
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:50 2008
+# Fri Feb 15 01:08:06 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -256,6 +256,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig f92a949985835df6b375a1c419aea95096316c60
+++ packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig 971e7cc0b77f0096a7e40064c28bba3037c67293
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:50 2008
+# Fri Feb 15 01:08:07 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -264,6 +264,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig da563aa584be8a2be72ee32964d85d16175fd562
+++ packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig 13a3f2d1e37ef33a2baef9120b25617c5e8ea53d
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:50 2008
+# Fri Feb 15 01:08:07 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -236,6 +236,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig 99b053b8acb4395312d738a99a6516c987d5d409
+++ packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig 21ccaec9a02606d6585ed044589763f4eb225f84
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:51 2008
+# Fri Feb 15 01:08:07 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -234,6 +234,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig 460627dfb8addd52f278ba98c63d263a1fcc2784
+++ packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig 44effc433e89914a9e2a81bad3fe8ea96c854e0c
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:51 2008
+# Fri Feb 15 01:08:08 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -257,6 +257,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
@@ -1434,4 +1435,3 @@ CONFIG_HAS_IOPORT=y
CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
-CONFIG_ATAGS_PROC=y
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig 2040c8752a6f755a6a20d9ff042c5912eb32bb0f
+++ packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig d6534c5a049859c9f6fd78ba44c6512b98418e69
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:52 2008
+# Fri Feb 15 01:08:08 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -270,6 +270,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig 32750cd6ada179a51ca03416acd45d51a32ea145
+++ packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig a184b532adf07f5fd4a9548e62b3a32d5fb14c7f
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:52 2008
+# Fri Feb 15 01:08:09 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -258,6 +258,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig 85ae080bc9ddf4014b97cd550558c09bfd9ba085
+++ packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig b92667f679aeccd03cf1856a05836a4403b0950e
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:53 2008
+# Fri Feb 15 01:08:10 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -256,6 +256,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig 7372bed084e45ce719cdc23451424de4a9893ee0
+++ packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig 4025521a75f7df7170d9c19821753ced9d1ece60
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:54 2008
+# Fri Feb 15 01:08:10 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -256,6 +256,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig 3585f1fc62fc9915c0103ac0650f5bada27c2146
+++ packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig c39affce90233491258ab0a533f6ec4c8aa9d0a2
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:54 2008
+# Fri Feb 15 01:08:11 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -260,6 +260,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig 02bef9c1024f8dbc325f9d13a4f1d05f4d02ef90
+++ packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig 3c614466e5001317f9bc3eb278336536206fe379
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Thu Feb 14 00:33:54 2008
+# Fri Feb 15 01:08:11 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -277,6 +277,7 @@ CONFIG_KEXEC=y
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r6d8388a3331ac09ba7e6c0f3cf6688f303afd4e1 -r205ba7953e2fae9d4cc1fe12f0b39193c146bb42
#
#
#
# add_file "packages/linux/linux-rp-2.6.24/spitz_h_rewrite.patch"
# content [74aa58d11861398f4b75b2fbd48a4705dc67ab74]
#
# add_file "packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb"
# content [3916433c0bdcdb906ba537ccf470b67f134ff0bf]
#
# add_file "packages/swt/swt3.4-gtk_3.3+3.4M5.bb"
# content [49299001965c29d520d50104199531c9d47f72dc]
#
# add_file "packages/tasks/task-java-gtk.bb"
# content [75c788e3b4dbc454c70f64a85a7cc9c62623eb89]
#
# patch "MAINTAINERS"
# from [42e1fd8bf852c29ab5e08a51152c446726334145]
# to [262b69f65fcf6efe10999757e3d8c513ed320113]
#
# patch "conf/local.conf.sample"
# from [eea5f30083587d9ac3261c904bbde0f7c622b752]
# to [fa7f5ad0f812c943367b2c88b4e4f7165797959d]
#
# patch "packages/anki/anki_0.4.3.bb"
# from [bbc71d5b420649c30e0f4e7ca986a9f3516be13e]
# to [de5cc8560fa7d2401299249253867146486bcf24]
#
# patch "packages/images/x11-gpe-java-image.bb"
# from [3b45ba2ebb901a469fad2c1a1d1fbe0cd62877e5]
# to [8964f66e4a4db91f939e8a0fa51801339db49a49]
#
# patch "packages/linux/linux-rp_2.6.24.bb"
# from [9191ec3a826c86540d5d145050269444154acb88]
# to [4e4d0888003dc67fb428a0930b3605d7a111f4a3]
#
# patch "packages/swt/files/swt-hildon.patch"
# from [cc6d6cb67722d189122f70411ef01e0639206d86]
# to [771120666e1eaa76c510287c3f5272ea8124c406]
#
# patch "packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb"
# from [2659ee0d88eeab0a2f7012db8f483cc8a4e0373c]
# to [8dd921847bcbe0395c0edf0aefecd834ec3d7191]
#
# patch "packages/tasks/task-java.bb"
# from [297623fd9c1f9cc6c4c53842cdc2d5060ac4eeb1]
# to [561eadc4fc973917e0ff343de3864c2e08c5c214]
#
============================================================
--- packages/linux/linux-rp-2.6.24/spitz_h_rewrite.patch 74aa58d11861398f4b75b2fbd48a4705dc67ab74
+++ packages/linux/linux-rp-2.6.24/spitz_h_rewrite.patch 74aa58d11861398f4b75b2fbd48a4705dc67ab74
@@ -0,0 +1,497 @@
+http://www.uwsg.indiana.edu/hypermail/linux/kernel/0802.1/3541.html
+
+Here is a rewrite of spitz.h, which includes comments documenting
+function of particular GPIO pins.
+
+spitz_h_rewrite.patch provides:
+- no changes in compiled code
+- partial spitz.h rewrite:
+ * organized by function
+ * describes complete GPIO pinout
+ * comments added
+ * removed defines cloning pxa-regs.h
+- prefer generic pxa-regs.h GPIO if available
+- use GPIO names instead of numbers
+
+Thanks to Trisoft for providing needed information.
+
+Index: linux-2.6.24/arch/arm/mach-pxa/spitz_pm.c
+===================================================================
+--- linux-2.6.24.orig/arch/arm/mach-pxa/spitz_pm.c 2008-01-24 22:58:37.000000000 +0000
++++ linux-2.6.24/arch/arm/mach-pxa/spitz_pm.c 2008-02-13 13:49:22.000000000 +0000
+@@ -110,9 +110,9 @@
+ pxa_gpio_mode(GPIO18_RDY|GPIO_OUT | GPIO_DFLT_HIGH);
+
+ PRER = GPIO_bit(SPITZ_GPIO_KEY_INT);
+- PFER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET);
+- PWER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET) | PWER_RTC;
+- PKWR = GPIO_bit(SPITZ_GPIO_SYNC) | GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET);
++ PFER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(GPIO1_RST);
++ PWER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(GPIO1_RST) | PWER_RTC;
++ PKWR = GPIO_bit(SPITZ_GPIO_SYNC) | GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(GPIO1_RST);
+ PKSR = 0xffffffff; // clear
+
+ /* nRESET_OUT Disable */
+@@ -128,7 +128,7 @@
+ static void spitz_postsuspend(void)
+ {
+ pxa_gpio_mode(GPIO18_RDY_MD);
+- pxa_gpio_mode(10 | GPIO_IN);
++ pxa_gpio_mode(SPITZ_GPIO_NC_10 | GPIO_IN);
+ }
+
+ static int spitz_should_wakeup(unsigned int resume_on_alarm)
+Index: linux-2.6.24/drivers/video/pxafb.c
+===================================================================
+--- linux-2.6.24.orig/drivers/video/pxafb.c 2008-02-13 13:49:04.000000000 +0000
++++ linux-2.6.24/drivers/video/pxafb.c 2008-02-13 13:49:57.000000000 +0000
+@@ -920,7 +920,7 @@
+ return;
+ }
+
+- for (gpio = 58; ldd_bits > 0; gpio++, ldd_bits--) {
++ for (gpio = GPIO58_LDD_0; ldd_bits > 0; gpio++, ldd_bits--) {
+ pxa_gpio_mode(gpio | GPIO_ALT_FN_2_OUT);
+ }
+ pxa_gpio_mode(GPIO74_LCD_FCLK_MD);
+Index: linux-2.6.24/include/asm-arm/arch-pxa/akita.h
+===================================================================
+--- linux-2.6.24.orig/include/asm-arm/arch-pxa/akita.h 2008-01-24 22:58:37.000000000 +0000
++++ linux-2.6.24/include/asm-arm/arch-pxa/akita.h 2008-02-13 13:49:22.000000000 +0000
+@@ -12,11 +12,11 @@
+ /* Akita IO Expander GPIOs */
+
+ #define AKITA_IOEXP_RESERVED_7 (1 << 7)
+-#define AKITA_IOEXP_IR_ON (1 << 6)
+-#define AKITA_IOEXP_AKIN_PULLUP (1 << 5)
+-#define AKITA_IOEXP_BACKLIGHT_CONT (1 << 4)
+-#define AKITA_IOEXP_BACKLIGHT_ON (1 << 3)
+-#define AKITA_IOEXP_MIC_BIAS (1 << 2)
++#define AKITA_IOEXP_IR_ON (1 << 6) /* IrDA On */
++#define AKITA_IOEXP_AKIN_PULLUP (1 << 5) /* Pull-Up for Remote */
++#define AKITA_IOEXP_BACKLIGHT_CONT (1 << 4) /* Backlight Control */
++#define AKITA_IOEXP_BACKLIGHT_ON (1 << 3) /* Backlight On */
++#define AKITA_IOEXP_MIC_BIAS (1 << 2) /* Mic Bias On */
+ #define AKITA_IOEXP_RESERVED_1 (1 << 1)
+ #define AKITA_IOEXP_RESERVED_0 (1 << 0)
+
+Index: linux-2.6.24/include/asm-arm/arch-pxa/pxa-regs.h
+===================================================================
+--- linux-2.6.24.orig/include/asm-arm/arch-pxa/pxa-regs.h 2008-02-13 13:49:07.000000000 +0000
++++ linux-2.6.24/include/asm-arm/arch-pxa/pxa-regs.h 2008-02-13 13:49:22.000000000 +0000
+@@ -1334,6 +1334,7 @@
+ #define GPIO85_nPCE_1 85 /* Card Enable for Card Space (PXA27x) */
+ #define GPIO92_MMCDAT0 92 /* MMC DAT0 (PXA27x) */
+ #define GPIO102_nPCE_1 102 /* PCMCIA (PXA27x) */
++#define GPIO104_pSKTSEL 104 /* PCMCIA Socket Select (PXA27x) */
+ #define GPIO109_MMCDAT1 109 /* MMC DAT1 (PXA27x) */
+ #define GPIO110_MMCDAT2 110 /* MMC DAT2 (PXA27x) */
+ #define GPIO110_MMCCS0 110 /* MMC Chip Select 0 (PXA27x) */
+Index: linux-2.6.24/include/asm-arm/arch-pxa/spitz.h
+===================================================================
+--- linux-2.6.24.orig/include/asm-arm/arch-pxa/spitz.h 2008-02-13 13:49:01.000000000 +0000
++++ linux-2.6.24/include/asm-arm/arch-pxa/spitz.h 2008-02-13 13:49:22.000000000 +0000
+@@ -1,8 +1,9 @@
+ /*
+- * Hardware specific definitions for SL-Cx000 series of PDAs
++ * Hardware specific definitions for SL-Cxx00 series of PDAs
+ *
+ * Copyright (c) 2005 Alexander Wykes
+ * Copyright (c) 2005 Richard Purdie
++ * Copyright (c) 2008 Stanislav Brabec
+ *
+ * Based on Sharp's 2.4 kernel patches
+ *
+@@ -13,140 +14,257 @@
+ */
+ #ifndef __ASM_ARCH_SPITZ_H
+ #define __ASM_ARCH_SPITZ_H 1
+-#endif
+
+-#include <linux/fb.h>
++#include <asm-arm/arch-pxa/irqs.h>
++#include <linux/platform_device.h>
+
+ /* Spitz/Akita GPIOs */
+
+-#define SPITZ_GPIO_KEY_INT (0) /* Key Interrupt */
+-#define SPITZ_GPIO_RESET (1)
+-#define SPITZ_GPIO_nSD_DETECT (9)
+-#define SPITZ_GPIO_TP_INT (11) /* Touch Panel interrupt */
+-#define SPITZ_GPIO_AK_INT (13) /* Remote Control */
+-#define SPITZ_GPIO_ADS7846_CS (14)
+-#define SPITZ_GPIO_SYNC (16)
+-#define SPITZ_GPIO_MAX1111_CS (20)
+-#define SPITZ_GPIO_FATAL_BAT (21)
+-#define SPITZ_GPIO_HSYNC (22)
+-#define SPITZ_GPIO_nSD_CLK (32)
+-#define SPITZ_GPIO_USB_DEVICE (35)
+-#define SPITZ_GPIO_USB_HOST (37)
+-#define SPITZ_GPIO_USB_CONNECT (41)
+-#define SPITZ_GPIO_LCDCON_CS (53)
+-#define SPITZ_GPIO_nPCE (54)
+-#define SPITZ_GPIO_nSD_WP (81)
+-#define SPITZ_GPIO_ON_RESET (89)
+-#define SPITZ_GPIO_BAT_COVER (90)
+-#define SPITZ_GPIO_CF_CD (94)
+-#define SPITZ_GPIO_ON_KEY (95)
+-#define SPITZ_GPIO_SWA (97)
+-#define SPITZ_GPIO_SWB (96)
+-#define SPITZ_GPIO_CHRG_FULL (101)
+-#define SPITZ_GPIO_CO (101)
+-#define SPITZ_GPIO_CF_IRQ (105)
+-#define SPITZ_GPIO_AC_IN (115)
+-#define SPITZ_GPIO_HP_IN (116)
++/* This list refers to all GPIO pins either in defines or in comments.
++ *
++ * GPIO pins not listed:
++ * GPIO2 SYS_EN: System Power Enable
++ * GPIO5-GPIO8 PWR_CAP0-PWR_CAP3: sleep DC-DC converter power capacitors
++ * GPIO40 not connected
++ */
+
+-/* Spitz Only GPIOs */
+
+-#define SPITZ_GPIO_CF2_IRQ (106) /* CF slot1 Ready */
+-#define SPITZ_GPIO_CF2_CD (93)
++/* Spitz/Akita System GPIO */
++
++#define SPITZ_GPIO_KEY_INT (0) /* Key Interrupt */
++#define SPITZ_GPIO_SYNC (16) /* IOPORT Wake Up (input) */
++#define SPITZ_GPIO_NAND_CS (79) /* NAND Flash Chip Select */
++#define SPITZ_GPIO_NC_10 (10) /* Not Connected (but used in kernel) */
++/* This GPIO pin is connected:
++ * GPIO1_RST
++ */
+
+
++/* Compact Flash Interface */
++
++/* Spitz/Akita Compact Flash Interface */
++#define SPITZ_GPIO_CF_CD (94) /* CF IRQ */
++#define SPITZ_GPIO_CF_IRQ (105) /* CF Ready */
++/* These GPIO pins are connected:
++ * GPIO48_nPOE
++ * GPIO49_nPWE
++ * GPIO50_nPIOR
++ * GPIO51_nPIOW
++ * GPIO54_nPCE_2
++ * GPIO55_nPREG
++ * GPIO56_nPWAIT
++ * GPIO57_nIOIS16
++ * GPIO80_nCS_4
++ * GPIO85_nPCE_1
++ * GPIO104_pSKTSEL
++ */
++
++/* Spitz only Compact Flash Interface */
++#define SPITZ_GPIO_CF2_CD (93) /* CF slot1 IRQ */
++#define SPITZ_GPIO_CF2_IRQ (106) /* CF slot1 Ready */
++/* This GPIO pin is connected:
++ * GPIO78_nCS_2
++ */
++
++
++/* Spitz/Akita Battery, Power and Service Connector */
++
++#define SPITZ_GPIO_FATAL_BAT (21) /* Fatal Battery */
++#define SPITZ_GPIO_BAT_COVER (90) /* Battery Cover switch */
++#define SPITZ_GPIO_BAT_COVER2 (15) /* Battery Cover switch, parallel pin */
++#define SPITZ_GPIO_CHRG_FULL (101) /* Battery Full */
++#define SPITZ_GPIO_AC_IN (115) /* External Power Supply is active */
++#define SPITZ_GPIO_ON_RESET (89) /* Software Reset */
++#define SPITZ_GPIO_SERVICE0 (83) /* Service Connector */
++#define SPITZ_GPIO_SERVICE1 (84) /* Service Connector */
++/* This GPIO pin is connected:
++ * GPIO18_RDY
++ */
++
++
++/* Spitz/Akita Display Controller */
++
++#define SPITZ_GPIO_HSYNC (22) /* Line Sync Feedback */
++/* These GPIO pins are connected:
++ * GPIO58_LDD_0-GPIO58_LDD_15
++ * GPIO74_LCD_FCLK
++ * GPIO75_LCD_LCLK
++ * GPIO76_LCD_PCLK
++ * GPIO77_LCD_ACBIAS
++ */
++
++
++/* Spitz/Akita SSP/SPI Bus and Devices */
++
++#define SPITZ_GPIO_SSP_CLK (19) /* SSP bus Clock */
++#define SPITZ_GPIO_SSP_RXD (86) /* SSP bus RxD */
++#define SPITZ_GPIO_SSP_TXD (87) /* SSP bus TxD */
++#define SPITZ_GPIO_TP_INT (11) /* Touch Panel IRQ */
++#define SPITZ_GPIO_ADS7846_CS (14) /* Touch Panel Controller Chip Select */
++#define SPITZ_GPIO_MAX1111_CS (20) /* Multi Channel ADC Chip Select */
++#define SPITZ_GPIO_LCDCON_CS (53) /* LCD Controller Chip Select */
++
++
++/* Spitz/Akita Supplementary USB OTG Pins */
++
++#define SPITZ_GPIO_USB_DEVICE (35) /* USB Client power is present */
++#define SPITZ_GPIO_USB_HOST (37) /* USB OTG 5V Host power supply control */
++#define SPITZ_GPIO_USB_CONNECT (41) /* USB Host Cable is connected */
++
++
++/* Spitz/Akita Audio */
++
++#define SPITZ_GPIO_HP_IN (116) /* CPU Headphone detect */
++#define SPITZ_GPIO_AK_INT (13) /* Remote Control detect */
++/* These GPIO AC97 pins are connected:
++ * GPIO28_BITCLK
++ * GPIO29_SDATA_IN
++ * GPIO30_SDATA_OUT
++ * GPIO31_SYNC
++ * GPIO113_AC97_RESET_N
++ */
++
++
++/* Spitz/Akita SD Slot */
++
++#define SPITZ_GPIO_nSD_DETECT (9) /* SD Card Presence */
++#define SPITZ_GPIO_nSD_WP (81) /* SD Write Protection */
++/* These GPIO pins are connected:
++ * GPIO32_MMCCLK
++ * GPIO92_MMCDAT0
++ * GPIO109_MMCDAT1
++ * GPIO110_MMCDAT2
++ * GPIO111_MMCDAT3
++ * GPIO112_MMCCMD
++ */
++
++/* Spitz/Akita I2C bus */
++#define SPITZ_GPIO_SCL (117) /* I2C SCL */
++#define SPITZ_GPIO_SDA (118) /* I2C SDA */
++#define SPITZ_GPIO_PWR_SCL (3) /* I2C SCL power */
++#define SPITZ_GPIO_PWR_SDA (4) /* I2C SDA power */
++
++/* audio codec pins */
++
++
++/* Spitz/Akita UART ports */
++
++/* Fully Featured UART - connected to IOPORT connector */
++#define SPITZ_GPIO_FFRXD (102) /* IOPORT has nRXD inverted levels */
++#define SPITZ_GPIO_FFTXD (99) /* IOPORT has nTXD inverted levels */
++#define SPITZ_GPIO_FFRTS (98)
++#define SPITZ_GPIO_FFCTS (100)
++#define SPITZ_GPIO_FFDTR (82)
++#define SPITZ_GPIO_FFDSR (33)
++
++/* These UART GPIO pins are connected to Bluetooth
++ * (only on Akita version with Bluetooth)
++ * GPIO42_BTRXD
++ * GPIO43_BTTXD
++ * GPIO44_BTCTS
++ * GPIO45_BTRTS
++ */
++
++/* These UART GPIO pins are connected to IrDA:
++ * GPIO46_STRXD
++ * GPIO47_STTXD
++ */
++
+ /* Spitz/Akita Keyboard Definitions */
+
+-#define SPITZ_KEY_STROBE_NUM (11)
+-#define SPITZ_KEY_SENSE_NUM (7)
+-#define SPITZ_GPIO_G0_STROBE_BIT 0x0f800000
+-#define SPITZ_GPIO_G1_STROBE_BIT 0x00100000
+-#define SPITZ_GPIO_G2_STROBE_BIT 0x01000000
+-#define SPITZ_GPIO_G3_STROBE_BIT 0x00041880
+-#define SPITZ_GPIO_G0_SENSE_BIT 0x00021000
+-#define SPITZ_GPIO_G1_SENSE_BIT 0x000000d4
+-#define SPITZ_GPIO_G2_SENSE_BIT 0x08000000
+-#define SPITZ_GPIO_G3_SENSE_BIT 0x00000000
+-
+-#define SPITZ_GPIO_KEY_STROBE0 88
+-#define SPITZ_GPIO_KEY_STROBE1 23
+-#define SPITZ_GPIO_KEY_STROBE2 24
+-#define SPITZ_GPIO_KEY_STROBE3 25
+-#define SPITZ_GPIO_KEY_STROBE4 26
+-#define SPITZ_GPIO_KEY_STROBE5 27
+-#define SPITZ_GPIO_KEY_STROBE6 52
+-#define SPITZ_GPIO_KEY_STROBE7 103
+-#define SPITZ_GPIO_KEY_STROBE8 107
+-#define SPITZ_GPIO_KEY_STROBE9 108
+-#define SPITZ_GPIO_KEY_STROBE10 114
+-
+-#define SPITZ_GPIO_KEY_SENSE0 12
+-#define SPITZ_GPIO_KEY_SENSE1 17
+-#define SPITZ_GPIO_KEY_SENSE2 91
+-#define SPITZ_GPIO_KEY_SENSE3 34
+-#define SPITZ_GPIO_KEY_SENSE4 36
+-#define SPITZ_GPIO_KEY_SENSE5 38
+-#define SPITZ_GPIO_KEY_SENSE6 39
++#define SPITZ_KEY_STROBE_NUM (11)
++#define SPITZ_KEY_SENSE_NUM (7)
++#define SPITZ_GPIO_G0_STROBE_BIT 0x0f800000
++#define SPITZ_GPIO_G1_STROBE_BIT 0x00100000
++#define SPITZ_GPIO_G2_STROBE_BIT 0x01000000
++#define SPITZ_GPIO_G3_STROBE_BIT 0x00041880
++#define SPITZ_GPIO_G0_SENSE_BIT 0x00021000
++#define SPITZ_GPIO_G1_SENSE_BIT 0x000000d4
++#define SPITZ_GPIO_G2_SENSE_BIT 0x08000000
++#define SPITZ_GPIO_G3_SENSE_BIT 0x00000000
++#define SPITZ_GPIO_KEY_STROBE0 (88)
++#define SPITZ_GPIO_KEY_STROBE1 (23)
++#define SPITZ_GPIO_KEY_STROBE2 (24)
++#define SPITZ_GPIO_KEY_STROBE3 (25)
++#define SPITZ_GPIO_KEY_STROBE4 (26)
++#define SPITZ_GPIO_KEY_STROBE5 (27)
++#define SPITZ_GPIO_KEY_STROBE6 (52)
++#define SPITZ_GPIO_KEY_STROBE7 (103)
++#define SPITZ_GPIO_KEY_STROBE8 (107)
++#define SPITZ_GPIO_KEY_STROBE9 (108)
++#define SPITZ_GPIO_KEY_STROBE10 (114)
++#define SPITZ_GPIO_KEY_SENSE0 (12)
++#define SPITZ_GPIO_KEY_SENSE1 (17)
++#define SPITZ_GPIO_KEY_SENSE2 (91)
++#define SPITZ_GPIO_KEY_SENSE3 (34)
++#define SPITZ_GPIO_KEY_SENSE4 (36)
++#define SPITZ_GPIO_KEY_SENSE5 (38)
++#define SPITZ_GPIO_KEY_SENSE6 (39)
++
++#define SPITZ_GPIO_SWA (97) /* Keyboard Interrupt A */
++#define SPITZ_GPIO_SWB (96) /* Keyboard Interrupt B */
++#define SPITZ_GPIO_ON_KEY (95) /* Power On Key */
+
+
+-/* Spitz Scoop Device (No. 1) GPIOs */
++/* Spitz/Akita Scoop Device (No. 1) GPIOs */
+ /* Suspend States in comments */
+-#define SPITZ_SCP_LED_GREEN SCOOP_GPCR_PA11 /* Keep */
+-#define SPITZ_SCP_JK_B SCOOP_GPCR_PA12 /* Keep */
+-#define SPITZ_SCP_CHRG_ON SCOOP_GPCR_PA13 /* Keep */
+-#define SPITZ_SCP_MUTE_L SCOOP_GPCR_PA14 /* Low */
+-#define SPITZ_SCP_MUTE_R SCOOP_GPCR_PA15 /* Low */
+-#define SPITZ_SCP_CF_POWER SCOOP_GPCR_PA16 /* Keep */
+-#define SPITZ_SCP_LED_ORANGE SCOOP_GPCR_PA17 /* Keep */
+-#define SPITZ_SCP_JK_A SCOOP_GPCR_PA18 /* Low */
+-#define SPITZ_SCP_ADC_TEMP_ON SCOOP_GPCR_PA19 /* Low */
++#define SPITZ_SCP_LED_GREEN SCOOP_GPCR_PA11 /* Green LED, Keep */
++#define SPITZ_SCP_JK_B SCOOP_GPCR_PA12 /* Fast Charge On, Keep */
++#define SPITZ_SCP_CHRG_ON SCOOP_GPCR_PA13 /* Charge On, Keep */
++#define SPITZ_SCP_MUTE_L SCOOP_GPCR_PA14 /* Extra Mute Left, Low */
++#define SPITZ_SCP_MUTE_R SCOOP_GPCR_PA15 /* Extra Mute Right, Low */
++#define SPITZ_SCP_CF_POWER SCOOP_%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list