[meta-fsl-ppc][PATCH 00/12] qoriq sdk v1.7 patches (part II)

[meta-fsl-ppc][PATCH 00/12] qoriq sdk v1.7 patches (part II)

[ting.liu]

From: Ting Liu <ting.liu@freescale.com>

Rich Schmitt (1):
  uio-seville: update to revision 35af73f

Ting Liu (11):
  t1024qds-64b: add machine support
  t1024qds: add machine support
  t1024rdb: add machine support
  t1024rdb-64b: add machine support
  qemu: remove unavailable gtk+ options
  skmm-ep: update revision to 27156a6
  fm-ucode: use soc_family to match deployed binaries
  fm-ucode: update to revision 4cda2e3
  usdpaa: use soc_family to define SOC/FMAN_VARIANT
  usdpaa: update to revision d997594
  multilib: use ?= to allow overridden in local.conf

 conf/machine/include/e5500-64b.inc            |  4 +--
 conf/machine/include/e6500-64b.inc            |  4 +--
 conf/machine/include/e6500.inc                |  4 +--
 conf/machine/t1024qds-64b.conf                | 15 ++++++++
 conf/machine/t1024qds.conf                    | 15 ++++++++
 conf/machine/t1024rdb-64b.conf                | 15 ++++++++
 conf/machine/t1024rdb.conf                    | 15 ++++++++
 recipes-devtools/qemu/qemu_fslgit.bb          |  1 +
 recipes-dpaa/fm-ucode/fm-ucode_git.bb         | 31 +++++------------
 recipes-dpaa/usdpaa/usdpaa_git.bb             | 50 ++++++++++-----------------
 recipes-extended/skmm-ep/skmm-ep_git.bb       |  6 ++--
 recipes-kernel/uio-seville/uio-seville_0.1.bb |  8 +++--
 12 files changed, 103 insertions(+), 65 deletions(-)
 create mode 100644 conf/machine/t1024qds-64b.conf
 create mode 100644 conf/machine/t1024qds.conf
 create mode 100644 conf/machine/t1024rdb-64b.conf
 create mode 100644 conf/machine/t1024rdb.conf

-- 
1.9.1

[meta-fsl-ppc][PATCH 01/12] t1024qds-64b: add machine support

[ting.liu]

From: Ting Liu <ting.liu@freescale.com>

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 conf/machine/t1024qds-64b.conf | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 conf/machine/t1024qds-64b.conf

diff --git a/conf/machine/t1024qds-64b.conf b/conf/machine/t1024qds-64b.conf
new file mode 100644
index 0000000..81d5763
--- /dev/null
+++ b/conf/machine/t1024qds-64b.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: Freescale T1024QDS
+#@SOC: t1024
+#@DESCRIPTION: Machine configuration for running T1024QDS in 64-bit mode
+#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
+
+require conf/machine/include/e5500-64b.inc
+
+SOC_FAMILY = "t1:t1024"
+UBOOT_MACHINES ?= "T1024QDS T1024QDS_D4 T1024QDS_NAND T1024QDS_SDCARD T1024QDS_SPIFLASH T1024QDS_SECURE_BOOT"
+KERNEL_DEVICETREE ?= "t1024qds.dtb t1024qds-usdpaa.dtb t1024qds-usdpaa-capwap.dtb"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
-- 
1.9.1

[meta-fsl-ppc][PATCH 02/12] t1024qds: add machine support

[ting.liu]

From: Ting Liu <ting.liu@freescale.com>

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 conf/machine/t1024qds.conf | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 conf/machine/t1024qds.conf

diff --git a/conf/machine/t1024qds.conf b/conf/machine/t1024qds.conf
new file mode 100644
index 0000000..3e5cac1
--- /dev/null
+++ b/conf/machine/t1024qds.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: Freescale T1024QDS
+#@SOC: t1024
+#@DESCRIPTION: Machine configuration for running T1024QDS in 32-bit mode
+#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
+
+require conf/machine/include/e5500.inc
+
+SOC_FAMILY = "t1:t1024"
+UBOOT_MACHINES ?= "T1024QDS T1024QDS_D4 T1024QDS_NAND T1024QDS_SDCARD T1024QDS_SPIFLASH T1024QDS_SECURE_BOOT"
+KERNEL_DEVICETREE ?= "t1024qds.dtb t1024qds-usdpaa.dtb t1024qds-usdpaa-capwap.dtb"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
-- 
1.9.1

[meta-fsl-ppc][PATCH 03/12] t1024rdb: add machine support

[ting.liu]

From: Ting Liu <ting.liu@freescale.com>

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 conf/machine/t1024rdb.conf | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 conf/machine/t1024rdb.conf

diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf
new file mode 100644
index 0000000..82a0400
--- /dev/null
+++ b/conf/machine/t1024rdb.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: Freescale T1024RDB
+#@SOC: t1024
+#@DESCRIPTION: Machine configuration for running T1024RDB in 32-bit mode
+#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
+
+require conf/machine/include/e5500.inc
+
+SOC_FAMILY = "t1:t1024"
+UBOOT_MACHINES ?= "T1024RDB T1024RDB_NAND T1024RDB_SDCARD T1024RDB_SPIFLASH T1024RDB_SECURE_BOOT"
+KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
-- 
1.9.1

[meta-fsl-ppc][PATCH 04/12] t1024rdb-64b: add machine support

[ting.liu]

From: Ting Liu <ting.liu@freescale.com>

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 conf/machine/t1024rdb-64b.conf | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 conf/machine/t1024rdb-64b.conf

diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf
new file mode 100644
index 0000000..c40bba8
--- /dev/null
+++ b/conf/machine/t1024rdb-64b.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: Freescale T1024RDB
+#@SOC: t1024
+#@DESCRIPTION: Machine configuration for running T1024RDB in 64-bit mode
+#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
+
+require conf/machine/include/e5500-64b.inc
+
+SOC_FAMILY = "t1:t1024"
+UBOOT_MACHINES ?= "T1024RDB T1024RDB_NAND T1024RDB_SDCARD T1024RDB_SPIFLASH T1024RDB_SECURE_BOOT"
+KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
-- 
1.9.1

[meta-fsl-ppc][PATCH 05/12] qemu: remove unavailable gtk+ options

[ting.liu]

From: Ting Liu <ting.liu@freescale.com>

The preferred version of qemu defined in this layer (1.7) does not have
the same configuration options as the original yocto version (2.0).
Since this recipe includes yocto's qemu.inc, some of the configuration
options defined there generate an error during the do_configure task:

| ERROR: unknown option --disable-vte

Setting PACKAGECONFIG[option] to an empty string fixes the problem.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 recipes-devtools/qemu/qemu_fslgit.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb
index 1a7dd8e..32e738e 100644
--- a/recipes-devtools/qemu/qemu_fslgit.bb
+++ b/recipes-devtools/qemu/qemu_fslgit.bb
@@ -12,6 +12,7 @@ PV = "1.7+fsl"
 PACKAGECONFIG[quorum] = ""
 PACKAGECONFIG[lzo]    = ""
 PACKAGECONFIG[numa]   = ""
+PACKAGECONFIG[gtk+] = ""
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;nobranch=1"
 SRCREV = "6ac4597c059d35e2737b234747243e56d340f4db"
-- 
1.9.1

[meta-fsl-ppc][PATCH 06/12] skmm-ep: update revision to 27156a6

[ting.liu]

From: Ting Liu <ting.liu@freescale.com>

This includes following fixes:

27156a6 skmm-ep: add gcc flag '-mno-strict-align' to improve performance
d6adb62 skmm-ep: fix up skmm application segment fault
13deed1 DMA: fix the mmap failed check
bc505e5 PCIDMA: Add DMA chain and multiple channel support
68ee05f Temporarily add fsl_pci_ep_vfio.h which should be in linux
9e6e2cb PCIDMA: Change DMA BWC and memory allocation
4805577 PCIDMA: Add MSIX trigger functionality
31f653a PCIDMA: Add MSIX outbound window support
e903be6 PCIDMA: Adjust PCI EP display information
7f8012d PCIDMA: Change DMA channel initialization code
fb29219 PCIDMA: Remove duplicate code

Also add missing DEPENDS on virtual/kernel

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 recipes-extended/skmm-ep/skmm-ep_git.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb
index 145b1d9..fcbd2ed 100644
--- a/recipes-extended/skmm-ep/skmm-ep_git.bb
+++ b/recipes-extended/skmm-ep/skmm-ep_git.bb
@@ -3,12 +3,14 @@ SECTION = "skmm-ep"
 LICENSE = "BSD & GPLv2"
 LIC_FILES_CHKSUM = "file://Makefile;endline=30;md5=39e58bedc879163c9338596e52df5b1f"
 
-DEPENDS = "libedit openssl"
+DEPENDS = "libedit openssl virtual/kernel"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-ep.git;nobranch=1 \
     file://add-two-missing-header-files.patch \
 "
-SRCREV = "448522aa1ba3f0c4a1481631dc1c3b168d410a61"
+SRCREV = "27156a6621c8f6d7f98210b1ca5cd97bde926875"
 
 COMPATIBLE_MACHINE = "(p4080ds|t4240qds|c293pcie)"
 
-- 
1.9.1

[meta-fsl-ppc][PATCH 07/12] fm-ucode: use soc_family to match deployed binaries

[ting.liu]

From: Ting Liu <ting.liu@freescale.com>

listing machine names in recipe is painful when adding support
for boards with same soc. use soc_family instead.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 recipes-dpaa/fm-ucode/fm-ucode_git.bb | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/recipes-dpaa/fm-ucode/fm-ucode_git.bb b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
index ef9cae0..9f8ac46 100644
--- a/recipes-dpaa/fm-ucode/fm-ucode_git.bb
+++ b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
@@ -12,33 +12,19 @@ SRCREV = "517267e5f9ca9ab13cb2e94e0a20f555f73885ee"
 
 S = "${WORKDIR}/git"
 
-ALLOW_EMPTY_${PN} = "1"
+REGLEX ?= "${MACHINE}"
+REGLEX_t1042 = "t1040"
+REGLEX_b4420 = "b4860"
+REGLEX_t4160 = "t4240"
+
 do_install () {
-    case ${MACHINE} in
-        t1040qds|t1040qds-64b|t1040rdb|t1040rdb-64b|t1042rdb|t1042rdb-64b) UCODE=t1040;;
-        t2080qds|t2080qds-64b|t2080rdb|t2080rdb-64b) UCODE=t2080;;
-        b4420qds|b4420qds-64b|b4860qds|b4860qds-64b) UCODE=b4860;;
-        t4240qds|t4240qds-64b|t4240rdb|t4240rdb-64b|t4160qds|t4160qds-64b) UCODE=t4240;;
-        p5020ds|p5020ds-64b) UCODE=p5020;;
-        p5040ds|p5040ds-64b) UCODE=p5040;;
-        *) UCODE=${MACHINE};;
-    esac
-    UCODE=`echo $UCODE | sed -e 's,[a-zA-Z]*$,,'`
+    UCODE=`echo ${REGLEX} | sed -e 's,-.*$,,' -e 's,[a-zA-Z]*$,,'`
     install -d ${D}/boot
     install -m 644 fsl_fman_ucode_${UCODE}*.bin ${D}/boot/
 }
 
 do_deploy () {
-    case ${MACHINE} in
-        t1040qds|t1040qds-64b|t1040rdb|t1040rdb-64b|t1042rdb|t1042rdb-64b) UCODE=t1040;;
-        t2080qds|t2080qds-64b|t2080rdb|t2080rdb-64b) UCODE=t2080;;
-        b4420qds|b4420qds-64b|b4860qds|b4860qds-64b) UCODE=b4860;;
-        t4240qds|t4240qds-64b|t4240rdb|t4240rdb-64b|t4160qds|t4160qds-64b) UCODE=t4240;;
-        p5020ds|p5020ds-64b) UCODE=p5020;;
-        p5040ds|p5040ds-64b) UCODE=p5040;;
-        *) UCODE=${MACHINE};;
-    esac
-    UCODE=`echo $UCODE | sed -e 's,[a-zA-Z]*$,,'`
+    UCODE=`echo ${REGLEX} | sed -e 's,-.*$,,' -e 's,[a-zA-Z]*$,,'`
     install -d ${DEPLOYDIR}/
     install -m 644 fsl_fman_ucode_${UCODE}*.bin ${DEPLOYDIR}/
 }
@@ -46,5 +32,6 @@ addtask deploy before do_build after do_install
 
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
+ALLOW_EMPTY_${PN} = "1"
 COMPATIBLE_MACHINE = "(p1023rdb|e500mc|e5500|e5500-64b|e6500|e6500-64b)"
 
-- 
1.9.1

[meta-fsl-ppc][PATCH 08/12] fm-ucode: update to revision 4cda2e3

[ting.liu]

From: Ting Liu <ting.liu@freescale.com>

This includes following fixes:
4cda2e3 fm-ucode: add t1040 and t2080 rev 1.1 files
222cd35 fm-ucode: remove prev version of _t1040_r1.0_107_
c5006bf fm-ucode: add t1024 packages
2698dc3 fm-ucode: release 107.4.2
3b66ca5 fm-ucode: new version 107_4_2_candidate1

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 recipes-dpaa/fm-ucode/fm-ucode_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-dpaa/fm-ucode/fm-ucode_git.bb b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
index 9f8ac46..1bb7098 100644
--- a/recipes-dpaa/fm-ucode/fm-ucode_git.bb
+++ b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
@@ -8,7 +8,7 @@ PR = "r1"
 inherit deploy
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/fm-ucode.git;nobranch=1"
-SRCREV = "517267e5f9ca9ab13cb2e94e0a20f555f73885ee"
+SRCREV = "4cda2e3f36408ded79022cf599260add07769786"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.1

[meta-fsl-ppc][PATCH 09/12] usdpaa: use soc_family to define SOC/FMAN_VARIANT

[ting.liu]

From: Ting Liu <ting.liu@freescale.com>

listing machine names in recipe is painful when adding support
for boards with same soc. use soc_family instead.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 recipes-dpaa/usdpaa/usdpaa_git.bb | 48 ++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 31 deletions(-)

diff --git a/recipes-dpaa/usdpaa/usdpaa_git.bb b/recipes-dpaa/usdpaa/usdpaa_git.bb
index 78d4253..c8daab0 100644
--- a/recipes-dpaa/usdpaa/usdpaa_git.bb
+++ b/recipes-dpaa/usdpaa/usdpaa_git.bb
@@ -21,33 +21,27 @@ S = "${WORKDIR}/git"
 EXTRA_OEMAKE = 'CC="${CC}" LD="${LD}" AR="${AR}"'
 export ARCH="${TARGET_ARCH}"
 
+SOC ?= "P4080"
+SOC_b4 = "B4860"
+SOC_t1 = "T1040"
+SOC_t2 = "T2080"
+SOC_t4 = "T4240"
+SOC_p1023rdb = "P1023"
+
+FMAN_VARIANT ?= "P4080"
+FMAN_VARIANT_b4 = "B4860"
+FMAN_VARIANT_t1 = "B4860"
+FMAN_VARIANT_t2 = "B4860"
+FMAN_VARIANT_t4 = "B4860"
+FMAN_VARIANT_p1023rdb = "P1023"
+
 do_compile_prepend () {
-    case ${MACHINE} in
-        b4420qds|b4420qds-64b|b4860qds|b4860qds-64b)
-            SOC=B4860;
-            FMAN_VARIANT=B4860;;
-        t1040qds|t1040qds-64b|t1040rdb|t1040rdb-64b)
-            SOC=T1040;
-            FMAN_VARIANT=B4860;;
-        t2080qds|t2080qds-64b|t2080rdb|t2080rdb-64b)
-            SOC=T2080;
-            FMAN_VARIANT=B4860;;
-        t4240qds|t4240qds-64b|t4240rdb|t4240rdb-64b)
-            SOC=T4240;
-            FMAN_VARIANT=B4860;;
-        p1023rdb)
-            SOC=P1023;
-            FMAN_VARIANT=P1023;;
-        *)
-            SOC=P4080;
-            FMAN_VARIANT=P4080;;
-    esac
-    export SOC=$SOC
+    export SOC=${SOC}
     export FMC_EXTRA_CFLAGS="-I ${STAGING_INCDIR}/fmc"
     export FMLIB_EXTRA_CFLAGS="-I ${STAGING_INCDIR}/fmd \
         -I ${STAGING_INCDIR}/fmd/Peripherals \
         -I ${STAGING_INCDIR}/fmd/integrations \
-        -D$FMAN_VARIANT"
+        -D${FMAN_VARIANT}"
 
     export LIBXML2_CFLAGS="$(pkg-config --cflags libxml-2.0)"
     export LIBXML2_LDFLAGS="$(pkg-config --libs --static libxml-2.0)"
@@ -56,15 +50,7 @@ do_compile_prepend () {
 }
 
 do_install () {
-    case ${MACHINE} in
-        b4420qds|b4420qds-64b|b4860qds|b4860qds-64b) SOC=B4860;;
-        t1040qds|t1040qds-64b|t1040rdb|t1040rdb-64b) SOC=T1040;;
-        t2080qds|t2080qds-64b|t2080rdb|t2080rdb-64b) SOC=T2080;;
-        t4240qds|t4240qds-64b|t4240rdb|t4240rdb-64b) SOC=T4240;;
-        p1023rdb) SOC=P1023;;
-        *) SOC=P4080;;
-    esac
-    export SOC=$SOC
+    export SOC=${SOC}
     oe_runmake install DESTDIR=${D}
 }
 
-- 
1.9.1

[meta-fsl-ppc][PATCH 10/12] usdpaa: update to revision d997594

[ting.liu]

From: Ting Liu <ting.liu@freescale.com>

This update to fsl sdk v1.7 release. There are 143 new commits.
The detailed changes can be found at:
http://git.freescale.com/git/cgit.cgi/ppc/sdk/usdpaa.git/

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 recipes-dpaa/usdpaa/usdpaa_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-dpaa/usdpaa/usdpaa_git.bb b/recipes-dpaa/usdpaa/usdpaa_git.bb
index c8daab0..e6bf5f6 100644
--- a/recipes-dpaa/usdpaa/usdpaa_git.bb
+++ b/recipes-dpaa/usdpaa/usdpaa_git.bb
@@ -14,7 +14,7 @@ DEPENDS_append_b4420qds = " ipc-ust"
 RDEPENDS_${PN} = "libgcc bash"
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa.git;nobranch=1"
-SRCREV = "db3534f4d21892bc7f9fbe973f4e4cf8de924c75"
+SRCREV = "d9975948bb6bf9fdcec189c0f1c31ce45f74961c"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.1

[meta-fsl-ppc][PATCH 11/12] uio-seville: update to revision 35af73f

[ting.liu]

From: Rich Schmitt <B43082@freescale.com>

This includes following fixes:
35af73f Fix: Copy user-space buffer of injected control frame to kernel
00c8040 Add multiple error labels in the probe function
2835689 Fix: Remove memory leaks when the module is removed or fails on probing
d770a37 Fix: Remove compile warning on 32b
89e29fc Fix: Remove unnecessary checks
adbb47e Beautify: Rename macros into more proper names
d5cac6e Add "poll()" function for NPI device
220cee3 Replace rescheduling with work queues
2a5fe4e Add cacheline support for extraction of control frames
6f14f0b Fix: UIO device might not be removed properly if module fails to initialize
2dcea55 Removed unecessary includes
1077880 Add UIO driver
68ab7bd Initial empty repository

update COMPATIBLE_MACHINE to use soc_family.

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---
 recipes-kernel/uio-seville/uio-seville_0.1.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/uio-seville/uio-seville_0.1.bb b/recipes-kernel/uio-seville/uio-seville_0.1.bb
index 0307a6d..49ef484 100755
--- a/recipes-kernel/uio-seville/uio-seville_0.1.bb
+++ b/recipes-kernel/uio-seville/uio-seville_0.1.bb
@@ -2,11 +2,13 @@ DESCRIPTION = "UIO driver for T1040 L2 Switch"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/l2switch-uio.git"
-SRCREV = "1077880ff3557d44dc5dd9fe5e2f4ee1474fb25f"
+SRC_URI = "git://git.freescale.com/ppc/sdk/l2switch-uio.git;branch=sdk-v1.7.x"
+SRCREV = "35af73f3ba00745777f32787400d9eb0317d7ff5"
 
 inherit module
 
 S = "${WORKDIR}/git/uio-driver"
 
-COMPATIBLE_MACHINE = "(t1040qds|t1040rdb|t1040rdb-64b)"
+COMPATIBLE_MACHINE ?= "(none)"
+COMPATIBLE_MACHINE_t1 = ".*"
+
-- 
1.9.1

[meta-fsl-ppc][PATCH 12/12] multilib: use ?= to allow overridden in local.conf

[ting.liu]

From: Ting Liu <ting.liu@freescale.com>

the multilib setting have already been moved to the machine
configure file. according to the including order in bitbake.conf
the machine configure file is after local.conf file.so the value
in local.conf will be overridden. change to use ?=.

This is useful when using external toolchain which does not need
to enable multilib.

Signed-off-by: Zongchun Yu <Zongchun.Yu@freescale.com>
---
 conf/machine/include/e5500-64b.inc | 4 ++--
 conf/machine/include/e6500-64b.inc | 4 ++--
 conf/machine/include/e6500.inc     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index a8b69dd..d6d3cfd 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -7,7 +7,7 @@ require conf/machine/include/qoriq-base.inc
 MACHINEOVERRIDES .= ":e5500-64b"
 
 require conf/multilib.conf
-MULTILIBS = "multilib:lib32"
-DEFAULTTUNE_virtclass-multilib-lib32 = "ppce5500"
+MULTILIBS ?= "multilib:lib32"
+DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500"
 USER_CLASSES_remove = "image-prelink"
 
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index 6b7297b..f98f402 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -7,7 +7,7 @@ require conf/machine/include/qoriq-base.inc
 MACHINEOVERRIDES .= ":e6500-64b"
 
 require conf/multilib.conf
-MULTILIBS = "multilib:lib32"
-DEFAULTTUNE_virtclass-multilib-lib32 = "ppce6500"
+MULTILIBS ?= "multilib:lib32"
+DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"
 USER_CLASSES_remove = "image-prelink"
 
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index e6848bd..4121fbe 100644
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -8,6 +8,6 @@ MACHINEOVERRIDES .= ":e6500"
 BUILD_64BIT_KERNEL = "1"
 
 require conf/multilib.conf
-MULTILIBS = "multilib:lib64"
-DEFAULTTUNE_virtclass-multilib-lib64 = "ppc64e6500"
+MULTILIBS ?= "multilib:lib64"
+DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500"
 
-- 
1.9.1

Re: [meta-fsl-ppc][PATCH 12/12] multilib: use ?= to allow overridden in local.conf

[Bob Cochran]

This patch does not apply properly.  See below plus a comment on commit 
log...


On 01/06/2015 11:33 PM, ting.liu@freescale.com wrote:
> From: Ting Liu <ting.liu@freescale.com>
>
> the multilib setting have already been moved to the machine
> configure file.


I'm not sure what you mean.  Aren't the machine config files the ones in 
"meta-fsl-ppc/conf/machine"  MULTILIBS is not set in any of machine conf 
files (e.g., t1040rdb-64b.conf).   The only conf files I see MULTILIBS 
being used are in the e5500 and e6500 include files.



according to the including order in bitbake.conf
> the machine configure file is after local.conf file.so the value
> in local.conf will be overridden. change to use ?=.
>
> This is useful when using external toolchain which does not need
> to enable multilib.
>
> Signed-off-by: Zongchun Yu <Zongchun.Yu@freescale.com>
> ---
>   conf/machine/include/e5500-64b.inc | 4 ++--
>   conf/machine/include/e6500-64b.inc | 4 ++--
>   conf/machine/include/e6500.inc     | 4 ++--
>   3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
> index a8b69dd..d6d3cfd 100644
> --- a/conf/machine/include/e5500-64b.inc
> +++ b/conf/machine/include/e5500-64b.inc
> @@ -7,7 +7,7 @@ require conf/machine/include/qoriq-base.inc
>   MACHINEOVERRIDES .= ":e5500-64b"
>
>   require conf/multilib.conf
> -MULTILIBS = "multilib:lib32"
> -DEFAULTTUNE_virtclass-multilib-lib32 = "ppce5500"
> +MULTILIBS ?= "multilib:lib32"
> +DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500"
>   USER_CLASSES_remove = "image-prelink"

I'm seeing errors when applying this patch.  I don't see a 
"USER_CLASSES_remove  = "image-prelink" line in these conf files.


>
> diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
> index 6b7297b..f98f402 100644
> --- a/conf/machine/include/e6500-64b.inc
> +++ b/conf/machine/include/e6500-64b.inc
> @@ -7,7 +7,7 @@ require conf/machine/include/qoriq-base.inc
>   MACHINEOVERRIDES .= ":e6500-64b"
>
>   require conf/multilib.conf
> -MULTILIBS = "multilib:lib32"
> -DEFAULTTUNE_virtclass-multilib-lib32 = "ppce6500"
> +MULTILIBS ?= "multilib:lib32"
> +DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"
>   USER_CLASSES_remove = "image-prelink"

Line doesn't exist

>
> diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
> index e6848bd..4121fbe 100644
> --- a/conf/machine/include/e6500.inc
> +++ b/conf/machine/include/e6500.inc
> @@ -8,6 +8,6 @@ MACHINEOVERRIDES .= ":e6500"
>   BUILD_64BIT_KERNEL = "1"
>
>   require conf/multilib.conf
> -MULTILIBS = "multilib:lib64"
> -DEFAULTTUNE_virtclass-multilib-lib64 = "ppc64e6500"
> +MULTILIBS ?= "multilib:lib64"
> +DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500"
>
>

Re: [meta-fsl-ppc][PATCH 12/12] multilib: use ?= to allow overridden in local.conf

[ting.liu]

> -----Original Message-----
> From: Bob Cochran [mailto:yocto@mindchasers.com]
> Sent: Wednesday, January 07, 2015 11:13 PM
> To: Liu Ting-B28495; meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH 12/12] multilib: use ?= to
> allow overridden in local.conf
> 
> This patch does not apply properly.  See below plus a comment on commit log...
> 
> 
> On 01/06/2015 11:33 PM, ting.liu@freescale.com wrote:
> > From: Ting Liu <ting.liu@freescale.com>
> >
> > the multilib setting have already been moved to the machine
> > configure file.
> 
> 
> I'm not sure what you mean.  Aren't the machine config files the ones in
> "meta-fsl-ppc/conf/machine"  MULTILIBS is not set in any of machine conf
> files (e.g., t1040rdb-64b.conf).   The only conf files I see MULTILIBS
> being used are in the e5500 and e6500 include files.
> 
[Liu Ting-B28495] yes, I mean e5500 and e6500 include files under conf/machine/.
They are included by machine config files, so is it suitable?

I can update the msg if needed.

> 
> 
> according to the including order in bitbake.conf
> > the machine configure file is after local.conf file.so the value
> > in local.conf will be overridden. change to use ?=.
> >
> > This is useful when using external toolchain which does not need
> > to enable multilib.
> >
> > Signed-off-by: Zongchun Yu <Zongchun.Yu@freescale.com>
> > ---
> >   conf/machine/include/e5500-64b.inc | 4 ++--
> >   conf/machine/include/e6500-64b.inc | 4 ++--
> >   conf/machine/include/e6500.inc     | 4 ++--
> >   3 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/conf/machine/include/e5500-64b.inc
> b/conf/machine/include/e5500-64b.inc
> > index a8b69dd..d6d3cfd 100644
> > --- a/conf/machine/include/e5500-64b.inc
> > +++ b/conf/machine/include/e5500-64b.inc
> > @@ -7,7 +7,7 @@ require conf/machine/include/qoriq-base.inc
> >   MACHINEOVERRIDES .= ":e5500-64b"
> >
> >   require conf/multilib.conf
> > -MULTILIBS = "multilib:lib32"
> > -DEFAULTTUNE_virtclass-multilib-lib32 = "ppce5500"
> > +MULTILIBS ?= "multilib:lib32"
> > +DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500"
> >   USER_CLASSES_remove = "image-prelink"
> 
> I'm seeing errors when applying this patch.  I don't see a
> "USER_CLASSES_remove  = "image-prelink" line in these conf files.
> 
[Liu Ting-B28495] sorry, I generated the patches based on internal test branch.
This line should be removed here.

> 
> >
> > diff --git a/conf/machine/include/e6500-64b.inc
> b/conf/machine/include/e6500-64b.inc
> > index 6b7297b..f98f402 100644
> > --- a/conf/machine/include/e6500-64b.inc
> > +++ b/conf/machine/include/e6500-64b.inc
> > @@ -7,7 +7,7 @@ require conf/machine/include/qoriq-base.inc
> >   MACHINEOVERRIDES .= ":e6500-64b"
> >
> >   require conf/multilib.conf
> > -MULTILIBS = "multilib:lib32"
> > -DEFAULTTUNE_virtclass-multilib-lib32 = "ppce6500"
> > +MULTILIBS ?= "multilib:lib32"
> > +DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"
> >   USER_CLASSES_remove = "image-prelink"
> 
> Line doesn't exist
[Liu Ting-B28495] This line should be removed here.

> 
> >
> > diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
> > index e6848bd..4121fbe 100644
> > --- a/conf/machine/include/e6500.inc
> > +++ b/conf/machine/include/e6500.inc
> > @@ -8,6 +8,6 @@ MACHINEOVERRIDES .= ":e6500"
> >   BUILD_64BIT_KERNEL = "1"
> >
> >   require conf/multilib.conf
> > -MULTILIBS = "multilib:lib64"
> > -DEFAULTTUNE_virtclass-multilib-lib64 = "ppc64e6500"
> > +MULTILIBS ?= "multilib:lib64"
> > +DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500"
> >
> >

Re: [meta-fsl-ppc][PATCH 11/12] uio-seville: update to revision 35af73f

[zhenhua.luo]

> -----Original Message-----
> From: ting.liu@freescale.com [mailto:ting.liu@freescale.com]
> Sent: Wednesday, January 07, 2015 12:33 PM
> 
> -COMPATIBLE_MACHINE = "(t1040qds|t1040rdb|t1040rdb-64b)"
> +COMPATIBLE_MACHINE ?= "(none)"
> +COMPATIBLE_MACHINE_t1 = ".*"
[Luo Zhenhua-B19537] t1024 should be excluded. 


Best Regards,

Zhenhua