TARGET_ARCH = "mipsel"
-PREFERRED_VERSION_linux-vusolo = "2.6.18"
-PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+PREFERRED_VERSION_linux-vusolo = "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-autofs4 \
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 \
"
-TARGET_FPU = "hard"
-
-# used by sysvinit_2
-#SERIAL_CONSOLE = "115200 ttyS0"
-
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS_3.1.1 = "kernel vuplus-dvb-modules"
-MACHINE_FEATURES += "kernel26"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1 = "\
+ kernel-module-ext2 \
+ "
-TARGET_CC_ARCH = "-march=mips32"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ${@base_contains('PREFERRED_VERSION_linux-vusolo', '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-vusolo', '2.6.18', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_2.6.18}', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1}', d)}
+MACHINE_FEATURES += "ralink-legacy"
+MACHINE_FEATURES += "ralink-kmod"
+require conf/machine/include/vuplus-modules.inc
-DISTRO_FEATURES += " mplt"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vusolo', '3.1.1', '${KERNEL_WIFI_MODULES}', '', d)}
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vusolo', '3.1.1', '${KERNEL_DVB_MODULES}', '', d)}
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vusolo', '3.1.1', '${KERNEL_3G_MODULES}', '', d)}
+PREFERRED_VERSION_wpa-supplicant = ${@base_contains('PREFERRED_VERSION_linux-vusolo', '2.6.18', '0.5.10', '0.7.3', d)}
+IMAGE_FSTYPES = ${@base_contains('PREFERRED_VERSION_linux-vusolo', '2.6.18', 'tar.bz2 jffs2', 'tar.bz2 ubi', d)}
+TARGET_FPU = "hard"
-PREFERRED_PROVIDER_task-vuplus-dvbapi = "task-vuplus-dvbapi3"
-PREFERRED_PROVIDER_task-vuplus-ui = "task-vuplus-enigma2"
+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"
EXTRA_IMAGEDEPENDS += "vuplus-makenfi-native"
MACHINE_FEATURES += "alsa pci"
-
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "vuwlan"
+
+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}/tmp/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
+ rm -f ${IMAGE_ROOTFS}/tmp/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/solo; \
+ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${DEPLOY_DIR_IMAGE}/vuplus/solo/root_cfe_auto.jffs2; \
+ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/solo/boot_cfe_auto.jffs2; \
+ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/solo/kernel_cfe_auto.bin; \
+ cd ${DEPLOY_DIR_IMAGE}; \
+ zip ${IMAGE_NAME}_usb.zip vuplus/solo/*; \
+ 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}/tmp/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
+ rm -f ${IMAGE_ROOTFS}/tmp/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; \
cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/solo/kernel_cfe_auto.bin; \
cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/solo/boot_cfe_auto.jffs2; \
cd ${DEPLOY_DIR_IMAGE}; \
- rm -f usb_upgrade.zip; \
- zip solo_usb_upgrade.zip vuplus/solo/*; \
- rm -rf vuplus; \
- "
+ zip ${IMAGE_NAME}_usb.zip vuplus/solo/*; \
+ rm -rf vuplus; \
+ "