[meta-freescale] [meta-fsl-arm][PATCH 03/41] linux-ls1: rename to linux-qoriq

[ting.liu at nxp.com]

From: Ting Liu <ting.liu at nxp.com>

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 conf/machine/include/qoriq-arm.inc                            |  2 +-
 recipes-kernel/linux/linux-ls1_3.12.bb                        | 11 -----------
 ...1-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch |  0
 ...-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch |  0
 .../0003-use-static-inline-in-ARM-lifeboot.h.patch            |  0
 .../Fix-the-compile-issue-under-gcc6.patch                    |  0
 recipes-kernel/linux/{linux-ls1 => linux-qoriq}/defconfig     |  0
 recipes-kernel/linux/{linux-ls1.inc => linux-qoriq_3.12.bb}   | 11 ++++++++---
 8 files changed, 9 insertions(+), 15 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-ls1_3.12.bb
 rename recipes-kernel/linux/{linux-ls1 => linux-qoriq}/0001-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch (100%)
 rename recipes-kernel/linux/{linux-ls1 => linux-qoriq}/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch (100%)
 rename recipes-kernel/linux/{linux-ls1 => linux-qoriq}/0003-use-static-inline-in-ARM-lifeboot.h.patch (100%)
 rename recipes-kernel/linux/{linux-ls1 => linux-qoriq}/Fix-the-compile-issue-under-gcc6.patch (100%)
 rename recipes-kernel/linux/{linux-ls1 => linux-qoriq}/defconfig (100%)
 rename recipes-kernel/linux/{linux-ls1.inc => linux-qoriq_3.12.bb} (77%)

diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index cd33b75..f20ce56 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -3,7 +3,7 @@ require conf/machine/include/soc-family.inc
 # Freescale BSP default providers
 PREFERRED_PROVIDER_u-boot_ls102xa ?= "u-boot-qoriq"
 PREFERRED_PROVIDER_virtual/bootloader_ls102xa ?= "u-boot-qoriq"
-PREFERRED_PROVIDER_virtual/kernel_ls102xa ?= "linux-ls1"
+PREFERRED_PROVIDER_virtual/kernel_ls102xa ?= "linux-qoriq"
 
 # Define the default image type
 IMAGE_CLASSES ?= "image_types_uboot"
diff --git a/recipes-kernel/linux/linux-ls1_3.12.bb b/recipes-kernel/linux/linux-ls1_3.12.bb
deleted file mode 100644
index eaa0f2a..0000000
--- a/recipes-kernel/linux/linux-ls1_3.12.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SUMMARY = "Linux Kernel for Freescale layerscape platforms"
-DESCRIPTION = "Linux Kernel provided and supported by Freescale with focus on \
-Layerscape1 Family Boards. "
-
-require recipes-kernel/linux/linux-ls1.inc
-require recipes-kernel/linux/linux-dtb.inc
-
-SRCBRANCH = "master"
-SRCREV = "f488de6741d5ba805b9fe813d2ddf32368d3a888"
-
-COMPATIBLE_MACHINE = "(ls102xa)"
diff --git a/recipes-kernel/linux/linux-ls1/0001-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/recipes-kernel/linux/linux-qoriq/0001-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
similarity index 100%
rename from recipes-kernel/linux/linux-ls1/0001-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
rename to recipes-kernel/linux/linux-qoriq/0001-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
diff --git a/recipes-kernel/linux/linux-ls1/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch b/recipes-kernel/linux/linux-qoriq/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch
similarity index 100%
rename from recipes-kernel/linux/linux-ls1/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch
rename to recipes-kernel/linux/linux-qoriq/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch
diff --git a/recipes-kernel/linux/linux-ls1/0003-use-static-inline-in-ARM-lifeboot.h.patch b/recipes-kernel/linux/linux-qoriq/0003-use-static-inline-in-ARM-lifeboot.h.patch
similarity index 100%
rename from recipes-kernel/linux/linux-ls1/0003-use-static-inline-in-ARM-lifeboot.h.patch
rename to recipes-kernel/linux/linux-qoriq/0003-use-static-inline-in-ARM-lifeboot.h.patch
diff --git a/recipes-kernel/linux/linux-ls1/Fix-the-compile-issue-under-gcc6.patch b/recipes-kernel/linux/linux-qoriq/Fix-the-compile-issue-under-gcc6.patch
similarity index 100%
rename from recipes-kernel/linux/linux-ls1/Fix-the-compile-issue-under-gcc6.patch
rename to recipes-kernel/linux/linux-qoriq/Fix-the-compile-issue-under-gcc6.patch
diff --git a/recipes-kernel/linux/linux-ls1/defconfig b/recipes-kernel/linux/linux-qoriq/defconfig
similarity index 100%
rename from recipes-kernel/linux/linux-ls1/defconfig
rename to recipes-kernel/linux/linux-qoriq/defconfig
diff --git a/recipes-kernel/linux/linux-ls1.inc b/recipes-kernel/linux/linux-qoriq_3.12.bb
similarity index 77%
rename from recipes-kernel/linux/linux-ls1.inc
rename to recipes-kernel/linux/linux-qoriq_3.12.bb
index 85b5391..313cea5 100644
--- a/recipes-kernel/linux/linux-ls1.inc
+++ b/recipes-kernel/linux/linux-qoriq_3.12.bb
@@ -1,19 +1,23 @@
+SUMMARY = "Linux Kernel for Freescale layerscape platforms"
+DESCRIPTION = "Linux Kernel provided and supported by Freescale with focus on \
+Layerscape1 Family Boards. "
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
+require recipes-kernel/linux/linux-dtb.inc
+
 inherit kernel fsl-kernel-localversion
 LOCALVERSION ?= "+ls1"
 
+SRCBRANCH = "master"
 SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=${SRCBRANCH} \
     file://defconfig \
-"
-
-SRC_URI += " \
     file://0001-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
     file://0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch \
     file://0003-use-static-inline-in-ARM-lifeboot.h.patch \
     file://Fix-the-compile-issue-under-gcc6.patch \
 "
+SRCREV = "f488de6741d5ba805b9fe813d2ddf32368d3a888"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 ZIMAGE_BASE_NAME = "zImage-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
@@ -32,3 +36,4 @@ do_deploy_append() {
 }
 
 FILES_kernel-image += "/boot/zImage*"
+COMPATIBLE_MACHINE = "(ls102xa)"
-- 
1.9.2