From 44a7cbbf07dce23fdd80b7c80733937f14f06b47 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Wed, 15 Jun 2016 18:10:45 +0800 Subject: qoriq-ppc.inc: abstract common bit to qoriq.inc Signed-off-by: Ting Liu --- conf/machine/include/qoriq-ppc.inc | 25 +++---------------------- conf/machine/include/qoriq.inc | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 conf/machine/include/qoriq.inc diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc index 404a2d5..f21f6d3 100644 --- a/conf/machine/include/qoriq-ppc.inc +++ b/conf/machine/include/qoriq-ppc.inc @@ -1,29 +1,10 @@ -# Provides the QorIQ common settings -require conf/machine/include/soc-family.inc - -# providers -PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" -PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" - -# versions -PREFERRED_VERSION_qemu = "2.2.0+fsl" -PREFERRED_VERSION_openssl = "1.0.1i" -PREFERRED_VERSION_cryptodev-linux = "1.7" -PREFERRED_VERSION_cryptodev-module = "1.7" -PREFERRED_VERSION_cryptodev-tests = "1.7" - -# settings -MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" -MACHINEOVERRIDES =. "qoriq-ppc:" - -IMAGE_CLASSES += "image_types_uboot" -EXTRA_IMAGEDEPENDS += "u-boot" +# Provides the QorIQ common settings for PPC KERNEL_IMAGETYPE ?= "uImage" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" -USE_VT = "0" +MACHINEOVERRIDES =. "qoriq-ppc:" +require conf/machine/include/qoriq.inc diff --git a/conf/machine/include/qoriq.inc b/conf/machine/include/qoriq.inc new file mode 100644 index 0000000..cfcb5fa --- /dev/null +++ b/conf/machine/include/qoriq.inc @@ -0,0 +1,21 @@ +# Provides the QorIQ common settings + +require conf/machine/include/soc-family.inc + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq" +PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" + +PREFERRED_VERSION_qemu = "2.2.0+fsl" +PREFERRED_VERSION_openssl = "1.0.1i" +PREFERRED_VERSION_cryptodev-linux = "1.7" +PREFERRED_VERSION_cryptodev-module = "1.7" +PREFERRED_VERSION_cryptodev-tests = "1.7" + +MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" +MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" + +IMAGE_CLASSES += "image_types_uboot" +EXTRA_IMAGEDEPENDS += "u-boot" + +MACHINEOVERRIDES =. "qoriq:" -- cgit v1.2.3-54-g00ecf