From d58b569f36102bd697ddedeabe302c3b400a01b6 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 30 Dec 2020 11:57:34 +0100 Subject: machines: mx8/mx8x: follow changes in meta-freescale In order to build also with use-mainline-bsp ATF_PLATFORM and IMX_BOOT_SOC_TARGET variable assignments are no longer generically set with SoC override and are now to be set by the machine configurations. Signed-off-by: Max Krummenacher --- conf/machine/apalis-imx8.conf | 3 +++ conf/machine/apalis-imx8x.conf | 3 +++ conf/machine/colibri-imx8x.conf | 3 +++ 3 files changed, 9 insertions(+) (limited to 'conf/machine') diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf index 9506bcf..b207aa7 100644 --- a/conf/machine/apalis-imx8.conf +++ b/conf/machine/apalis-imx8.conf @@ -41,6 +41,8 @@ UBOOT_CONFIG[sd] = "apalis-imx8_defconfig,sdcard" UBOOT_ENTRYPOINT = "0x80280000" UBOOT_RD_LOADADDRESS = "0xA0000000" +ATF_PLATFORM = "imx8qm" + BOOT_SPACE = "65536" IMX_BOOT_SEEK = "32" @@ -60,6 +62,7 @@ MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" MACHINE_FIRMWARE_append = " firmware-imx-8" IMXBOOT_TARGETS = "flash_b0" +IMX_BOOT_SOC_TARGET = "iMX8QM" PREFERRED_PROVIDER_imx-sc-firmware = "imx-sc-firmware-toradex" BOARD_TYPE = "apalis" diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf index ff78ecb..81c227c 100644 --- a/conf/machine/apalis-imx8x.conf +++ b/conf/machine/apalis-imx8x.conf @@ -38,6 +38,8 @@ UBOOT_CONFIG[sd] = "apalis-imx8x_defconfig,sdcard" UBOOT_ENTRYPOINT = "0x80280000" UBOOT_RD_LOADADDRESS = "0xA0000000" +ATF_PLATFORM = "imx8qx" + BOOT_SPACE = "65536" IMX_BOOT_SEEK = "32" @@ -56,6 +58,7 @@ MACHINE_FIRMWARE_append = " linux-firmware-usb8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" IMXBOOT_TARGETS = "flash" +IMX_BOOT_SOC_TARGET = "iMX8QX" PREFERRED_PROVIDER_imx-sc-firmware = "imx-sc-firmware-toradex" BOARD_TYPE = "apalis" diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index 658e9f0..be8c27e 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -41,6 +41,8 @@ UBOOT_CONFIG[sd] = "colibri-imx8x_defconfig,sdcard" UBOOT_ENTRYPOINT = "0x80280000" UBOOT_RD_LOADADDRESS = "0xA0000000" +ATF_PLATFORM = "imx8qx" + BOOT_SPACE = "65536" IMX_BOOT_SEEK = "32" @@ -63,6 +65,7 @@ MACHINE_FIRMWARE_append = " linux-firmware-pcie8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" IMXBOOT_TARGETS = "flash" +IMX_BOOT_SOC_TARGET = "iMX8QX" PREFERRED_PROVIDER_imx-sc-firmware = "imx-sc-firmware-toradex" BOARD_TYPE = "colibri" -- cgit v1.2.3