summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/aximx50.conf5
-rw-r--r--conf/machine/h2200.conf7
-rw-r--r--conf/machine/h3600.conf23
-rw-r--r--conf/machine/h4000.conf5
-rw-r--r--conf/machine/htcuniversal.conf6
-rw-r--r--conf/machine/hx4700.conf25
-rw-r--r--conf/machine/include/collie-2.6.inc27
-rw-r--r--conf/machine/include/ixp4xx.inc22
-rw-r--r--conf/machine/magician.conf18
-rw-r--r--conf/machine/mpc8313e-rdb.conf3
10 files changed, 73 insertions, 68 deletions
diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf
index 0dda9492e9..b119a24359 100644
--- a/conf/machine/aximx50.conf
+++ b/conf/machine/aximx50.conf
@@ -32,10 +32,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
- kernel-module-nls-iso8859-1 \
- kernel-module-nls-utf8 \
- kernel-module-af-key \
+MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-i2c-pxa"
#
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 60a732ffa6..c149da18fa 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -27,12 +27,19 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround"
+MACHINE_EXTRA_RRECOMMENDS = "\
+ kernel-module-snd-h2200-audio \
+ kernel-module-i2c-pxa \
+ "
+
EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
#
# Modules autoload and other boot properties
#
module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-h2000-audio = "snd-h2000-audio"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 9cf8272b51..1fcaf664d4 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -27,32 +27,11 @@ PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
+MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-micro"
EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
-
-
-# TODO: see if any of these modules have 2.6 counterparts
-# and need to be RRECOMMENDED
-#
-#H3600_MODULES = "\
-#h3600-asic \
-#hwtimer \
-#nvrd \
-#sa1100-cs \
-#sa1100-ir \
-#sa1100-wdt \
-#sa1100-audio \
-#sa1100-rtc \
-#sa1100usb-core \
-#sd-mod \
-#serial-h3800 \
-#"
-
-
-
#
# Modules autoload and other boot properties
#
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index f56bee00e8..0683498c5f 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -26,8 +26,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}"
MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
- kernel-module-h4000-pcmcia \
kernel-module-i2c-pxa \
+ kernel-module-h4000-bt \
+ kernel-module-h4000-pcmcia \
kernel-module-acx \
"
@@ -36,7 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
#
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_snd-h4000_audio = "snd-h4000_audio"
+module_autoload_snd-h4000-audio = "snd-h4000-audio"
module_autoload_g_ether = "g_ether"
module_conf_acx = "blacklist acx"
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index c3e7cf710e..b7b9b5cdc0 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -28,11 +28,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
XSERVER = "xserver-kdrive-fbdev"
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \
- kernel-module-nls-iso8859-1 \
- kernel-module-nls-utf8 \
- kernel-module-af-key \
- kernel-module-bsd-comp \
+MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-i2c-pxa \
kernel-module-snd-htcuniversal-audio \
kernel-module-htcuniversal-acx \
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 87e03a7bdd..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"
#
@@ -34,17 +36,14 @@ XSERVER = "xserver-kdrive-w100"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
- kernel-module-nls-iso8859-1 \
- kernel-module-nls-utf8 \
- kernel-module-af-key \
- 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"
+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"
#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/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc
index f22ffce6c2..36b01c7ef2 100644
--- a/conf/machine/include/collie-2.6.inc
+++ b/conf/machine/include/collie-2.6.inc
@@ -4,3 +4,30 @@ SERIAL_CONSOLE = "115200 ttySA0"
MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi"
MACHINE_EXTRA_RDEPENDS = "kernel-modules"
+
+MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
+
+zaurus_make_installkit () {
+ cd ${DEPLOY_DIR_IMAGE}
+ rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+ mkdir ${IMAGE_NAME}-installkit/
+ # Get the latest kernel using the zImage-<machine>.bin symlink
+ cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+ if [ "${MACHINE}" = "spitz" ]; then
+ cp gnu-tar ${IMAGE_NAME}-installkit/
+ cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+ else
+ [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+ fi
+
+ # All zaurus machines except collie need updater.sh
+ if [ "${MACHINE}" != "collie" ]; then
+ cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+ fi
+
+ tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
+ md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
+ rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+}
+
+
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index 04b6542470..6e7d303586 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -2,20 +2,24 @@
#@NAME: ixp4xx
#@DESCRIPTION: genric machine configuration for ixp4xx platforms
-# Set default for nslu2 - can be overridden for machines with other features.
-MACHINE_FEATURES ?= "kernel26 usbhost ext2"
+# Set default for common ixp4xx-based machines
+MACHINE_FEATURES ?= "kernel26 usbhost ext2 redboot apex"
-# Set defaults for nslu2 - can be overridden for machines with other requirements.
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+# Select an appropriate default kernel
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
+
+# Add packages required for basic networking support
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
-# Set default for nslu2 - can be overridden for machines with more flash.
+# Set default for 16MB machines - can be overridden for more or less flash.
ROOT_FLASH_SIZE ?= "12"
-# Set default for nslu2, nas100d, dsmg600
-EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
+# Allow for rootfs loaded direct from internal hard disk
+IMAGE_FSTYPES ?= "jffs2 tar.gz"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
+# Set default for common ixp4xx-based machines
+EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
require conf/machine/include/tune-xscale.inc
require conf/machine/include/tune-thumb.inc
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 900b24b751..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
#
@@ -41,20 +35,20 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
MACHINE_EXTRA_RRECOMMENDS = " \
- kernel-module-af-key \
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
@@ -64,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/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index 3c47b53b56..81c3e29e91 100644
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -13,6 +13,9 @@ MACHINE_FEATURES = "kernel26 usbhost ext2"
PREFERRED_VERSION_u-boot = "1.3.0"
UBOOT_MACHINE = "MPC8313ERDB_33_config"
+#rootfs on NAND flash
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers"
+
#don't try to access tty1
USE_VT = "0"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-20 01:55:44 +0000