From 3597f8b0637641ba4bee2d70bc981d009bf6204d Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Fri, 11 Jan 2019 11:41:10 +0100 Subject: [PATCH] ccimx6ulsbcexpress: Separate machine configuration into SOM and board This commit prepares for the introduction of a second ConnectCore 6UL System-On-Module based board by grouping the SOM configuration into its own file avoiding code redundancy. Signed-off-by: Alex Gonzalez --- conf/machine/ccimx6ulsbcexpress.conf | 29 +----------------------- conf/machine/include/ccimx6ulsom.inc | 34 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 28 deletions(-) create mode 100644 conf/machine/include/ccimx6ulsom.inc diff --git a/conf/machine/ccimx6ulsbcexpress.conf b/conf/machine/ccimx6ulsbcexpress.conf index 4778643..648b537 100644 --- a/conf/machine/ccimx6ulsbcexpress.conf +++ b/conf/machine/ccimx6ulsbcexpress.conf @@ -4,34 +4,7 @@ #@DESCRIPTION: Machine configuration for ConnectCore 6UL SBC Express board. #@MAINTAINER: Alex Gonzalez -MACHINEOVERRIDES =. "mx6:mx6ul:ccimx6ul:use-mainline-bsp:" - -include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa7.inc - -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-digi" -PREFERRED_PROVIDER_u-boot = "u-boot-digi" - -UBOOT_BOOTSCRIPT = "boot.scr" - -UBOOT_CONFIG ??= "ccimx6ulstarter1GB ccimx6ulstarter" -UBOOT_CONFIG[ccimx6ulstarter1GB] = "ccimx6ulstarter1GB_defconfig" -UBOOT_CONFIG[ccimx6ulstarter] = "ccimx6ulstarter_defconfig" - -MACHINE_EXTRA_RDEPENDS += " \ - mtd-utils-ubifs \ -" -# mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files) -# Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size. -MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 255" - -# mkfs.ubifs parameters for rootfs partition -# Max LEB count (-c 8191) calculated for a partition of up to 1 GiB considering 128 KiB erase-block size. -MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 8191" - -IMAGE_CLASSES += "image_types_digi" -# Overwrite the defaults in imx-base not to include wic images -IMAGE_FSTYPES = "tar.bz2 ubifs boot.ubifs" +include conf/machine/include/ccimx6ulsom.inc SERIAL_CONSOLES = "115200;ttymxc4" diff --git a/conf/machine/include/ccimx6ulsom.inc b/conf/machine/include/ccimx6ulsom.inc new file mode 100644 index 0000000..0c15e73 --- /dev/null +++ b/conf/machine/include/ccimx6ulsom.inc @@ -0,0 +1,34 @@ +#@TYPE: Machine +#@NAME: ConnecCore 6UL SOM +#@SOC: i.MX6UL +#@DESCRIPTION: Machine configuration for ConnectCore 6UL System-On-Module. +#@MAINTAINER: Alex Gonzalez + +MACHINEOVERRIDES =. "mx6:mx6ul:ccimx6ul:use-mainline-bsp:" + +include conf/machine/include/imx-base.inc +include conf/machine/include/tune-cortexa7.inc + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-digi" +PREFERRED_PROVIDER_u-boot = "u-boot-digi" + +UBOOT_BOOTSCRIPT = "boot.scr" + +UBOOT_CONFIG ??= "ccimx6ulstarter1GB ccimx6ulstarter" +UBOOT_CONFIG[ccimx6ulstarter1GB] = "ccimx6ulstarter1GB_defconfig" +UBOOT_CONFIG[ccimx6ulstarter] = "ccimx6ulstarter_defconfig" + +MACHINE_EXTRA_RDEPENDS += " \ + mtd-utils-ubifs \ +" +# mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files) +# Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size. +MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 255" + +# mkfs.ubifs parameters for rootfs partition +# Max LEB count (-c 8191) calculated for a partition of up to 1 GiB considering 128 KiB erase-block size. +MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 8191" + +IMAGE_CLASSES += "image_types_digi" +# Overwrite the defaults in imx-base not to include wic images +IMAGE_FSTYPES = "tar.bz2 ubifs boot.ubifs"