[meta-freescale] ][PATCH 03/31] reorg the qoriq include files

[Daiane Angolini]

On Wed, Aug 12, 2015 at 11:42 AM, Zhenhua Luo <zhenhua.luo at freescale.com> wrote:
> * update qoriq-base.inc to ensure common bits of QorIQ ARM and QorIQ PPC are there
> * add qoriq-ppc.inc to manage the common bits of QorIQ PPC targets
> * update qoriq-arm.inc to ensure QorIQ ARM specific bits are there
>
> Signed-off-by: Zhenhua Luo <zhenhua.luo at freescale.com>

Acked-by: Daiane Angolini <daiane.angolini at freescale.com>

> ---
>  conf/machine/include/qoriq-arm.inc  | 29 +++++++++++++----------------
>  conf/machine/include/qoriq-base.inc | 26 +++++++++-----------------
>  conf/machine/include/qoriq-ppc.inc  | 16 ++++++++++++++++
>  3 files changed, 38 insertions(+), 33 deletions(-)
>  create mode 100644 conf/machine/include/qoriq-ppc.inc
>
> diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
> index f93a0b2..1ec8917 100644
> --- a/conf/machine/include/qoriq-arm.inc
> +++ b/conf/machine/include/qoriq-arm.inc
> @@ -1,21 +1,18 @@
> -require conf/machine/include/soc-family.inc
> +require conf/machine/include/qoriq-base.inc
>
> -# Freescale BSP default providers
> -PREFERRED_PROVIDER_u-boot_ls102xa ?= "u-boot-ls1"
> -PREFERRED_PROVIDER_virtual/bootloader_ls102xa ?= "u-boot-ls1"
> -PREFERRED_PROVIDER_virtual/kernel_ls102xa ?= "linux-ls1"
> -PREFERRED_PROVIDER_cryptodev_ls102xa = "cryptodev-qoriq"
> -PREFERRED_PROVIDER_cryptodev-module_ls102xa = "cryptodev-qoriq-module"
> -PREFERRED_PROVIDER_cryptodev-tests_ls102xa = "cryptodev-qoriq-tests"
> -PREFERRED_PROVIDER_openssl_ls102xa = "openssl-qoriq"
> +DEFAULTTUNE ?= "cortexa7hf-neon"

I don't know all qoriq-arm machines, so I'm assuming setting
DEFAULTTUNE for all of them at once is the right approach currently.

>
> -# Define the default image type
> -IMAGE_CLASSES ?= "image_types_uboot"
> -KERNEL_IMAGETYPE ?= "uImage"
> +# providers of QorIQ ARM targets
> +PREFERRED_PROVIDER_u-boot ?= "u-boot-ls1"
> +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ls1"
> +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ls1"
>
> -UBOOT_ENTRYPOINT_ls102xa = "0x80008000"
> +UBOOT_ENTRYPOINT = "0x80008000"
>
> -MACHINE_FEATURES = "pci ext2 ext3 serial"
> -MACHINE_EXTRA_RRECOMMENDS = "udev-extraconf"
> +MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
> +UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
>
> -DEFAULTTUNE_ls102xa ?= "cortexa7hf-neon"
> +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
> +SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
> +
> +MACHINEOVERRIDES .= ":qoriq-arm"
> diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
> index a89f4d5..d6fca93 100644
> --- a/conf/machine/include/qoriq-base.inc
> +++ b/conf/machine/include/qoriq-base.inc
> @@ -1,29 +1,21 @@
>  # 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"
> +# common providers of QorIQ targets
>  PREFERRED_PROVIDER_cryptodev = "cryptodev-qoriq"
>  PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module"
>  PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests"
>  PREFERRED_PROVIDER_openssl = "openssl-qoriq"
>
> -# versions
> -PREFERRED_VERSION_qemu = "2.2.0+fsl"
> -
> -# 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"
> -
> +# Define the default image type
> +IMAGE_CLASSES ?= "image_types_uboot"
>  KERNEL_IMAGETYPE ?= "uImage"
>
> -SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
> -SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
> +MACHINE_FEATURES ?= "pci ext2 ext3 serial"
> +MACHINE_EXTRA_RRECOMMENDS ?= "udev-rules-qoriq"
> +
> +EXTRA_IMAGEDEPENDS += "u-boot cst-native"
>
> -USE_VT = "0"
> +USE_VT ?= "0"

This variable (USE_VT) is not used besides this line, and it is
removed in patch 30 of this series. So I'm dropping this in this patch
already

I'm grouping locally all the patches I think it's OK. I'm trying to
make Otavio's life easier when he come back, and not get this huge
patchset locked because of this.

Daiane

>
> +MACHINEOVERRIDES .= ":qoriq"
> diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc
> new file mode 100644
> index 0000000..6b77210
> --- /dev/null
> +++ b/conf/machine/include/qoriq-ppc.inc
> @@ -0,0 +1,16 @@
> +require conf/machine/include/qoriq-base.inc
> +
> +# providers of QorIQ PPC targets
> +PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
> +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq"
> +PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
> +
> +UBOOT_ENTRYPOINT = "0x80008000"
> +
> +MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
> +UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
> +
> +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
> +SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
> +
> +MACHINEOVERRIDES .= ":qoriq-ppc"
> --
> 2.4.3
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale