X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openembedded;a=blobdiff_plain;f=conf%2Fmachine%2Fvuultimo.conf;h=308a0c10ca6a60ff37c40d47c76eeaf30d0936e2;hp=20cb177af86449d8c41b824ced5f30ab5084201c;hb=4574f22cde5bbe485e31f806425db1603495599c;hpb=7fe7393abc7bebcfe458c77a08630bffcc96fe40

diff --git a/conf/machine/vuultimo.conf b/conf/machine/vuultimo.conf
index 20cb177..308a0c1 100644
--- a/conf/machine/vuultimo.conf
+++ b/conf/machine/vuultimo.conf
@@ -4,60 +4,68 @@
 
 TARGET_ARCH = "mipsel"
 
-PREFERRED_VERSION_linux-vuultimo = "2.6.18"
-PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+PREFERRED_VERSION_linux-vuultimo = "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 \
         kernel-module-msdos kernel-module-vfat kernel-module-fat \
         kernel-module-libata kernel-module-ntfs kernel-module-sata-svw \
-        kernel-module-nls-base kernel-module-nls-iso8859-1 kernel-module-nls-cp437 \
         kernel-module-nls-iso8859-15 kernel-module-nls-cp850 \
         kernel-module-nls-utf8 \
-        kernel-module-i2c-core kernel-module-firmware-class kernel-module-input kernel-module-evdev \
+        kernel-module-i2c-core kernel-module-i2c-dev 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 \
         kernel-module-reiserfs \
         kernel-module-xfs \
 	"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS_3.1.1 = "kernel vuplus-dvb-modules"
 
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1 = "\
+	kernel-module-ext2 \
+	"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ${@base_contains('PREFERRED_VERSION_linux-vuultimo', '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-vuultimo', '2.6.18', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_2.6.18}', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1}', d)}
 
-TARGET_FPU = "hard"
+MACHINE_FEATURES += "ralink-legacy"
+MACHINE_FEATURES += "ralink-kmod"
+require conf/machine/include/vuplus-modules.inc
 
-# used by sysvinit_2
-#SERIAL_CONSOLE = "115200 ttyS0"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vuultimo', '3.1.1', '${KERNEL_WIFI_MODULES}', '', d)}
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vuultimo', '3.1.1', '${KERNEL_DVB_MODULES}', '', d)}
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vuultimo', '3.1.1', '${KERNEL_3G_MODULES}', '', d)}
 
+PREFERRED_VERSION_wpa-supplicant = ${@base_contains('PREFERRED_VERSION_linux-vuultimo', '2.6.18', '0.5.10', '0.7.3', d)}
 
-MACHINE_FEATURES += "kernel26"
+IMAGE_FSTYPES = ${@base_contains('PREFERRED_VERSION_linux-vuultimo', '2.6.18', 'tar.bz2 jffs2', 'tar.bz2 ubi', d)}
 
-#csh wifi test
-#MACHINE_FEATURES += "wifi"
+TARGET_FPU = "hard"
 
-TARGET_CC_ARCH = "-march=mips32"
+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"
 
@@ -66,13 +74,18 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 EXTRA_IMAGEDEPENDS += "vuplus-makenfi-native"
 
 MACHINE_FEATURES += "alsa pci"
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "vuwlan"
+MACHINE_FEATURES += "display-graphic-vfd"
+MACHINE_FEATURES += "right-half-vfd-skin"
+MACHINE_FEATURES += "enable-rc-kbd"
 
 
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "
 IMAGE_CMD_jffs2 = " \
-	cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
+	cp ${IMAGE_ROOTFS}/tmp/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
 	cp ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin; \
-	rm -f ${IMAGE_ROOTFS}/boot/vmlinux.gz; \
+	rm -f ${IMAGE_ROOTFS}/tmp/vmlinux.gz; \
 	rm -f ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin; \
 	mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
 	--disable-compressor=lzo --compression-mode=size \
@@ -90,7 +103,66 @@ IMAGE_CMD_jffs2 = " \
 	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/ultimo/splash_cfe_auto.bin; \
 	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/ultimo/boot_cfe_auto.jffs2; \
 	cd ${DEPLOY_DIR_IMAGE}; \
-	rm -f usb_upgrade.zip; \
-	zip ultimo_usb_upgrade.zip vuplus/ulitmo/*; \
+	zip ${IMAGE_NAME}_usb.zip vuplus/ultimo/*; \
 	rm -rf vuplus; \       
 "
+
+
+
+UBI_VOLNAME = "rootfs"
+MKUBIFS_ARGS = "-m 2048 -e 126976 -c 3984 -F"
+UBINIZE_ARGS = "-m 2048 -p 128KiB"
+
+IMAGEDIR ?= "${MACHINE}"
+EXTRA_IMAGECMD_COMPAT = " --eraseblock=0x20000 -n -l "
+
+IMAGE_CMD_ubi_prepend = " \
+        cp ${IMAGE_ROOTFS}/tmp/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
+        cp ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin; \
+        rm -f ${IMAGE_ROOTFS}/tmp/vmlinux.gz; \
+        rm -f ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin; \
+        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/ultimo; \
+        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${DEPLOY_DIR_IMAGE}/vuplus/ultimo/root_cfe_auto.jffs2; \
+	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/ultimo/boot_cfe_auto.jffs2; \
+	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/ultimo/kernel_cfe_auto.bin; \
+	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/ultimo/splash_cfe_auto.bin; \
+        cd ${DEPLOY_DIR_IMAGE}; \
+	zip ${IMAGE_NAME}_usb.zip vuplus/ultimo/*; \
+	rm -rf vuplus; \ 
+        "
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+