X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openembedded;a=blobdiff_plain;f=conf%2Fmachine%2Fbm750.conf;h=a0344793d78ccebaf89568db31682e02ed405472;hp=4a712c42b92a7caec8f864b4e6fa084c6c7d9ed9;hb=90d3a41c05d0a7fec50c4077f3ad107edcb2bf0d;hpb=7df6b0791d8f48ca87617b9ef2efe770f9ca6720

diff --git a/conf/machine/bm750.conf b/conf/machine/bm750.conf
index 4a712c4..a034479 100644
--- a/conf/machine/bm750.conf
+++ b/conf/machine/bm750.conf
@@ -4,13 +4,13 @@
 
 TARGET_ARCH = "mipsel"
 
-PREFERRED_VERSION_linux-bm750 = "2.6.18"
-PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+PREFERRED_VERSION_linux-bm750 = "3.1.1"
+PREFERRED_VERSION_linux-libc-headers = "2.6.31"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "kernel vuplus-dvb-modules \
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS_2.6.18 = "kernel vuplus-dvb-modules \
         kernel-module-isofs \
         kernel-module-sr-mod    kernel-module-usb-storage \
         kernel-module-cdrom \
@@ -22,10 +22,13 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "kernel vuplus-dvb-modules \
         kernel-module-i2c-core kernel-module-firmware-class kernel-module-input kernel-module-evdev \
         kernel-module-snd-pcm kernel-module-snd \
 	kernel-module-tun \
+	kernel-module-fb \
 	v4l-dvb-module-dvb-core \
+        kernel-module-usbhid \
+        kernel-module-mousedev \
         "
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "\
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_2.6.18 = "\
         kernel-module-cifs \
         kernel-module-exportfs \
         kernel-module-ext2 \
@@ -33,28 +36,37 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "\
         kernel-module-xfs \
 	"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS_3.1.1 = "kernel vuplus-dvb-modules"
 
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1 = "\
+        kernel-module-ext2 \
+	"
 
-TARGET_FPU = "hard"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ${@base_contains('PREFERRED_VERSION_linux-bm750', '2.6.18', '${MACHINE_ESSENTIAL_EXTRA_RDEPENDS_2.6.18}', '${MACHINE_ESSENTIAL_EXTRA_RDEPENDS_3.1.1}', d)}
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = ${@base_contains('PREFERRED_VERSION_linux-bm750', '2.6.18', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_2.6.18}', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1}', d)}
+
+#MACHINE_FEATURES += "rt3070-legacy"
+require conf/machine/include/vuplus-modules.inc
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-bm750', '3.1.1', '${KERNEL_WIFI_MODULES}', '', d)}
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-bm750', '3.1.1', '${KERNEL_DVB_MODULES}', '', d)}
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-bm750', '3.1.1', '${KERNEL_3G_MODULES}', '', d)}
 
-# used by sysvinit_2
-#SERIAL_CONSOLE = "115200 ttyS0"
+PREFERRED_VERSION_wpa-supplicant = ${@base_contains('PREFERRED_VERSION_linux-bm750', '2.6.18', '0.5.10', '0.7.3', d)}
 
+IMAGE_FSTYPES = ${@base_contains('PREFERRED_VERSION_linux-bm750', '2.6.18', 'tar.bz2 jffs2', 'tar.bz2 ubi', d)}
+
+TARGET_FPU = "hard"
 
 MACHINE_FEATURES += "kernel26"
 
 TARGET_CC_ARCH = "-march=mips32"
 
-
 DISTRO_FEATURES += " mplt"
 
-
 PREFERRED_PROVIDER_task-vuplus-dvbapi = "task-vuplus-dvbapi3"
 PREFERRED_PROVIDER_task-vuplus-ui = "task-vuplus-enigma2"
 
-
-
-#GLIBC_ADDONS = "nptl" which will be set at glibc_xxx.bb. Setting here causes a configure error.
 GLIBC_ADDONS ?= "ports,nptl,libidn"
 GLIBC_EXTRA_OECONF = "--disable-profile --with-tls --without-fp --with-__thread"
 
@@ -63,28 +75,58 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 EXTRA_IMAGEDEPENDS += "vuplus-makenfi-native"
 
 MACHINE_FEATURES += "alsa pci"
-
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "vuwlan"
+MACHINE_FEATURES += "display-text-vfd"
+
+UBI_VOLNAME = "rootfs"
+MKUBIFS_ARGS = "-m 2048 -e 126976 -c 4096 -F"
+UBINIZE_ARGS = "-m 2048 -p 128KiB"
+
+IMAGEDIR ?= "${MACHINE}"
+EXTRA_IMAGECMD_COMPAT = " --eraseblock=0x20000 -n -l "
+
+IMAGE_CMD_ubi_prepend = " \
+        cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
+        rm -f ${IMAGE_ROOTFS}/boot/vmlinux.gz; \
+        mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
+        --disable-compressor=lzo --compression-mode=size \
+        --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
+        ${EXTRA_IMAGECMD_COMPAT}; rm -rf ${IMAGE_ROOTFS}/boot/*; \
+	"
+IMAGE_CMD_ubi_append = "; \
+        vfi3 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfi; \
+        mkdir -p ${DEPLOY_DIR_IMAGE}/vuplus/duo; \
+        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${DEPLOY_DIR_IMAGE}/vuplus/duo/root_cfe_auto.jffs2; \
+        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/duo/boot_cfe_auto.jffs2; \
+        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/duo/kernel_cfe_auto.bin; \
+        cd ${DEPLOY_DIR_IMAGE}; \
+        zip ${IMAGE_NAME}_usb.zip vuplus/duo/*; \
+        rm -rf vuplus; \
+        "
 
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "
 IMAGE_CMD_jffs2 = " \
-	cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
-	rm -f ${IMAGE_ROOTFS}/boot/vmlinux.gz; \
-	mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
-	--disable-compressor=lzo --compression-mode=size \
+        cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
+        rm -f ${IMAGE_ROOTFS}/boot/vmlinux.gz; \
+        mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
+        --disable-compressor=lzo --compression-mode=size \
        --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
        ${EXTRA_IMAGECMD}; rm -rf ${IMAGE_ROOTFS}/boot/*; \
        rm -rf ${IMAGE_ROOTFS}/tmp/*; \
        mkfs.jffs2 --root=${IMAGE_ROOTFS} \
-	--disable-compressor=lzo --compression-mode=size \
+        --disable-compressor=lzo --compression-mode=size \
        --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
        ${EXTRA_IMAGECMD}; \
        vfi3 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfi; \
-	mkdir -p ${DEPLOY_DIR_IMAGE}/vuplus/duo; \
-	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/duo/root_cfe_auto.jffs2; \
-	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/duo/kernel_cfe_auto.bin; \
-	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/duo/boot_cfe_auto.jffs2; \
-	cd ${DEPLOY_DIR_IMAGE}; \
-	rm -f usb_upgrade.zip; \
-	zip duo_usb_upgrade.zip vuplus/duo/*; \
-	rm -rf vuplus; \       
+        mkdir -p ${DEPLOY_DIR_IMAGE}/vuplus/duo; \
+        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/duo/root_cfe_auto.jffs2; \
+        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/duo/kernel_cfe_auto.bin; \
+        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/duo/boot_cfe_auto.jffs2; \
+        cd ${DEPLOY_DIR_IMAGE}; \
+        zip ${IMAGE_NAME}_usb.zip vuplus/duo/*; \
+        rm -rf vuplus; \
 "
+
+
+