[meta-freescale] [PATCH 18/24] reorg the qoriq include files

[Bob Cochran]

On 08/12/2015 06:22 AM, Zhenhua Luo 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 the qoriq-arm.inc to ensure QorIQ ARM specific bits are there
>
> Signed-off-by: Zhenhua Luo <zhenhua.luo at freescale.com>
> ---
>   conf/machine/include/qoriq-arm.inc  | 24 +++++++--------------
>   conf/machine/include/qoriq-base.inc | 43 +++++++++++++++----------------------
>   conf/machine/include/qoriq-ppc.inc  | 11 ++++++++++
>   3 files changed, 36 insertions(+), 42 deletions(-)
>   create mode 100644 conf/machine/include/qoriq-ppc.inc
>

[snip]

> diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
> index ed66fda..856af15 100644
> --- a/conf/machine/include/qoriq-base.inc
> +++ b/conf/machine/include/qoriq-base.inc
> @@ -1,32 +1,23 @@
> -# 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"
> -PREFERRED_PROVIDER_cryptodev = "cryptodev-qoriq"
> -PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module"
> -PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests"
> -PREFERRED_PROVIDER_openssl = "openssl-qoriq"
> -PREFERRED_PROVIDER_qemu = "qemu-qoriq"
> -PREFERRED_PROVIDER_valgrind_e500v2 = "valgrind-qoriq"
> -
> -# versions
> -PREFERRED_VERSION_qemu = "2.2.0+fsl"
> -PREFERRED_VERSION_valgrind_e500v2 = "3.8.1+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"
> -
> +# Freescale BSP default providers
> +PREFERRED_PROVIDER_u-boot_qoriq ?= "u-boot-qoriq"
> +PREFERRED_PROVIDER_virtual/bootloader_qoriq ?= "u-boot-qoriq"
> +PREFERRED_PROVIDER_virtual/kernel_qoriq ?= "linux-qoriq"
> +PREFERRED_PROVIDER_cryptodev_qoriq = "cryptodev-qoriq"
> +PREFERRED_PROVIDER_cryptodev-module_qoriq = "cryptodev-qoriq-module"
> +PREFERRED_PROVIDER_cryptodev-tests_qoriq = "cryptodev-qoriq-tests"
> +PREFERRED_PROVIDER_openssl_qoriq = "openssl-qoriq"
> +
> +# 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"
>
> +MACHINEOVERRIDES .= ":qoriq"
> diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc
> new file mode 100644
> index 0000000..b608782
> --- /dev/null
> +++ b/conf/machine/include/qoriq-ppc.inc
> @@ -0,0 +1,11 @@
> +require conf/machine/include/qoriq-base.inc
> +
> +UBOOT_ENTRYPOINT_qoriq-ppc = "0x80008000"
> +
> +MKUBIFS_ARGS_qoriq-ppc ??= "-m 512 -e 15360 -c 3600"
> +UBINIZE_ARGS_qoriq-ppc ??= "-m 512 -p 16KiB -s 512"
> +
> +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
> +SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
> +
> +MACHINEOVERRIDES .= ":qoriq-ppc"
>

I don't think this is what we want since I get the following:

MACHINEOVERRIDES="e5500-64b:qoriq:t1:t1040:t1040rdb-64b:qoriq-ppc"

And this means that the generic files under meta-freescale like 
init-ifupdown/qoriq-ppc/interfaces is overriding my machine specific 
interfaces file.

I believe we want it to be like:

MACHINEOVERRIDES="e5500-64b:qoriq:qoriq-ppc:t1:t1040:t1040rdb-64b"


I propose we simplify things a bit and just do the following in 
qoriq-ppc.inc:

MACHINEOVERRIDES =. "qoriq:qoriq-ppc:"

and yank the MACHINEOVERRIDES specifier in qoriq-base.inc.  I would do 
the same sort of thing in qoriq-arm.inc.  This way, there would be less 
chance of these overrides moving around again later because their 
relocation tends to pop up as an occasional nuisance during builds.

Bob