summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/linux/linux-ezx_2.6.21.bb30
-rw-r--r--packages/linux/linux.inc36
-rw-r--r--packages/openmoko-base/openmoko-sound-system/session2
-rw-r--r--packages/openmoko-base/openmoko-sound-system_0.1.0.bb2
-rw-r--r--packages/openmoko-base/openmoko-sound-theme-standard_svn.bb4
5 files changed, 50 insertions, 24 deletions
diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index cf0f246ecc..d74a22b652 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -1,12 +1,9 @@
DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680"
-SECTION = "kernel"
-AUTHOR = "Harald Welte and the OpenEZX Team <openezx-devel@lists.openezx.org>"
+AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
-LICENSE = "GPL"
EZX = "ezxdev"
PR = "${EZX}-r15"
-inherit kernel
require linux.inc
@@ -85,13 +82,18 @@ COMPATIBLE_MACHINE = '(a780|e680|a1200|rorkre2|rokre6)'
CMDLINE_CON = "console=tty1 "
CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5"
-# uncomment if you want to boot over NFS
-#CMDLINE_ROOT = "root=301 root=/dev/nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 "
-# uncomment to enable dyntick
+CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 "
+# Uncomment to enable dyntick
#CMDLINE_OTHER = "dyntick=enable"
CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
CMDLINE_IP = "ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} mem=32M@0xA0000000 mem=16M@0xAC000000"
+CMDLINE_MEM = "mem=32M@0xA0000000 mem=16M@0xAC000000"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}"
+# Uncomment to use root-over-nfs-over-usb
+#CMDLINE_NFSROOT_USB = "${CMDLINE_CON} ${CMDLINE_NFSROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}"
+
+# 1024x1024 is the maximum kernel size for boot-over-usb
+KERNEL_IMAGE_MAXSIZE = "1294336"
###############################################################
# module configs specific to this kernel
@@ -99,15 +101,3 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDL
#module_autoload_pxaficp_ir = "pxaficp_ir"
#module_autoload_snd-pcm-oss = "snd-pcm-oss"
-###############################################################
-# check the kernel is below the 1024*1024 byte limit for the boot-over usb
-#
-do_compile_append() {
- size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
- if [ $size -ge 1294336 ]; then
- #rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
- echo "Size is $size"
- echo "This kernel is too big for your EZX Phone. Please reduce the size of the kernel by making more of it modular."
- fi
-}
-
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index a25dc44083..4fef1f98ef 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -18,7 +18,7 @@ DEPENDS_append_fic-gta01 = " u-boot-mkimage-openmoko-native "
DEPENDS_append_fic-gta02 = " u-boot-mkimage-openmoko-native "
-# Specify the commandline for you device
+# Specify the commandline for your device
#boot from mmc
CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=5"
@@ -28,12 +28,18 @@ CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfs
do_configure_prepend() {
echo "" > ${S}/.config
+ #
+ # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
+ #
if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
echo "CONFIG_LOGO=y" >> ${S}/.config
echo "CONFIG_LOGO_LINUX_CLUT224=y" >> ${S}/.config
fi
+ #
+ # oabi / eabi support
+ #
if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
echo "CONFIG_AEABI=y" >> ${S}/.config
echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
@@ -51,9 +57,36 @@ do_configure_prepend() {
-e '/CONFIG_LOGO_LINUX_CLUT224=/d' \
< '${WORKDIR}/defconfig' >>'${S}/.config'
+ #
+ # root-over-nfs-over-usbgadget support. Limited, but should cover some cases.
+ # Note that you need to have a proper CMDLINE_NFSROOT_USB set for this to work.
+ #
+ if [ ! -z "${CMDLINE_NFSROOT_USB}" ]; then
+ oenote "Configuring the kernel for root-over-nfs-over-usbgadget with CMDLINE ${CMDLINE_NFSROOT_USB}"
+ echo "CONFIG_INET=y" >> ${S}/.config
+ echo "CONFIG_IP_PNP=y" >> ${S}/.config
+ echo "CONFIG_USB_GADGET=y" >> ${S}/.config
+ echo "CONFIG_USB_ETH=y" >> ${S}/.config
+ echo "CONFIG_NFS_FS=y" >> ${S}/.config
+ echo "CONFIG_ROOT_NFS=y" >> ${S}/.config
+ echo "CONFIG_CMDLINE=\"${CMDLINE_NFSROOT_USB}\"" >> ${S}/.config
+ fi
+
yes '' | oe_runmake oldconfig
}
+# Support checking the kernel size since some kernels need to reside in partitions
+# with a fixed length or there is a limit in transferring the kernel to memory
+do_sizecheck() {
+ if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
+ size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
+ if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
+ rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+ die "This kernel (size=$size) is too big for your device. Please reduce the size of the kernel by making more of it modular."
+ fi
+ fi
+}
+
do_install_prepend() {
if test -e arch/${ARCH}/boot/Image ; then
ln -f arch/${ARCH}/boot/Image arch/${ARCH}/boot/uImage
@@ -90,5 +123,6 @@ do_deploy() {
do_deploy[dirs] = "${S}"
+addtask sizecheck before do_install after do_compile
addtask deploy before do_package after do_install
diff --git a/packages/openmoko-base/openmoko-sound-system/session b/packages/openmoko-base/openmoko-sound-system/session
index 91267b672a..dfef83d934 100644
--- a/packages/openmoko-base/openmoko-sound-system/session
+++ b/packages/openmoko-base/openmoko-sound-system/session
@@ -24,3 +24,5 @@ load-module module-x11-bell sample=x11-bell
# Load samples
load-sample startup /usr/share/openmoko/sounds/startup_openmoko.wav
load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
+load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
+
diff --git a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
index 671ff37f45..ddb5053f3e 100644
--- a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
+++ b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
@@ -10,7 +10,7 @@ RDEPENDS = "\
pulseaudio-module-native-protocol-unix \
pulseaudio-module-cli-protocol-unix \
"
-PR = "r5"
+PR = "r6"
inherit openmoko-base update-rc.d
diff --git a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
index f521fe1de6..f42b75ecb0 100644
--- a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
SECTION = "openmoko/base"
PV = "0.1+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
inherit openmoko-base autotools
@@ -14,7 +14,7 @@ do_install() {
for i in *.mp3; do
cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
done
- for i in touchscreen_click.wav notify_doorbell.wav startup_openmoko.wav; do
+ for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_openmoko.wav; do
cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
done
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-31 22:55:28 +0000