summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/moko-autorev.inc3
-rw-r--r--conf/machine/hx4700.conf20
-rw-r--r--conf/machine/magician.conf17
-rw-r--r--packages/base-files/base-files/fic-gta01/fstab2
-rw-r--r--packages/base-files/base-files/fic-gta02/fstab2
-rw-r--r--packages/images/base-image.bb76
-rw-r--r--packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb2
7 files changed, 93 insertions, 29 deletions
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 2cc722f013..74b930781b 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -27,8 +27,6 @@ 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-gps ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
@@ -51,4 +49,3 @@ SRCREV_pn-dfu-util ?= "${AUTOREV}"
SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
SRCREV_pn-usbpath ?= "${AUTOREV}"
SRCREV_pn-usbpath-native ?= "${AUTOREV}"
-
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 \
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"
diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/fic-gta01/fstab
index 4a0cc7750d..e5acb6a1eb 100644
--- a/packages/base-files/base-files/fic-gta01/fstab
+++ b/packages/base-files/base-files/fic-gta01/fstab
@@ -6,10 +6,8 @@ proc /proc proc defaults 0 0
# usb?
# Temporary
-tmpfs /tmp tmpfs defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /dev/shm tmpfs mode=0777 0 0
-tmpfs /media/ram tmpfs defaults 0 0
# microSD slot
/dev/mmcblk0p1 /media/card auto defaults,async,noauto 0 0
diff --git a/packages/base-files/base-files/fic-gta02/fstab b/packages/base-files/base-files/fic-gta02/fstab
index 4a0cc7750d..e5acb6a1eb 100644
--- a/packages/base-files/base-files/fic-gta02/fstab
+++ b/packages/base-files/base-files/fic-gta02/fstab
@@ -6,10 +6,8 @@ proc /proc proc defaults 0 0
# usb?
# Temporary
-tmpfs /tmp tmpfs defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /dev/shm tmpfs mode=0777 0 0
-tmpfs /media/ram tmpfs defaults 0 0
# microSD slot
/dev/mmcblk0p1 /media/card auto defaults,async,noauto 0 0
diff --git a/packages/images/base-image.bb b/packages/images/base-image.bb
new file mode 100644
index 0000000000..20a5fd9445
--- /dev/null
+++ b/packages/images/base-image.bb
@@ -0,0 +1,76 @@
+# This image is intended to provide a basic configuration that allows
+# you to access a newly flashed device over the network or via the
+# native console, and use ipkg to install (from feeds accessible via
+# the network) any further features you require into internal flash
+# memory or onto attached storage.
+
+# It should be as small as possible, while still achieving that goal.
+
+# The rationale for naming it 'base-image' is that this image is the
+# base upon which you can install any other functionality you desire.
+
+# See the end of this file for further rationale and policy regarding
+# the contents of this image, and the criteria which are used to make
+# decisions about adding and removing packages from this image.
+
+# Although it is only fully tested with the Angstrom distro, this
+# image is intended to be distro-agnostic.
+
+DISTRO_SSH_DAEMON ?= "dropbear"
+DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+
+DEPENDS = "\
+ task-boot \
+ task-distro-base task-machine-base \
+ ${DISTRO_SSH_DAEMON} \
+ ${DISTRO_PACKAGE_MANAGER} \
+ task-base-usbhost task-base-ext2 \
+ "
+
+IMAGE_INSTALL = "\
+ task-boot \
+ task-distro-base task-machine-base \
+ ${DISTRO_SSH_DAEMON} \
+ ${DISTRO_PACKAGE_MANAGER} \
+ task-base-usbhost task-base-ext2 \
+ "
+
+export IMAGE_BASENAME = "base-image"
+IMAGE_LINGUAS = ""
+
+inherit image
+
+# Key features of this image are:
+
+# 1) Must be able to mount attached storage devices like SD cards, CF
+# cards, internal disks, external USB disks, etc. Should support
+# various filesystem choices, but ext2 at a minimum. The rationale
+# for this is that you need storage to be able to install significant
+# new functionality.
+
+# 2) Must be able to boot from internal flash, or directly from a
+# filesystem stored on the attached storage. The rationale for this
+# is that you will want to boot from attached storage instead of
+# messing around with ipkg-link.
+
+# Rationale and policy:
+
+# 'base-image' is the smallest possible image which allows you to ssh
+# into a device via it's native network interface, and install
+# packages from feeds across the network into internal flash or onto
+# an attached storage device.
+
+# It is "larger" than minimal-image (which is strictly only that which
+# is required to boot and get ssh access to the device, and nothing
+# else), but is "smaller" than console-image (which has a whole lot of
+# stuff in it which could easily be ipkg installed after boot rather
+# than being in the initial rootfs).
+
+# It is required to always be small enough to fit in the internal
+# flash rootfs partition of an NSLU2 (as an example of the smaller end
+# of flash sizes that OE supports), and features will be removed from
+# the image to ensure that this is always the case. Any feature that
+# can be installed over the network using the package manager after
+# the first boot is always fair game for removal at any time, and
+# patches are welcome to make base-image as small as possible while
+# still retaining the ability to subsequently install that feature.
diff --git a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
index b96cf8fa74..1526cbab55 100644
--- a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
+++ b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
@@ -4,7 +4,7 @@ PACKAGE_ARCH = "all"
SRC_URI = "svn://svn.openmoko.org/developers/john_lee;module=toolkit;proto=http"
SRC_URI += "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=openmoko-sample2;proto=http"
-SRCREV="3563"
+SRCREV="3630"
FILES_${PN} = "/"
do_install () {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 21:23:23 +0000