From 66caa4ab876648016d63cb2ace3f0291e5addfe7 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Tue, 13 Jan 2015 23:04:31 +0800 Subject: move all common definitions onto qoriq-base.inc Signed-off-by: Ting Liu --- conf/machine/include/qoriq-base.inc | 29 ++++++++++++++++++++---- conf/machine/include/qoriq-default-providers.inc | 3 --- conf/machine/include/qoriq-default-settings.inc | 21 ----------------- conf/machine/include/qoriq-default-versions.inc | 3 --- 4 files changed, 25 insertions(+), 31 deletions(-) delete mode 100644 conf/machine/include/qoriq-default-providers.inc delete mode 100644 conf/machine/include/qoriq-default-settings.inc delete mode 100644 conf/machine/include/qoriq-default-versions.inc diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc index 9b26d10..aae476d 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc @@ -1,8 +1,29 @@ # Provides the QorIQ common settings +require conf/machine/include/soc-family.inc -require conf/machine/include/qoriq-default-settings.inc -require conf/machine/include/qoriq-default-versions.inc -require conf/machine/include/qoriq-default-providers.inc +# providers +PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" +PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" -require conf/machine/include/soc-family.inc +# versions +PREFERRED_VERSION_qemu = "1.7+fsl" +PREFERRED_VERSION_openssl = "1.0.1i" + +# 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" + +KERNEL_IMAGETYPE ?= "uImage" + +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" +SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" + +USE_VT = "0" + +MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600" +UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512" diff --git a/conf/machine/include/qoriq-default-providers.inc b/conf/machine/include/qoriq-default-providers.inc deleted file mode 100644 index 25197da..0000000 --- a/conf/machine/include/qoriq-default-providers.inc +++ /dev/null @@ -1,3 +0,0 @@ -PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" -PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" - diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc deleted file mode 100644 index 539f6a1..0000000 --- a/conf/machine/include/qoriq-default-settings.inc +++ /dev/null @@ -1,21 +0,0 @@ -MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" - -IMAGE_CLASSES += "image_types_uboot" -EXTRA_IMAGEDEPENDS += "u-boot" - -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-ppc" - -SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" - -USE_VT = "0" - -MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600" -UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512" - diff --git a/conf/machine/include/qoriq-default-versions.inc b/conf/machine/include/qoriq-default-versions.inc deleted file mode 100644 index 639e61e..0000000 --- a/conf/machine/include/qoriq-default-versions.inc +++ /dev/null @@ -1,3 +0,0 @@ -PREFERRED_VERSION_qemu = "1.7+fsl" -PREFERRED_VERSION_openssl = "1.0.1i" - -- cgit v1.2.3-54-g00ecf