[oe-commits] org.oe.dev merge of '0d28663b1cddb7ffeb3f2c43b300935b7b432b98'

[pfalcon commit]

merge of '0d28663b1cddb7ffeb3f2c43b300935b7b432b98'
     and '673818154cbb2b32a756188c27a827021f5d81f5'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 1b96e689e33845c251e1db7e51f28be0d2d037f8
ViewMTN: http://monotone.openembedded.org/revision/info/1b96e689e33845c251e1db7e51f28be0d2d037f8
Files:
1
conf/machine/hx4700.conf
conf/machine/magician.conf
conf/distro/generic-uclibc.conf
conf/distro/generic.conf
Diffs:

#
# mt diff -r0d28663b1cddb7ffeb3f2c43b300935b7b432b98 -r1b96e689e33845c251e1db7e51f28be0d2d037f8
#
# 
# 
# patch "conf/machine/hx4700.conf"
#  from [1181931b2a5904b7567bc19b2442b84fec80033a]
#    to [7073f22f2c781c6ef6eaf11fac2de5ae77d66f5b]
# 
# patch "conf/machine/magician.conf"
#  from [1ae98222e011e1527f45541f6e78db64c18e0824]
#    to [4260af3d8d3a880db6afad5b346400cd59e1fd77]
# 
============================================================
--- conf/machine/hx4700.conf	1181931b2a5904b7567bc19b2442b84fec80033a
+++ conf/machine/hx4700.conf	7073f22f2c781c6ef6eaf11fac2de5ae77d66f5b
@@ -1,5 +1,5 @@
 #@TYPE: Machine
-#@NAME: iPAQ hx47xx
+#@NAME: HP iPAQ hx47xx
 #@DESCRIPTION: Machine configuration for the hx4700 iPAQ with a pxa27x CPU
 
 #
@@ -19,7 +19,9 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "200"
+MACHINE_FEATURES = "alsa apm bluetooth irda pcmcia screen touchscreen usbgadget wifi"
 MACHINE_FEATURES += "iwmmxt"
 
 #
@@ -35,13 +37,13 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 
 MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
 MACHINE_EXTRA_RRECOMMENDS = "\
-				kernel-module-i2c-pxa \
-				kernel-module-pxa27x-voltage \
-				kernel-module-pxa27x-voltage-max158xx \
-				kernel-module-acx \
-				kernel-module-hx4700-acx \
-				kernel-module-hx4700-bt \
-				kernel-module-snd-hx4700-audio"
+	kernel-module-i2c-pxa \
+	kernel-module-pxa27x-voltage \
+	kernel-module-pxa27x-voltage-max158xx \
+	kernel-module-acx \
+	kernel-module-hx4700-acx \
+	kernel-module-hx4700-bt \
+	kernel-module-snd-hx4700-audio"
 
 #write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there
 EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
============================================================
--- conf/machine/magician.conf	1ae98222e011e1527f45541f6e78db64c18e0824
+++ conf/machine/magician.conf	4260af3d8d3a880db6afad5b346400cd59e1fd77
@@ -24,13 +24,7 @@ MACHINE_FEATURES += "iwmmxt"
 MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost"
 MACHINE_FEATURES += "iwmmxt"
 
-
 #
-# We don't support jffs2 installations (yet).
-#
-IMAGE_FSTYPES = "tar.bz2"
-
-#
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
@@ -44,17 +38,18 @@ MACHINE_EXTRA_RRECOMMENDS = " \
 	kernel-module-i2c-pxa \
 	kernel-module-pxa27x-voltage \
 	kernel-module-pxa27x-voltage-max158xx \
-	kernel-module-leds-magician \
 	kernel-module-magician-ts \
-	kernel-module-magician-flash \
-	kernel-module-magician-ds1wm \
-	kernel-module-magician-battery \
 	kernel-module-magician-phone \
 	kernel-module-magician-pm \
 	kernel-module-n-tihtc \
 	kernel-module-snd-soc-magician"
 
+#write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there
+EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
+			  -e 256KiB -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
+
 #
 # Modules autoload and other boot properties
 #
@@ -63,8 +58,6 @@ module_autoload_pxa27x_udc = "pxa27x_udc
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
 module_autoload_pxa27x_udc = "pxa27x_udc"
-module_autoload_magician_ds1wm = "magician_ds1wm"
-module_autoload_magician-battery = "magician-battery"
 module_autoload_magician_phone = "magician_phone"
 module_autoload_magician_pm = "magician_pm"
 module_autoload_n_tihtc = "n_tihtc"


#
# mt diff -r673818154cbb2b32a756188c27a827021f5d81f5 -r1b96e689e33845c251e1db7e51f28be0d2d037f8
#
# 
# 
# patch "conf/distro/generic-uclibc.conf"
#  from [24dc46bef762014295a9f6a96c586ddbdea62d06]
#    to [2280bf1003490f3615211613df40817df22352d3]
# 
# patch "conf/distro/generic.conf"
#  from [4c7db192371c90fef979ed8017dcb610a2842914]
#    to [d45a46f2df99b280a6fead15ab5f1e1c3b41ab0f]
# 
============================================================
--- conf/distro/generic-uclibc.conf	24dc46bef762014295a9f6a96c586ddbdea62d06
+++ conf/distro/generic-uclibc.conf	2280bf1003490f3615211613df40817df22352d3
@@ -21,5 +21,9 @@ TARGET_FPU_armeb = "soft"
 TARGET_OS = "linux-uclibc"
 TARGET_FPU_arm = "soft"
 TARGET_FPU_armeb = "soft"
+PREFERRED_PROVIDER_virtual/libc = "uclibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
 PREFERRED_PROVIDER_virtual/libintl = "libintl"
============================================================
--- conf/distro/generic.conf	4c7db192371c90fef979ed8017dcb610a2842914
+++ conf/distro/generic.conf	d45a46f2df99b280a6fead15ab5f1e1c3b41ab0f
@@ -56,9 +56,7 @@ PREFERRED_PROVIDER_virtual/libc = "glibc
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
 PREFERRED_PROVIDER_virtual/libc = "glibc"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
 PREFERRED_VERSION_glibc ?= "2.5"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"