merge of '981cc5dae86118a7c743b3f8ad711e7763194aae'

     and 'e991ee5c3b5bbf092467b905481b36d1fde8d2de'

4 files changed, 13 insertions, 9 deletions

diff --git a/packages/images/neuros-osd-base-image.bb b/packages/images/neuros-osd-base-image.bb
index d2e39760c8..008bd67321 100644
--- a/packages/images/neuros-osd-base-image.bb
+++ b/packages/images/neuros-osd-base-image.bb
@@ -21,6 +21,9 @@ IMAGE_INSTALL = "task-boot \
                  wireless-tools zd1211-firmware \
                  ${DISTRO_SSH_DAEMON} \
                  qt-embedded dbus \
+                 neuros-mainmenu \
+                 neuros-nwm \
+#                 vlc-davinci \
                 "
 
 IMAGE_LINGUAS = ""
diff --git a/packages/linux/linux-neuros/neuros-osd2/defconfig b/packages/linux/linux-neuros/neuros-osd2/defconfig
index d68f2d069f..1958f1ca0c 100644
--- a/packages/linux/linux-neuros/neuros-osd2/defconfig
+++ b/packages/linux/linux-neuros/neuros-osd2/defconfig
@@ -32,7 +32,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -496,7 +496,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_IDE=y
-CONFIG_IDE_MAX_HWIFS=4
+CONFIG_IDE_MAX_HWIFS=1
 CONFIG_BLK_DEV_IDE=y
 
 #
@@ -850,6 +850,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_VIDEO_DAVINCI=y
 CONFIG_VIDEO_TVP5150=y
+CONFIG_VIDEO_TVP7000=y
 # CONFIG_VIDEO_TVP5146 is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_CPIA2 is not set
@@ -892,7 +893,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
@@ -914,9 +915,9 @@ CONFIG_FB_DEFERRED_IO=y
 # Frame buffer hardware drivers
 #
 # CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_DAVINCI=y
+# CONFIG_FB_DAVINCI is not set
 # CONFIG_FB_VIRTUAL is not set
-
+CONFIG_FB_DM=y
 #
 # Console display driver support
 #
diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb
index 345e3174ae..563a2c5aaa 100644
--- a/packages/linux/linux-neuros_git.bb
+++ b/packages/linux/linux-neuros_git.bb
@@ -2,10 +2,10 @@ require linux.inc
 
 DESCRIPTION = "Linux kernel for Neuros OSD devices"
 
-SRCREV = "7ee93e596406d465e5af2c119e13def9af323f6b"
+SRCREV = "d2867be8abb7d67442cec3ae13d782f1254835d8"
 
 PV = "2.6.23-${PR}+git${SRCREV}"
-PR = "r8"
+PR = "r9"
 
 COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"
 
diff --git a/packages/vlc/vlc-davinci_0.8.6h.bb b/packages/vlc/vlc-davinci_0.8.6h.bb
index 6f0308880c..26fba388c3 100644
--- a/packages/vlc/vlc-davinci_0.8.6h.bb
+++ b/packages/vlc/vlc-davinci_0.8.6h.bb
@@ -4,9 +4,9 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "multimedia"
 
-SRCREV = "1ae3abd276bc478f7a3156c4acef1dd20f1b1899"
+SRCREV = "d13ee15ec1547dd34a3290684573f91df359f589"
 
-PR = "r3"
+PR = "r4"
 
 PV = "0.8.6h+${PR}+gitr${SRCREV}"