summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-03-28 20:03:39 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-28 20:03:39 +0000
commita4f921a0bcfa7ec3ea032f94798a7cc7f9f00cf2 (patch)
tree449c1908f5e8daaf064c53f14a410fee11bccbe7
parentecc1bd45d39bd4b1f36f682905c3f8b16c96d983 (diff)
parentaca937147be3a8a24513f2a46980e81ae7ee4dca (diff)
merge of 302d21decbd1d79c1094dfee3467af3dce7f2b80
and bad98b28c8abd2db8c6e9a0a38da11c57881f29f
-rw-r--r--packages/altboot/altboot_0.0.0.bb2
-rw-r--r--packages/altboot/files/tosa/.mtn2git_empty0
-rw-r--r--packages/altboot/files/tosa/altboot-2.4.cfg27
-rw-r--r--packages/keymap-locales/keymap-locales.bb6
4 files changed, 33 insertions, 2 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 7d56cbd3a6..4b69c50e14 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
LICENSE = "GPL"
IGNORE_STRIP_ERRORS = "1"
-PR = "r26"
+PR = "r27"
SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/files/tosa/.mtn2git_empty b/packages/altboot/files/tosa/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/altboot/files/tosa/.mtn2git_empty
diff --git a/packages/altboot/files/tosa/altboot-2.4.cfg b/packages/altboot/files/tosa/altboot-2.4.cfg
new file mode 100644
index 0000000000..edbaff8b87
--- /dev/null
+++ b/packages/altboot/files/tosa/altboot-2.4.cfg
@@ -0,0 +1,27 @@
+# Handled by /sbin/init.altboot
+# Allow booting images from SD or CF instead of booting
+# the ROM.
+ENABLE_ALTBOOT="yes"
+TIMEOUT="4"
+REAL_INIT="/sbin/init.sysvinit"
+SH_SHELL="/bin/sh"
+
+IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
+FSCK_IMAGES="no"
+
+SD_DEVICE="/dev/mmcda1"
+SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"
+
+USB_HOST_AVAILABLE="yes"
+USB_STORAGE_MODULES="usb_ohci_tc6393 usb-storage"
+USB_STORAGE_PARTITION="/dev/sda1"
+USB_STORAGE_WAIT="4"
+
+INIT_RUNLEVEL="5"
+NO_GUI_RL="2"
+MASTER_PASSWORD=""
+ASK_PW_ON_BOOT="no"
+
+SD_MOUNTPOINT="/media/card"
+CF_MOUNTPOINT="/media/cf"
diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb
index 5ba84e69ca..f1b479d47a 100644
--- a/packages/keymap-locales/keymap-locales.bb
+++ b/packages/keymap-locales/keymap-locales.bb
@@ -4,13 +4,17 @@ PRIORITY = "optional"
MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
SRC_URI = "file://*.map"
# If any python guru wants to setup PACKAGES_$machine with some code instead,
# be my guet =)
PACKAGES_akita = "keymap-extension-de"
+PACKAGES_spitz = "keymap-extension-de"
+PACKAGES_borzoi = "keymap-extension-de"
+PACKAGES_c7x0 = "keymap-extension-de"
+PACKAGES_collie = "keymap-extension-de"
FILES_keymap-extension-de = "/etc/*-de.map"
FILES_keymap-extension-fr = "/etc/*-fr.map"