[meta-fsl-ppc][PATCH 00/26] patch series to upgrade to fsl 1.4 release

[meta-fsl-ppc][PATCH 00/26] patch series to upgrade to fsl 1.4 release

[b28495]

From: Ting Liu <b28495@freescale.com>

The following changes since commit b515997652f0703f333c96a46c66e73e48b4bfbc:

  recipes: make meta-fsl-ppc play with other layers

Chunrong Guo (4):
  add p1023rdb support
  Add P1025TWR support
  Add BSC9131RDB support
  Add BSC9132QDS support

Ting Liu (1):
  p1020rdb: update machine conf

Zhenhua Luo (21):
  linux-qoriq-sdk(-headers): upgrade to the version of sdk-1.4
  u-boot: upgrade to the version of sdk1.4
  qemu: upgrade to the version of sdk-1.4
  udev-extraconf: unify the name of PCIe Ethernet port for DPAA targets
  udev-extraconf: fix the name conflict of macless and PCIe Ethernet
    port in slot3
  boot-format: update SHA for sdk-1.4
  eth-config: upgrade to sha of sdk-1.4
  flib: upgrade to the SHA of sdk-1.4
  fm-ucode: upgrade to the SHA of sdk-1.4
  fmc: upgrade to the SHA of sdk-1.4
  fmlib: upgrade to the SHA of sdk-1.4
  hv-cfg: upgrade to the SHA of sdk-1.4
  hypervisor: upgrade to the SHA of sdk-1.4 and add hypertrk submodule
  rcw: upgrade to the version of sdk-1.4
  usdpaa: upgrade to the version of sdk-1.4
  asf: add recipe
  cst: add recipe
  mux-server: add recipe
  qoriq-debug: add recipe
  skmm: add recipe
  web-sysmon: add recipe

 conf/machine/bsc9131rdb.conf                       |   16 ++++
 conf/machine/bsc9132qds.conf                       |   16 ++++
 conf/machine/e500mc.inc                            |    2 +-
 conf/machine/e500v2.inc                            |    2 +-
 conf/machine/e5500-64b.inc                         |    2 +-
 conf/machine/e5500.inc                             |    2 +-
 conf/machine/e6500-64b.inc                         |    2 +-
 conf/machine/e6500.inc                             |    2 +-
 conf/machine/p1020rdb.conf                         |    4 +-
 conf/machine/p1023rdb.conf                         |   16 ++++
 conf/machine/p1025twr.conf                         |   18 ++++
 .../71-fsl-dpaa-persistent-networking.rules        |    9 ++
 .../72-fsl-dpaa-persistent-networking.rules        |    9 ++
 ...configure-properly-check-if-lrt-is-needed.patch |   43 ----------
 .../fix-libcap-header-issue-on-some-distro.patch   |   84 ++++++++++++++++++++
 recipes-devtools/qemu/files/relocatable_sdk.patch  |   34 ++++++++
 recipes-devtools/qemu/qemu_1.0.bb                  |   42 ----------
 recipes-devtools/qemu/qemu_fslgit.bb               |   47 +++++++++++
 recipes-kernel/asf/asf_git.bb                      |   25 ++++++
 ...option-Automount-devtmpfs-at-dev-in-kerne.patch |   78 ------------------
 ...Undef-before-redefining-__attribute_const.patch |   28 -------
 ...-build-dependencies-for-c-files-requiring.patch |   44 ----------
 .../linux/files/fix_getrusage_for_perf.patch       |   33 --------
 ...efile.headersinst-install-headers-from-sc.patch |   46 +++++++++++
 recipes-kernel/linux/linux-qoriq-sdk-headers.bb    |    4 +
 recipes-kernel/linux/linux-qoriq-sdk.bb            |    8 +-
 recipes-kernel/linux/linux-qoriq-sdk.inc           |    7 +-
 recipes-kernel/qoriq-debug/qoriq-debug_git.bb      |   34 ++++++++
 recipes-kernel/u-boot/u-boot_git.bb                |   10 +-
 recipes-tools/boot-format/boot-format_git.bb       |    4 +-
 recipes-tools/cst/cst_git.bb                       |   29 +++++++
 recipes-tools/embedded-hv/hypervisor_git.bb        |   21 ++++-
 recipes-tools/eth-config/eth-config_git.bb         |    4 +-
 recipes-tools/flib/flib_git.bb                     |    2 +-
 recipes-tools/hv-cfg/hv-cfg_git.bb                 |    4 +-
 .../mux-server/files/mux-server-1.02.tar.gz        |  Bin 0 -> 10021 bytes
 recipes-tools/mux-server/mux-server_1.02.bb        |   16 ++++
 recipes-tools/rcw/rcw_git.bb                       |    4 +-
 recipes-tools/skmm/skmm_git.bb                     |   33 ++++++++
 recipes-tools/usdpaa/usdpaa_git.bb                 |   18 ++++-
 recipes-tools/web-sysmon/web-sysmon_git.bb         |   21 +++++
 recipes-ucode/fm-ucode/fm-ucode_git.bb             |    8 +-
 recipes-ucode/fmc/fmc_git.bb                       |    4 +-
 recipes-ucode/fmlib/fmlib_git.bb                   |    4 +-
 44 files changed, 525 insertions(+), 314 deletions(-)
 create mode 100644 conf/machine/bsc9131rdb.conf
 create mode 100644 conf/machine/bsc9132qds.conf
 create mode 100644 conf/machine/p1023rdb.conf
 create mode 100644 conf/machine/p1025twr.conf
 delete mode 100644 recipes-devtools/qemu/files/0001-configure-properly-check-if-lrt-is-needed.patch
 create mode 100644 recipes-devtools/qemu/files/fix-libcap-header-issue-on-some-distro.patch
 create mode 100644 recipes-devtools/qemu/files/relocatable_sdk.patch
 delete mode 100644 recipes-devtools/qemu/qemu_1.0.bb
 create mode 100644 recipes-devtools/qemu/qemu_fslgit.bb
 create mode 100644 recipes-kernel/asf/asf_git.bb
 delete mode 100644 recipes-kernel/linux/files/0001-Enable-the-option-Automount-devtmpfs-at-dev-in-kerne.patch
 delete mode 100644 recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch
 delete mode 100644 recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch
 delete mode 100644 recipes-kernel/linux/files/fix_getrusage_for_perf.patch
 create mode 100644 recipes-kernel/linux/files/scripts-Makefile.headersinst-install-headers-from-sc.patch
 create mode 100644 recipes-kernel/qoriq-debug/qoriq-debug_git.bb
 create mode 100644 recipes-tools/cst/cst_git.bb
 create mode 100644 recipes-tools/mux-server/files/mux-server-1.02.tar.gz
 create mode 100644 recipes-tools/mux-server/mux-server_1.02.bb
 create mode 100644 recipes-tools/skmm/skmm_git.bb
 create mode 100644 recipes-tools/web-sysmon/web-sysmon_git.bb

-- 
1.7.3.4

[meta-fsl-ppc][PATCH 01/26] linux-qoriq-sdk(-headers): upgrade to the version of sdk-1.4

[b28495]

From: Zhenhua Luo <b19537@freescale.com>

1.Update kernel version to 3.8.

2.add DEPENDS libgcc and append TOOLCHAIN_OPTIONS to KERNEL_{CC,LD}.
kernel in sdk 1.4 need run-time support libraries 'libgcc.a', added
in file arch/powerpc/Makefile:
LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
Without passing the TOOLCHAIN_OPTIONS (define --sysroot parameter),
it will fail to find the libgcc.a.

3.Also remove the patches which were already merged on git tree.

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Signed-off-by: Ting Liu <b28495@freescale.com>
---
 ...option-Automount-devtmpfs-at-dev-in-kerne.patch |   78 --------------------
 ...Undef-before-redefining-__attribute_const.patch |   28 -------
 ...-build-dependencies-for-c-files-requiring.patch |   44 -----------
 .../linux/files/fix_getrusage_for_perf.patch       |   33 --------
 ...efile.headersinst-install-headers-from-sc.patch |   46 ++++++++++++
 recipes-kernel/linux/linux-qoriq-sdk-headers.bb    |    4 +
 recipes-kernel/linux/linux-qoriq-sdk.bb            |    8 +-
 recipes-kernel/linux/linux-qoriq-sdk.inc           |    7 +-
 8 files changed, 57 insertions(+), 191 deletions(-)
 delete mode 100644 recipes-kernel/linux/files/0001-Enable-the-option-Automount-devtmpfs-at-dev-in-kerne.patch
 delete mode 100644 recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch
 delete mode 100644 recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch
 delete mode 100644 recipes-kernel/linux/files/fix_getrusage_for_perf.patch
 create mode 100644 recipes-kernel/linux/files/scripts-Makefile.headersinst-install-headers-from-sc.patch

diff --git a/recipes-kernel/linux/files/0001-Enable-the-option-Automount-devtmpfs-at-dev-in-kerne.patch b/recipes-kernel/linux/files/0001-Enable-the-option-Automount-devtmpfs-at-dev-in-kerne.patch
deleted file mode 100644
index 39783ef..0000000
--- a/recipes-kernel/linux/files/0001-Enable-the-option-Automount-devtmpfs-at-dev-in-kerne.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 3179602e581b6fe8797a5677d5ac4ecfab065cc6 Mon Sep 17 00:00:00 2001
-From: Chunrong Guo <B40290@freescale.com>
-Date: Thu, 11 Apr 2013 01:52:48 -0500
-Subject: [PATCH] Enable "the option Automount devtmpfs at /dev" in kernel
-
-Upstream-Status:Pending
-Signed-off-by: Chunrong Guo <b40290@freescale.com>
----
- arch/powerpc/configs/85xx/e6500rev1_defconfig |    1 +
- arch/powerpc/configs/corenet32_smp_defconfig  |    1 +
- arch/powerpc/configs/corenet64_smp_defconfig  |    1 +
- arch/powerpc/configs/mpc85xx_defconfig        |    1 +
- arch/powerpc/configs/mpc85xx_smp_defconfig    |    1 +
- 5 files changed, 5 insertions(+)
-
-diff --git a/arch/powerpc/configs/85xx/e6500rev1_defconfig b/arch/powerpc/configs/85xx/e6500rev1_defconfig
-index 4b5866d..32ebb50 100644
---- a/arch/powerpc/configs/85xx/e6500rev1_defconfig
-+++ b/arch/powerpc/configs/85xx/e6500rev1_defconfig
-@@ -72,6 +72,7 @@ CONFIG_IPV6=y
- CONFIG_IP_SCTP=m
- CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
- CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
- CONFIG_MTD=y
- CONFIG_MTD_CMDLINE_PARTS=y
- CONFIG_MTD_CHAR=y
-diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig
-index b43d4b6..3fe10e5 100644
---- a/arch/powerpc/configs/corenet32_smp_defconfig
-+++ b/arch/powerpc/configs/corenet32_smp_defconfig
-@@ -71,6 +71,7 @@ CONFIG_IPV6=y
- CONFIG_IP_SCTP=m
- CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
- CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
- CONFIG_MTD=y
- CONFIG_MTD_CMDLINE_PARTS=y
- CONFIG_MTD_CHAR=y
-diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig
-index 13b032b..74cc46a 100644
---- a/arch/powerpc/configs/corenet64_smp_defconfig
-+++ b/arch/powerpc/configs/corenet64_smp_defconfig
-@@ -66,6 +66,7 @@ CONFIG_IPV6=y
- CONFIG_IP_SCTP=m
- CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
- CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
- CONFIG_MTD=y
- CONFIG_MTD_CMDLINE_PARTS=y
- CONFIG_MTD_CHAR=y
-diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
-index 8fb742d..f353a6e 100644
---- a/arch/powerpc/configs/mpc85xx_defconfig
-+++ b/arch/powerpc/configs/mpc85xx_defconfig
-@@ -75,6 +75,7 @@ CONFIG_IPV6=y
- CONFIG_IP_SCTP=m
- CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
- CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
- CONFIG_MTD=y
- CONFIG_MTD_CHAR=y
- CONFIG_MTD_BLOCK=y
-diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
-index b31c8ac..cdc2c87 100644
---- a/arch/powerpc/configs/mpc85xx_smp_defconfig
-+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
-@@ -77,6 +77,7 @@ CONFIG_IPV6=y
- CONFIG_IP_SCTP=m
- CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
- CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
- CONFIG_MTD=y
- CONFIG_MTD_CHAR=y
- CONFIG_MTD_BLOCK=y
--- 
-1.7.9.7
-
diff --git a/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch b/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch
deleted file mode 100644
index 597fd3b..0000000
--- a/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Thu, 5 Jan 2012 11:42:35 -0800
-Subject: [PATCH] compiler.h: Undef before redefining __attribute_const__
-
-This is required to avoid warnings like
-util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror]
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
- tools/perf/util/include/linux/compiler.h |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
---- a/tools/perf/util/include/linux/compiler.h
-+++ b/tools/perf/util/include/linux/compiler.h
-@@ -4,9 +4,11 @@
- #ifndef __always_inline
- #define __always_inline	inline
- #endif
-+#undef __user
- #define __user
-+#undef __attribute_const__
- #define __attribute_const__
--
-+#undef __used
- #define __used		__attribute__((__unused__))
- 
- #endif
diff --git a/recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch b/recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch
deleted file mode 100644
index d3464fb..0000000
--- a/recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Upstream-Status: Pending
-
-From 2e7ffea0c0c09c6d9219d604e0351423f43844f4 Mon Sep 17 00:00:00 2001
-From: Matthew McClintock <msm@freescale.com>
-Date: Thu, 6 Sep 2012 13:45:21 -0500
-Subject: powerpc: Fix build dependencies for c files requiring libfdt.h
-
-Several files in obj-plat depend on libfdt header file. Sometimes
-when building one can see the following issue. This patch adds
-libfdt as dependency to those object files
-
-| In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0:
-| arch/powerpc/boot/libfdt.h:854:1: error: unterminated comment
-| In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0:
-| arch/powerpc/boot/libfdt.h:1:0: error: unterminated #ifndef
-|   BOOTCC  arch/powerpc/boot/inffast.o
-| make[1]: *** [arch/powerpc/boot/treeboot-iss4xx.o] Error 1
-| make[1]: *** Waiting for unfinished jobs....
-|   BOOTCC  arch/powerpc/boot/inflate.o
-| make: *** [uImage] Error 2
-| ERROR: oe_runmake failed
-| ERROR: Function failed: do_compile (see /srv/home/pokybuild/yocto-autobuilder/yocto-slave/p1022ds/build/build/tmp/work/p1022ds-poky-linux-gnuspe/linux-qoriq-sdk-3.0.34-r5/temp/log.do_compile.2167 for further information)
-NOTE: recipe linux-qoriq-sdk-3.0.34-r5: task do_compile: Failed
-
-Signed-off-by: Matthew McClintock <msm@freescale.com>
----
- arch/powerpc/boot/Makefile |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
-index b7d8333..6a15c96 100644
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -107,6 +107,7 @@ src-boot := $(addprefix $(obj)/, $(src-boot))
- obj-boot := $(addsuffix .o, $(basename $(src-boot)))
- obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib))))
- obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))
-+obj-plat: $(libfdt)
- 
- quiet_cmd_copy_zlib = COPY    $@
-       cmd_copy_zlib = sed "s@__used@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
--- 
-1.7.9.7
-
diff --git a/recipes-kernel/linux/files/fix_getrusage_for_perf.patch b/recipes-kernel/linux/files/fix_getrusage_for_perf.patch
deleted file mode 100644
index 0029fdc..0000000
--- a/recipes-kernel/linux/files/fix_getrusage_for_perf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 7b78f13603c6fcb64e020a0bbe31a651ea2b657b
-Author: Markus Trippelsdorf <markus@trippelsdorf.de>
-Date: Wed Apr 4 10:45:27 2012 +0200
-
-    perf tools: Fix getrusage() related build failure on glibc trunk
-    
-    On a system running glibc trunk perf doesn't build:
-    
-        CC builtin-sched.o
-    builtin-sched.c: In function ‘get_cpu_usage_nsec_parent’: builtin-sched.c:399:16: error: storage size of ‘ru’ isn’t known builtin-sched.c:403:2: error: implicit declaration of function ‘getrusage’ [-Werror=implicit-function-declaration]
-        [...]
-    
-    Fix it by including sys/resource.h.
-    
-    Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
-    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
-    Link: http://lkml.kernel.org/r/20120404084527.GA294@x4
-    Signed-off-by: Ingo Molnar <mingo@kernel.org>
-
-Upstream-Status: Backport [3.4]
-
-diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
-index fb8b5f8..1cad3af 100644
---- a/tools/perf/builtin-sched.c
-+++ b/tools/perf/builtin-sched.c
-@@ -17,6 +17,7 @@
- #include "util/debug.h"
- 
- #include <sys/prctl.h>
-+#include <sys/resource.h>
- 
- #include <semaphore.h>
- #include <pthread.h>
diff --git a/recipes-kernel/linux/files/scripts-Makefile.headersinst-install-headers-from-sc.patch b/recipes-kernel/linux/files/scripts-Makefile.headersinst-install-headers-from-sc.patch
new file mode 100644
index 0000000..0f28d3d
--- /dev/null
+++ b/recipes-kernel/linux/files/scripts-Makefile.headersinst-install-headers-from-sc.patch
@@ -0,0 +1,46 @@
+From e60cc1b011bf0f1acdb7e5168b7bed4ebb78c91f Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Wed, 9 Jan 2013 16:24:39 -0500
+Subject: [PATCH] scripts/Makefile.headersinst: install headers from scratch file
+
+If headers_install is executed from a deep/long directory structure, the
+shell's maximum argument length can be execeeded, which breaks the operation
+with:
+
+| make[2]: execvp: /bin/sh: Argument list too long
+| make[2]: ***
+
+By dumping the input files to a scratch file and using xargs to read the
+input list from the scratch file, we can avoid blowing out the maximum
+argument size and install headers in a long path name environment.
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+---
+ scripts/Makefile.headersinst |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
+index 06ba4a7..536d722 100644
+--- a/scripts/Makefile.headersinst
++++ b/scripts/Makefile.headersinst
+@@ -71,7 +71,7 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@))
+ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
+                             file$(if $(word 2, $(all-files)),s))
+       cmd_install = \
+-        $(PERL) $< $(installdir) $(SRCARCH) $(input-files); \
++        xargs $(PERL) $< $(installdir) $(SRCARCH) < $(INSTALL_HDR_PATH)/.input-files; \
+         for F in $(wrapper-files); do                                   \
+                 echo "\#include <asm-generic/$$F>" > $(installdir)/$$F;    \
+         done;                                                           \
+@@ -100,7 +100,9 @@ targets += $(install-file)
+ $(install-file): scripts/headers_install.pl $(input-files) FORCE
+ 	$(if $(unwanted),$(call cmd,remove),)
+ 	$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
++	@echo $(input-files) > $(INSTALL_HDR_PATH)/.input-files
+ 	$(call if_changed,install)
++	@rm $(INSTALL_HDR_PATH)/.input-files
+ 
+ else
+ __headerscheck: $(subdirs) $(check-file)
+-- 
+1.7.0.4
diff --git a/recipes-kernel/linux/linux-qoriq-sdk-headers.bb b/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
index b1cbb8d..0ee4fc1 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
+++ b/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
@@ -2,6 +2,8 @@ DESCRIPTION = "Linux kernel headers for Freescale platforms"
 SECTION = "devel"
 LICENSE = "GPLv2"
 
+PR = "${INC_PR}.1"
+
 INHIBIT_DEFAULT_DEPS = "1"
 PROVIDES = "linux-libc-headers ${PN}"
 RPROVIDES_${PN}-dev += "linux-libc-headers-dev"
@@ -11,6 +13,8 @@ RRECOMMENDS_${PN}-dbg = "linux-libc-headers-dev (= ${EXTENDPKGV})"
 
 require recipes-kernel/linux/linux-qoriq-sdk.inc
 
+SRC_URI_append += " file://scripts-Makefile.headersinst-install-headers-from-sc.patch"
+
 inherit kernel-arch
 
 do_configure() {
diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-kernel/linux/linux-qoriq-sdk.bb
index a015e49..502132f 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk.bb
+++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
@@ -7,11 +7,11 @@ LICENSE = "GPLv2"
 
 require recipes-kernel/linux/linux-qoriq-sdk.inc
 
-PR = "r11"
+PR = "${INC_PR}.1"
 
-SRC_URI += "file://fix_getrusage_for_perf.patch \
-            file://0001-Enable-the-option-Automount-devtmpfs-at-dev-in-kerne.patch \
-           "
+DEPENDS_append = " libgcc"
+KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
+KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
 
 do_configure_prepend() {
 	# copy desired defconfig so we pick it up for the real kernel_do_configure
diff --git a/recipes-kernel/linux/linux-qoriq-sdk.inc b/recipes-kernel/linux/linux-qoriq-sdk.inc
index f77543e..3047ba5 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk.inc
+++ b/recipes-kernel/linux/linux-qoriq-sdk.inc
@@ -1,11 +1,10 @@
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-PV = "3.0.51"
-PR = "r11"
+PV = "3.8"
+INC_PR = "r12"
 
-SRCREV = "faac5211f398f25e2be44ac996895335d5218516"
+SRCREV = "4b66366af2d77de68f4bd6548d07421e13d3df05"
 SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \
-           file://0001-compiler.h-Undef-before-redefining-__attribute_const.patch \
 	  "
 
 KSRC ?= ""
-- 
1.7.3.4

[meta-fsl-ppc][PATCH 02/26] u-boot: upgrade to the version of sdk1.4

[b28495]

From: Zhenhua Luo <zhenhua.luo@freescale.com>

install the right nand-uboot for p1010rdb and bsc913x.
u-boot-with-spl.bin is the right nand-uboot image.

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Signed-off-by: Ting Liu <b28495@freescale.com>
---
 recipes-kernel/u-boot/u-boot_git.bb |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes-kernel/u-boot/u-boot_git.bb b/recipes-kernel/u-boot/u-boot_git.bb
index e322ab7..54160d4 100644
--- a/recipes-kernel/u-boot/u-boot_git.bb
+++ b/recipes-kernel/u-boot/u-boot_git.bb
@@ -5,15 +5,15 @@ PROVIDES = "virtual/bootloader"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
-PR = "r30"
+PR = "r31"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc libgcc"
 
 inherit deploy
 
-SRCREV = "7bcd7f45c8974978f8eb73ae4d32e71cb6a49b77"
-SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git \
-		"
+SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git"
+SRCREV = "831b30de4b768f0b3b7dbfa11739b14cea612d7e"
+
 python () {
 	ml = d.getVar("MULTILIB_VARIANTS", True)
 	arch = d.getVar("OVERRIDES", True)
@@ -68,7 +68,7 @@ do_compile () {
 				cp ${S}/${board}/u-boot.bin  ${S}/${board}/${UBOOT_TARGET}.bin
             elif [ "${UBOOT_TARGET}" == "u-boot-nand" ];then
 				if [ "${DEFAULTTUNE}" = "ppce500v2" ];then
-                    if echo $board |egrep "(P1020RDB|P1021RDB|P1024RDB|P2020RDB|P1022DS|P1025RDB)" 2>&1 >/dev/null;then
+                    if echo $board |egrep "(P1010RDB|P1020RDB|P1021RDB|P1024RDB|P2020RDB|P1022DS|P1025RDB|BSC9131RDB|BSC9132QDS)" 2>&1 >/dev/null;then
                         cp ${S}/${board}/u-boot-with-spl.bin ${S}/${board}/${UBOOT_TARGET}.bin
                     fi
                 else
-- 
1.7.3.4

[meta-fsl-ppc][PATCH 03/26] qemu: upgrade to the version of sdk-1.4

[b28495]

From: Zhenhua Luo <zhenhua.luo@freescale.com>

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---
 conf/machine/e500mc.inc                            |    2 +-
 conf/machine/e500v2.inc                            |    2 +-
 conf/machine/e5500-64b.inc                         |    2 +-
 conf/machine/e5500.inc                             |    2 +-
 conf/machine/e6500-64b.inc                         |    2 +-
 conf/machine/e6500.inc                             |    2 +-
 ...configure-properly-check-if-lrt-is-needed.patch |   43 ----------
 .../fix-libcap-header-issue-on-some-distro.patch   |   84 ++++++++++++++++++++
 recipes-devtools/qemu/files/relocatable_sdk.patch  |   34 ++++++++
 recipes-devtools/qemu/qemu_1.0.bb                  |   42 ----------
 recipes-devtools/qemu/qemu_fslgit.bb               |   47 +++++++++++
 11 files changed, 171 insertions(+), 91 deletions(-)
 delete mode 100644 recipes-devtools/qemu/files/0001-configure-properly-check-if-lrt-is-needed.patch
 create mode 100644 recipes-devtools/qemu/files/fix-libcap-header-issue-on-some-distro.patch
 create mode 100644 recipes-devtools/qemu/files/relocatable_sdk.patch
 delete mode 100644 recipes-devtools/qemu/qemu_1.0.bb
 create mode 100644 recipes-devtools/qemu/qemu_fslgit.bb

diff --git a/conf/machine/e500mc.inc b/conf/machine/e500mc.inc
index e523a87..268942a 100644
--- a/conf/machine/e500mc.inc
+++ b/conf/machine/e500mc.inc
@@ -8,7 +8,7 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
-PREFERRED_VERSION_qemu = "1.0+fsl"
+PREFERRED_VERSION_qemu = "1.4+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/conf/machine/e500v2.inc b/conf/machine/e500v2.inc
index cb3d7ad..9688784 100644
--- a/conf/machine/e500v2.inc
+++ b/conf/machine/e500v2.inc
@@ -6,7 +6,7 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
-PREFERRED_VERSION_qemu = "1.0+fsl"
+PREFERRED_VERSION_qemu = "1.4+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/conf/machine/e5500-64b.inc b/conf/machine/e5500-64b.inc
index d2fa078..3230d51 100644
--- a/conf/machine/e5500-64b.inc
+++ b/conf/machine/e5500-64b.inc
@@ -9,7 +9,7 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
-PREFERRED_VERSION_qemu = "1.0+fsl"
+PREFERRED_VERSION_qemu = "1.4+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/conf/machine/e5500.inc b/conf/machine/e5500.inc
index 09870c9..ae40896 100644
--- a/conf/machine/e5500.inc
+++ b/conf/machine/e5500.inc
@@ -8,7 +8,7 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
-PREFERRED_VERSION_qemu = "1.0+fsl"
+PREFERRED_VERSION_qemu = "1.4+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/conf/machine/e6500-64b.inc b/conf/machine/e6500-64b.inc
index 57e61b2..b8766df 100644
--- a/conf/machine/e6500-64b.inc
+++ b/conf/machine/e6500-64b.inc
@@ -9,7 +9,7 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
-PREFERRED_VERSION_qemu = "1.0+fsl"
+PREFERRED_VERSION_qemu = "1.4+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/conf/machine/e6500.inc b/conf/machine/e6500.inc
index b343742..9968230 100644
--- a/conf/machine/e6500.inc
+++ b/conf/machine/e6500.inc
@@ -8,7 +8,7 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
-PREFERRED_VERSION_qemu = "1.0+fsl"
+PREFERRED_VERSION_qemu = "1.4+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/recipes-devtools/qemu/files/0001-configure-properly-check-if-lrt-is-needed.patch b/recipes-devtools/qemu/files/0001-configure-properly-check-if-lrt-is-needed.patch
deleted file mode 100644
index d74ddb9..0000000
--- a/recipes-devtools/qemu/files/0001-configure-properly-check-if-lrt-is-needed.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e5906138d8042817cc3b49872dd181c66a11abdf Mon Sep 17 00:00:00 2001
-From: Ting Liu <b28495@freescale.com>
-Date: Wed, 6 Mar 2013 01:56:35 -0600
-Subject: [PATCH] configure: properly check if -lrt is needed
-
-Upstream-Status: Backport
-commit  8bacde8d86a09699207d85d4bab06162aed18dc4
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
-Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-Signed-off-by: Ting Liu <b28495@freescale.com>
----
- configure |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 999375a..29b3e30 100755
---- a/configure
-+++ b/configure
-@@ -2444,13 +2444,18 @@ fi
- cat > $TMPC <<EOF
- #include <signal.h>
- #include <time.h>
--int main(void) { clockid_t id; return clock_gettime(id, NULL); }
-+int main(void) {
-+  timer_create(CLOCK_REALTIME, NULL, NULL);
-+  return clock_gettime(CLOCK_REALTIME, NULL);
-+}
- EOF
- 
- if compile_prog "" "" ; then
-   :
--elif compile_prog "" "-lrt" ; then
-+# we need pthread for static linking. use previous pthread test result
-+elif compile_prog "" "-lrt $pthread_lib" ; then
-   LIBS="-lrt $LIBS"
-+  libs_qga="-lrt $libs_qga"
- fi
- 
- if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
--- 
-1.7.9.7
-
diff --git a/recipes-devtools/qemu/files/fix-libcap-header-issue-on-some-distro.patch b/recipes-devtools/qemu/files/fix-libcap-header-issue-on-some-distro.patch
new file mode 100644
index 0000000..13a6ea2
--- /dev/null
+++ b/recipes-devtools/qemu/files/fix-libcap-header-issue-on-some-distro.patch
@@ -0,0 +1,84 @@
+fix libcap header issue on some distro
+
+1, When build qemu-native on SLED 11.2, there is an error:
+...
+| In file included from /usr/include/bits/sigcontext.h:28,
+|  from /usr/include/signal.h:339,
+|  from /buildarea2/tmp/work/i686-linux/qemu-native/1.4.0-r0/
+qemu-1.4.0/include/qemu-common.h:42,
+|  from fsdev/virtfs-proxy-helper.c:23:
+|  /usr/include/asm/sigcontext.h:28: error: expected specifier-
+qualifier-list before '__u64'
+|  /usr/include/asm/sigcontext.h:191: error: expected specifier-
+qualifier-list before '__u64'
+...
+
+2, The virtfs-proxy-helper.c includes <sys/capability.h> and
+qemu-common.h in sequence. The header include map is:
+(`-->' presents `include')
+...
+"virtfs-proxy-helper.c" --> <sys/capability.h>
+...
+"virtfs-proxy-helper.c" --> "qemu-common.h" --> <signal.h> -->
+<bits/sigcontext.h> --> <asm/sigcontext.h> --> <linux/types.h> -->
+<asm/types.h> --> <asm-generic/types.h> --> <asm-generic/int-ll64.h>
+...
+
+3, The bug is found on SLED 11.2 x86. In libcap header file
+/usr/include/sys/capability.h, it does evil stuff like this:
+...
+  25 /*
+  26  * Make sure we can be included from userland by preventing
+  27  * capability.h from including other kernel headers
+  28  */
+  29 #define _LINUX_TYPES_H
+  30 #define _LINUX_FS_H
+  31 #define __LINUX_COMPILER_H
+  32 #define __user
+  33
+  34 typedef unsigned int __u32;
+  35 typedef __u32 __le32;
+...
+This completely prevents including /usr/include/linux/types.h.
+The above `<asm/sigcontext.h> --> <linux/types.h>' is prevented,
+and '__u64' is defined in <asm-generic/int-ll64.h>.
+
+4, Modify virtfs-proxy-helper.c to include <sys/capability.h>
+last to workaround the issue.
+
+http://www.linuxtv.org/pipermail/vdr/2009-August/021194.html
+http://patchwork.linuxtv.org/patch/12748/
+
+Upstream-Status: Pending
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ fsdev/virtfs-proxy-helper.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
+--- a/fsdev/virtfs-proxy-helper.c
++++ b/fsdev/virtfs-proxy-helper.c
+@@ -12,7 +12,6 @@
+ #include <sys/resource.h>
+ #include <getopt.h>
+ #include <syslog.h>
+-#include <sys/capability.h>
+ #include <sys/fsuid.h>
+ #include <sys/vfs.h>
+ #include <sys/ioctl.h>
+@@ -26,7 +25,11 @@
+ #include "virtio-9p-marshal.h"
+ #include "hw/9pfs/virtio-9p-proxy.h"
+ #include "fsdev/virtio-9p-marshal.h"
+-
++/*
++ * Include this one last due to some versions of it being buggy:
++ * http://www.linuxtv.org/pipermail/vdr/2009-August/021194.html
++ */
++#include <sys/capability.h>
+ #define PROGNAME "virtfs-proxy-helper"
+ 
+ #ifndef XFS_SUPER_MAGIC
+-- 
+1.7.10.4
+
diff --git a/recipes-devtools/qemu/files/relocatable_sdk.patch b/recipes-devtools/qemu/files/relocatable_sdk.patch
new file mode 100644
index 0000000..774a49c
--- /dev/null
+++ b/recipes-devtools/qemu/files/relocatable_sdk.patch
@@ -0,0 +1,34 @@
+Upstream-Status: Inappropriate [SDK specific]
+
+In order to be able to change the dynamic loader path when relocating
+binaries, the interp section has to be made big enough to accomodate
+the new path (4096 is the maximum path length in Linux).
+
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+
+Index: qemu-1.4.0/ldscripts/i386.ld
+===================================================================
+--- qemu-1.4.0.orig/ldscripts/i386.ld	2013-02-15 15:05:35.000000000 -0800
++++ qemu-1.4.0/ldscripts/i386.ld	2013-02-28 22:55:36.138816418 -0800
+@@ -8,7 +8,7 @@
+ {
+   /* Read-only sections, merged into text segment: */
+   . = 0x60000000 + SIZEOF_HEADERS;
+-  .interp     : { *(.interp) 	}
++  .interp     : { *(.interp); . = 0x1000; }
+   .hash          : { *(.hash)		}
+   .dynsym        : { *(.dynsym)		}
+   .dynstr        : { *(.dynstr)		}
+Index: qemu-1.4.0/ldscripts/x86_64.ld
+===================================================================
+--- qemu-1.4.0.orig/ldscripts/x86_64.ld	2013-02-15 15:05:35.000000000 -0800
++++ qemu-1.4.0/ldscripts/x86_64.ld	2013-02-28 22:55:36.138816418 -0800
+@@ -6,7 +6,7 @@
+ {
+   /* Read-only sections, merged into text segment: */
+   . = 0x60000000 + SIZEOF_HEADERS;
+-  .interp         : { *(.interp) }
++  .interp         : { *(.interp); . = 0x1000; }
+   .hash           : { *(.hash) }
+   .dynsym         : { *(.dynsym) }
+   .dynstr         : { *(.dynstr) }
diff --git a/recipes-devtools/qemu/qemu_1.0.bb b/recipes-devtools/qemu/qemu_1.0.bb
deleted file mode 100644
index 19efd9f..0000000
--- a/recipes-devtools/qemu/qemu_1.0.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-require recipes-devtools/qemu/qemu.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
-                    file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
-
-# This means v1.0 with FSL specific patches applied
-PV = "1.0+fsl"
-PR = "r3"
-
-DEPENDS += "dtc"
-
-SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git \
-            file://0001-configure-properly-check-if-lrt-is-needed.patch \
-"
-SRCREV = "7feabd47a814214dc4bebfd97d0eaf30dc50a68f"
-
-S = "${WORKDIR}/git"
-
-QEMU_TARGETS = "ppc"
-PPC_OECONF = '${SDL} --disable-werror --disable-vnc --audio-drv-list="" --audio-card-list="" --disable-bluez --disable-curl'
-EXTRA_OECONF_powerpc = "--target-list=ppc-softmmu ${PPC_OECONF}"
-EXTRA_OECONF_powerpc64 = "--target-list=ppc64-softmmu ${PPC_OECONF}"
-
-do_configure_append () {
-	grep 'CONFIG_FDT=y' config-host.mak
-}
-
-# gets around qemu.inc trying to install powerpc_rom.bin
-do_install_prepend() {
-	touch ${WORKDIR}/powerpc_rom.bin
-}
-
-do_install_append() {
-	rm ${WORKDIR}/powerpc_rom.bin
-}
-
-# This is only meant to be build to run on the target
-# for the given arch types listed, otherwise don't let
-# the package get built. COMPATIBLE_HOST would not work
-# because it was too generic
-COMPATIBLE_MACHINE = "a^"
-COMPATIBLE_MACHINE_libc-glibc_fslmachine = ".*"
diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb
new file mode 100644
index 0000000..ac40fb5
--- /dev/null
+++ b/recipes-devtools/qemu/qemu_fslgit.bb
@@ -0,0 +1,47 @@
+require recipes-devtools/qemu/qemu.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
+                    file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
+
+# This means v1.4 with FSL specific patches applied
+PV = "1.4+fsl"
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git"
+SRCREV = "8713c58725df407dbbedb48fa315248d0100720c"
+
+S = "${WORKDIR}/git"
+
+QEMU_TARGETS = "ppc"
+PPC_OECONF = '${SDL} --cross-prefix=${TARGET_PREFIX} --disable-werror --disable-vnc --audio-drv-list="" --audio-card-list="" --disable-bluez --disable-curl'
+EXTRA_OECONF_e5500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}"
+EXTRA_OECONF_e6500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}"
+EXTRA_OECONF_e6500 = "--target-list=ppc64-softmmu ${PPC_OECONF}"
+EXTRA_OECONF_e5500 = "--target-list=ppc64-softmmu ${PPC_OECONF}"
+EXTRA_OECONF_e500v2 = "--target-list=ppc-softmmu ${PPC_OECONF}"
+EXTRA_OECONF_e500mc = "--target-list=ppc-softmmu ${PPC_OECONF}"
+
+do_configure_prepend() {
+        export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config
+}
+
+do_configure_append () {
+	grep 'CONFIG_FDT=y' config-host.mak
+}
+
+# gets around qemu.inc trying to install powerpc_rom.bin
+do_install_prepend() {
+	touch ${WORKDIR}/powerpc_rom.bin
+}
+
+do_install_append() {
+	rm ${WORKDIR}/powerpc_rom.bin
+}
+
+INSANE_SKIP_${PN} += "dev-deps"
+
+# This is only meant to be build to run on the target
+# for the given arch types listed, otherwise don't let
+# the package get built. COMPATIBLE_HOST would not work
+# because it was too generic
+COMPATIBLE_MACHINE = "a^"
+COMPATIBLE_MACHINE_libc-glibc_fslmachine = ".*"
-- 
1.7.3.4

[meta-fsl-ppc][PATCH 04/26] p1020rdb: update machine conf

[b28495]

From: Ting Liu <b28495@freescale.com>

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 conf/machine/p1020rdb.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf
index 70132c5..b17213c 100644
--- a/conf/machine/p1020rdb.conf
+++ b/conf/machine/p1020rdb.conf
@@ -6,9 +6,9 @@ require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1020"
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
-UBOOT_MACHINES ?= " P1020RDB-PC P1020RDB-PC_SPIFLASH P1020RDB-PC_NAND P1020RDB-PC_SDCARD P1020RDB-PC_36BIT P1020RDB-PC_36BIT_SPIFLASH P1020RDB-PC_36BIT_NAND P1020RDB-PC_36BIT_SDCARD"
+UBOOT_MACHINES ?= " P1020RDB-PD P1020RDB-PD_NAND P1020RDB-PD_SDCARD P1020RDB-PD_SPIFLASH"
 
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020rdb-pc_32b.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020rdb-pd_32b.dts"
 
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
-- 
1.7.3.4

[meta-fsl-ppc][PATCH 05/26] add p1023rdb support

[b28495]

From: Chunrong Guo <B40290@freescale.com>

Change-Id:Ic42311e8619e5fbcf6f53f9f661439f6776dd760
Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 conf/machine/p1023rdb.conf |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)
 create mode 100644 conf/machine/p1023rdb.conf

diff --git a/conf/machine/p1023rdb.conf b/conf/machine/p1023rdb.conf
new file mode 100644
index 0000000..e591e09
--- /dev/null
+++ b/conf/machine/p1023rdb.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@DESCRIPTION: Machine configuration for running 
+
+require e500v2.inc
+require conf/machine/include/soc-family.inc
+
+SOC_FAMILY = "p1023"
+UBOOT_MACHINES ?= "P1023RDB"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1023rdb.dts"
+KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/p1023rds_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+USE_VT = "0"
-- 
1.7.3.4

[meta-fsl-ppc][PATCH 06/26] Add P1025TWR support

[b28495]

From: Chunrong Guo <B40290@freescale.com>

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 conf/machine/p1025twr.conf |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
 create mode 100644 conf/machine/p1025twr.conf

diff --git a/conf/machine/p1025twr.conf b/conf/machine/p1025twr.conf
new file mode 100644
index 0000000..d1d1db0
--- /dev/null
+++ b/conf/machine/p1025twr.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@Name: Freescale P1025TWR
+#@DESCRIPTION: Machine configuration for the Freescale P1025TWR
+
+require e500v2.inc
+require conf/machine/include/soc-family.inc
+
+SOC_FAMILY = "p1025"
+BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
+UBOOT_MACHINES ?= "TWR-P1025"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1025twr_32b.dts"
+KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+USE_VT = "0"
-- 
1.7.3.4

[meta-fsl-ppc][PATCH 07/26] Add BSC9131RDB support

[b28495]

From: Chunrong Guo <B40290@freescale.com>

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 conf/machine/bsc9131rdb.conf |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)
 create mode 100644 conf/machine/bsc9131rdb.conf

diff --git a/conf/machine/bsc9131rdb.conf b/conf/machine/bsc9131rdb.conf
new file mode 100644
index 0000000..39a73e5
--- /dev/null
+++ b/conf/machine/bsc9131rdb.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@DESCRIPTION: Machine configuration for running 
+
+require e500v2.inc
+require conf/machine/include/soc-family.inc
+
+SOC_FAMILY = "bsc9131"
+UBOOT_MACHINES ?= "BSC9131RDB_SPIFLASH BSC9131RDB_NAND BSC9131RDB_NAND_SYSCLK100 BSC9131RDB_SPIFLASH_SYSCLK100"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/bsc9131rdb.dts"
+KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/bsc913x_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+USE_VT = "0"
-- 
1.7.3.4

[meta-fsl-ppc][PATCH 08/26] Add BSC9132QDS support

[b28495]

From: Chunrong Guo <B40290@freescale.com>

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 conf/machine/bsc9132qds.conf |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)
 create mode 100644 conf/machine/bsc9132qds.conf

diff --git a/conf/machine/bsc9132qds.conf b/conf/machine/bsc9132qds.conf
new file mode 100644
index 0000000..90131a9
--- /dev/null
+++ b/conf/machine/bsc9132qds.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@DESCRIPTION: Machine configuration for running 
+
+require e500v2.inc
+require conf/machine/include/soc-family.inc
+
+SOC_FAMILY = "bsc9132"
+UBOOT_MACHINES ?= " BSC9132QDS_NAND_DDRCLK133 BSC9132QDS_NAND_DDRCLK100 BSC9132QDS_NOR_DDRCLK100 BSC9132QDS_NOR_DDRCLK133 BSC9132QDS_SDCARD_DDRCLK100 BSC9132QDS_SDCARD_DDRCLK133 BSC9132QDS_SPIFLASH_DDRCLK100 BSC9132QDS_SPIFLASH_DDRCLK133"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/bsc9132qds.dts"
+KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+USE_VT = "0"
-- 
1.7.3.4

[meta-fsl-ppc][PATCH 09/26] udev-extraconf: unify the name of PCIe Ethernet port for DPAA targets

[b28495]

From: Zhenhua Luo <zhenhua.luo@freescale.com>

In kernel-3.8, PCIe Ethernet port is the last one to be brought up,
so the name of PCIe Ethernet card is ethN(N is variant) instead of eth0.
The udev rules update is to unify the PCIe Ethernet port of DPAA targets:
    Ethernet card in PCIe slot0: eth0
    Ethernet card in PCIe slot1: eth1
    Ethernet card in PCIe slot2: eth2
    Ethernet card in PCIe slot3: eth3

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Change-Id: Ia2a9cc3eb5b6c49e911bb6cc067a2d2d3cfaec0a
---
 .../71-fsl-dpaa-persistent-networking.rules        |    6 ++++++
 .../72-fsl-dpaa-persistent-networking.rules        |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/recipes-core/udev/udev-extraconf/71-fsl-dpaa-persistent-networking.rules b/recipes-core/udev/udev-extraconf/71-fsl-dpaa-persistent-networking.rules
index 356c172..50bc446 100644
--- a/recipes-core/udev/udev-extraconf/71-fsl-dpaa-persistent-networking.rules
+++ b/recipes-core/udev/udev-extraconf/71-fsl-dpaa-persistent-networking.rules
@@ -15,3 +15,9 @@ SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ffe5f0000", NAME="fm2-
 # P1023 has its Fman @ different offsets
 SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ff7e0000", NAME="fm1-gb0"
 SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ff7e2000", NAME="fm1-gb1"
+
+# Unify the PCIe Etherenet port -maxinum PCIe slots is 4
+SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe200000.pcie", DRIVERS=="fsl-pci", NAME="eth0"
+SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe201000.pcie", DRIVERS=="fsl-pci", NAME="eth1"
+SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe202000.pcie", DRIVERS=="fsl-pci", NAME="eth2"
+SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe203000.pcie", DRIVERS=="fsl-pci", NAME="eth3"
diff --git a/recipes-core/udev/udev-extraconf/72-fsl-dpaa-persistent-networking.rules b/recipes-core/udev/udev-extraconf/72-fsl-dpaa-persistent-networking.rules
index 34e72a3..cfc2853 100644
--- a/recipes-core/udev/udev-extraconf/72-fsl-dpaa-persistent-networking.rules
+++ b/recipes-core/udev/udev-extraconf/72-fsl-dpaa-persistent-networking.rules
@@ -19,3 +19,9 @@ SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ffe5ec000", NAME="fm2-
 SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ffe5ee000", NAME="fm2-mac8"
 SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ffe5f0000", NAME="fm2-mac9"
 SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ffe5f2000", NAME="fm2-mac10"
+
+# Unify the PCIe Etherenet port -maxinum PCIe slots is 4
+SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe240000.pcie", DRIVERS=="fsl-pci", NAME="eth0"
+SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe250000.pcie", DRIVERS=="fsl-pci", NAME="eth1"
+SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe260000.pcie", DRIVERS=="fsl-pci", NAME="eth2"
+SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe270000.pcie", DRIVERS=="fsl-pci", NAME="eth3"
-- 
1.7.3.4

Re: [meta-fsl-ppc][PATCH 04/26] p1020rdb: update machine conf

[Otavio Salvador]

On Thu, Jun 27, 2013 at 6:19 AM,  <b28495@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> Signed-off-by: Ting Liu <b28495@freescale.com>

The commit log needs rework. I know you updated the machine conf but
please explain why.

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 00/26] patch series to upgrade to fsl 1.4 release

[Otavio Salvador]

On Thu, Jun 27, 2013 at 6:19 AM,  <b28495@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> The following changes since commit b515997652f0703f333c96a46c66e73e48b4bfbc:
>
>   recipes: make meta-fsl-ppc play with other layers
>
> Chunrong Guo (4):
>   add p1023rdb support
>   Add P1025TWR support
>   Add BSC9131RDB support
>   Add BSC9132QDS support
>
> Ting Liu (1):
>   p1020rdb: update machine conf
>
> Zhenhua Luo (21):
>   linux-qoriq-sdk(-headers): upgrade to the version of sdk-1.4
>   u-boot: upgrade to the version of sdk1.4
>   qemu: upgrade to the version of sdk-1.4
>   udev-extraconf: unify the name of PCIe Ethernet port for DPAA targets
>   udev-extraconf: fix the name conflict of macless and PCIe Ethernet
>     port in slot3
>   boot-format: update SHA for sdk-1.4
>   eth-config: upgrade to sha of sdk-1.4
>   flib: upgrade to the SHA of sdk-1.4
>   fm-ucode: upgrade to the SHA of sdk-1.4
>   fmc: upgrade to the SHA of sdk-1.4
>   fmlib: upgrade to the SHA of sdk-1.4
>   hv-cfg: upgrade to the SHA of sdk-1.4
>   hypervisor: upgrade to the SHA of sdk-1.4 and add hypertrk submodule
>   rcw: upgrade to the version of sdk-1.4
>   usdpaa: upgrade to the version of sdk-1.4
>   asf: add recipe
>   cst: add recipe
>   mux-server: add recipe
>   qoriq-debug: add recipe
>   skmm: add recipe
>   web-sysmon: add recipe

Most changes looks great; one point which you might want to check is
about dropping the PR changes. As master now uses PRServer you can
rely on this for PR management and this also easy backport for old
BSPs if need.

I also commented in one change which the commit log needs some rework.

Regards,

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 00/26] patch series to upgrade to fsl 1.4 release

[Luo Zhenhua-B19537]

Hi Otavio,

Regarding PR, should it be removed from recipe or just be kept as is?


Best Regards,

Zhenhua

> -----Original Message-----
> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> bounces@yoctoproject.org] On Behalf Of Otavio Salvador
> Sent: Thursday, June 27, 2013 8:45 PM
> To: Liu Ting-B28495
> Cc: meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH 00/26] patch series to
> upgrade to fsl 1.4 release
> 
> On Thu, Jun 27, 2013 at 6:19 AM,  <b28495@freescale.com> wrote:
> > From: Ting Liu <b28495@freescale.com>
> >
> > The following changes since commit
> b515997652f0703f333c96a46c66e73e48b4bfbc:
> >
> >   recipes: make meta-fsl-ppc play with other layers
> >
> > Chunrong Guo (4):
> >   add p1023rdb support
> >   Add P1025TWR support
> >   Add BSC9131RDB support
> >   Add BSC9132QDS support
> >
> > Ting Liu (1):
> >   p1020rdb: update machine conf
> >
> > Zhenhua Luo (21):
> >   linux-qoriq-sdk(-headers): upgrade to the version of sdk-1.4
> >   u-boot: upgrade to the version of sdk1.4
> >   qemu: upgrade to the version of sdk-1.4
> >   udev-extraconf: unify the name of PCIe Ethernet port for DPAA targets
> >   udev-extraconf: fix the name conflict of macless and PCIe Ethernet
> >     port in slot3
> >   boot-format: update SHA for sdk-1.4
> >   eth-config: upgrade to sha of sdk-1.4
> >   flib: upgrade to the SHA of sdk-1.4
> >   fm-ucode: upgrade to the SHA of sdk-1.4
> >   fmc: upgrade to the SHA of sdk-1.4
> >   fmlib: upgrade to the SHA of sdk-1.4
> >   hv-cfg: upgrade to the SHA of sdk-1.4
> >   hypervisor: upgrade to the SHA of sdk-1.4 and add hypertrk submodule
> >   rcw: upgrade to the version of sdk-1.4
> >   usdpaa: upgrade to the version of sdk-1.4
> >   asf: add recipe
> >   cst: add recipe
> >   mux-server: add recipe
> >   qoriq-debug: add recipe
> >   skmm: add recipe
> >   web-sysmon: add recipe
> 
> Most changes looks great; one point which you might want to check is
> about dropping the PR changes. As master now uses PRServer you can rely
> on this for PR management and this also easy backport for old BSPs if
> need.
> 
> I also commented in one change which the commit log needs some rework.
> 
> Regards,
> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://projetos.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

Re: [meta-fsl-ppc][PATCH 00/26] patch series to upgrade to fsl 1.4 release

[Otavio Salvador]

On Thu, Jun 27, 2013 at 11:36 PM, Luo Zhenhua-B19537
<B19537@freescale.com> wrote:
> Hi Otavio,
>
> Regarding PR, should it be removed from recipe or just be kept as is?

When PV changes, you can drop them. When PV does not change, keep it as is.

You should check for buildhistory so it'll warn in case a revision
goes backwards.

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 00/26] patch series to upgrade to fsl 1.4 release

[Luo Zhenhua-B19537]

Thanks.

Following patches are applied in master-next branch and will be synced to master after successfully build. 

[meta-fsl-ppc,26/26] web-sysmon: add recipe
[meta-fsl-ppc,25/26] skmm: add recipe	 
[meta-fsl-ppc,24/26] qoriq-debug: add recipe	 
[meta-fsl-ppc,23/26] mux-server: add recipe	 
[meta-fsl-ppc,22/26] cst: add recipe	 
[meta-fsl-ppc,21/26] asf: add recipe	 
[meta-fsl-ppc,13/26] flib: upgrade to the SHA of sdk-1.4	 
[meta-fsl-ppc,10/26] udev-extraconf: fix the name conflict of macless and PCIe Ethernet port in slot3	 
[meta-fsl-ppc,09/26] udev-extraconf: unify the name of PCIe Ethernet port for DPAA targets	 
[meta-fsl-ppc,08/26] Add BSC9132QDS support	 
[meta-fsl-ppc,07/26] Add BSC9131RDB support	 
[meta-fsl-ppc,06/26] Add P1025TWR support	 
[meta-fsl-ppc,05/26] add p1023rdb support	 
[meta-fsl-ppc,03/26] qemu: upgrade to the version of sdk-1.4	


Best Regards,

Zhenhua


> -----Original Message-----
> From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On
> Behalf Of Otavio Salvador
> Sent: Friday, June 28, 2013 10:37 AM
> To: Luo Zhenhua-B19537
> Cc: Liu Ting-B28495; meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH 00/26] patch series to
> upgrade to fsl 1.4 release
> 
> On Thu, Jun 27, 2013 at 11:36 PM, Luo Zhenhua-B19537
> <B19537@freescale.com> wrote:
> > Hi Otavio,
> >
> > Regarding PR, should it be removed from recipe or just be kept as is?
> 
> When PV changes, you can drop them. When PV does not change, keep it as
> is.
> 
> You should check for buildhistory so it'll warn in case a revision goes
> backwards.
> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://projetos.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750