Merge branch 'org.openembedded.dev' of ssh://git@git.openembedded.net/openembedded into org.openembedded.dev

7 files changed, 41 insertions, 8 deletions

diff --git a/conf/machine/nhk15.conf b/conf/machine/nhk15.conf
index 40f10371f9..ad6227848b 100644
--- a/conf/machine/nhk15.conf
+++ b/conf/machine/nhk15.conf
@@ -6,15 +6,14 @@ TARGET_ARCH = "arm"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n -x lzo"
 
-IMAGE_CMD_jffs2 = "mkdir -p ${DEPLOY_DIR_IMAGE}; \
-                  mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-                   --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img ${EXTRA_IMAGECMD}; "
-
 IMAGE_FSTYPES ?= "tar.bz2 ext2.gz jffs2"
 
 SERIAL_CONSOLE = "115200 ttyAMA1"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "00008000"
+
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-nomadik"
 XSERVER = "xserver-kdrive-nomadikfb"
 
diff --git a/recipes/libsdl/ballfield_1.0.bb b/recipes/libsdl/ballfield_1.0.bb
index 9b44be5516..9cb361add2 100644
--- a/recipes/libsdl/ballfield_1.0.bb
+++ b/recipes/libsdl/ballfield_1.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "This is a cute little "3D" sprite demo using SDL and SDL_image."
-DEPENDS = "vrtual/libsdl libsdl-image"
+DEPENDS = "virtual/libsdl libsdl-image"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://olofson.net/download/ballfield-${PV}.tar.gz"
diff --git a/recipes/linux/linux_2.6.20.bb b/recipes/linux/linux_2.6.20.bb
index 7a43dff9ce..d8427bfc6f 100644
--- a/recipes/linux/linux_2.6.20.bb
+++ b/recipes/linux/linux_2.6.20.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE_at91sam9261ek = "20"
 DEFAULT_PREFERENCE_at91sam9260ek = "20"
 DEFAULT_PREFERENCE_nhk15 = "1"
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://defconfig"
diff --git a/recipes/netbase/netbase/igep0020/interfaces b/recipes/netbase/netbase/igep0020/interfaces
new file mode 100644
index 0000000000..d7409f7a64
--- /dev/null
+++ b/recipes/netbase/netbase/igep0020/interfaces
@@ -0,0 +1,5 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
diff --git a/recipes/netbase/netbase_4.21.bb b/recipes/netbase/netbase_4.21.bb
index 403ca191b1..0ce40ba93e 100644
--- a/recipes/netbase/netbase_4.21.bb
+++ b/recipes/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r38"
+PR = "r39"
 
 inherit update-rc.d
 
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf
new file mode 100644
index 0000000000..07d849d705
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf
@@ -0,0 +1,29 @@
+Section "Module"
+        Load    "extmod"
+        Load    "dbe"
+        Load    "glx"
+        Load    "freetype"
+        Load    "type1"
+        Load    "record"
+        Load    "dri"
+EndSection
+
+Section "Monitor"
+        Identifier      "Builtin Default Monitor"
+EndSection
+
+Section "Device"
+        Identifier      "Builtin Default fbdev Device 0"
+        Driver  "omapfb"
+EndSection
+
+Section "Screen"
+        Identifier      "Builtin Default fbdev Screen 0"
+        Device  "Builtin Default fbdev Device 0"
+        Monitor "Builtin Default Monitor"
+EndSection
+
+Section "ServerLayout"
+        Identifier      "Builtin Default Layout"
+        Screen  "Builtin Default fbdev Screen 0"
+EndSection
diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index ba52376ab2..37d200ba5d 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "file://xorg.conf"