* [meta-fsl-ppc][PATCH v2 04/12] conf/machine/: move common bits to inc files
@ 2014-07-14 2:08 ting.liu
2014-07-14 2:08 ` [meta-fsl-ppc][PATCH v2 09/12] set IMAGE_CLASSES = "image_types_uboot" as defaut ting.liu
2014-07-14 2:08 ` [meta-fsl-ppc][PATCH v2 11/12] inherit qoriq_build_64bit_kernel for kernel/module recipes ting.liu
0 siblings, 2 replies; 5+ messages in thread
From: ting.liu @ 2014-07-14 2:08 UTC (permalink / raw)
To: meta-freescale
From: Ting Liu <b28495@freescale.com>
* add four new files to hold common bits:
include/qoriq-base.inc
include/qoriq-default-providers.inc
include/qoriq-default-settings.inc
include/qoriq-default-versions.inc
* add 'qoriq' into list of MACHINEOVERRIDES
Signed-off-by: Ting Liu <b28495@freescale.com>
---
Changes in v2: use ?= for SERIAL_CONSOLES settings
conf/machine/b4420qds-64b.conf | 6 ------
conf/machine/b4420qds.conf | 5 -----
conf/machine/b4860qds-64b.conf | 5 -----
conf/machine/b4860qds.conf | 5 -----
conf/machine/bsc9131rdb.conf | 4 ----
conf/machine/bsc9132qds.conf | 4 ----
conf/machine/c293pcie.conf | 4 ----
conf/machine/include/e500mc.inc | 13 +------------
conf/machine/include/e500v2.inc | 13 +------------
conf/machine/include/e5500-64b.inc | 15 ++-------------
conf/machine/include/e5500.inc | 13 +------------
conf/machine/include/e6500-64b.inc | 15 ++-------------
conf/machine/include/e6500.inc | 14 +++-----------
conf/machine/include/qoriq-base.inc | 8 ++++++++
conf/machine/include/qoriq-default-providers.inc | 2 ++
conf/machine/include/qoriq-default-settings.inc | 15 +++++++++++++++
conf/machine/include/qoriq-default-versions.inc | 3 +++
conf/machine/p1010rdb.conf | 4 ----
conf/machine/p1020rdb.conf | 6 ------
conf/machine/p1021rdb.conf | 4 ----
conf/machine/p1022ds.conf | 4 ----
conf/machine/p1023rdb.conf | 4 ----
conf/machine/p1025twr.conf | 4 ----
conf/machine/p2020ds.conf | 4 ----
conf/machine/p2020rdb.conf | 4 ----
conf/machine/p2041rdb.conf | 4 ----
conf/machine/p3041ds.conf | 4 ----
conf/machine/p4080ds.conf | 4 ----
conf/machine/p5020ds-64b.conf | 5 -----
conf/machine/p5020ds.conf | 4 ----
conf/machine/p5040ds-64b.conf | 4 ----
conf/machine/p5040ds.conf | 4 ----
conf/machine/t1040rdb-64b.conf | 4 ----
conf/machine/t1040rdb.conf | 4 ----
conf/machine/t1042rdb-64b.conf | 5 -----
conf/machine/t1042rdb.conf | 5 -----
conf/machine/t2080qds-64b.conf | 5 -----
conf/machine/t2080qds.conf | 5 -----
conf/machine/t2080rdb-64b.conf | 5 -----
conf/machine/t2080rdb.conf | 5 -----
conf/machine/t4160qds-64b.conf | 5 -----
conf/machine/t4160qds.conf | 5 -----
conf/machine/t4240qds-64b.conf | 5 -----
conf/machine/t4240qds.conf | 5 -----
conf/machine/t4240rdb-64b.conf | 5 -----
conf/machine/t4240rdb.conf | 5 -----
46 files changed, 38 insertions(+), 237 deletions(-)
create mode 100644 conf/machine/include/qoriq-base.inc
create mode 100644 conf/machine/include/qoriq-default-providers.inc
create mode 100644 conf/machine/include/qoriq-default-settings.inc
create mode 100644 conf/machine/include/qoriq-default-versions.inc
diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf
index 45c820e..a623c84 100644
--- a/conf/machine/b4420qds-64b.conf
+++ b/conf/machine/b4420qds-64b.conf
@@ -5,17 +5,11 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "b4420"
-
-# TODO: fix 32bit build of u-boot
UBOOT_MACHINES ?= "B4420QDS"
KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/b4420qds.conf b/conf/machine/b4420qds.conf
index 9016cfb..fa1187b 100644
--- a/conf/machine/b4420qds.conf
+++ b/conf/machine/b4420qds.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "b4420"
UBOOT_MACHINES ?= "B4420QDS"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index 4da069f..3ba5648 100644
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -5,16 +5,11 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "b4860"
-# TODO: fix 32bit build of u-boot
UBOOT_MACHINES ?= "B4860QDS"
KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf
index c560f1c..972d29f 100644
--- a/conf/machine/b4860qds.conf
+++ b/conf/machine/b4860qds.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "b4860"
UBOOT_MACHINES ?= "B4860QDS"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
diff --git a/conf/machine/bsc9131rdb.conf b/conf/machine/bsc9131rdb.conf
index 64ba795..e65f7e4 100644
--- a/conf/machine/bsc9131rdb.conf
+++ b/conf/machine/bsc9131rdb.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "bsc9131"
UBOOT_MACHINES ?= "BSC9131RDB_SPIFLASH BSC9131RDB_NAND BSC9131RDB_NAND_SYSCLK100 BSC9131RDB_SPIFLASH_SYSCLK100"
@@ -14,6 +13,3 @@ 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"
diff --git a/conf/machine/bsc9132qds.conf b/conf/machine/bsc9132qds.conf
index a51cbd8..82078ee 100644
--- a/conf/machine/bsc9132qds.conf
+++ b/conf/machine/bsc9132qds.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/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"
@@ -14,6 +13,3 @@ 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"
diff --git a/conf/machine/c293pcie.conf b/conf/machine/c293pcie.conf
index b22dfd0..6a63844 100644
--- a/conf/machine/c293pcie.conf
+++ b/conf/machine/c293pcie.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "c293pcie"
BOOTFORMAT_CONFIG = "config_ddr3_512m_c29xpcie_800M.dat"
@@ -15,6 +14,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index a35d91b..09b5c69 100644
--- a/conf/machine/include/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
@@ -1,17 +1,6 @@
TARGET_FPU = "hard"
require conf/machine/include/tune-ppce500mc.inc
-
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-# ext2.bz2 ext2.lzma \
-# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/qoriq-base.inc
MACHINEOVERRIDES .= ":e500mc:fslmachine"
diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index adaa3cd..178de18 100644
--- a/conf/machine/include/e500v2.inc
+++ b/conf/machine/include/e500v2.inc
@@ -1,15 +1,4 @@
require conf/machine/include/tune-ppce500v2.inc
-
-MACHINE_FEATURES = "pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-# ext2.bz2 ext2.lzma \
-# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/qoriq-base.inc
MACHINEOVERRIDES .= ":e500v2:fslmachine"
diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index c951843..47a9ad7 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -1,18 +1,7 @@
TARGET_FPU = "hard"
-
DEFAULTTUNE ?= "ppc64e5500"
-require conf/machine/include/tune-ppce5500.inc
-
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-# ext2.bz2 ext2.lzma \
-# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/tune-ppce5500.inc
+require conf/machine/include/qoriq-base.inc
MACHINEOVERRIDES .= ":e5500-64b:fslmachine"
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 0babacc..e6f0400 100644
--- a/conf/machine/include/e5500.inc
+++ b/conf/machine/include/e5500.inc
@@ -1,17 +1,6 @@
TARGET_FPU = "hard"
require conf/machine/include/tune-ppce5500.inc
-
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-# ext2.bz2 ext2.lzma \
-# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/qoriq-base.inc
MACHINEOVERRIDES .= ":e5500:fslmachine"
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index 36f55a2..0770cc3 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -1,18 +1,7 @@
TARGET_FPU = "hard"
-
DEFAULTTUNE ?= "ppc64e6500"
-require conf/machine/include/tune-ppce6500.inc
-
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-# ext2.bz2 ext2.lzma \
-# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/tune-ppce6500.inc
+require conf/machine/include/qoriq-base.inc
MACHINEOVERRIDES .= ":e6500-64b:fslmachine"
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 81a2bf4..323e420 100644
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -1,17 +1,9 @@
TARGET_FPU = "hard"
require conf/machine/include/tune-ppce6500.inc
+require conf/machine/include/qoriq-base.inc
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
+MACHINEOVERRIDES .= ":e6500:fslmachine"
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-# ext2.bz2 ext2.lzma \
-# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+BUILD_64BIT_KERNEL = "1"
-MACHINEOVERRIDES .= ":e6500:fslmachine"
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
new file mode 100644
index 0000000..9b26d10
--- /dev/null
+++ b/conf/machine/include/qoriq-base.inc
@@ -0,0 +1,8 @@
+# Provides the QorIQ common settings
+
+require conf/machine/include/qoriq-default-settings.inc
+require conf/machine/include/qoriq-default-versions.inc
+require conf/machine/include/qoriq-default-providers.inc
+
+require conf/machine/include/soc-family.inc
+
diff --git a/conf/machine/include/qoriq-default-providers.inc b/conf/machine/include/qoriq-default-providers.inc
new file mode 100644
index 0000000..824712b
--- /dev/null
+++ b/conf/machine/include/qoriq-default-providers.inc
@@ -0,0 +1,2 @@
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
+
diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc
new file mode 100644
index 0000000..2247495
--- /dev/null
+++ b/conf/machine/include/qoriq-default-settings.inc
@@ -0,0 +1,15 @@
+MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
+MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
+
+KERNEL_IMAGETYPE ?= "uImage"
+# disable the images below for now
+# ext2.bz2 ext2.lzma \
+# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+
+MACHINEOVERRIDES .= ":qoriq"
+
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+
+USE_VT = "0"
+
diff --git a/conf/machine/include/qoriq-default-versions.inc b/conf/machine/include/qoriq-default-versions.inc
new file mode 100644
index 0000000..3bb03ba
--- /dev/null
+++ b/conf/machine/include/qoriq-default-versions.inc
@@ -0,0 +1,3 @@
+PREFERRED_VERSION_qemu = "1.7+fsl"
+PREFERRED_VERSION_openssl = "1.0.1g"
+
diff --git a/conf/machine/p1010rdb.conf b/conf/machine/p1010rdb.conf
index 10b1c92..ee7a9b6 100644
--- a/conf/machine/p1010rdb.conf
+++ b/conf/machine/p1010rdb.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p1010"
BOOTFORMAT_CONFIG = "config_sram_p1010rdb.dat"
@@ -17,6 +16,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
JFFS2_ERASEBLOCK = "0x20000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf
index 3fa7377..e2b706e 100644
--- a/conf/machine/p1020rdb.conf
+++ b/conf/machine/p1020rdb.conf
@@ -5,18 +5,12 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p1020"
BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
UBOOT_MACHINES ?= " P1020RDB-PD P1020RDB-PD_NAND P1020RDB-PD_SDCARD P1020RDB-PD_SPIFLASH"
-
KERNEL_DEVICETREE ?= "p1020rdb-pd_32b.dtb"
-
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"
diff --git a/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf
index 711a62d..4c793e8 100644
--- a/conf/machine/p1021rdb.conf
+++ b/conf/machine/p1021rdb.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p1021"
BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
@@ -15,6 +14,3 @@ 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"
diff --git a/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf
index 107cbe4..823131a 100644
--- a/conf/machine/p1022ds.conf
+++ b/conf/machine/p1022ds.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p1022"
BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
@@ -25,6 +24,3 @@ XSERVER = " \
JFFS2_ERASEBLOCK = "0x20000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p1023rdb.conf b/conf/machine/p1023rdb.conf
index 59a9ce6..02ec4a5 100644
--- a/conf/machine/p1023rdb.conf
+++ b/conf/machine/p1023rdb.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p1023"
UBOOT_MACHINES ?= "P1023RDB"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/p1023_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p1025twr.conf b/conf/machine/p1025twr.conf
index e7d25fe..67fa569 100644
--- a/conf/machine/p1025twr.conf
+++ b/conf/machine/p1025twr.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p1025"
BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
@@ -15,6 +14,3 @@ 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"
diff --git a/conf/machine/p2020ds.conf b/conf/machine/p2020ds.conf
index 7510787..96433a2 100644
--- a/conf/machine/p2020ds.conf
+++ b/conf/machine/p2020ds.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p2020"
BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat"
@@ -15,6 +14,3 @@ 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"
diff --git a/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf
index c3d08c9..9544c25 100644
--- a/conf/machine/p2020rdb.conf
+++ b/conf/machine/p2020rdb.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p2020"
BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
@@ -15,6 +14,3 @@ 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"
diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index d06df45..f641a00 100644
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500mc.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p2041"
UBOOT_MACHINES ?= "P2041RDB P2041RDB_NAND P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index 7be35b9..01c51e4 100644
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500mc.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p3041"
UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SDCARD P3041DS_SPIFLASH"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index 51c0fed..1b6fad7 100644
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e500mc.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p4080"
UBOOT_MACHINES ?= "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH "
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index a901b48..057e9f3 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -5,16 +5,11 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e5500-64b.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p5020"
-# TODO: fix 32bit build of u-boot for p5020ds-64b
UBOOT_MACHINES ?= "P5020DS"
KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 42ab769..7effe1e 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e5500.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p5020"
UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SDCARD P5020DS_SPIFLASH "
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index c462970..fbbe9e2 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e5500-64b.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p5040"
UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 8f5ea62..1cd9512 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e5500.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "p5040"
UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t1040rdb-64b.conf b/conf/machine/t1040rdb-64b.conf
index bc4de7b..b4ea5c8 100644
--- a/conf/machine/t1040rdb-64b.conf
+++ b/conf/machine/t1040rdb-64b.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e5500-64b.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t1040"
UBOOT_MACHINES ?= "T1040RDB"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_64bit_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t1040rdb.conf b/conf/machine/t1040rdb.conf
index d2ec7a4..684cf8e 100644
--- a/conf/machine/t1040rdb.conf
+++ b/conf/machine/t1040rdb.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e5500.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t1040"
UBOOT_MACHINES ?= "T1040RDB"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_32bit_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t1042rdb-64b.conf b/conf/machine/t1042rdb-64b.conf
index 58b2bd0..0141e10 100644
--- a/conf/machine/t1042rdb-64b.conf
+++ b/conf/machine/t1042rdb-64b.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e5500-64b.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t1042"
UBOOT_MACHINES ?= "T1042RDB_PI"
@@ -14,10 +13,6 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_64bit_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
XSERVER = " \
xserver-xorg \
diff --git a/conf/machine/t1042rdb.conf b/conf/machine/t1042rdb.conf
index e5c4112..1f13d86 100644
--- a/conf/machine/t1042rdb.conf
+++ b/conf/machine/t1042rdb.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e5500.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t1042"
UBOOT_MACHINES ?= "T1042RDB_PI"
@@ -14,10 +13,6 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_32bit_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
XSERVER = " \
xserver-xorg \
diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf
index bd1cd1d..e2b5682 100644
--- a/conf/machine/t2080qds-64b.conf
+++ b/conf/machine/t2080qds-64b.conf
@@ -5,16 +5,11 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t2080"
-# TODO: fix 32bit build of u-boot
UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT"
KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf
index 2892baa..dfa6b09 100644
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t2080"
UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index 2d28f9c..5d4eed4 100644
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -5,16 +5,11 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t2080"
-# TODO: fix 32bit build of u-boot
UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT"
KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index 256a3d0..08d2dd7 100644
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t2080"
UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
diff --git a/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf
index 1865078..3f35e57 100644
--- a/conf/machine/t4160qds-64b.conf
+++ b/conf/machine/t4160qds-64b.conf
@@ -5,16 +5,11 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t4160"
-# TODO: fix 32bit build of u-boot
UBOOT_MACHINES ?= "T4160QDS"
KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf
index 07ea41b..f87b58e 100644
--- a/conf/machine/t4160qds.conf
+++ b/conf/machine/t4160qds.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t4160"
UBOOT_MACHINES ?= "T4160QDS"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf
index ff56c3b..510b813 100644
--- a/conf/machine/t4240qds-64b.conf
+++ b/conf/machine/t4240qds-64b.conf
@@ -5,16 +5,11 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t4240"
-# TODO: fix 32bit build of u-boot
UBOOT_MACHINES ?= "T4240QDS"
KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf
index 0df32f6..58e5200 100644
--- a/conf/machine/t4240qds.conf
+++ b/conf/machine/t4240qds.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t4240"
UBOOT_MACHINES ?= "T4240QDS"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf
index 0838187..ea45895 100644
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -5,16 +5,11 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t4240"
-# TODO: fix 32bit build of u-boot
UBOOT_MACHINES ?= "T4240RDB"
KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb t4240rdb-usdpaa-shared-interfaces.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf
index dc5f45c..ec9c5bb 100644
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -5,7 +5,6 @@
#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
SOC_FAMILY = "t4240"
UBOOT_MACHINES ?= "T4240RDB"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
--
1.7.9.7
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-fsl-ppc][PATCH v2 09/12] set IMAGE_CLASSES = "image_types_uboot" as defaut
2014-07-14 2:08 [meta-fsl-ppc][PATCH v2 04/12] conf/machine/: move common bits to inc files ting.liu
@ 2014-07-14 2:08 ` ting.liu
2014-07-14 2:08 ` [meta-fsl-ppc][PATCH v2 11/12] inherit qoriq_build_64bit_kernel for kernel/module recipes ting.liu
1 sibling, 0 replies; 5+ messages in thread
From: ting.liu @ 2014-07-14 2:08 UTC (permalink / raw)
To: meta-freescale
From: Ting Liu <b28495@freescale.com>
Signed-off-by: Ting Liu <b28495@freescale.com>
---
Changes in v2: use += instead of =
conf/machine/include/qoriq-default-settings.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc
index 6dcbc9a..f808ac2 100644
--- a/conf/machine/include/qoriq-default-settings.inc
+++ b/conf/machine/include/qoriq-default-settings.inc
@@ -1,5 +1,7 @@
MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf kernel-modules"
+
+IMAGE_CLASSES += "image_types_uboot"
EXTRA_IMAGEDEPENDS += "u-boot"
KERNEL_IMAGETYPE ?= "uImage"
--
1.7.9.7
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-fsl-ppc][PATCH v2 11/12] inherit qoriq_build_64bit_kernel for kernel/module recipes
2014-07-14 2:08 [meta-fsl-ppc][PATCH v2 04/12] conf/machine/: move common bits to inc files ting.liu
2014-07-14 2:08 ` [meta-fsl-ppc][PATCH v2 09/12] set IMAGE_CLASSES = "image_types_uboot" as defaut ting.liu
@ 2014-07-14 2:08 ` ting.liu
2014-07-14 4:52 ` Bob Cochran
1 sibling, 1 reply; 5+ messages in thread
From: ting.liu @ 2014-07-14 2:08 UTC (permalink / raw)
To: meta-freescale
From: Ting Liu <b28495@freescale.com>
ppce6500 is a specific core which only support 64bit kernel, the duplicate
hack codes were packaged into qoriq_build_64bit_kernel.bbclass, use it.
Signed-off-by: Ting Liu <b28495@freescale.com>
---
Changes in v2: add commit msg
recipes-bsp/ipc/ipc-modules.inc | 20 +-------------------
recipes-kernel/asf/asf_git.bb | 21 +--------------------
recipes-kernel/ceetm/ceetm_git.bb | 21 +--------------------
recipes-kernel/linux/linux-qoriq.inc | 25 +------------------------
recipes-kernel/lttng/lttng-modules_%.bbappend | 18 +-----------------
recipes-kernel/pkc-host/pkc-host_git.bb | 21 +--------------------
recipes-kernel/qoriq-debug/qoriq-debug_git.bb | 21 +--------------------
recipes-kernel/skmm-host/skmm-host_git.bb | 21 +--------------------
8 files changed, 8 insertions(+), 160 deletions(-)
diff --git a/recipes-bsp/ipc/ipc-modules.inc b/recipes-bsp/ipc/ipc-modules.inc
index 015a91b..3d7dfa6 100644
--- a/recipes-bsp/ipc/ipc-modules.inc
+++ b/recipes-bsp/ipc/ipc-modules.inc
@@ -5,27 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10"
require ipc.inc
-inherit module
+inherit module qoriq_build_64bit_kernel
S = "${WORKDIR}/git"
-python () {
- ma = d.getVar("DISTRO_FEATURES", True)
- arch = d.getVar("OVERRIDES", True)
-
- # the : after the arch is to skip the message on 64b
- if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
- raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
- promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
- if promote_kernel == "1":
- d.setVar('KERNEL_CC_append', ' -m64')
- d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
- error_qa = d.getVar('ERROR_QA', True)
- if 'arch' in error_qa:
- d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-}
do_compile_prepend () {
cd ${S}/kernel
diff --git a/recipes-kernel/asf/asf_git.bb b/recipes-kernel/asf/asf_git.bb
index 743ce62..9597257 100644
--- a/recipes-kernel/asf/asf_git.bb
+++ b/recipes-kernel/asf/asf_git.bb
@@ -9,32 +9,13 @@ SRCREV = "f107bc7dac7fe74d765dc09f66dca84951921d2c"
DEPENDS="virtual/kernel"
RDEPENDS_${PN} += "ipsec-tools"
-inherit module
+inherit module qoriq_build_64bit_kernel
S = "${WORKDIR}/git/asfmodule"
EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
-python () {
- ma = d.getVar("DISTRO_FEATURES", True)
- arch = d.getVar("OVERRIDES", True)
-
- # the : after the arch is to skip the message on 64b
- if not "multiarch" in ma and "e6500:" in arch:
- raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
- promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
- if promote_kernel == "1":
- d.setVar('KERNEL_CC_append', ' -m64')
- d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
- error_qa = d.getVar('ERROR_QA', True)
- if 'arch' in error_qa:
- d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-}
-
do_install(){
mkdir -p ${D}/usr/driver/asf
cp -rf ${S}/bin/full ${D}/usr/driver/asf
diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 7620cdb..266261e 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b5881ecf398da8a03a3f4c501e29d287"
DEPENDS="virtual/kernel"
-inherit module
+inherit module qoriq_build_64bit_kernel
SRC_URI = "git://git.freescale.com/ppc/sdk/ceetm.git;nobranch=1"
SRCREV = "ecf55c9ca0cd42a212653e1f99c19cd611e3a008"
@@ -14,25 +14,6 @@ S = "${WORKDIR}/git"
EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} SYSROOT=${STAGING_DIR_TARGET}"
export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
-python () {
- ma = d.getVar("DISTRO_FEATURES", True)
- arch = d.getVar("OVERRIDES", True)
-
- # the : after the arch is to skip the message on 64b
- if not "multiarch" in ma and "e6500:" in arch:
- raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
- promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
- if promote_kernel == "1":
- d.setVar('KERNEL_CC_append', ' -m64')
- d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
- error_qa = d.getVar('ERROR_QA', True)
- if 'arch' in error_qa:
- d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-}
-
do_install(){
mkdir -p ${D}/usr/driver/ceetm
mkdir -p ${D}/${libdir}/tc
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 00fe526..9e463dd 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -1,4 +1,4 @@
-inherit kernel
+inherit kernel qoriq_build_64bit_kernel
require recipes-kernel/linux/linux-dtb.inc
DESCRIPTION = "Linux kernel for Freescale platforms"
@@ -9,29 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
KSRC ?= ""
S = '${@base_conditional("KSRC", "", "${WORKDIR}/git", "${KSRC}", d)}'
-python () {
- ma = d.getVar("DISTRO_FEATURES", True)
- arch = d.getVar("OVERRIDES", True)
-
- # the : after the arch is to skip the message on 64b
- if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
- raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
- promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
- if promote_kernel == "1":
- d.setVar('KERNEL_CC_append', ' -m64')
- d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
- error_qa = d.getVar('ERROR_QA', True)
- if 'arch' in error_qa:
- d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-
- all_qa = d.getVar('ALL_QA', True)
- if 'arch' in all_qa:
- d.setVar('ALL_QA', all_qa.replace(' arch', ''))
-}
-
DEPENDS_append = " libgcc"
KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
diff --git a/recipes-kernel/lttng/lttng-modules_%.bbappend b/recipes-kernel/lttng/lttng-modules_%.bbappend
index 5415f16..5ff765d 100644
--- a/recipes-kernel/lttng/lttng-modules_%.bbappend
+++ b/recipes-kernel/lttng/lttng-modules_%.bbappend
@@ -1,18 +1,2 @@
-inherit distro_features_check
+inherit qoriq_build_64bit_kernel
-REQUIRED_DISTRO_FEATURES_append_e6500 ?= "multiarch"
-
-python () {
-
- promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
- if promote_kernel == "1":
- d.appendVar('KERNEL_CC', ' -m64')
- d.appendVar('KERNEL_LD', ' -melf64ppc')
-
-
- error_qa = d.getVar('ERROR_QA', True)
- if 'arch' in error_qa:
- d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-
-}
diff --git a/recipes-kernel/pkc-host/pkc-host_git.bb b/recipes-kernel/pkc-host/pkc-host_git.bb
index 9535005..2e579c1 100644
--- a/recipes-kernel/pkc-host/pkc-host_git.bb
+++ b/recipes-kernel/pkc-host/pkc-host_git.bb
@@ -3,7 +3,7 @@ SECTION = "pkc-host"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://Makefile;endline=30;md5=6a26ed8e76a8ea2e019c525369ed0f03"
-inherit module
+inherit module qoriq_build_64bit_kernel
SRC_URI = "git://git.freescale.com/ppc/sdk/pkc-host.git;nobranch=1"
SRCREV = "cae512c94e2a26cc6b0d6393d307cdea2d7282c9"
@@ -12,25 +12,6 @@ S = "${WORKDIR}/git"
EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
-python () {
- ma = d.getVar("DISTRO_FEATURES", True)
- arch = d.getVar("OVERRIDES", True)
-
- # the : after the arch is to skip the message on 64b
- if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
- raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
- promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
- if promote_kernel == "1":
- d.setVar('KERNEL_CC_append', ' -m64')
- d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
- error_qa = d.getVar('ERROR_QA', True)
- if 'arch' in error_qa:
- d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-}
-
do_install() {
install -d ${D}/lib/modules/c2x0
install -d ${D}/etc/crypto
diff --git a/recipes-kernel/qoriq-debug/qoriq-debug_git.bb b/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
index 5dd2468..c08f057 100644
--- a/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
+++ b/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
@@ -3,7 +3,7 @@ SECTION = "qoriq-debug"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=e29234dd5d40dc352cc60cc0c93437ba"
-inherit module autotools-brokensep
+inherit module autotools-brokensep qoriq_build_64bit_kernel
SRC_URI = "git://git.freescale.com/ppc/sdk/qoriq-debug.git;nobranch=1"
SRCREV = "20615c1ea332102635f8314cee5787c48c1a4254"
@@ -13,22 +13,3 @@ S = "${WORKDIR}/git"
EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_DIR}"
EXTRA_OEMAKE += 'SYSROOT="${D}"'
-python () {
- ma = d.getVar("DISTRO_FEATURES", True)
- arch = d.getVar("OVERRIDES", True)
-
- # the : after the arch is to skip the message on 64b
- if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
- raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
- promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
- if promote_kernel == "1":
- d.setVar('KERNEL_CC_append', ' -m64')
- d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
- error_qa = d.getVar('ERROR_QA', True)
- if 'arch' in error_qa:
- d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-}
-
diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb
index 9ce8a1d..a1c43f3 100644
--- a/recipes-kernel/skmm-host/skmm-host_git.bb
+++ b/recipes-kernel/skmm-host/skmm-host_git.bb
@@ -3,7 +3,7 @@ SECTION = "c293-skmm-host"
LICENSE = "Freescale-EULA"
LIC_FILES_CHKSUM = "file://Makefile;endline=7;md5=edffaac1da9e809ade0d2fcfcc18d8df"
-inherit module
+inherit module qoriq_build_64bit_kernel
SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-host.git;nobranch=1"
SRCREV = "97c9241a359edccdf8913cb9accbfe4ceb511523"
@@ -12,23 +12,4 @@ S = "${WORKDIR}/git"
EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
-python () {
- ma = d.getVar("DISTRO_FEATURES", True)
- arch = d.getVar("OVERRIDES", True)
-
- # the : after the arch is to skip the message on 64b
- if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
- raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
- promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
- if promote_kernel == "1":
- d.setVar('KERNEL_CC_append', ' -m64')
- d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
- error_qa = d.getVar('ERROR_QA', True)
- if 'arch' in error_qa:
- d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-}
-
FILES_${PN} += "/etc/skmm/"
--
1.7.9.7
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-fsl-ppc][PATCH v2 11/12] inherit qoriq_build_64bit_kernel for kernel/module recipes
2014-07-14 2:08 ` [meta-fsl-ppc][PATCH v2 11/12] inherit qoriq_build_64bit_kernel for kernel/module recipes ting.liu
@ 2014-07-14 4:52 ` Bob Cochran
2014-07-14 5:10 ` ting.liu
0 siblings, 1 reply; 5+ messages in thread
From: Bob Cochran @ 2014-07-14 4:52 UTC (permalink / raw)
To: meta-freescale
On 07/13/2014 10:08 PM, ting.liu@freescale.com wrote:
> From: Ting Liu <b28495@freescale.com>
>
> ppce6500 is a specific core which only support 64bit kernel, the duplicate
> hack codes were packaged into qoriq_build_64bit_kernel.bbclass, use it.
A few questions about this:
Isn't the e5500-64b impacted in addition to the e6500?
The python function that you removed is slightly different than the one
supplied by the class. It's not clear to me whether there would be be
side effects.
I see in
sdk1.6:meta-fsl-ppc-toolchain/conf/distro/include/tcmode-external-fsl.inc that
the variable BUILD_64BIT_KERNEL will be set to 1 for the e5500-64b. I
haven't found it elsewhere. Should it be set?
>
> Signed-off-by: Ting Liu <b28495@freescale.com>
> ---
> Changes in v2: add commit msg
>
> recipes-bsp/ipc/ipc-modules.inc | 20 +-------------------
> recipes-kernel/asf/asf_git.bb | 21 +--------------------
> recipes-kernel/ceetm/ceetm_git.bb | 21 +--------------------
> recipes-kernel/linux/linux-qoriq.inc | 25 +------------------------
> recipes-kernel/lttng/lttng-modules_%.bbappend | 18 +-----------------
> recipes-kernel/pkc-host/pkc-host_git.bb | 21 +--------------------
> recipes-kernel/qoriq-debug/qoriq-debug_git.bb | 21 +--------------------
> recipes-kernel/skmm-host/skmm-host_git.bb | 21 +--------------------
> 8 files changed, 8 insertions(+), 160 deletions(-)
>
> diff --git a/recipes-bsp/ipc/ipc-modules.inc b/recipes-bsp/ipc/ipc-modules.inc
> index 015a91b..3d7dfa6 100644
> --- a/recipes-bsp/ipc/ipc-modules.inc
> +++ b/recipes-bsp/ipc/ipc-modules.inc
> @@ -5,27 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10"
>
> require ipc.inc
>
> -inherit module
> +inherit module qoriq_build_64bit_kernel
>
> S = "${WORKDIR}/git"
> -python () {
> - ma = d.getVar("DISTRO_FEATURES", True)
> - arch = d.getVar("OVERRIDES", True)
> -
> - # the : after the arch is to skip the message on 64b
> - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
> - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
> -
> - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> -
> - if promote_kernel == "1":
> - d.setVar('KERNEL_CC_append', ' -m64')
> - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> -
> - error_qa = d.getVar('ERROR_QA', True)
> - if 'arch' in error_qa:
> - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> -}
>
> do_compile_prepend () {
> cd ${S}/kernel
> diff --git a/recipes-kernel/asf/asf_git.bb b/recipes-kernel/asf/asf_git.bb
> index 743ce62..9597257 100644
> --- a/recipes-kernel/asf/asf_git.bb
> +++ b/recipes-kernel/asf/asf_git.bb
> @@ -9,32 +9,13 @@ SRCREV = "f107bc7dac7fe74d765dc09f66dca84951921d2c"
> DEPENDS="virtual/kernel"
> RDEPENDS_${PN} += "ipsec-tools"
>
> -inherit module
> +inherit module qoriq_build_64bit_kernel
>
> S = "${WORKDIR}/git/asfmodule"
>
> EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
> export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
>
> -python () {
> - ma = d.getVar("DISTRO_FEATURES", True)
> - arch = d.getVar("OVERRIDES", True)
> -
> - # the : after the arch is to skip the message on 64b
> - if not "multiarch" in ma and "e6500:" in arch:
> - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
> -
> - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> -
> - if promote_kernel == "1":
> - d.setVar('KERNEL_CC_append', ' -m64')
> - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> -
> - error_qa = d.getVar('ERROR_QA', True)
> - if 'arch' in error_qa:
> - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> -}
> -
> do_install(){
> mkdir -p ${D}/usr/driver/asf
> cp -rf ${S}/bin/full ${D}/usr/driver/asf
> diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
> index 7620cdb..266261e 100644
> --- a/recipes-kernel/ceetm/ceetm_git.bb
> +++ b/recipes-kernel/ceetm/ceetm_git.bb
> @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b5881ecf398da8a03a3f4c501e29d287"
>
> DEPENDS="virtual/kernel"
>
> -inherit module
> +inherit module qoriq_build_64bit_kernel
>
> SRC_URI = "git://git.freescale.com/ppc/sdk/ceetm.git;nobranch=1"
> SRCREV = "ecf55c9ca0cd42a212653e1f99c19cd611e3a008"
> @@ -14,25 +14,6 @@ S = "${WORKDIR}/git"
> EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} SYSROOT=${STAGING_DIR_TARGET}"
> export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
>
> -python () {
> - ma = d.getVar("DISTRO_FEATURES", True)
> - arch = d.getVar("OVERRIDES", True)
> -
> - # the : after the arch is to skip the message on 64b
> - if not "multiarch" in ma and "e6500:" in arch:
> - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
> -
> - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> -
> - if promote_kernel == "1":
> - d.setVar('KERNEL_CC_append', ' -m64')
> - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> -
> - error_qa = d.getVar('ERROR_QA', True)
> - if 'arch' in error_qa:
> - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> -}
> -
> do_install(){
> mkdir -p ${D}/usr/driver/ceetm
> mkdir -p ${D}/${libdir}/tc
> diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
> index 00fe526..9e463dd 100644
> --- a/recipes-kernel/linux/linux-qoriq.inc
> +++ b/recipes-kernel/linux/linux-qoriq.inc
> @@ -1,4 +1,4 @@
> -inherit kernel
> +inherit kernel qoriq_build_64bit_kernel
> require recipes-kernel/linux/linux-dtb.inc
>
> DESCRIPTION = "Linux kernel for Freescale platforms"
> @@ -9,29 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> KSRC ?= ""
> S = '${@base_conditional("KSRC", "", "${WORKDIR}/git", "${KSRC}", d)}'
>
> -python () {
> - ma = d.getVar("DISTRO_FEATURES", True)
> - arch = d.getVar("OVERRIDES", True)
> -
> - # the : after the arch is to skip the message on 64b
> - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
> - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
> -
> - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> -
> - if promote_kernel == "1":
> - d.setVar('KERNEL_CC_append', ' -m64')
> - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> -
> - error_qa = d.getVar('ERROR_QA', True)
> - if 'arch' in error_qa:
> - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> -
> - all_qa = d.getVar('ALL_QA', True)
> - if 'arch' in all_qa:
> - d.setVar('ALL_QA', all_qa.replace(' arch', ''))
> -}
> -
> DEPENDS_append = " libgcc"
> KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
> KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
> diff --git a/recipes-kernel/lttng/lttng-modules_%.bbappend b/recipes-kernel/lttng/lttng-modules_%.bbappend
> index 5415f16..5ff765d 100644
> --- a/recipes-kernel/lttng/lttng-modules_%.bbappend
> +++ b/recipes-kernel/lttng/lttng-modules_%.bbappend
> @@ -1,18 +1,2 @@
> -inherit distro_features_check
> +inherit qoriq_build_64bit_kernel
>
> -REQUIRED_DISTRO_FEATURES_append_e6500 ?= "multiarch"
> -
> -python () {
> -
> - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> -
> - if promote_kernel == "1":
> - d.appendVar('KERNEL_CC', ' -m64')
> - d.appendVar('KERNEL_LD', ' -melf64ppc')
> -
> -
> - error_qa = d.getVar('ERROR_QA', True)
> - if 'arch' in error_qa:
> - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> -
> -}
> diff --git a/recipes-kernel/pkc-host/pkc-host_git.bb b/recipes-kernel/pkc-host/pkc-host_git.bb
> index 9535005..2e579c1 100644
> --- a/recipes-kernel/pkc-host/pkc-host_git.bb
> +++ b/recipes-kernel/pkc-host/pkc-host_git.bb
> @@ -3,7 +3,7 @@ SECTION = "pkc-host"
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://Makefile;endline=30;md5=6a26ed8e76a8ea2e019c525369ed0f03"
>
> -inherit module
> +inherit module qoriq_build_64bit_kernel
>
> SRC_URI = "git://git.freescale.com/ppc/sdk/pkc-host.git;nobranch=1"
> SRCREV = "cae512c94e2a26cc6b0d6393d307cdea2d7282c9"
> @@ -12,25 +12,6 @@ S = "${WORKDIR}/git"
>
> EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
>
> -python () {
> - ma = d.getVar("DISTRO_FEATURES", True)
> - arch = d.getVar("OVERRIDES", True)
> -
> - # the : after the arch is to skip the message on 64b
> - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
> - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
> -
> - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> -
> - if promote_kernel == "1":
> - d.setVar('KERNEL_CC_append', ' -m64')
> - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> -
> - error_qa = d.getVar('ERROR_QA', True)
> - if 'arch' in error_qa:
> - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> -}
> -
> do_install() {
> install -d ${D}/lib/modules/c2x0
> install -d ${D}/etc/crypto
> diff --git a/recipes-kernel/qoriq-debug/qoriq-debug_git.bb b/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
> index 5dd2468..c08f057 100644
> --- a/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
> +++ b/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
> @@ -3,7 +3,7 @@ SECTION = "qoriq-debug"
> LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=e29234dd5d40dc352cc60cc0c93437ba"
>
> -inherit module autotools-brokensep
> +inherit module autotools-brokensep qoriq_build_64bit_kernel
>
> SRC_URI = "git://git.freescale.com/ppc/sdk/qoriq-debug.git;nobranch=1"
> SRCREV = "20615c1ea332102635f8314cee5787c48c1a4254"
> @@ -13,22 +13,3 @@ S = "${WORKDIR}/git"
> EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_DIR}"
> EXTRA_OEMAKE += 'SYSROOT="${D}"'
>
> -python () {
> - ma = d.getVar("DISTRO_FEATURES", True)
> - arch = d.getVar("OVERRIDES", True)
> -
> - # the : after the arch is to skip the message on 64b
> - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
> - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
> -
> - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> -
> - if promote_kernel == "1":
> - d.setVar('KERNEL_CC_append', ' -m64')
> - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> -
> - error_qa = d.getVar('ERROR_QA', True)
> - if 'arch' in error_qa:
> - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> -}
> -
> diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb
> index 9ce8a1d..a1c43f3 100644
> --- a/recipes-kernel/skmm-host/skmm-host_git.bb
> +++ b/recipes-kernel/skmm-host/skmm-host_git.bb
> @@ -3,7 +3,7 @@ SECTION = "c293-skmm-host"
> LICENSE = "Freescale-EULA"
> LIC_FILES_CHKSUM = "file://Makefile;endline=7;md5=edffaac1da9e809ade0d2fcfcc18d8df"
>
> -inherit module
> +inherit module qoriq_build_64bit_kernel
>
> SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-host.git;nobranch=1"
> SRCREV = "97c9241a359edccdf8913cb9accbfe4ceb511523"
> @@ -12,23 +12,4 @@ S = "${WORKDIR}/git"
>
> EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
>
> -python () {
> - ma = d.getVar("DISTRO_FEATURES", True)
> - arch = d.getVar("OVERRIDES", True)
> -
> - # the : after the arch is to skip the message on 64b
> - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
> - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
> -
> - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> -
> - if promote_kernel == "1":
> - d.setVar('KERNEL_CC_append', ' -m64')
> - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> -
> - error_qa = d.getVar('ERROR_QA', True)
> - if 'arch' in error_qa:
> - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> -}
> -
> FILES_${PN} += "/etc/skmm/"
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-fsl-ppc][PATCH v2 11/12] inherit qoriq_build_64bit_kernel for kernel/module recipes
2014-07-14 4:52 ` Bob Cochran
@ 2014-07-14 5:10 ` ting.liu
0 siblings, 0 replies; 5+ messages in thread
From: ting.liu @ 2014-07-14 5:10 UTC (permalink / raw)
To: Bob Cochran; +Cc: meta-freescale@yoctoproject.org
> -----Original Message-----
> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> bounces@yoctoproject.org] On Behalf Of Bob Cochran
> Sent: Monday, July 14, 2014 12:53 PM
> To: meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH v2 11/12] inherit
> qoriq_build_64bit_kernel for kernel/module recipes
>
> On 07/13/2014 10:08 PM, ting.liu@freescale.com wrote:
> > From: Ting Liu <b28495@freescale.com>
> >
> > ppce6500 is a specific core which only support 64bit kernel, the
> > duplicate hack codes were packaged into qoriq_build_64bit_kernel.bbclass,
> use it.
>
> A few questions about this:
>
> Isn't the e5500-64b impacted in addition to the e6500?
>
> The python function that you removed is slightly different than the one
> supplied by the class. It's not clear to me whether there would be be side
> effects.
>
> I see in
> sdk1.6:meta-fsl-ppc-toolchain/conf/distro/include/tcmode-external-fsl.inc that
> the variable BUILD_64BIT_KERNEL will be set to 1 for the e5500-64b. I haven't
> found it elsewhere. Should it be set?
By default 64bit kernel is built for e5500-64b. no need to set this variable.
>
>
> >
> > Signed-off-by: Ting Liu <b28495@freescale.com>
> > ---
> > Changes in v2: add commit msg
> >
> > recipes-bsp/ipc/ipc-modules.inc | 20 +-------------------
> > recipes-kernel/asf/asf_git.bb | 21 +--------------------
> > recipes-kernel/ceetm/ceetm_git.bb | 21 +--------------------
> > recipes-kernel/linux/linux-qoriq.inc | 25 +--------------------
> ----
> > recipes-kernel/lttng/lttng-modules_%.bbappend | 18 +-----------------
> > recipes-kernel/pkc-host/pkc-host_git.bb | 21 +--------------------
> > recipes-kernel/qoriq-debug/qoriq-debug_git.bb | 21 +--------------------
> > recipes-kernel/skmm-host/skmm-host_git.bb | 21 +--------------------
> > 8 files changed, 8 insertions(+), 160 deletions(-)
> >
> > diff --git a/recipes-bsp/ipc/ipc-modules.inc
> > b/recipes-bsp/ipc/ipc-modules.inc index 015a91b..3d7dfa6 100644
> > --- a/recipes-bsp/ipc/ipc-modules.inc
> > +++ b/recipes-bsp/ipc/ipc-modules.inc
> > @@ -5,27 +5,9 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10"
> >
> > require ipc.inc
> >
> > -inherit module
> > +inherit module qoriq_build_64bit_kernel
> >
> > S = "${WORKDIR}/git"
> > -python () {
> > - ma = d.getVar("DISTRO_FEATURES", True)
> > - arch = d.getVar("OVERRIDES", True)
> > -
> > - # the : after the arch is to skip the message on 64b
> > - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
> > - raise bb.parse.SkipPackage("Building the kernel for this
> arch requires multiarch to be in DISTRO_FEATURES")
> > -
> > - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> > -
> > - if promote_kernel == "1":
> > - d.setVar('KERNEL_CC_append', ' -m64')
> > - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> > -
> > - error_qa = d.getVar('ERROR_QA', True)
> > - if 'arch' in error_qa:
> > - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> > -}
> >
> > do_compile_prepend () {
> > cd ${S}/kernel
> > diff --git a/recipes-kernel/asf/asf_git.bb
> > b/recipes-kernel/asf/asf_git.bb index 743ce62..9597257 100644
> > --- a/recipes-kernel/asf/asf_git.bb
> > +++ b/recipes-kernel/asf/asf_git.bb
> > @@ -9,32 +9,13 @@ SRCREV = "f107bc7dac7fe74d765dc09f66dca84951921d2c"
> > DEPENDS="virtual/kernel"
> > RDEPENDS_${PN} += "ipsec-tools"
> >
> > -inherit module
> > +inherit module qoriq_build_64bit_kernel
> >
> > S = "${WORKDIR}/git/asfmodule"
> >
> > EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
> > export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
> >
> > -python () {
> > - ma = d.getVar("DISTRO_FEATURES", True)
> > - arch = d.getVar("OVERRIDES", True)
> > -
> > - # the : after the arch is to skip the message on 64b
> > - if not "multiarch" in ma and "e6500:" in arch:
> > - raise bb.parse.SkipPackage("Building the kernel for this arch
> requires multiarch to be in DISTRO_FEATURES")
> > -
> > - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> > -
> > - if promote_kernel == "1":
> > - d.setVar('KERNEL_CC_append', ' -m64')
> > - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> > -
> > - error_qa = d.getVar('ERROR_QA', True)
> > - if 'arch' in error_qa:
> > - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> > -}
> > -
> > do_install(){
> > mkdir -p ${D}/usr/driver/asf
> > cp -rf ${S}/bin/full ${D}/usr/driver/asf diff --git
> > a/recipes-kernel/ceetm/ceetm_git.bb
> > b/recipes-kernel/ceetm/ceetm_git.bb
> > index 7620cdb..266261e 100644
> > --- a/recipes-kernel/ceetm/ceetm_git.bb
> > +++ b/recipes-kernel/ceetm/ceetm_git.bb
> > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=b5881ecf398da8a03a3f4c501e29d287"
> >
> > DEPENDS="virtual/kernel"
> >
> > -inherit module
> > +inherit module qoriq_build_64bit_kernel
> >
> > SRC_URI = "git://git.freescale.com/ppc/sdk/ceetm.git;nobranch=1"
> > SRCREV = "ecf55c9ca0cd42a212653e1f99c19cd611e3a008"
> > @@ -14,25 +14,6 @@ S = "${WORKDIR}/git"
> > EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}
> SYSROOT=${STAGING_DIR_TARGET}"
> > export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
> >
> > -python () {
> > - ma = d.getVar("DISTRO_FEATURES", True)
> > - arch = d.getVar("OVERRIDES", True)
> > -
> > - # the : after the arch is to skip the message on 64b
> > - if not "multiarch" in ma and "e6500:" in arch:
> > - raise bb.parse.SkipPackage("Building the kernel for this arch
> requires multiarch to be in DISTRO_FEATURES")
> > -
> > - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> > -
> > - if promote_kernel == "1":
> > - d.setVar('KERNEL_CC_append', ' -m64')
> > - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> > -
> > - error_qa = d.getVar('ERROR_QA', True)
> > - if 'arch' in error_qa:
> > - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> > -}
> > -
> > do_install(){
> > mkdir -p ${D}/usr/driver/ceetm
> > mkdir -p ${D}/${libdir}/tc
> > diff --git a/recipes-kernel/linux/linux-qoriq.inc
> > b/recipes-kernel/linux/linux-qoriq.inc
> > index 00fe526..9e463dd 100644
> > --- a/recipes-kernel/linux/linux-qoriq.inc
> > +++ b/recipes-kernel/linux/linux-qoriq.inc
> > @@ -1,4 +1,4 @@
> > -inherit kernel
> > +inherit kernel qoriq_build_64bit_kernel
> > require recipes-kernel/linux/linux-dtb.inc
> >
> > DESCRIPTION = "Linux kernel for Freescale platforms"
> > @@ -9,29 +9,6 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> > KSRC ?= ""
> > S = '${@base_conditional("KSRC", "", "${WORKDIR}/git", "${KSRC}", d)}'
> >
> > -python () {
> > - ma = d.getVar("DISTRO_FEATURES", True)
> > - arch = d.getVar("OVERRIDES", True)
> > -
> > - # the : after the arch is to skip the message on 64b
> > - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
> > - raise bb.parse.SkipPackage("Building the kernel for this arch
> requires multiarch to be in DISTRO_FEATURES")
> > -
> > - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> > -
> > - if promote_kernel == "1":
> > - d.setVar('KERNEL_CC_append', ' -m64')
> > - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> > -
> > - error_qa = d.getVar('ERROR_QA', True)
> > - if 'arch' in error_qa:
> > - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> > -
> > - all_qa = d.getVar('ALL_QA', True)
> > - if 'arch' in all_qa:
> > - d.setVar('ALL_QA', all_qa.replace(' arch', ''))
> > -}
> > -
> > DEPENDS_append = " libgcc"
> > KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
> > KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
> > diff --git a/recipes-kernel/lttng/lttng-modules_%.bbappend
> > b/recipes-kernel/lttng/lttng-modules_%.bbappend
> > index 5415f16..5ff765d 100644
> > --- a/recipes-kernel/lttng/lttng-modules_%.bbappend
> > +++ b/recipes-kernel/lttng/lttng-modules_%.bbappend
> > @@ -1,18 +1,2 @@
> > -inherit distro_features_check
> > +inherit qoriq_build_64bit_kernel
> >
> > -REQUIRED_DISTRO_FEATURES_append_e6500 ?= "multiarch"
> > -
> > -python () {
> > -
> > - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> > -
> > - if promote_kernel == "1":
> > - d.appendVar('KERNEL_CC', ' -m64')
> > - d.appendVar('KERNEL_LD', ' -melf64ppc')
> > -
> > -
> > - error_qa = d.getVar('ERROR_QA', True)
> > - if 'arch' in error_qa:
> > - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> > -
> > -}
> > diff --git a/recipes-kernel/pkc-host/pkc-host_git.bb
> > b/recipes-kernel/pkc-host/pkc-host_git.bb
> > index 9535005..2e579c1 100644
> > --- a/recipes-kernel/pkc-host/pkc-host_git.bb
> > +++ b/recipes-kernel/pkc-host/pkc-host_git.bb
> > @@ -3,7 +3,7 @@ SECTION = "pkc-host"
> > LICENSE = "GPLv2"
> > LIC_FILES_CHKSUM =
> "file://Makefile;endline=30;md5=6a26ed8e76a8ea2e019c525369ed0f03"
> >
> > -inherit module
> > +inherit module qoriq_build_64bit_kernel
> >
> > SRC_URI = "git://git.freescale.com/ppc/sdk/pkc-host.git;nobranch=1"
> > SRCREV = "cae512c94e2a26cc6b0d6393d307cdea2d7282c9"
> > @@ -12,25 +12,6 @@ S = "${WORKDIR}/git"
> >
> > EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
> >
> > -python () {
> > - ma = d.getVar("DISTRO_FEATURES", True)
> > - arch = d.getVar("OVERRIDES", True)
> > -
> > - # the : after the arch is to skip the message on 64b
> > - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
> > - raise bb.parse.SkipPackage("Building the kernel for this
> arch requires multiarch to be in DISTRO_FEATURES")
> > -
> > - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> > -
> > - if promote_kernel == "1":
> > - d.setVar('KERNEL_CC_append', ' -m64')
> > - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> > -
> > - error_qa = d.getVar('ERROR_QA', True)
> > - if 'arch' in error_qa:
> > - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> > -}
> > -
> > do_install() {
> > install -d ${D}/lib/modules/c2x0
> > install -d ${D}/etc/crypto
> > diff --git a/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
> > b/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
> > index 5dd2468..c08f057 100644
> > --- a/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
> > +++ b/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
> > @@ -3,7 +3,7 @@ SECTION = "qoriq-debug"
> > LICENSE = "GPLv2+"
> > LIC_FILES_CHKSUM = "file://COPYING;md5=e29234dd5d40dc352cc60cc0c93437ba"
> >
> > -inherit module autotools-brokensep
> > +inherit module autotools-brokensep qoriq_build_64bit_kernel
> >
> > SRC_URI = "git://git.freescale.com/ppc/sdk/qoriq-debug.git;nobranch=1"
> > SRCREV = "20615c1ea332102635f8314cee5787c48c1a4254"
> > @@ -13,22 +13,3 @@ S = "${WORKDIR}/git"
> > EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_DIR}"
> > EXTRA_OEMAKE += 'SYSROOT="${D}"'
> >
> > -python () {
> > - ma = d.getVar("DISTRO_FEATURES", True)
> > - arch = d.getVar("OVERRIDES", True)
> > -
> > - # the : after the arch is to skip the message on 64b
> > - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
> > - raise bb.parse.SkipPackage("Building the kernel for this arch
> requires multiarch to be in DISTRO_FEATURES")
> > -
> > - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> > -
> > - if promote_kernel == "1":
> > - d.setVar('KERNEL_CC_append', ' -m64')
> > - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> > -
> > - error_qa = d.getVar('ERROR_QA', True)
> > - if 'arch' in error_qa:
> > - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> > -}
> > -
> > diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb
> > b/recipes-kernel/skmm-host/skmm-host_git.bb
> > index 9ce8a1d..a1c43f3 100644
> > --- a/recipes-kernel/skmm-host/skmm-host_git.bb
> > +++ b/recipes-kernel/skmm-host/skmm-host_git.bb
> > @@ -3,7 +3,7 @@ SECTION = "c293-skmm-host"
> > LICENSE = "Freescale-EULA"
> > LIC_FILES_CHKSUM =
> "file://Makefile;endline=7;md5=edffaac1da9e809ade0d2fcfcc18d8df"
> >
> > -inherit module
> > +inherit module qoriq_build_64bit_kernel
> >
> > SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-host.git;nobranch=1"
> > SRCREV = "97c9241a359edccdf8913cb9accbfe4ceb511523"
> > @@ -12,23 +12,4 @@ S = "${WORKDIR}/git"
> >
> > EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
> >
> > -python () {
> > - ma = d.getVar("DISTRO_FEATURES", True)
> > - arch = d.getVar("OVERRIDES", True)
> > -
> > - # the : after the arch is to skip the message on 64b
> > - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
> > - raise bb.parse.SkipPackage("Building the kernel for this arch
> requires multiarch to be in DISTRO_FEATURES")
> > -
> > - promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
> > -
> > - if promote_kernel == "1":
> > - d.setVar('KERNEL_CC_append', ' -m64')
> > - d.setVar('KERNEL_LD_append', ' -melf64ppc')
> > -
> > - error_qa = d.getVar('ERROR_QA', True)
> > - if 'arch' in error_qa:
> > - d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
> > -}
> > -
> > FILES_${PN} += "/etc/skmm/"
> >
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-07-14 5:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-14 2:08 [meta-fsl-ppc][PATCH v2 04/12] conf/machine/: move common bits to inc files ting.liu
2014-07-14 2:08 ` [meta-fsl-ppc][PATCH v2 09/12] set IMAGE_CLASSES = "image_types_uboot" as defaut ting.liu
2014-07-14 2:08 ` [meta-fsl-ppc][PATCH v2 11/12] inherit qoriq_build_64bit_kernel for kernel/module recipes ting.liu
2014-07-14 4:52 ` Bob Cochran
2014-07-14 5:10 ` ting.liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.