From 8b3f5e14259bcb2bc9872577238754f5372b443a Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 13 Dec 2007 07:00:43 +0000 Subject: patch moko-autorev.inc to reflect the removal of OM2007 in svn by comment out the obsolete items. --- conf/distro/include/moko-autorev.inc | 47 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 24 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 0e29c19c5c..348234e789 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -10,56 +10,56 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-neod ?= "${AUTOREV}" -SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}" +#SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}" SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}" SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-calculator ?= "${AUTOREV}" +#SRCREV_pn-openmoko-calculator ?= "${AUTOREV}" SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-common ?= "${AUTOREV}" +#SRCREV_pn-openmoko-common ?= "${AUTOREV}" SRCREV_pn-openmoko-common2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-contacts ?= "${AUTOREV}" +#SRCREV_pn-openmoko-contacts ?= "${AUTOREV}" SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-dates ?= "${AUTOREV}" +#SRCREV_pn-openmoko-dates ?= "${AUTOREV}" SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-dialer ?= "${AUTOREV}" +#SRCREV_pn-openmoko-dialer ?= "${AUTOREV}" SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}" SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}" +#SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}" SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-footer ?= "${AUTOREV}" -SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}" +#SRCREV_pn-openmoko-footer ?= "${AUTOREV}" +#SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}" SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}" -SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}" -SRCREV_pn-openmoko-libs ?= "${AUTOREV}" +#SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}" +#SRCREV_pn-openmoko-libs ?= "${AUTOREV}" SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-messages ?= "${AUTOREV}" +#SRCREV_pn-openmoko-messages ?= "${AUTOREV}" SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}" -SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}" +#SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" -SRCREV_pn-openmoko-session ?= "${AUTOREV}" -SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" -SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" +#SRCREV_pn-openmoko-session ?= "${AUTOREV}" +#SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" +#SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}" -SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}" -SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}" -SRCREV_pn-openmoko-tasks ?= "${AUTOREV}" +#SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}" +#SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}" +#SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}" +#SRCREV_pn-openmoko-tasks ?= "${AUTOREV}" SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}" SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}" -SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}" +#SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}" +#SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}" -SRCREV_pn-openmoko-today ?= "${AUTOREV}" +#SRCREV_pn-openmoko-today ?= "${AUTOREV}" SRCREV_pn-openmoko-today2 ?= "${AUTOREV}" SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" @@ -72,4 +72,3 @@ SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" SRCREV_pn-usbpath ?= "${AUTOREV}" SRCREV_pn-usbpath-native ?= "${AUTOREV}" - -- cgit v1.2.3 From a60198d94c77b96ed3fc8c1bfee24432fec4412d Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 13 Dec 2007 08:58:40 +0000 Subject: missed SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}" --- conf/distro/include/moko-autorev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 348234e789..85376da766 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -39,7 +39,7 @@ SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}" -SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}" +#SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}" #SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" -- cgit v1.2.3 From 2f833ae83653728fb8e370ab571f125e9935ccf3 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 15 Dec 2007 18:52:17 +0000 Subject: hx4700: MACHINE variable housekeeping * add MACHINE_DISPLAY_ORIENTATION, MACHINE_DISPLAY_PPI * reorder MACHINE_FEATURES alphabetically --- conf/machine/hx4700.conf | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'conf') diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index daa74866b2..ce8aab0d84 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -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 @@ VOLATILE_STORAGE_SIZE = "64" 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 @@ PREFERRED_VERSION_orinoco-modules = "0.15rc1" 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 \ -- cgit v1.2.3 From 4e8136255b37ef73e1e513edfee977e8d93db235 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 15 Dec 2007 18:54:29 +0000 Subject: magician.conf: remove deprecated kernel modules, enable jffs2 image building --- conf/machine/magician.conf | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'conf') diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index e099825a40..e605001406 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -24,12 +24,6 @@ MACHINE_DISPLAY_PPI = "142" 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 # @@ -44,16 +38,17 @@ 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_leds-magician = "leds-magician" 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" -- cgit v1.2.3