diff options
Diffstat (limited to 'bsp/meta-freescale-3rdparty/conf/machine')
41 files changed, 464 insertions, 290 deletions
diff --git a/bsp/meta-freescale-3rdparty/conf/machine/apalis-imx6.conf b/bsp/meta-freescale-3rdparty/conf/machine/apalis-imx6.conf index a9b9af0d..8125f61f 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/apalis-imx6.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/apalis-imx6.conf @@ -9,11 +9,9 @@ MACHINEOVERRIDES =. "mx6:mx6q:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc -PREFERRED_PROVIDER_virtual/kernel ??= "linux-toradex" -PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc" +PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" KERNEL_DEVICETREE += "imx6q-apalis-eval.dtb imx6q-apalis-ixora.dtb \ imx6q-apalis-ixora-v1.1.dtb" -KERNEL_DEVICETREE_use-mainline-bsp += "imx6q-apalis-ixora.dtb" KERNEL_IMAGETYPE = "zImage" # The kernel lives in a seperate FAT partition, don't deploy it in /boot/ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" @@ -22,6 +20,7 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex" PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" PREFERRED_RPROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" +PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" SPL_BINARY = "SPL" # The SPL configures the DDR RAM depending on the module it runs on. Thus there @@ -33,6 +32,8 @@ UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000" IMAGE_FSTYPES += "tar.xz" # wic support +IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr" +WKS_FILE_DEPENDS_append = " u-boot-default-script" WKS_FILE = "sdimage-bootpart.wks" MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/cgtqmx6.conf b/bsp/meta-freescale-3rdparty/conf/machine/cgtqmx6.conf index 5be7971d..bce34b19 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/cgtqmx6.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/cgtqmx6.conf @@ -16,13 +16,13 @@ UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" UBOOT_CONFIG ??= "cgtqmx6" UBOOT_CONFIG[cgtqmx6] = "cgtqmx6eval_defconfig" -WKS_FILE = "imx-uboot-spl-bootpart.wks" +WKS_FILE = "imx-uboot-spl-bootpart.wks.in" # Use linux kernel QMX6 PREFERRED_PROVIDER_virtual/kernel ??= "linux-congatec" KERNEL_DEVICETREE = "imx6q-qmx6.dtb imx6dl-qmx6.dtb" KERNEL_IMAGETYPE = "uImage" -SERIAL_CONSOLE = "115200 ttymxc1" +SERIAL_CONSOLES = "115200;ttymxc1" MACHINE_FEATURES += " pci" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/cm-fx6.conf b/bsp/meta-freescale-3rdparty/conf/machine/cm-fx6.conf deleted file mode 100644 index 81d1062e..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/cm-fx6.conf +++ /dev/null @@ -1,21 +0,0 @@ -#@TYPE: Machine -#@NAME: CompuLab CM-FX6 -#@SOC: i.MX6 Q/DL -#@DESCRIPTION: Machine configuration for CompuLab CM-FX6 machines -#@MAINTAINER: Valentin Raevsky <valentin@compulab.co.il> - -MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:" - -require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa9.inc - -PREFERRED_PROVIDER_u-boot = "u-boot-compulab" -PREFERRED_PROVIDER_virtual/kernel = "linux-compulab" - -UBOOT_MACHINE ?= "cm_fx6_defconfig" - -KERNEL_DEVICETREE = "imx6dl-cm-fx6.dtb imx6dl-sbc-fx6.dtb imx6dl-sbc-fx6m.dtb imx6q-cm-fx6.dtb imx6q-sbc-fx6.dtb imx6q-sbc-fx6m.dtb" - -MACHINE_FEATURES += "pci wifi bluetooth alsa bluetooth serial usbhost wifi" - -SERIAL_CONSOLE = "115200 ttymxc3" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6.conf b/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6.conf index 0c6d7ccf..45f4d9b2 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6.conf @@ -9,11 +9,10 @@ MACHINEOVERRIDES =. "mx6:mx6dl:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc -PREFERRED_PROVIDER_virtual/kernel ??= "linux-toradex" -PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc" +PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb \ imx6dl-colibri-aster.dtb" -KERNEL_DEVICETREE_use-mainline-bsp += "imx6dl-colibri-eval-v3.dtb" +KERNEL_DEVICETREE_use-mainline-bsp = "imx6dl-colibri-eval-v3.dtb" KERNEL_IMAGETYPE = "zImage" # The kernel lives in a seperate FAT partition, don't deploy it in /boot/ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" @@ -22,6 +21,7 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex" PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" PREFERRED_RPROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" +PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" SPL_BINARY = "SPL" UBOOT_CONFIG ??= "spl" @@ -31,6 +31,8 @@ UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000" IMAGE_FSTYPES += "tar.xz" # wic support +IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr" +WKS_FILE_DEPENDS_append = " u-boot-default-script" WKS_FILE = "sdimage-bootpart.wks" MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6ull.conf b/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6ull.conf index a70dd421..1e1fd93c 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6ull.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6ull.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa7.inc -PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex" +PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ?= "linux-toradex" KERNEL_DEVICETREE += "imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb" KERNEL_IMAGETYPE = "zImage" # The kernel lives in its own ubi volume. @@ -19,13 +19,16 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex" PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" PREFERRED_RPROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" +PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" UBOOT_BINARY = "u-boot-nand.imx" -UBOOT_MAKE_TARGET = "u-boot-nand.imx" +UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_MACHINE ?= "colibri-imx6ull_defconfig" IMAGE_FSTYPES += "tar.xz" # wic support +IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr" +WKS_FILE_DEPENDS_append = " u-boot-default-script" WKS_FILE = "sdimage-bootpart.wks" MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx7-emmc.conf b/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx7-emmc.conf new file mode 100644 index 00000000..f67c41c3 --- /dev/null +++ b/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx7-emmc.conf @@ -0,0 +1,30 @@ +#@TYPE: Machine +#@NAME: Toradex Colibri iMX7 Dual 1GB (eMMC) +#@SOC: i.MX 7Dual +#@DESCRIPTION: Machine configuration for Toradex Colibri iMX7 SOM (eMMC) +#@MAINTAINER: Stefan Agner <stefan.agner@toradex.com> + +MACHINEOVERRIDES =. "mx7:mx7d:" + +include conf/machine/include/imx-base.inc +include conf/machine/include/tune-cortexa7.inc + +PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" + +KERNEL_DEVICETREE = "imx7d-colibri-emmc-eval-v3.dtb" +KERNEL_DEVICETREE_append_use-nxp-bsp = " imx7d-colibri-emmc-aster.dtb" + +# The kernel lives in a seperate FAT partition, don't deploy it in /boot/ +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" + +PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex" +PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" +PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" +UBOOT_MACHINE ?= "colibri_imx7_emmc_defconfig" + +IMAGE_FSTYPES += "tar.xz" +IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr" +WKS_FILE_DEPENDS_append = " u-boot-default-script" + +MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx7.conf b/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx7-nand.conf index 2ad296b9..4ab7a95d 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx7.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx7-nand.conf @@ -1,18 +1,27 @@ #@TYPE: Machine -#@NAME: Toradex Colibri iMX7D/S +#@NAME: Toradex Colibri iMX7D/S (NAND) #@SOC: i.MX 7Dual / i.MX 7Solo -#@DESCRIPTION: Machine configuration for Toradex Colibri iMX7 SOM +#@DESCRIPTION: Machine configuration for Toradex Colibri iMX7 SOM (NAND) #@MAINTAINER: Max Krummenacher <max.krummenacher@toradex.com> -MACHINEOVERRIDES =. "mx7:mx7d:" +MACHINEOVERRIDES =. "mx7:mx7d:colibri-imx7:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa7.inc -PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex" +PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" + KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE += "imx7d-colibri-eval-v3.dtb imx7s-colibri-eval-v3.dtb \ - imx7d-colibri-aster.dtb imx7s-colibri-aster.dtb" + +KERNEL_DEVICETREE = " \ + imx7d-colibri-eval-v3.dtb \ + imx7s-colibri-eval-v3.dtb \ +" + +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + imx7d-colibri-aster.dtb \ + imx7s-colibri-aster.dtb \ +" # U-Boot of our newer release read the Kernel and device tree from static UBI # volumes, hence no need to deploy the kernel binary in the image itself @@ -22,14 +31,17 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex" PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" PREFERRED_RPROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" +PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" # U-Boot NAND binary includes 0x400 padding required for NAND boot UBOOT_BINARY = "u-boot-nand.imx" -UBOOT_MAKE_TARGET = "u-boot-nand.imx" +UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_MACHINE ?= "colibri_imx7_defconfig" IMAGE_FSTYPES += "tar.xz" # wic support +IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr" +WKS_FILE_DEPENDS_append = " u-boot-default-script" WKS_FILE = "sdimage-bootpart.wks" # Enable free --space-fixup (-F) by default, this allows DFU updates @@ -37,6 +49,6 @@ MKUBIFS_ARGS = " -c 8112 -e 124KiB -m 2KiB -F" UBINIZE_ARGS = " -p 128KiB -m 2048 -s 2048" UBI_VOLNAME = "rootfs" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/colibri-vf.conf b/bsp/meta-freescale-3rdparty/conf/machine/colibri-vf.conf index a03853d9..8c66ceda 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/colibri-vf.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/colibri-vf.conf @@ -9,10 +9,19 @@ MACHINEOVERRIDES =. "vf:vf50:vf60:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa5.inc -PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex" +PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" + KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE += "vf500-colibri-eval-v3.dtb vf610-colibri-eval-v3.dtb \ - vf500-colibri-aster.dtb vf610-colibri-aster.dtb" + +KERNEL_DEVICETREE = " \ + vf500-colibri-eval-v3.dtb \ + vf610-colibri-eval-v3.dtb \ +" + +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + vf500-colibri-aster.dtb \ + vf610-colibri-aster.dtb \ +" # U-Boot of our newer release read the Kernel and device tree from static UBI volumes, # hence no need to deploy the kernel binary in the image itself @@ -22,17 +31,21 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex" PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" PREFERRED_RPROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" +PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" PREFERRED_PROVIDER_virtual/kernel-module-mcc ?= "kernel-module-mcc-toradex" PREFERRED_PROVIDER_virtual/kernel-module-mcc-dev ?= "kernel-module-mcc-toradex" PREFERRED_VERSION_mqxboot ?= "1.%" +PREFERRED_VERSION_weston_use-nxp-bsp = "" # U-Boot NAND binary includes 0x400 padding required for NAND boot -UBOOT_BINARY ?= "u-boot-nand.imx" -UBOOT_MAKE_TARGET = "u-boot-nand.imx" +UBOOT_BINARY = "u-boot-nand.imx" +UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_MACHINE ?= "colibri_vf_defconfig" IMAGE_FSTYPES += "tar.xz ubifs" # wic support +IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr" +WKS_FILE_DEPENDS_append = " u-boot-default-script" WKS_FILE = "sdimage-bootpart.wks" # Enable free --space-fixup (-F) by default, this allows DFU updates @@ -40,6 +53,6 @@ MKUBIFS_ARGS = " -c 8112 -e 124KiB -m 2KiB -F" UBINIZE_ARGS = " -p 128KiB -m 2048 -s 2048" UBI_VOLNAME = "rootfs" -SERIAL_CONSOLE = "115200 ttyLP0" +SERIAL_CONSOLES = "115200;ttyLP0" MACHINE_FEATURES += "usbgadget usbhost vfat alsa touchscreen" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/cubox-i.conf b/bsp/meta-freescale-3rdparty/conf/machine/cubox-i.conf index 4c9ae2e0..b4248157 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/cubox-i.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/cubox-i.conf @@ -23,7 +23,7 @@ UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6cuboxi_defconfig,sdcard" UENV_FILENAME = "uEnv-${MACHINE}.txt" SPL_BINARY = "SPL" -WKS_FILES = "imx-uboot-spl.wks" +WKS_FILES = "imx-uboot-spl.wks.in" UBOOT_EXTLINUX = "1" UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" @@ -34,7 +34,7 @@ KERNEL_DEVICETREE = "imx6dl-cubox-i.dtb imx6q-cubox-i.dtb imx6dl-hummingboard.dt MACHINE_FEATURES += "pci wifi bluetooth alsa irda serial usbhost" MACHINE_EXTRA_RRECOMMENDS += "bcm4330-nvram-config bcm4329-nvram-config" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ kernel-image \ diff --git a/bsp/meta-freescale-3rdparty/conf/machine/imx6dl-riotboard.conf b/bsp/meta-freescale-3rdparty/conf/machine/imx6dl-riotboard.conf index 157e2c96..e3e2f055 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/imx6dl-riotboard.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/imx6dl-riotboard.conf @@ -14,7 +14,7 @@ UBOOT_MACHINE = "riotboard_defconfig" PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc" KERNEL_DEVICETREE = "imx6dl-riotboard.dtb" -SERIAL_CONSOLE = "115200 ttymxc1" +SERIAL_CONSOLES = "115200;ttymxc1" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ kernel-image \ diff --git a/bsp/meta-freescale-3rdparty/conf/machine/imx6q-dms-ba16.conf b/bsp/meta-freescale-3rdparty/conf/machine/imx6q-dms-ba16.conf index 2f837f6c..56065d9b 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/imx6q-dms-ba16.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/imx6q-dms-ba16.conf @@ -11,11 +11,11 @@ include conf/machine/include/tune-cortexa9.inc UBOOT_MACHINE = "dms-ba16_defconfig" -PREFERRED_PROVIDER_virtual/kernel = "linux-advantech" +PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp = "linux-advantech" PREFERRED_PROVIDER_kernel = "linux-advantech" KERNEL_DEVICETREE = "imx6q-dms-ba16.dtb" KERNEL_IMAGETYPE = "uImage" MACHINE_FEATURES += "pci" -SERIAL_CONSOLE = "115200 ttymxc3" +SERIAL_CONSOLES = "115200;ttymxc3" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/imx6qdl-pico.conf b/bsp/meta-freescale-3rdparty/conf/machine/imx6qdl-pico.conf new file mode 100644 index 00000000..657299c0 --- /dev/null +++ b/bsp/meta-freescale-3rdparty/conf/machine/imx6qdl-pico.conf @@ -0,0 +1,50 @@ +#@TYPE: Machine +#@NAME: IMX6Q/DL-PICO +#@SOC: i.MX6QDL +#@DESCRIPTION: Machine configuration for IMX6QDL-PICO board. +#@MAINTAINER: Otavio Salvador otavio.salvador@ossystems.com.br + +MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa9.inc + +IMX_DEFAULT_BSP = "mainline" + +SERIAL_CONSOLES = "115200;ttymxc4" + +SPL_BINARY = "SPL" +UBOOT_SUFFIX = "img" +UBOOT_MAKE_TARGET = "" + +UBOOT_EXTLINUX = "1" +UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" +UBOOT_EXTLINUX_CONSOLE = "console=${console},${baudrate}" + +UBOOT_CONFIG ??= "generic" +UBOOT_CONFIG[generic] = "pico-imx6_defconfig" + +KERNEL_DEVICETREE = " \ + imx6dl-pico-dwarf.dtb \ + imx6dl-pico-hobbit.dtb \ + imx6dl-pico-nymph.dtb \ + imx6dl-pico-pi.dtb \ + imx6q-pico-dwarf.dtb \ + imx6q-pico-hobbit.dtb \ + imx6q-pico-nymph.dtb \ + imx6q-pico-pi.dtb \ +" + +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ + kernel-image \ + kernel-devicetree \ + u-boot-fslc \ +" + +MACHINE_EXTRA_RRECOMMENDS += " \ + bcm4339-nvram-config \ +" + +WKS_FILES ?= "imx-uboot-spl.wks.in" +WKS_FILE_DEPENDS ?= "" +IMAGE_FSTYPES = "wic.bmap wic.xz ext4.gz" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/imx6qdl-variscite-som.conf b/bsp/meta-freescale-3rdparty/conf/machine/imx6qdl-variscite-som.conf index 6b6d7b5b..467dba8b 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/imx6qdl-variscite-som.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/imx6qdl-variscite-som.conf @@ -11,7 +11,7 @@ require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa9.inc PREFERRED_PROVIDER_virtual/kernel = "linux-variscite" -PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc" +PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc-lts-4.19" KERNEL_DEVICETREE = " \ imx6dl-var-som-cap.dtb \ @@ -34,7 +34,7 @@ KERNEL_IMAGETYPE = "uImage" UBOOT_SPL_BUILD = "yes" UBOOT_MAKE_TARGET = "all" UBOOT_SUFFIX = "img" -WKS_FILE = "imx-uboot-spl-bootpart.wks" +WKS_FILE = "imx-uboot-spl-bootpart.wks.in" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-variscite" PREFERRED_PROVIDER_u-boot = "u-boot-variscite" @@ -52,7 +52,7 @@ UBI_VOLNAME = "rootfs" MKUBIFS_ARGS = " -m 2048 -e 124KiB -c 3965 -F " UBINIZE_ARGS = " -m 2048 -p 128KiB -s 2048 -O 2048 " -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" USE_VT = "0" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/imx6qsabrelite.conf b/bsp/meta-freescale-3rdparty/conf/machine/imx6qsabrelite.conf deleted file mode 100644 index d5703670..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/imx6qsabrelite.conf +++ /dev/null @@ -1,13 +0,0 @@ -#@TYPE: Machine -#@NAME: Boundary Devices i.MX6Q SABRE Lite -#@SOC: i.MX6Q -#@DESCRIPTION: Machine configuration for Boundary Devices i.MX6Q SABRE Lite -#@MAINTAINER: Ian Coolidge <ian@boundarydevices.com> - -# WARNING: This board now use the *same* code as Nitrogen6X and it -# boots from internal SPI NOR memory. If you did change it to boot -# from the MMC (SD3 or SD4) please check the Boundary's blog post -# at: http://boundarydevices.com/u-boot-on-i-mx6/#unbricking - -MACHINEOVERRIDES = "nitrogen6x:${MACHINE}" -include conf/machine/nitrogen6x.conf diff --git a/bsp/meta-freescale-3rdparty/conf/machine/imx6sl-warp.conf b/bsp/meta-freescale-3rdparty/conf/machine/imx6sl-warp.conf index 5e0d19f7..398220f2 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/imx6sl-warp.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/imx6sl-warp.conf @@ -27,6 +27,8 @@ MACHINEOVERRIDES =. "mx6:mx6sl:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc +IMX_DEFAULT_BSP = "mainline" + # WaRP uses eMMC boot partition by default and the u-boot inside .sdcard image # does not override it. However, build u-boot binary anyway in order to provide # a binary to be used if an update is needed @@ -37,10 +39,9 @@ EXTRA_IMAGEDEPENDS += "u-boot" UBOOT_MACHINE ?= "warp_defconfig" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc-imx" KERNEL_DEVICETREE = "imx6sl-warp.dtb" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FEATURES += "wifi bluetooth serial" MACHINE_EXTRA_RRECOMMENDS += "bcm4330-nvram-config" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/imx6ul-kontron.conf b/bsp/meta-freescale-3rdparty/conf/machine/imx6ul-kontron.conf new file mode 100644 index 00000000..1a779a87 --- /dev/null +++ b/bsp/meta-freescale-3rdparty/conf/machine/imx6ul-kontron.conf @@ -0,0 +1,62 @@ +#@TYPE: Machine +#@NAME: Kontron N63XX/N64XX SoM based boards +#@SOC: i.MX6UL/i.MX6ULL +#@DESCRIPTION: Machine configuration for Kontron N63XX/N64XX SoM based boards +#@MAINTAINER: Frieder Schrempf <frieder.schrempf@kontron.de> + +MACHINEOVERRIDES =. "mx6:mx6ul:" + +include conf/machine/include/imx-base.inc +include conf/machine/include/tune-cortexa7.inc + +IMX_DEFAULT_BSP = "mainline" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-kontron" +PREFERRED_PROVIDER_u-boot ?= "u-boot-kontron" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-kontron" + +KERNEL_CLASSES ?= " kernel-fitimage " +KERNEL_IMAGETYPES ?= "fitImage" +KERNEL_DEVICETREE = " \ + imx6ul-kontron-n6310-s.dtb \ + imx6ul-kontron-n6310-s-43.dtb \ + imx6ul-kontron-n6311-s.dtb \ + imx6ull-kontron-n6411-s.dtb \ +" + + +SERIAL_CONSOLES = "115200;ttymxc3" + +UBOOT_CONFIG = "kontron-mx6ul" +UBOOT_CONFIG[kontron-mx6ul] = "kontron_mx6ul_defconfig" + +SPL_BINARY = "SPL" +UBOOT_ENTRYPOINT = "0x81000000" +UBOOT_MAKE_TARGET = "u-boot.img SPL" +UBOOT_SUFFIX = "img" + +UBOOT_EXTLINUX ?= "1" +UBOOT_EXTLINUX_LABELS ?= "default" +UBOOT_EXTLINUX_KERNEL_IMAGE ?= "../fitImage" +UBOOT_EXTLINUX_FDTDIR ?= "" +UBOOT_EXTLINUX_KERNEL_ARGS ?= "rootwait" +UBOOT_EXTLINUX_TIMEOUT = "8" +UBOOT_EXTLINUX_LABELS = "kontron-n6310-s kontron-n6311-s kontron-n6310-s-43 kontron-n6411-s" +UBOOT_EXTLINUX_KERNEL_IMAGE_kontron-n6310-s = "../fitImage#conf@imx6ul-kontron-n6310-s.dtb" +UBOOT_EXTLINUX_KERNEL_IMAGE_kontron-n6311-s = "../fitImage#conf@imx6ul-kontron-n6311-s.dtb" +UBOOT_EXTLINUX_KERNEL_IMAGE_kontron-n6310-s-43 = "../fitImage#conf@imx6ul-kontron-n6310-s-43.dtb" +UBOOT_EXTLINUX_KERNEL_IMAGE_kontron-n6411-s = "../fitImage#conf@imx6ull-kontron-n6411-s.dtb" +UBOOT_EXTLINUX_MENU_DESCRIPTION_kontron-n6310-s = "Kontron N6310 S" +UBOOT_EXTLINUX_MENU_DESCRIPTION_kontron-n6311-s = "Kontron N6311 S" +UBOOT_EXTLINUX_MENU_DESCRIPTION_kontron-n6310-s-43 = "Kontron N6310 S 43" +UBOOT_EXTLINUX_MENU_DESCRIPTION_kontron-n6411-s = "Kontron N6411 S" +UBOOT_EXTLINUX_CONSOLE = "console=ttymxc3,115200" +UBOOT_EXTLINUX_ROOT = "root=/dev/mmcblk0p2" + +MACHINE_FEATURES = "usbhost vfat serial ext2 rtc usbgadget" +IMAGE_BOOT_FILES = " \ + extlinux.conf;extlinux/extlinux.conf \ + fitImage \ +" + +WKS_FILES ?= "imx-uboot-spl-bootpart.wks.in" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/imx6ul-pico.conf b/bsp/meta-freescale-3rdparty/conf/machine/imx6ul-pico.conf index 3448318a..11ea23bd 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/imx6ul-pico.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/imx6ul-pico.conf @@ -4,14 +4,17 @@ #@DESCRIPTION: Machine configuration for IMX6UL-PICO board. #@MAINTAINER: Daiane Angolini <daiane.angolini@nxp.com> -MACHINEOVERRIDES =. "use-mainline-bsp:mx6:mx6ul:" +MACHINEOVERRIDES =. "mx6:mx6ul:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa7.inc -SERIAL_CONSOLE = "115200 ttymxc5" +IMX_DEFAULT_BSP = "mainline" + +SERIAL_CONSOLES = "115200;ttymxc5" KERNEL_DEVICETREE = " \ + imx6ul-pico-dwarf.dtb \ imx6ul-pico-hobbit.dtb \ imx6ul-pico-pi.dtb \ " @@ -20,7 +23,8 @@ SPL_BINARY = "SPL" UBOOT_SUFFIX = "img" UBOOT_MAKE_TARGET = "" -UBOOT_CONFIG ??= "hobbit pi generic" +UBOOT_CONFIG ??= "dwarf hobbit pi generic" +UBOOT_CONFIG[dwarf] = "pico-dwarf-imx6ul_defconfig" UBOOT_CONFIG[generic] = "pico-imx6ul_defconfig" UBOOT_CONFIG[hobbit] = "pico-hobbit-imx6ul_defconfig" UBOOT_CONFIG[pi] = "pico-pi-imx6ul_defconfig" @@ -37,6 +41,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ MACHINE_FEATURES += "wifi bluetooth" -WKS_FILES ?= "imx-uboot-spl.wks" +WKS_FILES ?= "imx-uboot-spl.wks.in" WKS_FILE_DEPENDS ?= "" -IMAGE_FSTYPES = "wic.xz ext4.gz" +IMAGE_FSTYPES = "wic.bmap wic.xz ext4.gz" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/imx7d-pico.conf b/bsp/meta-freescale-3rdparty/conf/machine/imx7d-pico.conf index 625b6002..701cd6b0 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/imx7d-pico.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/imx7d-pico.conf @@ -4,25 +4,30 @@ #@DESCRIPTION: Machine configuration for IMX7D-PICO board. #@MAINTAINER: Vanessa Maegima <vanessa.maegima@nxp.com> -MACHINEOVERRIDES =. "use-mainline-bsp:mx7:mx7d:" +MACHINEOVERRIDES =. "mx7:mx7d:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa7.inc -SERIAL_CONSOLE = "115200 ttymxc4" +IMX_DEFAULT_BSP = "mainline" + +SERIAL_CONSOLES = "115200;ttymxc4" KERNEL_DEVICETREE = " \ + imx7d-pico-dwarf.dtb \ imx7d-pico-hobbit.dtb \ imx7d-pico-pi.dtb \ " SPL_BINARY = "SPL" -UBOOT_SUFFIX = "img" +UBOOT_BINARY = "u-boot-dtb.img" UBOOT_MAKE_TARGET = "" -UBOOT_CONFIG ??= "hobbit pi generic" +UBOOT_CONFIG ??= "dwarf hobbit nymph pi generic" +UBOOT_CONFIG[dwarf] = "pico-dwarf-imx7d_defconfig" UBOOT_CONFIG[generic] = "pico-imx7d_defconfig" UBOOT_CONFIG[hobbit] = "pico-hobbit-imx7d_defconfig" +UBOOT_CONFIG[nymph] = "pico-nymph-imx7d_defconfig" UBOOT_CONFIG[pi] = "pico-pi-imx7d_defconfig" UBOOT_EXTLINUX = "1" @@ -37,8 +42,9 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ MACHINE_EXTRA_RRECOMMENDS += " \ bcm4339-nvram-config \ + linux-firmware-ath10k \ " -WKS_FILES ?= "imx-uboot-spl.wks" +WKS_FILES ?= "imx-uboot-spl.wks.in" WKS_FILE_DEPENDS ?= "" -IMAGE_FSTYPES = "wic.xz ext4.gz" +IMAGE_FSTYPES = "wic.bmap wic.xz ext4.gz" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/imx7s-warp.conf b/bsp/meta-freescale-3rdparty/conf/machine/imx7s-warp.conf index 7760c109..f76386be 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/imx7s-warp.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/imx7s-warp.conf @@ -4,15 +4,20 @@ #@DESCRIPTION: Machine configuration for i.MX7S WaRP board. #@MAINTAINER: Pierre-Jean Texier <texier.pj2@gmail.com> -MACHINEOVERRIDES =. "mx7:mx7d:use-mainline-bsp:" +MACHINEOVERRIDES =. "mx7:mx7d:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa7.inc +IMX_DEFAULT_BSP = "mainline" + MACHINE_FEATURES += " wifi bluetooth" KERNEL_DEVICETREE = "imx7s-warp.dtb" +UBOOT_BINARY = "u-boot-dtb.imx" +UBOOT_MAKE_TARGET = "" + UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "warp7_defconfig,sdcard" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/ccimx6ulsbcexpress.conf b/bsp/meta-freescale-3rdparty/conf/machine/include/ccimx6ulsom.inc index 45508727..18ba7545 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/ccimx6ulsbcexpress.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/include/ccimx6ulsom.inc @@ -1,7 +1,7 @@ #@TYPE: Machine -#@NAME: ConnecCore 6UL SBC Express +#@NAME: ConnecCore 6UL SOM #@SOC: i.MX6UL -#@DESCRIPTION: Machine configuration for ConnectCore 6UL SBC Express board. +#@DESCRIPTION: Machine configuration for ConnectCore 6UL System-On-Module. #@MAINTAINER: Alex Gonzalez <alex.gonzalez@digi.com> MACHINEOVERRIDES =. "mx6:mx6ul:ccimx6ul:use-mainline-bsp:" @@ -21,6 +21,14 @@ UBOOT_CONFIG[ccimx6ulstarter] = "ccimx6ulstarter_defconfig" MACHINE_EXTRA_RDEPENDS += " \ mtd-utils-ubifs \ " + +MACHINE_FEATURES += " wifi bluetooth" + +MACHINE_EXTRA_RRECOMMENDS += " \ + ${@bb.utils.contains('MACHINE_FEATURES', 'wifi', 'kernel-module-qca6564 linux-firmware-qca6564-wifi', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'linux-firmware-qca6564-bt', '', d)} \ +" + # 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" @@ -32,7 +40,3 @@ 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" - -SERIAL_CONSOLE = "115200 ttymxc4" - -KERNEL_DEVICETREE = "imx6ul-ccimx6ulsbcexpress.dtb" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/include/tx6-karo-common.inc b/bsp/meta-freescale-3rdparty/conf/machine/include/tx6-karo-common.inc deleted file mode 100644 index 83a7de6f..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/include/tx6-karo-common.inc +++ /dev/null @@ -1,18 +0,0 @@ -# Provides the Ka-Ro TX6 common settings - -require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa9.inc - -SERIAL_CONSOLE = "115200 ttymxc0" - -UBOOT_SUFFIX = "bin" -UBOOT_MAKE_TARGET = "u-boot.bin" -UBOOT_BINARY="u-boot.bin" - -PREFERRED_PROVIDER_u-boot = "u-boot-karo" -PREFERRED_PROVIDER_virtual/kernel = "linux-karo" -PREFERRED_VERSION_linux-karo ?= "3.16%" - -MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" -MACHINE_FEATURES += " pci wifi bluetooth" -IMAGE_FSTYPES_remove = "sdcard" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/lx2160acex7.conf b/bsp/meta-freescale-3rdparty/conf/machine/lx2160acex7.conf new file mode 100644 index 00000000..4812f8ec --- /dev/null +++ b/bsp/meta-freescale-3rdparty/conf/machine/lx2160acex7.conf @@ -0,0 +1,49 @@ +#@TYPE: Machine +#@NAME: Solid-Run LX2160A-CEx7 +#@SOC: LSCH3 +#@DESCRIPTION: Machine configuration for running LX2160A-CEx7 in 64-bit mode + +require conf/machine/include/qoriq-arm64.inc +require conf/machine/include/arm/arch-arm64.inc + +MACHINEOVERRIDES =. "fsl-lsch3:lx2160a:" + +MACHINE_FEATURES += "optee" + +KERNEL_CLASSES = " kernel-fitimage " +KERNEL_IMAGETYPES = "fitImage" + +DTB_LOAD = "0x90000000" +UBOOT_ENTRYPOINT = "0x80080000" + +UBOOT_CONFIG ??= "tfa" +UBOOT_CONFIG[tfa] = "lx2160acex7_tfa_defconfig,,u-boot-dtb.bin" + +KERNEL_DEVICETREE_BASENAME ?= "fsl-lx2160a-cex7.dtb" +KERNEL_DEVICETREE ?= "freescale/${KERNEL_DEVICETREE_BASENAME}" +KERNEL_DEFCONFIG ?= "defconfig" + +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" +SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" + +#SERDES=8_5_2 # 8x10g +#SERDES=13_5_2 # dual 100g +#SERDES=20_5_2 # dual 40g +SERDES ?= "8_5_2" +SPEED ?= "2000_700_3200" + +RCWAUTO ?= "${SERDES}/${SPEED}" +BOOTTYPE="auto" + +EXTRA_IMAGEDEPENDS += "management-complex mc-utils rcw ls2-phy ddr-phy atf inphi" +USE_VT = "0" + +PREFERRED_PROVIDER_u-boot-default-script = "u-boot-script-qoriq" +PREFERRED_PROVIDER_virtual/kernel = "linux-fslc-qoriq" + +IMAGE_FSTYPES += "wic" +WKS_FILE = "lx2160acex7.wks.in" +WKS_FILE_DEPENDS_append = "\ + ${PREFERRED_PROVIDER_u-boot-default-script} \ +" +IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE_BASENAME} boot.scr-${MACHINE};boot.scr" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/m28evk.conf b/bsp/meta-freescale-3rdparty/conf/machine/m28evk.conf deleted file mode 100644 index d5d89862..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/m28evk.conf +++ /dev/null @@ -1,26 +0,0 @@ -#@TYPE: Machine -#@NAME: DENX M28 SoM Evaluation Kit -#@SOC: i.MX28 -#@DESCRIPTION: Machine configuration for DENX M28 SoM Evaluation Kit - -MACHINEOVERRIDES =. "mxs:mx28:" - -include conf/machine/include/imx-base.inc -include conf/machine/include/tune-arm926ejs.inc - -UBOOT_MACHINE = "m28evk_config" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc" -KERNEL_IMAGETYPE = "uImage" -KERNEL_DEVICETREE = "imx28-m28evk.dtb" - -SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard" - -SERIAL_CONSOLE = "115200 ttyAMA0" - -MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" - -# Overrides due use of non-FSL kernel -PREFERRED_VERSION_imx-test = "00.00.00" -MACHINE_GSTREAMER_PLUGIN_m28evk = "" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/m53evk.conf b/bsp/meta-freescale-3rdparty/conf/machine/m53evk.conf deleted file mode 100644 index 4356d18d..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/m53evk.conf +++ /dev/null @@ -1,28 +0,0 @@ -#@TYPE: Machine -#@NAME: DENX M53 SoM Evaluation Kit -#@SOC: i.MX53 -#@DESCRIPTION: Machine configuration for DENX M53 SoM Evaluation Kit - -MACHINEOVERRIDES =. "mx5:mx53:" - -include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa8.inc - -UBOOT_MACHINE = "m53evk_config" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-denx" - -KERNEL_IMAGETYPE = "uImage" -KERNEL_DEVICETREE = "imx53-m53evk.dtb" - -SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard" - -SERIAL_CONSOLE = "115200 ttymxc1" - -MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" - -# Overrides due use of non-FSL kernel -PREFERRED_VERSION_imx-test = "00.00.00" -MACHINE_GSTREAMER_PLUGIN_m53evk = "" -XSERVER_DRIVER_m53evk = "xf86-video-fbdev" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/nitrogen6sx.conf b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen6sx.conf index 9aa43d46..3b629603 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/nitrogen6sx.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen6sx.conf @@ -2,13 +2,15 @@ #@NAME: Boundary Devices Nitrogen6SX #@SOC: i.MX6SX #@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen6SX -#@MAINTAINER: Ian Coolidge <ian@boundarydevices.com> +#@MAINTAINER: Chris Dimich <chris.dimich@boundarydevices.com> MACHINEOVERRIDES =. "mx6:mx6sx:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc +IMX_DEFAULT_BSP = "nxp" + KERNEL_DEVICETREE = "imx6sx-nitrogen6sx.dtb" KERNEL_IMAGETYPE = "zImage" @@ -31,7 +33,7 @@ WKS_FILE_DEPENDS = " \ UBOOT_MACHINE ?= "nitrogen6sx_defconfig" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-wl12xx" MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/nitrogen6x-lite.conf b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen6x-lite.conf index 44cf5c26..406305bf 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/nitrogen6x-lite.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen6x-lite.conf @@ -2,13 +2,15 @@ #@NAME: Boundary Devices Nitrogen6X Lite #@SOC: i.MX6S #@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen6X Lite -#@MAINTAINER: Ian Coolidge <ian@boundarydevices.com> +#@MAINTAINER: Chris Dimich <chris.dimich@boundarydevices.com> MACHINEOVERRIDES =. "mx6:mx6dl:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc +IMX_DEFAULT_BSP = "nxp" + KERNEL_DEVICETREE = "imx6dl-nit6xlite.dtb" KERNEL_IMAGETYPE = "zImage" @@ -31,7 +33,7 @@ WKS_FILE_DEPENDS = " \ UBOOT_MACHINE ?= "nit6xlite_defconfig" -SERIAL_CONSOLE = "115200 ttymxc1" +SERIAL_CONSOLES = "115200;ttymxc1" MACHINE_EXTRA_RRECOMMENDS += " bcm4330-nvram-config" MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/nitrogen6x.conf b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen6x.conf index e777a14c..d3aa3514 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/nitrogen6x.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen6x.conf @@ -2,7 +2,7 @@ #@NAME: Boundary Devices Nitrogen6X #@SOC: i.MX6 Q/DL #@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen6X -#@MAINTAINER: Ian Coolidge <ian@boundarydevices.com> +#@MAINTAINER: Chris Dimich <chris.dimich@boundarydevices.com> # # Note that this machine configuration also supports the SABRE Lite # reference design and the Nitrogen6X-SOM. @@ -34,6 +34,8 @@ MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc +IMX_DEFAULT_BSP = "nxp" + KERNEL_DEVICETREE = "imx6q-sabrelite.dtb \ imx6q-nitrogen6_max.dtb imx6qp-nitrogen6_max.dtb \ imx6q-nitrogen6x.dtb imx6dl-nitrogen6x.dtb \ @@ -65,7 +67,7 @@ WKS_FILE_DEPENDS = " \ UBOOT_MACHINE ?= "nitrogen6q_defconfig" -SERIAL_CONSOLE = "115200 ttymxc1" +SERIAL_CONSOLES = "115200;ttymxc1" MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-wl12xx" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ diff --git a/bsp/meta-freescale-3rdparty/conf/machine/nitrogen7.conf b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen7.conf index 57160e08..b413212f 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/nitrogen7.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen7.conf @@ -2,13 +2,15 @@ #@NAME: Boundary Devices Nitrogen7 #@SOC: i.MX7D #@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen7 -#@MAINTAINER: Ian Coolidge <ian@boundarydevices.com> +#@MAINTAINER: Chris Dimich <chris.dimich@boundarydevices.com> MACHINEOVERRIDES =. "mx7:mx7d:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa7.inc +IMX_DEFAULT_BSP = "nxp" + KERNEL_DEVICETREE = "imx7d-nitrogen7.dtb" KERNEL_IMAGETYPE = "zImage" @@ -31,7 +33,7 @@ WKS_FILE_DEPENDS = " \ UBOOT_MACHINE ?= "nitrogen7_defconfig" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-wl12xx" MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/nitrogen8m.conf b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen8m.conf index 9565209b..73507f23 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/nitrogen8m.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen8m.conf @@ -2,17 +2,23 @@ #@NAME: Boundary Devices Nitrogen8M #@SOC: i.MX8 MQ #@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8M -#@MAINTAINER: Ian Coolidge <ian@boundarydevices.com> +#@MAINTAINER: Chris Dimich <chris.dimich@boundarydevices.com> MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" require conf/machine/include/imx-base.inc -require conf/machine/include/arm/arch-arm64.inc +require conf/machine/include/tune-cortexa53.inc + +IMX_DEFAULT_BSP = "nxp" # Kernel configuration PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary" KERNEL_DEVICETREE = "freescale/imx8mq-nitrogen8m.dtb \ freescale/imx8mq-nitrogen8m-m4.dtb \ + freescale/imx8mq-nitrogen8m_som.dtb \ + freescale/imx8mq-nitrogen8m_som-m4.dtb \ + freescale/imx8mq-nitrogen8m-tc358743.dtb \ + freescale/imx8mq-nitrogen8m-edp.dtb \ " KERNEL_IMAGETYPE = "Image" RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" @@ -20,11 +26,24 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" # U-Boot configuration PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary" PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary" +PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary" SPL_BINARY = "spl/u-boot-spl.bin" UBOOT_DTB_NAME ?= "imx8mq-nitrogen8m.dtb" -UBOOT_MACHINE ?= "nitrogen8m_defconfig" UBOOT_MAKE_TARGET = "" UBOOT_SUFFIX = "bin" +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "nitrogen8m_defconfig,sdcard" + +IMAGE_BOOTLOADER = "imx-boot" + +IMXBOOT_TARGETS = "flash_evk" + +DDR_FIRMWARE_NAME = "\ + lpddr4_pmu_train_1d_imem.bin \ + lpddr4_pmu_train_1d_dmem.bin \ + lpddr4_pmu_train_2d_imem.bin \ + lpddr4_pmu_train_2d_dmem.bin \ +" # wic support WKS_FILE = "sdimage-bootpart.wks" @@ -37,6 +56,6 @@ WKS_FILE_DEPENDS_mx8 += " \ bmap-tools-native \ " -SERIAL_CONSOLE ?= "115200 ttymxc0" +SERIAL_CONSOLES ?= "115200;ttymxc0" MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/nitrogen8mm.conf b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen8mm.conf new file mode 100644 index 00000000..cf18e0a8 --- /dev/null +++ b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen8mm.conf @@ -0,0 +1,65 @@ +#@TYPE: Machine +#@NAME: Boundary Devices Nitrogen8MM +#@SOC: i.MX8MM +#@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8MM +#@MAINTAINER: Chris Dimich <chris.dimich@boundarydevices.com> + +MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa53.inc + +IMX_DEFAULT_BSP = "nxp" + +# Kernel configuration +PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary" +KERNEL_DEVICETREE = "freescale/imx8mq-nitrogen8m.dtb \ + freescale/imx8mq-nitrogen8m-m4.dtb \ + freescale/imx8mm-nitrogen8mm.dtb \ + freescale/imx8mm-nitrogen8mm_som.dtb \ + freescale/imx8mm-nitrogen8mm_rev2.dtb \ + freescale/imx8mm-nitrogen8mm_rev2-m4.dtb \ + freescale/imx8mm-nitrogen8mm_som-m4.dtb \ + freescale/imx8mm-nitrogen8mm-m4.dtb \ + freescale/imx8mm-nitrogen8mm-tc358743.dtb \ +" +KERNEL_IMAGETYPE = "Image" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" + +# U-Boot configuration +PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary" +PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary" +PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary" +SPL_BINARY = "spl/u-boot-spl.bin" +UBOOT_DTB_NAME ?= "imx8mm-nitrogen8mm.dtb" +UBOOT_MAKE_TARGET = "" +UBOOT_SUFFIX = "bin" +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "nitrogen8mm_2g_defconfig,sdcard" + +IMAGE_BOOTLOADER = "imx-boot" + +IMXBOOT_TARGETS = "flash_evk" + +# Set DDR FIRMWARE +DDR_FIRMWARE_NAME = "\ + lpddr4_pmu_train_1d_imem.bin \ + lpddr4_pmu_train_1d_dmem.bin \ + lpddr4_pmu_train_2d_imem.bin \ + lpddr4_pmu_train_2d_dmem.bin \ +" + +# wic support +WKS_FILE = "sdimage-bootpart.wks" +IMAGE_BOOT_FILES_append = " \ + boot.scr-${MACHINE};boot.scr \ +" +WKS_FILE_DEPENDS_mx8 += " \ + u-boot-script-boundary \ + e2fsprogs-native \ + bmap-tools-native \ +" + +SERIAL_CONSOLES = "115200;ttymxc1" + +MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/nitrogen8mn.conf b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen8mn.conf new file mode 100644 index 00000000..f3a595d7 --- /dev/null +++ b/bsp/meta-freescale-3rdparty/conf/machine/nitrogen8mn.conf @@ -0,0 +1,60 @@ +#@TYPE: Machine +#@NAME: Boundary Devices Nitrogen8M Nano +#@SOC: i.MX8 Nano +#@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8M Nano +#@MAINTAINER: Chris Dimich <chris.dimich@boundarydevices.com> + +MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa53.inc + +IMX_DEFAULT_BSP = "nxp" + +# Kernel configuration +PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary" +KERNEL_DEVICETREE = "freescale/imx8mn-nitrogen8mn.dtb \ + freescale/imx8mn-nitrogen8mn_som.dtb \ + freescale/imx8mn-nitrogen8_nano.dtb \ +" + +KERNEL_IMAGETYPE = "Image" +KERNEL_DEFCONFIG = "boundary_defconfig" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" + +# U-Boot configuration +PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary" +PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary" +PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary" +SPL_BINARY = "spl/u-boot-spl.bin" +UBOOT_DTB_NAME ?= "imx8mn-nitrogen8_nano.dtb" +UBOOT_MAKE_TARGET = "" +UBOOT_SUFFIX = "bin" +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "nitrogen8_nano_8mn1gr0_defconfig,sdcard" + +IMAGE_BOOTLOADER = "imx-boot" + +IMXBOOT_TARGETS = "flash_evk" + +DDR_FIRMWARE_NAME = "\ + lpddr4_pmu_train_1d_imem.bin \ + lpddr4_pmu_train_1d_dmem.bin \ + lpddr4_pmu_train_2d_imem.bin \ + lpddr4_pmu_train_2d_dmem.bin \ +" + +# wic support +WKS_FILE = "sdimage-bootpart.wks" +IMAGE_BOOT_FILES_append = " \ + boot.scr-${MACHINE};boot.scr \ +" +WKS_FILE_DEPENDS_mx8 += " \ + u-boot-script-boundary \ + e2fsprogs-native \ + bmap-tools-native \ +" + +SERIAL_CONSOLES = "115200;ttymxc1" + +MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/pcm052.conf b/bsp/meta-freescale-3rdparty/conf/machine/pcm052.conf deleted file mode 100644 index c1d017ad..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/pcm052.conf +++ /dev/null @@ -1,25 +0,0 @@ -#@TYPE: Machine -#@NAME: Phytec phyCORE Vybrid Development Kit -#@SOC: vf60 -#@DESCRIPTION: Machine configuration for Phytec phyCORE Vybrid Development Kit -#@MAINTAINER: Anthony Felice <tony.felice@timesys.com> - -MACHINEOVERRIDES =. "vf:vf60:" - -include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa5.inc - -PREFERRED_PROVIDER_virtual/kernel = "linux-timesys" -PREFERRED_PROVIDER_virtual/kernel-module-mcc ?= "kernel-module-mcc" -PREFERRED_PROVIDER_virtual/kernel-module-mcc-dev ?= "kernel-module-mcc" - -UBOOT_MACHINE = "pcm052_config" - -KERNEL_DEVICETREE = "vf610-pcm052.dtb" - -SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard" - -SERIAL_CONSOLE = "115200 ttyLP1" - -MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/tx6q-10x0.conf b/bsp/meta-freescale-3rdparty/conf/machine/tx6q-10x0.conf deleted file mode 100644 index d2c65447..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/tx6q-10x0.conf +++ /dev/null @@ -1,13 +0,0 @@ -#@TYPE: Machine -#@NAME: Ka-Ro electronics i.MX6Q TX6Q Computer-On-Module -#@SOC: i.MX6Q -#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6Q Computer-On-Module -#@MAINTAINER: Oliver Wendt <ow@karo-electronics.com> - -MACHINEOVERRIDES =. "mx6:mx6q:" - -require include/tx6-karo-common.inc - -KERNEL_DEVICETREE = "imx6q-tx6q-10x0.dtb" - -UBOOT_MACHINE = "tx6q-10x0_config" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/tx6q-11x0.conf b/bsp/meta-freescale-3rdparty/conf/machine/tx6q-11x0.conf deleted file mode 100644 index 22cb6434..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/tx6q-11x0.conf +++ /dev/null @@ -1,13 +0,0 @@ -#@TYPE: Machine -#@NAME: Ka-Ro electronics i.MX6Q TX6Q Computer-On-Module -#@SOC: i.MX6Q -#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6Q Computer-On-Module -#@MAINTAINER: Oliver Wendt <ow@karo-electronics.com> - -MACHINEOVERRIDES =. "mx6:mx6q:" - -require include/tx6-karo-common.inc - -KERNEL_DEVICETREE = "imx6q-tx6q-11x0.dtb" - -UBOOT_MACHINE = "tx6q-11x0_config" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/tx6s-8034.conf b/bsp/meta-freescale-3rdparty/conf/machine/tx6s-8034.conf deleted file mode 100644 index c1d014c6..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/tx6s-8034.conf +++ /dev/null @@ -1,13 +0,0 @@ -#@TYPE: Machine -#@NAME: Ka-Ro electronics i.MX6S TX6S Computer-On-Module -#@SOC: i.MX6S -#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6S Computer-On-Module -#@MAINTAINER: Oliver Wendt <ow@karo-electronics.com> - -MACHINEOVERRIDES =. "mx6:mx6dl:" - -require include/tx6-karo-common.inc - -KERNEL_DEVICETREE = "imx6dl-tx6s-8034.dtb" - -UBOOT_MACHINE = "tx6s-8034_config" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/tx6s-8035.conf b/bsp/meta-freescale-3rdparty/conf/machine/tx6s-8035.conf deleted file mode 100644 index 41465f25..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/tx6s-8035.conf +++ /dev/null @@ -1,13 +0,0 @@ -#@TYPE: Machine -#@NAME: Ka-Ro electronics i.MX6S TX6S Computer-On-Module -#@SOC: i.MX6S -#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6S Computer-On-Module -#@MAINTAINER: Oliver Wendt <ow@karo-electronics.com> - -MACHINEOVERRIDES =. "mx6:mx6dl:" - -require include/tx6-karo-common.inc - -KERNEL_DEVICETREE = "imx6dl-tx6s-8035.dtb" - -UBOOT_MACHINE = "tx6s-80x0_config" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/tx6u-8033.conf b/bsp/meta-freescale-3rdparty/conf/machine/tx6u-8033.conf deleted file mode 100644 index b3fcca2a..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/tx6u-8033.conf +++ /dev/null @@ -1,13 +0,0 @@ -#@TYPE: Machine -#@NAME: Ka-Ro electronics i.MX6DL TX6DL Computer-On-Module -#@SOC: i.MX6DL -#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6DL Computer-On-Module -#@MAINTAINER: Oliver Wendt <ow@karo-electronics.com> - -MACHINEOVERRIDES =. "mx6:mx6dl:" - -require include/tx6-karo-common.inc - -KERNEL_DEVICETREE = "imx6dl-tx6u-8033.dtb" - -UBOOT_MACHINE = "tx6u-8033_config" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/tx6u-80x0.conf b/bsp/meta-freescale-3rdparty/conf/machine/tx6u-80x0.conf deleted file mode 100644 index c9450635..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/tx6u-80x0.conf +++ /dev/null @@ -1,13 +0,0 @@ -#@TYPE: Machine -#@NAME: Ka-Ro electronics i.MX6DL TX6DL Computer-On-Module -#@SOC: i.MX6DL -#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6DL Computer-On-Module -#@MAINTAINER: Oliver Wendt <ow@karo-electronics.com> - -MACHINEOVERRIDES =. "mx6:mx6dl:" - -require include/tx6-karo-common.inc - -KERNEL_DEVICETREE = "imx6dl-tx6u-80xx.dtb" - -UBOOT_MACHINE = "tx6u-80x0_config" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/tx6u-81x0.conf b/bsp/meta-freescale-3rdparty/conf/machine/tx6u-81x0.conf deleted file mode 100644 index 6951abe5..00000000 --- a/bsp/meta-freescale-3rdparty/conf/machine/tx6u-81x0.conf +++ /dev/null @@ -1,13 +0,0 @@ -#@TYPE: Machine -#@NAME: Ka-Ro electronics i.MX6DL TX6DL Computer-On-Module -#@SOC: i.MX6DL -#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6DL Computer-On-Module -#@MAINTAINER: Oliver Wendt <ow@karo-electronics.com> - -MACHINEOVERRIDES =. "mx6:mx6dl:" - -require include/tx6-karo-common.inc - -KERNEL_DEVICETREE = "imx6dl-tx6u-81xx.dtb" - -UBOOT_MACHINE = "tx6u-81x0_config" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/ventana.conf b/bsp/meta-freescale-3rdparty/conf/machine/ventana.conf index f3e111db..7794c779 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/ventana.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/ventana.conf @@ -61,7 +61,7 @@ UBOOT_CONFIG ??= "std" UBOOT_CONFIG[std] = "gwventana_config" UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000" -SERIAL_CONSOLE = "115200 ttymxc1" +SERIAL_CONSOLES = "115200;ttymxc1" # Override FS Type Creation IMAGE_FSTYPES = "tar.bz2 multiubi" diff --git a/bsp/meta-freescale-3rdparty/conf/machine/wandboard.conf b/bsp/meta-freescale-3rdparty/conf/machine/wandboard.conf index 50c19c8b..a32cb0b0 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/wandboard.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/wandboard.conf @@ -4,11 +4,13 @@ #@DESCRIPTION: Machine configuration for i.MX6 Wandboard QuadPlus/Quad/Dual/Solo #@MAINTAINER: Alfonso Tames <alfonso@tames.com> -MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:use-mainline-bsp:" +MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc +IMX_DEFAULT_BSP = "mainline" + UBOOT_MAKE_TARGET = "" UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" @@ -40,7 +42,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \ bcm4330-nvram-config \ " -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ kernel-image \ @@ -48,4 +50,4 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ u-boot-fslc \ " -WKS_FILES = "imx-uboot-spl.wks" +WKS_FILES = "imx-uboot-spl.wks.in" |