dm*.conf: create common include files and update for dev

diff --git a/conf/machine/dm500plus.conf b/conf/machine/dm500plus.conf
index 2aead2f..4998b03 100644 (file)
--- a/conf/machine/dm500plus.conf
+++ b/conf/machine/dm500plus.conf
@@ -1,45 +1,5 @@
-TARGET_ARCH = "powerpc"
-IPKG_ARCHS = "all powerpc ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-dm500plus"
+#@TYPE: Machine
+#@NAME: Dreambox DM 500+
+#@DESCRIPTION: Machine configuration for the Dreambox DM 500+
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "dreambox-dvb-modules"
-
-TARGET_FPU = "soft"
-TARGET_CPU = "405"
-
-OVERRIDES =. "dvbapiv1:"
-
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
-PREFERRED_VERSION_glibc-initial = "2.3.2+cvs20040726"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk = "3.4.4" 
-PREFERRED_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gdb = "6.5"
-PREFERRED_VERSION_gdb-cross = "6.5"
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
-PREFERRED_VERSION_binutils = "2.15.94.0.1"
-PREFERRED_VERSION_busybox = "1.01"
-
-GLIBC_EXTRA_OECONF = "--with-tls --without-fp --with-__thread"
-
-EXTRA_IMAGEDEPENDS += "dreambox-secondstage dreambox-buildimage-native"
-EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x4000 -n -b "
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
-       --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
-       ${EXTRA_IMAGECMD}; rm -rf ${IMAGE_ROOTFS}/boot/*; \
-                               mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-       --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-       ${EXTRA_IMAGECMD}; \
-       buildimage ${STAGING_LIBDIR}/dreambox-secondstage/main.bin.gz \
-       ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
-       ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-       ${MACHINE} \
-       > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfi"
+require conf/machine/include/dreambox-powerpc.inc

diff --git a/conf/machine/dm600pvr.conf b/conf/machine/dm600pvr.conf
index f489b71..809af91 100644 (file)
--- a/conf/machine/dm600pvr.conf
+++ b/conf/machine/dm600pvr.conf
@@ -1,43 +1,5 @@
-TARGET_ARCH = "powerpc"
-IPKG_ARCHS = "all powerpc ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-dm600pvr"
+#@TYPE: Machine
+#@NAME: Dreambox DM 600 PVR
+#@DESCRIPTION: Machine configuration for the Dreambox DM 600 PVR
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "dreambox-dvb-modules"
-
-TARGET_FPU = "soft"
-TARGET_CPU = "405"
-
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
-PREFERRED_VERSION_glibc-initial = "2.3.2+cvs20040726"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk = "3.4.4" 
-PREFERRED_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gdb = "6.5"
-PREFERRED_VERSION_gdb-cross = "6.5"
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
-PREFERRED_VERSION_binutils = "2.15.94.0.1"
-PREFERRED_VERSION_busybox = "1.01"
-
-GLIBC_EXTRA_OECONF = "--with-tls --without-fp --with-__thread"
-
-EXTRA_IMAGEDEPENDS += "dreambox-secondstage dreambox-buildimage-native"
-EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x4000 -n -b "
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
-       --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
-       ${EXTRA_IMAGECMD}; rm -rf ${IMAGE_ROOTFS}/boot/*; \
-                               mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-       --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-       ${EXTRA_IMAGECMD}; \
-       buildimage ${STAGING_LIBDIR}/dreambox-secondstage/main.bin.gz \
-       ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
-       ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-       ${MACHINE} \
-       > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfi"
+require conf/machine/include/dreambox-powerpc.inc

diff --git a/conf/machine/dm7020.conf b/conf/machine/dm7020.conf
index f6108b6..c3d17eb 100644 (file)
--- a/conf/machine/dm7020.conf
+++ b/conf/machine/dm7020.conf
@@ -1,42 +1,5 @@
-TARGET_ARCH = "powerpc"
-IPKG_ARCHS = "all powerpc ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-dm7020"
+#@TYPE: Machine
+#@NAME: Dreambox DM 7020
+#@DESCRIPTION: Machine configuration for the Dreambox DM 7020
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "dreambox-dvb-modules"
-
-TARGET_FPU = "soft"
-TARGET_CPU = "405"
-OLDEST_KERNEL = "2.6.9"
-
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
-PREFERRED_VERSION_glibc-initial = "2.3.2+cvs20040726"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk = "3.4.4" 
-PREFERRED_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gdb = "6.5"
-PREFERRED_VERSION_gdb-cross = "6.5"
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
-PREFERRED_VERSION_binutils = "2.15.94.0.1"
- 
-GLIBC_EXTRA_OECONF = "--with-tls --without-fp --with-__thread"
-
-EXTRA_IMAGEDEPENDS += "dreambox-secondstage dreambox-buildimage-native"
-EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x4000 -n -b "
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
-       --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
-       ${EXTRA_IMAGECMD}; rm -rf ${IMAGE_ROOTFS}/boot/*; \
-                               mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-       --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-       ${EXTRA_IMAGECMD}; \
-       buildimage ${STAGING_LIBDIR}/dreambox-secondstage/main.bin.gz \
-       ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
-       ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-       > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfi"
+require conf/machine/include/dreambox-powerpc.inc

diff --git a/conf/machine/dm7025.conf b/conf/machine/dm7025.conf
index e4a6ee1..c448505 100644 (file)
--- a/conf/machine/dm7025.conf
+++ b/conf/machine/dm7025.conf
@@ -1,39 +1,30 @@
 #@TYPE: Machine
-#@NAME: Dreambox DM7025
-#@DESCRIPTION: Machine configuration for the Dreambox DM7025
+#@NAME: Dreambox DM 7025
+#@DESCRIPTION: Machine configuration for the Dreambox DM 7025
 
-TARGET_ARCH = "mipsel"
-IPKG_ARCHS = "all mipsel ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-dm7025"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "dreambox-dvb-modules kernel-module-stv0299 \
-       kernel-module-cdrom     kernel-module-cifs      kernel-module-exportfs \
-       kernel-module-ide-cd kernel-module-reiserfs kernel-module-sd-mod \
-       kernel-module-sg        kernel-module-sr-mod \
-       kernel-module-xfs kernel-module-autofs4 kernel-module-msdos kernel-module-vfat \
-       kernel-module-fat       gst-plugin-dvbmediasink gst-plugin-fluendo-mpegdemux "
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@bb.data.getVar('DISTRO_VERSION', d, 1) != "1.4.0" and "kernel-module-squashfs kernel-module-sqlzma kernel-module-unlzma kernel-module-loop unionfs-modules dreambox-boottool " or " "}
-
-GLIBC_ADDONS = "ports,nptl,libidn"
-TARGET_FPU = "soft"
-OLDEST_KERNEL = "2.6.9"
-
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-
-#PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
-#PREFERRED_VERSION_gcc-cross-initial = "3.4.5"
-#PREFERRED_VERSION_gcc-cross = "3.4.5"
-#PREFERRED_VERSION_gcc-cross-sdk = "3.4.5"
-#PREFERRED_VERSION_gcc = "3.4.5"
-#PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-#PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
-#PREFERRED_VERSION_binutils = "2.15.94.0.1"
-#PREFERRED_VERSION_linux-libc-headers = "2.6.11.1"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
+       dreambox-boottool \
+       gst-plugin-dvbmediasink \
+       gst-plugin-fluendo-mpegdemux \
+       kernel-module-autofs4 \
+       kernel-module-cdrom \
+       kernel-module-cifs \
+       kernel-module-exportfs \
+       kernel-module-fat \
+       kernel-module-ide-cd \
+       kernel-module-loop \
+       kernel-module-msdos \
+       kernel-module-reiserfs \
+       kernel-module-sd-mod \
+       kernel-module-sg \
+       kernel-module-sqlzma \
+       kernel-module-squashfs \
+       kernel-module-sr-mod \
+       kernel-module-stv0299 \
+       kernel-module-unlzma \
+       kernel-module-vfat \
+       kernel-module-xfs \
+       unionfs-modules"
 
 PREFERRED_VERSION_glibc = "2.3.5+cvs20051107"
 PREFERRED_VERSION_gcc-cross-initial = "3.4.5"
@@ -45,74 +36,59 @@ PREFERRED_VERSION_gdb-cross = "6.6.50.20061209"
 PREFERRED_VERSION_binutils-cross = "2.16.1"
 PREFERRED_VERSION_binutils-cross-sdk = "2.16.1"
 PREFERRED_VERSION_binutils = "2.16.1"
-PREFERRED_VERSION_linux-libc-headers = "2.6.12.0"
-GLIBC_EXTRA_OECONF = "--disable-profile --with-tls --without-fp --with-__thread"
-#JAVA_mipsel = ",java"
-
-EXTRA_IMAGEDEPENDS += "dreambox-secondstage dreambox-buildimage-native"
-EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x4000 -n -l "
 
 KERNEL_VERSION = 2.6.12.6
 
+EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x4000 -n -l "
 IMAGE_CMD_jffs2 = "\
-       if [ "${@bb.data.getVar('DISTRO_VERSION', d, 1)}" != "1.4.0" ]; \
-       then \
-               install -d ${DEPLOY_DIR_IMAGE}/boot_tmp; \
-               for i in bin dev mnt/flash mnt/squashfs mnt/root; \
-               do \
-                       install -d ${IMAGE_ROOTFS}/boot/$i; \
-               done; \
-               install -d ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/fs; \
-               install -d ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/drivers/block; \
-               mv ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/kernel/fs/squashfs \
-                       ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/fs; \
-               mv ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/kernel/fs/unionfs.ko \
-                       ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/fs; \
-               mv ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/kernel/drivers/block/loop.ko \
-                       ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/drivers/block; \
-               mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
-                       --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
-                       ${EXTRA_IMAGECMD}; \
-               mv ${IMAGE_ROOTFS}/boot/* ${DEPLOY_DIR_IMAGE}/boot_tmp; \
-               \
-               install -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta; \
-               cd ${IMAGE_ROOTFS}; \
-               for i in `find -maxdepth 3 -name enigma2 | xargs`; \
-               do \
-                       install -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/enigma2}; \
-                       mv $i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/enigma2}; \
-               done; \
-               for i in `find -type d -name extra | xargs`; \
-               do \
-                       install -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/extra}; \
-                       mv $i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/extra}; \
-               done; \
-               cat ${IMAGE_ROOTFS}/etc/fstab | sed 's/^\/dev\/mtdblock\/2/\/dev\/root/;' > ${IMAGE_ROOTFS}/etc/fstab_neu; \
-               mv -f ${IMAGE_ROOTFS}/etc/fstab_neu ${IMAGE_ROOTFS}/etc/fstab; \
-               mksquashfs ${IMAGE_ROOTFS}/* ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/squashfs \
-                       -root-owned -le -noappend; \
-               \
-               mkfs.jffs2 --root=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME} --faketime \
-                       --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-                       ${EXTRA_IMAGECMD}; \
-               \
-               for i in ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/*; \ 
-                       do cp -R $i ${IMAGE_ROOTFS}; done; \
-               rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}; \
-               rm -rf ${IMAGE_ROOTFS}/boot; \
-               mv ${DEPLOY_DIR_IMAGE}/boot_tmp ${IMAGE_ROOTFS}/boot; \
-       else \
-               mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
-                       --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
-                       ${EXTRA_IMAGECMD}; \
-               rm -rf ${IMAGE_ROOTFS}/boot/*; \
-               \
-               mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-                       --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-                       ${EXTRA_IMAGECMD}; \
-       fi; \
+       install -d ${DEPLOY_DIR_IMAGE}/boot_tmp; \
+       for i in bin dev mnt/flash mnt/squashfs mnt/root; \
+       do \
+               install -d ${IMAGE_ROOTFS}/boot/$i; \
+       done; \
+       install -d ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/fs; \
+       install -d ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/drivers/block; \
+       mv ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/kernel/fs/squashfs \
+               ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/fs; \
+       mv ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/kernel/fs/unionfs.ko \
+               ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/fs; \
+       mv ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/kernel/drivers/block/loop.ko \
+               ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/drivers/block; \
+       mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
+               --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
+               ${EXTRA_IMAGECMD}; \
+       mv ${IMAGE_ROOTFS}/boot/* ${DEPLOY_DIR_IMAGE}/boot_tmp; \
+       \
+       install -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta; \
+       cd ${IMAGE_ROOTFS}; \
+       for i in `find -maxdepth 3 -name enigma2 | xargs`; \
+       do \
+               install -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/enigma2}; \
+               mv $i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/enigma2}; \
+       done; \
+       for i in `find -type d -name extra | xargs`; \
+       do \
+               install -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/extra}; \
+               mv $i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/extra}; \
+       done; \
+       cat ${IMAGE_ROOTFS}/etc/fstab | sed 's/^\/dev\/mtdblock\/2/\/dev\/root/;' > ${IMAGE_ROOTFS}/etc/fstab_neu; \
+       mv -f ${IMAGE_ROOTFS}/etc/fstab_neu ${IMAGE_ROOTFS}/etc/fstab; \
+       mksquashfs ${IMAGE_ROOTFS}/* ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/squashfs \
+               -root-owned -le -noappend; \
+       \
+       mkfs.jffs2 --root=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME} --faketime \
+               --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+               ${EXTRA_IMAGECMD}; \
+       \
+       for i in ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/*; \
+               do cp -R $i ${IMAGE_ROOTFS}; done; \
+       rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}; \
+       rm -rf ${IMAGE_ROOTFS}/boot; \
+       mv ${DEPLOY_DIR_IMAGE}/boot_tmp ${IMAGE_ROOTFS}/boot; \
        buildimage ${STAGING_LIBDIR}/dreambox-secondstage/main.bin.gz \
                ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
                ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
                ${MACHINE} \
                > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfi"
+
+require conf/machine/include/dreambox-mipsel.inc

diff --git a/conf/machine/dm800.conf b/conf/machine/dm800.conf
index 8476c19..09a01d4 100644 (file)
--- a/conf/machine/dm800.conf
+++ b/conf/machine/dm800.conf
@@ -1,29 +1,28 @@
 #@TYPE: Machine
-#@NAME: Dreambox DM800
-#@DESCRIPTION: Machine configuration for the Dreambox DM800
+#@NAME: Dreambox DM 800 HD PVR
+#@DESCRIPTION: Machine configuration for the Dreambox DM 800 HD PVR
 
-TARGET_ARCH = "mipsel"
-IPKG_ARCHS = "all mipsel ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-dm800"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "dreambox-dvb-modules kernel-module-stv0299 \
-       kernel-module-cifs kernel-module-exportfs \
-       kernel-module-isofs     \
-       kernel-module-reiserfs  kernel-module-scsi-mod  kernel-module-sd-mod \
-       kernel-module-sg        kernel-module-sr-mod    kernel-module-usb-storage \
-       kernel-module-usbhid    kernel-module-usbmon \
-       kernel-module-xfs \
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
+       gst-plugin-dvbmediasink \
+       gst-plugin-fluendo-mpegdemux \
        kernel-module-autofs4 \
-       kernel-module-msdos kernel-module-vfat kernel-module-fat \
-       gst-plugin-dvbmediasink gst-plugin-fluendo-mpegdemux"
-
-PREFERRED_VERSION_linux-libc-headers = "2.6.12.0"
+       kernel-module-cifs \
+       kernel-module-exportfs \
+       kernel-module-fat \
+       kernel-module-isofs \
+       kernel-module-msdos \
+       kernel-module-reiserfs \
+       kernel-module-scsi-mod \
+       kernel-module-sd-mod \
+       kernel-module-sg \
+       kernel-module-sr-mod \
+       kernel-module-stv0299 \
+       kernel-module-usb-storage \
+       kernel-module-usbhid \
+       kernel-module-usbmon \
+       kernel-module-vfat \
+       kernel-module-xfs"
 
-GLIBC_ADDONS = "ports,nptl,libidn"
-TARGET_FPU = "soft"
-#OLDEST_KERNEL = "2.6.9"
-EXTRA_IMAGEDEPENDS += "dreambox-secondstage dreambox-buildimage-native"
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x4000 -n -l "
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime -x lzo \
        --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
@@ -36,3 +35,5 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime -x lzo \
        ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
        ${MACHINE} 64 \
        > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfi"
+
+require conf/machine/dreambox-mipsel.inc

diff --git a/conf/machine/dm8000.conf b/conf/machine/dm8000.conf
index 938a00c..06f1eac 100644 (file)
--- a/conf/machine/dm8000.conf
+++ b/conf/machine/dm8000.conf
@@ -1,25 +1,18 @@
 #@TYPE: Machine
-#@NAME: Dreambox DM8000
-#@DESCRIPTION: Machine configuration for the Dreambox DM8000
+#@NAME: Dreambox DM 8000 HD PVR
+#@DESCRIPTION: Machine configuration for the Dreambox DM 8000 HD PVR
 
-TARGET_ARCH = "mipsel"
-IPKG_ARCHS = "all mipsel ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-dm8000"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
+       gst-plugin-dvbmediasink \
+       kernel-module-exportfs \
+       kernel-module-reiserfs \
+       kernel-module-sd-mod \
+       kernel-module-sg \
+       kernel-module-sr-mod \
+       kernel-module-usbhid \
+       kernel-module-usbmon \
+       kernel-module-xfs"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "dreambox-dvb-modules \
-       kernel-module-exportfs  \
-       kernel-module-reiserfs  kernel-module-sd-mod \
-       kernel-module-sg        kernel-module-sr-mod     \
-       kernel-module-usbhid    kernel-module-usbmon  \
-       kernel-module-xfs gst-plugin-dvbmediasink"
-
-PREFERRED_VERSION_linux-libc-headers = "2.6.12.0"
-
-GLIBC_ADDONS = "ports,nptl,libidn"
-TARGET_FPU = "soft"
-#OLDEST_KERNEL = "2.6.9"
-EXTRA_IMAGEDEPENDS += "dreambox-secondstage dreambox-buildimage-native"
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime -x lzo \
        --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
@@ -32,3 +25,5 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime -x lzo \
        ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
        ${MACHINE} 64 large \
        > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfi"
+
+require conf/machine/include/dreambox-mipsel.inc

diff --git a/conf/machine/include/dreambox-mipsel.inc b/conf/machine/include/dreambox-mipsel.inc
new file mode 100644 (file)
index 0000000..6a50a7a
--- /dev/null
+++ b/conf/machine/include/dreambox-mipsel.inc
@@ -0,0 +1,10 @@
+# dreambox-mipsel.inc
+
+MACHINE_FEATURES += "alsa pci wifi"
+
+PREFERRED_VERSION_linux-libc-headers = "2.6.12.0"
+
+TARGET_ARCH = "mipsel"
+TARGET_FPU = "soft"
+
+require conf/machine/include/dreambox.inc

diff --git a/conf/machine/include/dreambox-powerpc.inc b/conf/machine/include/dreambox-powerpc.inc
new file mode 100644 (file)
index 0000000..a167358
--- /dev/null
+++ b/conf/machine/include/dreambox-powerpc.inc
@@ -0,0 +1,35 @@
+# dreambox-powerpc.inc
+
+PACKAGE_EXTRA_ARCHS = "ppc405"
+
+PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
+PREFERRED_VERSION_glibc-initial = "2.3.2+cvs20040726"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+PREFERRED_VERSION_gcc-cross = "3.4.4"
+PREFERRED_VERSION_gcc-cross-sdk = "3.4.4"
+PREFERRED_VERSION_gcc = "3.4.4"
+PREFERRED_VERSION_gdb = "6.5"
+PREFERRED_VERSION_gdb-cross = "6.5"
+PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
+PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
+PREFERRED_VERSION_binutils = "2.15.94.0.1"
+PREFERRED_VERSION_busybox = "1.01"
+
+TARGET_ARCH = "powerpc"
+TARGET_CPU = "405"
+
+EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x4000 -n -b "
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
+       --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
+       ${EXTRA_IMAGECMD}; rm -rf ${IMAGE_ROOTFS}/boot/*; \
+                               mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
+       --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+       ${EXTRA_IMAGECMD}; \
+       buildimage ${STAGING_LIBDIR}/dreambox-secondstage/main.bin.gz \
+       ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
+       ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+       ${MACHINE} \
+       > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfi"
+
+require conf/machine/include/dreambox.inc
+require conf/machine/include/tune-ppc405.inc

diff --git a/conf/machine/include/dreambox.inc b/conf/machine/include/dreambox.inc
new file mode 100644 (file)
index 0000000..1e70093
--- /dev/null
+++ b/conf/machine/include/dreambox.inc
@@ -0,0 +1,14 @@
+# dreambox.inc
+
+EXTRA_IMAGEDEPENDS += "dreambox-secondstage dreambox-buildimage-native"
+
+GLIBC_ADDONS = "ports,nptl,libidn"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "dreambox-dvb-modules"
+MACHINE_FEATURES += "kernel26 keyboard screen usbhost"
+
+OLDEST_KERNEL = "2.6.9"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+