From 502b903c2a9947549e3564801d149e6455d54406 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 8 Apr 2021 07:29:49 -0500 Subject: imx8dxl-lpddr4-evk: Rework machine for re-use Signed-off-by: Tom Hochstein --- conf/machine/imx8dxl-evk.conf | 67 ------------------------------------ conf/machine/imx8dxl-lpddr4-evk.conf | 18 ++++++++++ conf/machine/include/imx8dxl-evk.inc | 62 +++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 67 deletions(-) delete mode 100644 conf/machine/imx8dxl-evk.conf create mode 100644 conf/machine/imx8dxl-lpddr4-evk.conf create mode 100644 conf/machine/include/imx8dxl-evk.inc diff --git a/conf/machine/imx8dxl-evk.conf b/conf/machine/imx8dxl-evk.conf deleted file mode 100644 index d905f9de..00000000 --- a/conf/machine/imx8dxl-evk.conf +++ /dev/null @@ -1,67 +0,0 @@ -#@TYPE: Machine -#@NAME: i.MX 8DXL EVK -#@DESCRIPTION: i.MX 8DXLite Evaluation Kit (EVK) board -#@MAINTAINER: Lauren Post - -MACHINEOVERRIDES =. "mx8:mx8x:mx8dxl:" - -require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa35.inc - -IMX_DEFAULT_BSP = "nxp" - -MACHINE_FEATURES += "pci bcm43455 bcm4356" -MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" - -# Don't include kernels in standard images -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" - -LOADADDR = "" - -# Disable the serial console due to auto-serial-console -SERIAL_CONSOLES = "115200;ttyLP0" - -# we do not want to have getty running on tty1 as we run -# auto-serial-console there -USE_VT = "0" - -KERNEL_DEVICETREE = "freescale/imx8dxl-evk.dtb" -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ - freescale/imx8dxl-evk-enet0.dtb \ - freescale/imx8dxl-evk-enet0-tja1100.dtb \ - freescale/imx8dxl-evk-inmate.dtb \ - freescale/imx8dxl-evk-lcdif.dtb \ - freescale/imx8dxl-evk-lpspi-slave.dtb \ - freescale/imx8dxl-evk-pcie-ep.dtb \ - freescale/imx8dxl-evk-root.dtb \ - freescale/imx8dxl-evk-rpmsg.dtb \ -" - -ATF_PLATFORM = "imx8dxl" -IMX_BOOT_SOC_TARGET = "iMX8DXL" - -# This machine is not supported by u-boot-fslc, so we force it to use -# u-boot-imx here. -IMX_DEFAULT_BOOTLOADER = "u-boot-imx" - -UBOOT_MAKE_TARGET = "all" -SPL_BINARY = "spl/u-boot-spl.bin" -UBOOT_SUFFIX = "bin" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8dxl_evk_defconfig,sdcard" -UBOOT_CONFIG[fspi] = "imx8dxl_evk_fspi_defconfig" - -IMX_BOOT_SEEK = "32" - -IMXBOOT_TARGETS_SD = \ - "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \ - 'flash', d)}" -IMXBOOT_TARGETS_FSPI = \ - "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl_flexspi', \ - 'flash_flexspi', d)}" -IMXBOOT_TARGETS = \ - "${@bb.utils.contains('UBOOT_CONFIG', 'sd', '${IMXBOOT_TARGETS_SD}', \ - '${IMXBOOT_TARGETS_FSPI}', d)}" - -BOARD_TYPE = "evk" diff --git a/conf/machine/imx8dxl-lpddr4-evk.conf b/conf/machine/imx8dxl-lpddr4-evk.conf new file mode 100644 index 00000000..1ea5260b --- /dev/null +++ b/conf/machine/imx8dxl-lpddr4-evk.conf @@ -0,0 +1,18 @@ +#@TYPE: Machine +#@NAME: i.MX 8DXL EVK with LPDDR4 +#@DESCRIPTION: i.MX 8DXLite Evaluation Kit with LPDDR4 +#@MAINTAINER: Lauren Post + +require conf/machine/include/imx8dxl-evk.inc +KERNEL_DEVICETREE_BASENAME = "imx8dxl-evk" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-enet0.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-enet0-tja1100.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ +" +UBOOT_CONFIG_BASENAME = "imx8dxl_evk" +UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc new file mode 100644 index 00000000..2868b4d6 --- /dev/null +++ b/conf/machine/include/imx8dxl-evk.inc @@ -0,0 +1,62 @@ +MACHINEOVERRIDES =. "mx8:mx8x:mx8dxl:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa35.inc + +IMX_DEFAULT_BSP = "nxp" + +MACHINE_FEATURES += "pci bcm43455 bcm4356" +MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" + +# Don't include kernels in standard images +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" + +LOADADDR = "" + +# Disable the serial console due to auto-serial-console +SERIAL_CONSOLES = "115200;ttyLP0" + +# we do not want to have getty running on tty1 as we run +# auto-serial-console there +USE_VT = "0" + +KERNEL_DEVICETREE = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ +" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ +" + +ATF_PLATFORM = "imx8dxl" +IMX_BOOT_SOC_TARGET = "iMX8DXL" + +# This machine is not supported by u-boot-fslc, so we force it to use +# u-boot-imx here. +IMX_DEFAULT_BOOTLOADER = "u-boot-imx" + +UBOOT_MAKE_TARGET = "all" +SPL_BINARY = "spl/u-boot-spl.bin" +UBOOT_SUFFIX = "bin" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" + +IMX_BOOT_SEEK = "32" + +IMXBOOT_TARGETS_SD = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \ + 'flash', d)}" +IMXBOOT_TARGETS_FSPI = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl_flexspi', \ + 'flash_flexspi', d)}" +IMXBOOT_TARGETS_NAND = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl_nand', \ + 'flash_nand flash_nand_fw', d)}" +IMXBOOT_TARGETS = \ + "${@bb.utils.contains('UBOOT_CONFIG', 'sd', '${IMXBOOT_TARGETS_SD}', \ + bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_FSPI}', \ + bb.utils.contains('UBOOT_CONFIG', 'nand', '${IMXBOOT_TARGETS_NAND}', \ + 'INVALID', d), d), d)}" + + +BOARD_TYPE = "evk" -- cgit v1.2.3-54-g00ecf