Merge branch 'vuplus-1.6' of ssh://192.168.102.66/~ikseong/work/repo/openembedded...

[vuplus_openembedded] / conf / machine / vusolo.conf

diff --git a/conf/machine/vusolo.conf b/conf/machine/vusolo.conf
index e671b0b..592d248 100644 (file)
--- a/conf/machine/vusolo.conf
+++ b/conf/machine/vusolo.conf
@@ -4,24 +4,37 @@
 
 TARGET_ARCH = "mipsel"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
-
+PREFERRED_VERSION_linux-vusolo = "2.6.18"
+PREFERRED_VERSION_linux-libc-headers = "2.6.18"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "vuplus-dvb-modules"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel \
-       kernel-module-cifs      kernel-module-exportfs  kernel-module-isofs \
-       kernel-module-reiserfs  \
-       kernel-module-sr-mod kernel-module-usb-storage \
-       kernel-module-cdrom \
-       kernel-module-snd-pcm kernel-module-snd \
-       kernel-module-msdos kernel-module-vfat kernel-module-fat \
-       kernel-module-ntfs \
-       kernel-module-nls-base kernel-module-nls-iso8859-1 kernel-module-nls-cp437 kernel-module-nls-utf8 \
-       kernel-module-i2c-core kernel-module-firmware-class kernel-module-input kernel-module-evdev \
-       kernel-module-xfs"
+PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
-TARGET_FPU = "soft"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "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-ntfs \
+        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-snd-pcm kernel-module-snd \
+       kernel-module-tun \
+       kernel-module-autofs4 \
+       kernel-module-fb \
+       v4l-dvb-module-dvb-core \
+        "   
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "\
+        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"
@@ -32,8 +45,6 @@ MACHINE_FEATURES += "kernel26"
 TARGET_CC_ARCH = "-march=mips32"
 
 
-#PREFERRED_VERSION_linux-libc-headers = "2.6.18"
-
 DISTRO_FEATURES += " mplt"
 
 
@@ -70,5 +81,14 @@ IMAGE_CMD_jffs2 = " \
        --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"
+       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/solo; \
+        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/solo/root_cfe_auto.jffs2; \
+        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; \ 
+       "