TARGET_ARCH = "mipsel"
-PREFERRED_VERSION_linux-vusolo2 = "3.1.1"
+PREFERRED_VERSION_linux-vusolo2 = "3.3.8"
PREFERRED_VERSION_linux-libc-headers = "2.6.31"
-PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
-
-
-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-iso8859-15 kernel-module-nls-cp850 \
- kernel-module-nls-utf8 \
- 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 \
- "
+PREFERRED_PROVIDER_virtual/kernel = "linux-vusolo2"
-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_RDEPENDS = "kernel vuplus-dvb-modules"
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1 = "\
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "\
kernel-module-ext2 \
"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ${@base_contains('PREFERRED_VERSION_linux-vusolo2', '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-vusolo2', '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-modules2.inc
-require conf/machine/include/vuplus-modules.inc
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vusolo2', '3.3.8', '${KERNEL_WIFI_MODULES}', '', d)}
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vusolo2', '3.3.8', '${KERNEL_DVB_MODULES}', '', d)}
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vusolo2', '3.3.8', '${KERNEL_3G_MODULES}', '', d)}
-#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vusolo2', '3.1.1', '${KERNEL_WIFI_MODULES}', '', d)}
-#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vusolo2', '3.1.1', '${KERNEL_DVB_MODULES}', '', d)}
+PREFERRED_VERSION_wpa-supplicant = "0.7.3"
-PREFERRED_VERSION_wpa-supplicant = ${@base_contains('PREFERRED_VERSION_linux-vusolo2', '2.6.18', '0.5.10', '0.7.3', d)}
-
-IMAGE_FSTYPES = ${@base_contains('PREFERRED_VERSION_linux-vusolo2', '2.6.18', 'tar.bz2 jffs2', 'tar.bz2 ubi', d)}
+IMAGE_FSTYPES = "tar.bz2 ubi"
TARGET_FPU = "hard"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-EXTRA_IMAGEDEPENDS += "vuplus-makenfi-native"
MACHINE_FEATURES += "alsa pci"
MACHINE_FEATURES += "wifi"
MACHINE_FEATURES += "display-text-vfd"
-
-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 \
- --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 \
- --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/ultimo; \
- cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/ultimo/root_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}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/ultimo/boot_cfe_auto.jffs2; \
- cd ${DEPLOY_DIR_IMAGE}; \
- zip ${IMAGE_NAME}_usb.zip vuplus/ultimo/*; \
- rm -rf vuplus; \
-"
-
-
-
UBI_VOLNAME = "rootfs"
-MKUBIFS_ARGS = "-m 2048 -e 126976 -c 3984"
+MKUBIFS_ARGS = "-m 2048 -e 126976 -c 4096"
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/*; \
+ cp ${IMAGE_ROOTFS}/tmp/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
+ cp ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin; \
+ 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/initrd_cfe_auto.bin; \
+ rm -f ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin; \
"
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; \
+ mkdir -p ${DEPLOY_DIR_IMAGE}/vuplus/solo2; \
+ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${DEPLOY_DIR_IMAGE}/vuplus/solo2/root_cfe_auto.bin; \
+ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/solo2/kernel_cfe_auto.bin; \
+ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/solo2/initrd_cfe_auto.bin; \
+ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/solo2/splash_cfe_auto.bin; \
+ touch ${DEPLOY_DIR_IMAGE}/vuplus/solo2/reboot.update; \
cd ${DEPLOY_DIR_IMAGE}; \
- zip ${IMAGE_NAME}_usb.zip vuplus/ultimo/*; \
+ zip ${IMAGE_NAME}_usb.zip vuplus/solo2/*; \
rm -rf vuplus; \
"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-