diff options
Diffstat (limited to 'bsp/meta-freescale/conf/machine')
56 files changed, 578 insertions, 552 deletions
diff --git a/bsp/meta-freescale/conf/machine/imx25pdk.conf b/bsp/meta-freescale/conf/machine/imx25pdk.conf index e22d9f4e..9e8ad003 100644 --- a/bsp/meta-freescale/conf/machine/imx25pdk.conf +++ b/bsp/meta-freescale/conf/machine/imx25pdk.conf @@ -13,7 +13,7 @@ UBOOT_MACHINE ?= "mx25pdk_defconfig" KERNEL_DEVICETREE = "imx25-pdk.dtb" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" diff --git a/bsp/meta-freescale/conf/machine/imx28evk.conf b/bsp/meta-freescale/conf/machine/imx28evk.conf index 937fd143..7c359e54 100644 --- a/bsp/meta-freescale/conf/machine/imx28evk.conf +++ b/bsp/meta-freescale/conf/machine/imx28evk.conf @@ -18,7 +18,7 @@ UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard" KERNEL_DEVICETREE = "imx28-evk.dtb" -SERIAL_CONSOLE = "115200 ttyAMA0" +SERIAL_CONSOLES = "115200;ttyAMA0" MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" diff --git a/bsp/meta-freescale/conf/machine/imx6qdlsabreauto.conf b/bsp/meta-freescale/conf/machine/imx6qdlsabreauto.conf index 71b1cf88..16c1dcb6 100644 --- a/bsp/meta-freescale/conf/machine/imx6qdlsabreauto.conf +++ b/bsp/meta-freescale/conf/machine/imx6qdlsabreauto.conf @@ -38,9 +38,9 @@ UBOOT_MACHINE ?= "mx6sabreauto_defconfig" UBOOT_MAKE_TARGET = "all" UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" -WKS_FILE = "imx-uboot-spl-bootpart.wks" +WKS_FILE = "imx-uboot-spl-bootpart.wks.in" -SERIAL_CONSOLE = "115200 ttymxc3" +SERIAL_CONSOLES = "115200;ttymxc3" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" diff --git a/bsp/meta-freescale/conf/machine/imx6qdlsabresd.conf b/bsp/meta-freescale/conf/machine/imx6qdlsabresd.conf index a8407e28..2fe95dc6 100644 --- a/bsp/meta-freescale/conf/machine/imx6qdlsabresd.conf +++ b/bsp/meta-freescale/conf/machine/imx6qdlsabresd.conf @@ -17,14 +17,23 @@ require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa9.inc KERNEL_DEVICETREE = " \ - imx6qp-sabresd.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb \ - imx6qp-sabresd-ldo.dtb imx6qp-sabresd-ldo-pcie-cert.dtb \ - \ - imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \ - imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb \ - \ - imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \ - imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb \ + imx6qp-sabresd-btwifi.dtb \ + imx6qp-sabresd.dtb \ + imx6qp-sabresd-hdcp.dtb \ + imx6qp-sabresd-ldo.dtb \ + \ + imx6q-sabresd-btwifi.dtb \ + imx6q-sabresd.dtb \ + imx6q-sabresd-enetirq.dtb \ + imx6q-sabresd-hdcp.dtb \ + imx6q-sabresd-ldo.dtb \ + imx6q-sabresd-uart.dtb \ + \ + imx6dl-sabresd-btwifi.dtb \ + imx6dl-sabresd.dtb \ + imx6dl-sabresd-enetirq.dtb \ + imx6dl-sabresd-hdcp.dtb \ + imx6dl-sabresd-ldo.dtb \ " KERNEL_DEVICETREE_use-mainline-bsp = " \ imx6qp-sabresd.dtb \ @@ -38,9 +47,9 @@ UBOOT_MACHINE ?= "mx6sabresd_defconfig" UBOOT_MAKE_TARGET = "all" UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" -WKS_FILE = "imx-uboot-spl-bootpart.wks" +WKS_FILE = "imx-uboot-spl-bootpart.wks.in" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" diff --git a/bsp/meta-freescale/conf/machine/imx6slevk.conf b/bsp/meta-freescale/conf/machine/imx6slevk.conf index ffcbaaa7..5d81272f 100644 --- a/bsp/meta-freescale/conf/machine/imx6slevk.conf +++ b/bsp/meta-freescale/conf/machine/imx6slevk.conf @@ -19,7 +19,7 @@ UBOOT_CONFIG[epdc] = "mx6slevk_epdc_config" UBOOT_CONFIG[spinor] = "mx6slevk_spinor_config" UBOOT_CONFIG[mfgtool] = "mx6slevk_config" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/bsp/meta-freescale/conf/machine/imx6sllevk.conf b/bsp/meta-freescale/conf/machine/imx6sllevk.conf index 84d1e319..478d1bbd 100644 --- a/bsp/meta-freescale/conf/machine/imx6sllevk.conf +++ b/bsp/meta-freescale/conf/machine/imx6sllevk.conf @@ -1,24 +1,22 @@ #@TYPE: Machine -#@NAME: Freescale i.MX6SLL Evaluation Kit +#@NAME: NXP i.MX6SLL Evaluation Kit #@SOC: i.MX6SLL -#@DESCRIPTION: Machine configuration for Freescale i.MX6SLL EVK -#@MAINTAINER: Lauren Post lauren.post@nxp.com +#@DESCRIPTION: Machine configuration for NXP i.MX6SLL EVK +#@MAINTAINER: Alexandru Palalau ioan-alexandru.palalau@nxp.com MACHINEOVERRIDES =. "mx6:mx6sll:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc -MACHINE_FIRMWARE_append = " firmware-imx-epdc firmware-imx-brcm" - -KERNEL_DEVICETREE = "imx6sll-evk.dtb imx6sll-evk-btwifi.dtb" +KERNEL_DEVICETREE = "imx6sll-evk.dtb imx6sll-evk-btwifi.dtb imx6sll-evk-reva.dtb" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6sllevk_config,sdcard" UBOOT_CONFIG[epdc] = "mx6sllevk_epdc_config" UBOOT_CONFIG[mfgtool] = "mx6sllevk_config" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/bsp/meta-freescale/conf/machine/imx6sxsabreauto.conf b/bsp/meta-freescale/conf/machine/imx6sxsabreauto.conf index ca5c9746..1bdb1080 100644 --- a/bsp/meta-freescale/conf/machine/imx6sxsabreauto.conf +++ b/bsp/meta-freescale/conf/machine/imx6sxsabreauto.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6:mx6sx:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa9.inc -KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb" +KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb" KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sabreauto.dtb" PREFERRED_PROVIDER_u-boot = "u-boot-imx" @@ -21,7 +21,7 @@ UBOOT_CONFIG[qspi1] = "mx6sxsabreauto_qspi1_config" UBOOT_CONFIG[nand] = "mx6sxsabreauto_nand_config,ubifs" UBOOT_CONFIG[mfgtool] = "mx6sxsabreauto_config" -SERIAL_CONSOLE = "115200 ttymxc3" +SERIAL_CONSOLES = "115200;ttymxc3" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" diff --git a/bsp/meta-freescale/conf/machine/imx6sxsabresd.conf b/bsp/meta-freescale/conf/machine/imx6sxsabresd.conf index 3a969e4a..5793a0b0 100644 --- a/bsp/meta-freescale/conf/machine/imx6sxsabresd.conf +++ b/bsp/meta-freescale/conf/machine/imx6sxsabresd.conf @@ -22,7 +22,7 @@ UBOOT_CONFIG[qspi2] = "mx6sxsabresd_qspi2_config" UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config" UBOOT_CONFIG[mfgtool] = "mx6sxsabresd_config" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" diff --git a/bsp/meta-freescale/conf/machine/imx6ulevk.conf b/bsp/meta-freescale/conf/machine/imx6ulevk.conf index 01ebce6f..18b6b04b 100644 --- a/bsp/meta-freescale/conf/machine/imx6ulevk.conf +++ b/bsp/meta-freescale/conf/machine/imx6ulevk.conf @@ -2,7 +2,7 @@ #@NAME: NXP i.MX6UL Evaluation Kit #@SOC: i.MX6UL #@DESCRIPTION: Machine configuration for NXP i.MX6UL EVK -#@MAINTAINER: Lauren Post <lauren.post@nxp.com> +#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com> MACHINEOVERRIDES =. "mx6:mx6ul:" @@ -11,16 +11,23 @@ include conf/machine/include/tune-cortexa7.inc MACHINE_FEATURES += " pci wifi bluetooth" -KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14-evk-btwifi.dtb \ - imx6ul-14x14-evk-gpmi-weim.dtb imx6ul-14x14-evk-usb-certi.dtb \ - imx6ul-14x14-evk-emmc.dtb " +KERNEL_DEVICETREE = " \ + imx6ul-14x14-evk-btwifi.dtb \ + imx6ul-14x14-evk-btwifi-oob.dtb \ + imx6ul-14x14-evk-csi.dtb \ + imx6ul-14x14-evk.dtb \ + imx6ul-14x14-evk-ecspi.dtb \ + imx6ul-14x14-evk-ecspi-slave.dtb \ + imx6ul-14x14-evk-emmc.dtb \ + imx6ul-14x14-evk-gpmi-weim.dtb \ +" KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb" # Use fslc u-boot by default. See also imx-base.inc. UBOOT_MAKE_TARGET = "" UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" -WKS_FILE = "imx-uboot-spl-bootpart.wks" +WKS_FILE = "imx-uboot-spl-bootpart.wks.in" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard" diff --git a/bsp/meta-freescale/conf/machine/imx6ullevk.conf b/bsp/meta-freescale/conf/machine/imx6ullevk.conf index 7cf9c328..1b31c2f7 100644 --- a/bsp/meta-freescale/conf/machine/imx6ullevk.conf +++ b/bsp/meta-freescale/conf/machine/imx6ullevk.conf @@ -1,24 +1,29 @@ #@TYPE: Machine -#@NAME: Freescale i.MX6ULL Evaluation Kit +#@NAME: NXP i.MX6ULL Evaluation Kit #@SOC: i.MX6ULL -#@DESCRIPTION: Machine configuration for Freescale i.MX6ULL EVK -#@MAINTAINER: Daiane Angolini <daiane.angolini@nxp.com> +#@DESCRIPTION: Machine configuration for NXP i.MX6ULL EVK +#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com> MACHINEOVERRIDES =. "mx6:mx6ull:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa7.inc -KERNEL_DEVICETREE = "imx6ull-14x14-evk.dtb imx6ull-14x14-evk-btwifi.dtb" +KERNEL_DEVICETREE = " \ + imx6ull-14x14-evk.dtb \ +" + +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + imx6ull-14x14-evk-btwifi.dtb \ + imx6ull-14x14-evk-btwifi-oob.dtb \ + imx6ull-14x14-evk-emmc.dtb \ + imx6ull-14x14-evk-gpmi-weim.dtb \ +" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6ull_14x14_evk_config,sdcard" UBOOT_CONFIG[mfgtool] = "mx6ull_14x14_evk_config" -PREFERRED_PROVIDER_u-boot = "u-boot-imx" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" -PREFERRED_PROVIDER_virtual/kernel = "linux-imx" - -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FEATURES += "wifi bluetooth" diff --git a/bsp/meta-freescale/conf/machine/imx7dsabresd.conf b/bsp/meta-freescale/conf/machine/imx7dsabresd.conf index be9a6703..84de3862 100644 --- a/bsp/meta-freescale/conf/machine/imx7dsabresd.conf +++ b/bsp/meta-freescale/conf/machine/imx7dsabresd.conf @@ -11,11 +11,17 @@ require conf/machine/include/tune-cortexa7.inc MACHINE_FEATURES += " pci wifi bluetooth" -KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \ - imx7d-sdb-m4.dtb imx7d-sdb-mipi-dsi.dtb imx7d-sdb-qspi.dtb \ - imx7d-sdb-reva.dtb imx7d-sdb-reva-epdc.dtb imx7d-sdb-reva-gpmi-weim.dtb \ - imx7d-sdb-reva-hdmi-audio.dtb imx7d-sdb-reva-m4.dtb imx7d-sdb-reva-qspi.dtb \ - imx7d-sdb-reva-touch.dtb imx7d-sdb-reva-wm8960.dtb" +KERNEL_DEVICETREE = " \ + imx7d-sdb.dtb \ + imx7d-sdb-epdc.dtb \ + imx7d-sdb-gpmi-weim.dtb \ + imx7d-sdb-m4.dtb \ + imx7d-sdb-mipi-dsi.dtb \ + imx7d-sdb-qspi.dtb \ + imx7d-sdb-reva.dtb \ + imx7d-sdb-sht11.dtb \ +" + KERNEL_DEVICETREE_use-mainline-bsp = "imx7d-sdb.dtb" UBOOT_CONFIG ??= "sd" @@ -25,4 +31,3 @@ UBOOT_CONFIG[nand] = "mx7dsabresd_nand_config,ubifs" UBOOT_CONFIG[epdc] = "mx7dsabresd_epdc_config" UBOOT_CONFIG[mfgtool] = "mx7dsabresd_config" -MACHINE_EXTRA_RRECOMMENDS += "firmware-imx-brcm" diff --git a/bsp/meta-freescale/conf/machine/imx7ulpevk.conf b/bsp/meta-freescale/conf/machine/imx7ulpevk.conf index d077de74..d9d2a559 100644 --- a/bsp/meta-freescale/conf/machine/imx7ulpevk.conf +++ b/bsp/meta-freescale/conf/machine/imx7ulpevk.conf @@ -2,26 +2,34 @@ #@NAME: NXP i.MX7ULP Evaluation Kit #@SOC: i.MX7ULP #@DESCRIPTION: Machine configuration for NXP i.MX7ULP EVK -#@MAINTAINER: Lauren Post <Lauren.Post@nxp.com> +#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com> + +MACHINEOVERRIDES =. "mx7:mx7ulp:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa7.inc -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += " pci wifi bluetooth qca9377" -MACHINEOVERRIDES =. "mx7:mx7ulp:" - -KERNEL_DEVICETREE = "imx7ulp-evk.dtb imx7ulp-evk-emmc.dtb imx7ulp-evk-emmc-qspi.dtb imx7ulp-evk-ft5416.dtb imx7ulp-evk-mipi.dtb" -KERNEL_DEVICETREE += "imx7ulp-evk-lpuart.dtb imx7ulp-evk-qspi.dtb imx7ulp-evk-sd1.dtb imx7ulp-evk-sensors-to-i2c5.dtb" -KERNEL_DEVICETREE += "imx7ulp-evk-wm8960.dtb" +KERNEL_DEVICETREE = " \ + imx7ulp-evkb.dtb \ + imx7ulp-evkb-emmc.dtb \ + imx7ulp-evkb-lpuart.dtb \ + imx7ulp-evkb-mipi.dtb \ + imx7ulp-evkb-rm68191-qhd.dtb \ + imx7ulp-evkb-rm68200-wxga.dtb \ + imx7ulp-evkb-sd1.dtb \ + imx7ulp-evkb-sensors-to-i2c5.dtb \ + imx7ulp-evkb-spi-slave.dtb \ + imx7ulp-evk.dtb \ + imx7ulp-evk-ft5416.dtb \ + imx7ulp-evk-mipi.dtb \ +" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx7ulp_evk_config,sdcard" UBOOT_CONFIG[emmc] = "mx7ulp_evk_emmc_config,sdcard" UBOOT_CONFIG[mfgtool] = "mx7ulp_evk_config" -# Install brcm firmware -MACHINE_FIRMWARE_append = " firmware-imx-brcm" - # Set Serial console -SERIAL_CONSOLE = "115200 ttyLP0" +SERIAL_CONSOLES = "115200;ttyLP0" diff --git a/bsp/meta-freescale/conf/machine/imx8mmevk.conf b/bsp/meta-freescale/conf/machine/imx8mmevk.conf index 44b3249f..2a2893e6 100644 --- a/bsp/meta-freescale/conf/machine/imx8mmevk.conf +++ b/bsp/meta-freescale/conf/machine/imx8mmevk.conf @@ -1,28 +1,32 @@ #@TYPE: Machine -#@NAME: NXP i.MX 8M Mini Evaluation Kit +#@NAME: NXP i.MX8MM LPDDR4 Evaluation Kit and i.MX8MM DDR4 Evaluation Kit #@SOC: i.MX8MM -#@DESCRIPTION: Machine configuration for NXP i.MX 8M Mini EVK +#@DESCRIPTION: Machine configuration for NXP i.MX8MMini LPDDR4 EVK and i.MX8MMini DDR4 EVK #@MAINTAINER: Jun Zhu <junzhu@nxp.com> MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:" require conf/machine/include/imx-base.inc -require conf/machine/include/arm/arch-arm64.inc - -MACHINE_FEATURES += " pci wifi bluetooth optee qca9377 qca6174" - -KERNEL_DEVICETREE = "freescale/fsl-imx8mm-evk.dtb " -KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-ak4497.dtb freescale/fsl-imx8mm-evk-ak5558.dtb " -KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-audio-tdm.dtb " -KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-inmate.dtb " -KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-m4.dtb " -KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-rm67191.dtb " -KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-root.dtb" - -IMAGE_BOOTFILES += "imx8mm_m4_TCM_hello_world.bin \ - imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \ - imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin \ - imx8mm_m4_TCM_sai_low_power_audio.bin \ +require conf/machine/include/tune-cortexa53.inc + +IMX_DEFAULT_BSP = "nxp" + +MACHINE_FEATURES += " pci wifi bluetooth optee qca9377" + +KERNEL_DEVICETREE = " \ + freescale/imx8mm-ddr4-evk.dtb \ + freescale/imx8mm-ddr4-evk-revb.dtb \ + freescale/imx8mm-ddr4-evk-revb-rm67191.dtb \ + freescale/imx8mm-ddr4-evk-rm67191.dtb \ + freescale/imx8mm-evk-ak4497.dtb \ + freescale/imx8mm-evk-ak5558.dtb \ + freescale/imx8mm-evk-audio-tdm.dtb \ + freescale/imx8mm-evk.dtb \ + freescale/imx8mm-evk-inmate.dtb \ + freescale/imx8mm-evk-revb.dtb \ + freescale/imx8mm-evk-rm67191.dtb \ + freescale/imx8mm-evk-root.dtb \ + freescale/imx8mm-evk-rpmsg.dtb \ " UBOOT_CONFIG ??= "sd" @@ -41,12 +45,10 @@ UBOOT_DTB_NAME = "fsl-imx8mm-evk.dtb" IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" # Set Serial console -SERIAL_CONSOLE = "115200 ttymxc1" +SERIAL_CONSOLES = "115200;ttymxc1" IMAGE_BOOTLOADER = "imx-boot" -BOOT_SPACE = "65536" - LOADADDR = "" UBOOT_SUFFIX = "bin" UBOOT_MAKE_TARGET = "" diff --git a/bsp/meta-freescale/conf/machine/imx8mnevk.conf b/bsp/meta-freescale/conf/machine/imx8mnevk.conf new file mode 100644 index 00000000..adf80ea8 --- /dev/null +++ b/bsp/meta-freescale/conf/machine/imx8mnevk.conf @@ -0,0 +1,61 @@ +#@TYPE: Machine +#@NAME: NXP i.MX8M Nano DDR4 Evaluation Kit +#@SOC: i.MX8MM +#@DESCRIPTION: Machine configuration for NXP i.MX8M Nano DDR4 EVK +#@MAINTAINER: Andrey Zhizhikin <andrey.z@gmail.com> + +MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa53.inc + +IMX_DEFAULT_BSP = "nxp" + +MACHINE_FEATURES += "wifi bluetooth optee bcm43455" + +KERNEL_DEVICETREE = " \ + freescale/imx8mn-ddr4-evk-ak5558.dtb \ + freescale/imx8mn-ddr4-evk.dtb \ + freescale/imx8mn-ddr4-evk-inmate.dtb \ + freescale/imx8mn-ddr4-evk-rm67191.dtb \ + freescale/imx8mn-ddr4-evk-root.dtb \ + freescale/imx8mn-ddr4-evk-rpmsg.dtb \ + freescale/imx8mn-evk.dtb \ + freescale/imx8mn-evk-rm67191.dtb \ +" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "imx8mn_ddr4_evk_defconfig,sdcard" +UBOOT_CONFIG[mfgtool] = "imx8mn_ddr4_evk_defconfig" +SPL_BINARY = "spl/u-boot-spl.bin" + +# Set DDR FIRMWARE +DDR_FIRMWARE_NAME = "ddr4_imem_1d_201810.bin \ + ddr4_dmem_1d_201810.bin \ + ddr4_imem_2d_201810.bin \ + ddr4_dmem_2d_201810.bin" + +# Set u-boot DTB +UBOOT_DTB_NAME = "fsl-imx8mn-ddr4-evk.dtb" + +# Set imx-mkimage boot target +IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_ddr4_evk_flexspi', 'flash_ddr4_evk', d)}" + +# Set Serial console +SERIAL_CONSOLES = "115200;ttymxc1" + +IMAGE_BOOTLOADER = "imx-boot" +BOOT_SPACE = "65536" +LOADADDR = "" +UBOOT_SUFFIX = "bin" +UBOOT_MAKE_TARGET = "" + +# Image boot offset as defined in section 6.1.6.1 "Primary image offset and IVT offset" of +# i.MX 8M Nano Applications Processor Reference Manual, Rev. 0, 12/2019 +# Doc ID: IMX8MNRM +IMX_BOOT_SEEK = "32" + +OPTEE_BIN_EXT = "8mn" + +# Add additional firmware +MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/bsp/meta-freescale/conf/machine/imx8mqevk.conf b/bsp/meta-freescale/conf/machine/imx8mqevk.conf index 8ddb03cb..40794c35 100644 --- a/bsp/meta-freescale/conf/machine/imx8mqevk.conf +++ b/bsp/meta-freescale/conf/machine/imx8mqevk.conf @@ -2,26 +2,35 @@ #@NAME: NXP i.MX8MQ Evaluation Kit #@SOC: i.MX8MQ #@DESCRIPTION: Machine configuration for NXP i.MX8MQ EVK -#@MAINTAINER: Jun Zhu <junzhu@nxp.com> +#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.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" MACHINE_FEATURES += "pci wifi bluetooth optee qca6174" MACHINE_SOCARCH_FILTER_append_mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" -KERNEL_DEVICETREE = "freescale/fsl-imx8mq-evk.dtb freescale/fsl-imx8mq-evk-ak4497.dtb " -KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-audio-tdm.dtb" -KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-dcss-adv7535.dtb freescale/fsl-imx8mq-evk-dcss-rm67191.dtb" -KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-dual-display.dtb freescale/fsl-imx8mq-evk-drm.dtb " -KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-lcdif-adv7535.dtb" -KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-m4.dtb freescale/fsl-imx8mq-evk-mipi-csi2.dtb" -KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-pcie1-m2.dtb freescale/fsl-imx8mq-evk-pdm.dtb" - -IMAGE_BOOTFILES += "imx8mq_m4_TCM_hello_world.bin imx8mq_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin imx8mq_m4_TCM_rpmsg_lite_str_echo_rtos.bin" +KERNEL_DEVICETREE = " \ + freescale/imx8mq-evk-ak4497.dtb \ + freescale/imx8mq-evk-audio-tdm.dtb \ + freescale/imx8mq-evk-dcss-adv7535.dtb \ + freescale/imx8mq-evk-dcss-rm67191.dtb \ + freescale/imx8mq-evk-dp.dtb \ + freescale/imx8mq-evk.dtb \ + freescale/imx8mq-evk-dual-display.dtb \ + freescale/imx8mq-evk-inmate.dtb \ + freescale/imx8mq-evk-lcdif-adv7535.dtb \ + freescale/imx8mq-evk-lcdif-rm67191.dtb \ + freescale/imx8mq-evk-pcie1-m2.dtb \ + freescale/imx8mq-evk-pdm.dtb \ + freescale/imx8mq-evk-root.dtb \ + freescale/imx8mq-evk-rpmsg.dtb \ +" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "imx8mq_evk_config,sdcard" @@ -35,15 +44,13 @@ DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin l UBOOT_DTB_NAME = "fsl-imx8mq-evk.dtb" # Set imx-mkimage boot target -IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi" +IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk" # Set Serial console -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" IMAGE_BOOTLOADER = "imx-boot" -BOOT_SPACE = "65536" - LOADADDR = "" UBOOT_SUFFIX = "bin" UBOOT_MAKE_TARGET = "" @@ -53,3 +60,10 @@ OPTEE_BIN_EXT = "8mq" # Add additional firmware MACHINE_FIRMWARE_append = " linux-firmware-ath10k" + +# Use gstreamer 1.16 from meta-freescale +PREFERRED_VERSION_gstreamer1.0 ?= "1.16.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.16.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.16.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.16.imx" +PREFERRED_VERSION_gstreamer1.0-libav ?= "1.16.0" diff --git a/bsp/meta-freescale/conf/machine/imx8qmmek.conf b/bsp/meta-freescale/conf/machine/imx8qmmek.conf index e1f26b44..c92e5fd2 100644 --- a/bsp/meta-freescale/conf/machine/imx8qmmek.conf +++ b/bsp/meta-freescale/conf/machine/imx8qmmek.conf @@ -1,12 +1,14 @@ #@TYPE: Machine #@NAME: i.MX 8QM MEK #@DESCRIPTION: i.MX 8QuadMax MEK board -#@MAINTAINER: Jun Zhu <junzhu@nxp.com> +#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com> MACHINEOVERRIDES =. "mx8:mx8qm:" require conf/machine/include/imx-base.inc -require conf/machine/include/arm/arch-arm64.inc +require conf/machine/include/tune-cortexa72-cortexa53.inc + +IMX_DEFAULT_BSP = "nxp" MACHINE_FEATURES_append = " qca6174" @@ -16,21 +18,28 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" # We have to disable SERIAL_CONSOLE due to auto-serial-console -SERIAL_CONSOLE = "115200 ttyAMA0" +SERIAL_CONSOLES = "115200;ttyAMA0" # we do not want to have getty running on tty1 as we run # auto-serial-console there USE_VT = "0" -KERNEL_DEVICETREE = "freescale/fsl-imx8qm-mek.dtb" -KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek_ca53.dtb freescale/fsl-imx8qm-mek_ca72.dtb " -KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek-8cam.dtb " -KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek-hdmi.dtb " -KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek-jdi-wuxga-lvds1-panel.dtb freescale/fsl-imx8qm-mek-dsi-rm67191.dtb" -KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek-mipi-ov5640.dtb freescale/fsl-imx8qm-mek-mipi-two-ov5640.dtb" -KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek-enet2-tja1100.dtb " -KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek-dom0.dtb freescale/fsl-imx8qm-mek-domu.dtb" -KERNEL_DEVICETREE += "freescale/fsl-imx8qp-lpddr4-arm2.dtb" +KERNEL_DEVICETREE = " \ + freescale/imx8qm-mek-ca53.dtb \ + freescale/imx8qm-mek-ca72.dtb \ + freescale/imx8qm-mek-dom0.dtb \ + freescale/imx8qm-mek-domu.dtb \ + freescale/imx8qm-mek-dsi-rm67191.dtb \ + freescale/imx8qm-mek-dsp.dtb \ + freescale/imx8qm-mek.dtb \ + freescale/imx8qm-mek-enet2-tja1100.dtb \ + freescale/imx8qm-mek-hdmi.dtb \ + freescale/imx8qm-mek-inmate.dtb \ + freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ + freescale/imx8qm-mek-ov5640.dtb \ + freescale/imx8qm-mek-root.dtb \ + freescale/imx8qm-mek-rpmsg.dtb \ +" UBOOT_MAKE_TARGET = "u-boot.bin" UBOOT_SUFFIX = "bin" @@ -39,12 +48,15 @@ UBOOT_CONFIG[sd] = "imx8qm_mek_defconfig,sdcard" UBOOT_CONFIG[fspi] = "imx8qm_mek_fspi_defconfig" UBOOT_CONFIG[mfgtool] = "imx8qm_mek_defconfig" -BOOT_SPACE = "65536" IMAGE_BOOTLOADER = "imx-boot" IMX_BOOT_SEEK = "33" -IMAGE_BOOTFILES_DEPENDS += "firmware-imx:do_deploy" -IMAGE_BOOTFILES += "hdmitxfw.bin hdmirxfw.bin dpfw.bin" +WKS_FILE_DEPENDS_append = " firmware-imx-8" +IMAGE_BOOT_FILES += "hdmitxfw.bin hdmirxfw.bin dpfw.bin" + +IMXBOOT_TARGETS = \ + "${@bb.utils.contains('UBOOT_CONFIG', 'sd', 'flash', \ + 'flash_flexspi', d)}" BOARD_TYPE = "mek" diff --git a/bsp/meta-freescale/conf/machine/imx8qxpmek.conf b/bsp/meta-freescale/conf/machine/imx8qxpmek.conf index 2ffbcacc..bdce4b68 100644 --- a/bsp/meta-freescale/conf/machine/imx8qxpmek.conf +++ b/bsp/meta-freescale/conf/machine/imx8qxpmek.conf @@ -1,11 +1,14 @@ #@TYPE: Machine #@NAME: i.MX 8QXP MEK -#@DESCRIPTION: i.MX 8QXP MEK board +#@DESCRIPTION: i.MX 8QXP Multisensory Enablement Kit (MEK) board +#@MAINTAINER: Cristinel Panfir <cristinel.panfir@nxp.com> MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:" require conf/machine/include/imx-base.inc -require conf/machine/include/arm/arch-arm64.inc +require conf/machine/include/tune-cortexa35.inc + +IMX_DEFAULT_BSP = "nxp" MACHINE_FEATURES_append = " qca6174" @@ -15,17 +18,31 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" # We have to disable SERIAL_CONSOLE due to auto-serial-console -SERIAL_CONSOLE = "115200 ttyAMA0" +SERIAL_CONSOLES = "115200;ttyAMA0" # we do not want to have getty running on tty1 as we run # auto-serial-console there USE_VT = "0" -KERNEL_DEVICETREE = "freescale/fsl-imx8qxp-mek.dtb freescale/fsl-imx8qxp-mek-dom0.dtb" -KERNEL_DEVICETREE += "freescale/fsl-imx8qxp-mek-dsi-rm67191.dtb" -KERNEL_DEVICETREE += "freescale/fsl-imx8qxp-mek-enet2.dtb freescale/fsl-imx8qxp-mek-enet2-tja1100.dtb" -KERNEL_DEVICETREE += "freescale/fsl-imx8qxp-mek-csi.dtb" -KERNEL_DEVICETREE += "freescale/fsl-imx8qxp-mek-mipi-ov5640.dtb freescale/fsl-imx8qxp-mek-ov5640.dtb" +KERNEL_DEVICETREE = " \ + freescale/imx8qxp-mek-a0.dtb \ + freescale/imx8qxp-mek-dom0.dtb \ + freescale/imx8qxp-mek-dsi-rm67191.dtb \ + freescale/imx8qxp-mek-dsp.dtb \ + freescale/imx8qxp-mek.dtb \ + freescale/imx8qxp-mek-enet2.dtb \ + freescale/imx8qxp-mek-enet2-tja1100.dtb \ + freescale/imx8qxp-mek-inmate.dtb \ + freescale/imx8qxp-mek-it6263-lvds0-dual-channel.dtb \ + freescale/imx8qxp-mek-it6263-lvds1-dual-channel.dtb \ + freescale/imx8qxp-mek-jdi-wuxga-lvds0-panel.dtb \ + freescale/imx8qxp-mek-jdi-wuxga-lvds1-panel.dtb \ + freescale/imx8qxp-mek-ov5640.dtb \ + freescale/imx8qxp-mek-root.dtb \ + freescale/imx8qxp-mek-rpmsg.dtb \ + freescale/imx8qxp-mek-sof-cs42888.dtb \ + freescale/imx8qxp-mek-sof-wm8960.dtb \ +" UBOOT_MAKE_TARGET = "u-boot.bin" UBOOT_SUFFIX = "bin" @@ -33,10 +50,14 @@ UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "imx8qxp_mek_config,sdcard" UBOOT_CONFIG[fspi] = "imx8qxp_mek_fspi_defconfig" -BOOT_SPACE = "65536" IMAGE_BOOTLOADER = "imx-boot" IMX_BOOT_SEEK = "32" +IMXBOOT_TARGETS = \ + "${@bb.utils.contains('UBOOT_CONFIG', 'sd', 'flash', \ + bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \ + 'UNKNOWN', d), d)}" + BOARD_TYPE = "mek" # Add additional firmware diff --git a/bsp/meta-freescale/conf/machine/include/imx-base.inc b/bsp/meta-freescale/conf/machine/include/imx-base.inc index 20f861f2..4be14fb1 100644 --- a/bsp/meta-freescale/conf/machine/include/imx-base.inc +++ b/bsp/meta-freescale/conf/machine/include/imx-base.inc @@ -9,12 +9,30 @@ require conf/machine/include/utilities.inc IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" IMX_DEFAULT_BOOTLOADER_mx8 = "u-boot-imx" +# Machines or distros can define which BSP it should use by default. We are +# intending to default for mainline BSP by default and specific machines or +# DISTROs might change it if need. +# +# Two values are considered valid: mainline, nxp +IMX_DEFAULT_BSP ?= "mainline" + +# Those are SoC families we'd like to force the use of mainline BSP. +IMX_DEFAULT_BSP_mxs ?= "mainline" +IMX_DEFAULT_BSP_mx5 ?= "mainline" + +MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:" + PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" +PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" +PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-${IMX_DEFAULT_BOOTLOADER}-tools" +PREFERRED_PROVIDER_u-boot-mkimage-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" +PREFERRED_PROVIDER_nativesdk-u-boot-mkimage ??= "nativesdk-${IMX_DEFAULT_BOOTLOADER}-tools" PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" -UBOOT_MAKE_TARGET ?= "u-boot.imx" +UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" +UBOOT_MAKE_TARGET ?= "u-boot.${UBOOT_SUFFIX}" UBOOT_MAKE_TARGET_mxs ?= "u-boot.sb" UBOOT_MAKE_TARGET_mx8 ?= "" @@ -32,6 +50,9 @@ UBOOT_ENTRYPOINT_mx6sx = "0x80008000" UBOOT_ENTRYPOINT_mx6ul = "0x10008000" UBOOT_ENTRYPOINT_mx6ull = "0x10008000" UBOOT_ENTRYPOINT_mx7 = "0x80008000" +UBOOT_ENTRYPOINT_mx7ulp = "0x60008000" +UBOOT_ENTRYPOINT_mx8mm = "0x40480000" +UBOOT_ENTRYPOINT_mx8mn = "0x40480000" UBOOT_ENTRYPOINT_mx8mq = "0x40480000" UBOOT_ENTRYPOINT_vf = "0x80008000" @@ -55,11 +76,17 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" # handled by software # DEFAULTTUNE_mx6 ?= "cortexa9t-neon" # handled by hardware -DEFAULTTUNE_mx6 ?= "cortexa9thf-neon" -DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon" +DEFAULTTUNE_mx6 ?= "cortexa9thf-neon" +DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon" DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon" -DEFAULTTUNE_mx7 ?= "cortexa7thf-neon" -DEFAULTTUNE_vf ?= "cortexa5thf-neon" +DEFAULTTUNE_mx7 ?= "cortexa7thf-neon" +DEFAULTTUNE_vf ?= "cortexa5thf-neon" + +DEFAULTTUNE_mx8mm ?= "cortexa53-crypto" +DEFAULTTUNE_mx8mn ?= "cortexa53-crypto" +DEFAULTTUNE_mx8mq ?= "cortexa53-crypto" +DEFAULTTUNE_mx8qm ?= "cortexa72-cortexa53-crypto" +DEFAULTTUNE_mx8qxp ?= "cortexa35-crypto" INHERIT += "machine-overrides-extender" @@ -75,10 +102,13 @@ MACHINEOVERRIDES_EXTENDER_mx7d = "imxfbdev:imxpxp:imxepdc" MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER_mx8mn = "imxdrm:imxgpu:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ + imx \ + \ mx6 \ mx6q \ mx6dl \ @@ -95,16 +125,13 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ mx8 \ mx8qm \ mx8mm \ + mx8mn \ mx8mq \ mx8qxp \ " # Sub-architecture support MACHINE_SOCARCH_SUFFIX ?= "" -MACHINE_SOCARCH_SUFFIX_mx23 = "-mxs" -MACHINE_SOCARCH_SUFFIX_mx28 = "-mxs" -MACHINE_SOCARCH_SUFFIX_mx51 = "-mx5" -MACHINE_SOCARCH_SUFFIX_mx53 = "-mx5" MACHINE_SOCARCH_SUFFIX_mx6q = "-mx6qdl" MACHINE_SOCARCH_SUFFIX_mx6dl = "-mx6qdl" MACHINE_SOCARCH_SUFFIX_mx6sx = "-mx6sx" @@ -118,6 +145,7 @@ MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul" MACHINE_SOCARCH_SUFFIX_mx8qm = "-mx8" MACHINE_SOCARCH_SUFFIX_mx8mm = "-mx8mm" +MACHINE_SOCARCH_SUFFIX_mx8mn = "-mx8mn" MACHINE_SOCARCH_SUFFIX_mx8mq = "-mx8m" MACHINE_SOCARCH_SUFFIX_mx8qxp = "-mx8" MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx" @@ -125,6 +153,7 @@ MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx" MACHINE_ARCH_FILTER = "virtual/kernel" MACHINE_SOCARCH_FILTER_append_imx = " \ alsa-lib \ + gstreamer1.0 \ weston \ " MACHINE_SOCARCH_FILTER_append_imxvpu = " \ @@ -140,7 +169,6 @@ MACHINE_SOCARCH_FILTER_append_imxgpu = " \ virtual/libopenvg \ libdrm \ cairo \ - gstreamer1.0-plugins-bad \ libgal-imx \ pango \ " @@ -207,13 +235,31 @@ MACHINE_FIRMWARE_append_use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" # Extra audio support -MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append_mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append_mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" +IMX_ALSA_EXTRA = "" +IMX_ALSA_EXTRA_use-nxp-bsp = "imx-alsa-plugins" +MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" +MACHINE_EXTRA_RRECOMMENDS_append_mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" +MACHINE_EXTRA_RRECOMMENDS_append_mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" + +# Extra Cypress Wi-Fi and BTW firmware (Murata) +MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}" +MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}" +MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}" +MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}" +MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}" + +# Extra QCA Wi-Fi & BTE driver and firmware +MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}" +MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca9377', 'packagegroup-fsl-qca9377', '', d)}" # Extra udev rules MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx" +# Jailhouse +MACHINE_EXTRA_RRECOMMENDS += " \ + ${@bb.utils.contains('COMBINED_FEATURES', 'jailhouse', 'jailhouse', '', d)} \ +" + # GStreamer 1.0 plugins MACHINE_GSTREAMER_1_0_PLUGIN ?= "" MACHINE_GSTREAMER_1_0_PLUGIN_mx6dl ?= "gstreamer1.0-plugins-imx-meta" @@ -244,60 +290,72 @@ PREFERRED_PROVIDER_virtual/libgl_imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles1_imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles2_imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" +PREFERRED_PROVIDER_virtual/libg2d_imxdpu ?= "imx-dpu-g2d" -PREFERRED_VERSION_weston_mx6 ?= "4.0.0.imx" -PREFERRED_VERSION_weston_mx7 ?= "4.0.0.imx" -PREFERRED_VERSION_weston_mx8 ?= "4.0.0.imx" +PREFERRED_VERSION_weston_imx ?= "8.0.0.imx" +PREFERRED_VERSION_weston_use-mainline-bsp = "" -PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.13.imx" -PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.13.imx" -PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.13.imx" +PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.18.imx" +PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.18.imx" +PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.18.imx" # Use i.MX libdrm Version -PREFERRED_VERSION_libdrm_mx6 ?= "2.4.91.imx" -PREFERRED_VERSION_libdrm_mx7 ?= "2.4.91.imx" -PREFERRED_VERSION_libdrm_mx8 ?= "2.4.91.imx" +PREFERRED_VERSION_libdrm_mx6 ?= "2.4.99.imx" +PREFERRED_VERSION_libdrm_mx7 ?= "2.4.99.imx" +PREFERRED_VERSION_libdrm_mx8 ?= "2.4.99.imx" + +# Use i.MX optee Version +PREFERRED_VERSION_optee-os_mx8 ?= "3.2.0.imx" +PREFERRED_VERSION_optee-client_mx8 ?= "3.2.0.imx" +PREFERRED_VERSION_optee-test_mx8 ?= "3.2.0.imx" # Handle default kernel IMX_DEFAULT_KERNEL = "linux-imx" IMX_DEFAULT_KERNEL_mxs = "linux-fslc" IMX_DEFAULT_KERNEL_mx5 = "linux-fslc" -IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-imx" -IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx" +IMX_DEFAULT_KERNEL_mx6 = "linux-imx" +IMX_DEFAULT_KERNEL_mx7 = "linux-imx" IMX_DEFAULT_KERNEL_mx8 = "linux-imx" IMX_DEFAULT_KERNEL_mx7ulp = "linux-imx" IMX_DEFAULT_KERNEL_mx6sll = "linux-imx" -IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx" -IMX_DEFAULT_KERNEL_mx6ull = "linux-fslc-imx" +IMX_DEFAULT_KERNEL_mx6ul = "linux-imx" +IMX_DEFAULT_KERNEL_mx6ull = "linux-imx" IMX_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc" PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" SOC_DEFAULT_IMAGE_FSTYPES = "wic.bmap wic.gz" -SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard wic.gz" +SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz" # Do not update fstab file when using wic images WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" -SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4" +OPTEE_BOOT_IMAGE = "uTee" +OPTEE_BOOT_IMAGE_aarch64 = "" + IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" IMAGE_BOOT_FILES ?= " \ ${KERNEL_IMAGETYPE} \ ${@make_dtb_boot_files(d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_BOOT_IMAGE}', '', d)} \ " ### wic default support +OPTEE_WKS_FILE_DEPENDS = "optee-os" +OPTEE_WKS_FILE_DEPENDS_aarch64 = "" + WKS_FILE_DEPENDS ?= " \ virtual/bootloader \ \ e2fsprogs-native \ bmap-tools-native \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ " -WKS_FILE_DEPENDS_mx8 += "imx-boot" +WKS_FILE_DEPENDS_append_mx8 = " imx-boot " -SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks" +SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in" SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" @@ -309,21 +367,24 @@ WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx" UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx" SPL_BINARY_use-fsl-bsp_mx6 = "" -WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks" +WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks.in" UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx" UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx" SPL_BINARY_use-fsl-bsp_mx7 = "" -WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks" +WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks.in" -SERIAL_CONSOLE = "115200 ttymxc0" -SERIAL_CONSOLE_mxs = "115200 ttyAMA0" +SERIAL_CONSOLES = "115200;ttymxc0" +SERIAL_CONSOLES_mxs = "115200;ttyAMA0" KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPE_aarch64 = "Image" MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" +SOC_MACHINE_FEATURES_BACKFILL_mx8m = "jailhouse" +MACHINE_FEATURES_BACKFILL_append = " ${SOC_MACHINE_FEATURES_BACKFILL}" + # Add the ability to specify _imx machines MACHINEOVERRIDES =. "imx:" -HOSTTOOLS_NONFATAL_append_mx8x = " sha384sum" +HOSTTOOLS_NONFATAL_append_mx8 = " sha384sum" diff --git a/bsp/meta-freescale/conf/machine/include/qoriq-base.inc b/bsp/meta-freescale/conf/machine/include/qoriq-base.inc index b19332e3..93e48505 100644 --- a/bsp/meta-freescale/conf/machine/include/qoriq-base.inc +++ b/bsp/meta-freescale/conf/machine/include/qoriq-base.inc @@ -2,9 +2,8 @@ PREFERRED_PROVIDER_cryptodev-linux = "cryptodev-qoriq-linux" PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module" PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests" -PREFERRED_PROVIDER_openssl = "openssl-qoriq" PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq" +PREFERRED_PROVIDER_virtual/bootloader ?= "${PREFERRED_PROVIDER_u-boot}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" PREFERRED_VERSION_testfloat = "2a" PREFERRED_PROVIDER_ptpd = "ptpd-qoriq" @@ -19,11 +18,20 @@ EXTRA_IMAGEDEPENDS += "u-boot cst-native" MACHINEOVERRIDES =. "qoriq:" +# Machines or distros can define which BSP it should use by default. We are +# intending to default for nxp BSP by default and specific machines or +# DISTROs might change it if need. +# +# Two values are considered valid: mainline, nxp +QORIQ_DEFAULT_BSP ?= "nxp" + +MACHINEOVERRIDES =. "use-${QORIQ_DEFAULT_BSP}-bsp:" + # Sub-architecture support MACHINE_SOCARCH_SUFFIX ?= "" MACHINE_SOCARCH_SUFFIX_qoriq = "-qoriq" MACHINE_ARCH_FILTER = "virtual/kernel" -MACHINE_SOCARCH_FILTER_append_qoriq = " cryptodev-qoriq-linux cryptodev-qoriq-module cryptodev-qoriq-test openssl-qoriq" +MACHINE_SOCARCH_FILTER_append_qoriq = " cryptodev-qoriq-linux cryptodev-qoriq-module cryptodev-qoriq-test" INHERIT += "fsl-dynamic-packagearch" diff --git a/bsp/meta-freescale/conf/machine/include/utilities.inc b/bsp/meta-freescale/conf/machine/include/utilities.inc index e6cfda80..e9695bde 100644 --- a/bsp/meta-freescale/conf/machine/include/utilities.inc +++ b/bsp/meta-freescale/conf/machine/include/utilities.inc @@ -6,11 +6,17 @@ def make_dtb_boot_files(d): # Use only the basename for dtb files: alldtbs = d.getVar('KERNEL_DEVICETREE') + + # DTBs may be built out of kernel with devicetree.bbclass + if not alldtbs: + return '' + def transform(dtb): - if dtb.endswith('dtb') or dtb.endswith('dtbo'): + if not (dtb.endswith('dtb') or dtb.endswith('dtbo')): # eg: whatever/bcm2708-rpi-b.dtb has: # DEPLOYDIR file: bcm2708-rpi-b.dtb # destination: bcm2708-rpi-b.dtb - return os.path.basename(dtb) + bb.error("KERNEL_DEVICETREE entry %s is not a .dtb or .dtbo file." % (dtb) ) + return os.path.basename(dtb) - return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) + return ' '.join([transform(dtb) for dtb in alldtbs.split() if dtb]) diff --git a/bsp/meta-freescale/conf/machine/ls1012afrwy-32b.conf b/bsp/meta-freescale/conf/machine/ls1012afrwy-32b.conf deleted file mode 100644 index 88f071ea..00000000 --- a/bsp/meta-freescale/conf/machine/ls1012afrwy-32b.conf +++ /dev/null @@ -1,33 +0,0 @@ -#@TYPE: Machine -#@NAME: NXP LS1012AFRWY board -#@SOC: LSCH2 -#@DESCRIPTION: Machine configuration for NXP QorIQ LS1012AFRWY in 32-bit mode -# with ARM Cortext-A53 core -#@MAINTAINER: Chunrong Guo <Chunrong.Guo@nxp.com> - -MACHINEOVERRIDES =. "fsl-lsch2:fsl-lsch2-32b:ls1012a:" - -require conf/machine/include/qoriq-arm.inc -require conf/machine/include/arm/arch-arm64.inc - -DEFAULTTUNE = "armv7ahf-neon" - -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" - -UBOOT_DTB_LOADADDRESS = "0x90000000" -UBOOT_ENTRYPOINT = "0x80080000" - -UBOOT_CONFIG ??= "qspi-secure-boot qspi" -UBOOT_CONFIG[qspi] = "ls1012afrwy_qspi_defconfig,,u-boot-dtb.bin" -UBOOT_CONFIG[qspi-secure-boot] = "ls1012afrwy_qspi_SECURE_BOOT_defconfig,,u-boot-dtb.bin" - -KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-frwy.dtb" -KERNEL_DEFCONFIG ?= "multi_v7_defconfig" - -EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw" -USE_VT = "0" - -require conf/multilib.conf -MULTILIBS ?= "multilib:lib64" -DEFAULTTUNE_virtclass-multilib-lib64 ?= "aarch64" diff --git a/bsp/meta-freescale/conf/machine/ls1012afrwy.conf b/bsp/meta-freescale/conf/machine/ls1012afrwy.conf index bd154acb..449e518c 100644 --- a/bsp/meta-freescale/conf/machine/ls1012afrwy.conf +++ b/bsp/meta-freescale/conf/machine/ls1012afrwy.conf @@ -10,6 +10,8 @@ MACHINEOVERRIDES =. "fsl-lsch2:ls1012a:" require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" @@ -20,7 +22,7 @@ UBOOT_CONFIG ??= "tfa-secure-boot tfa" UBOOT_CONFIG[tfa] = "ls1012afrwy_tfa_defconfig,,u-boot-dtb.bin" UBOOT_CONFIG[tfa-secure-boot] = "ls1012afrwy_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin" -RCWQSPI ?= "N_SSNP_3305/rcw_1000_default.bin" +RCWQSPI ?= "N_SSNP_3305/rcw_1000" KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-frwy.dtb" KERNEL_DEFCONFIG ?= "defconfig" diff --git a/bsp/meta-freescale/conf/machine/ls1012ardb-32b.conf b/bsp/meta-freescale/conf/machine/ls1012ardb-32b.conf deleted file mode 100644 index 43abf70a..00000000 --- a/bsp/meta-freescale/conf/machine/ls1012ardb-32b.conf +++ /dev/null @@ -1,34 +0,0 @@ -#@TYPE: Machine -#@NAME: NXP LS1012ARDB board -#@SOC: LSCH2 -#@DESCRIPTION: Machine configuration for NXP QorIQ LS1012ARDB -# with ARM Cortext-A53 core -#@MAINTAINER: Zongchun Yu <Zongchun.Yu@nxp.com> - -MACHINEOVERRIDES =. "fsl-lsch2:fsl-lsch2-32b:ls1012a:" - -require conf/machine/include/qoriq-arm.inc -require conf/machine/include/arm/arch-arm64.inc - -DEFAULTTUNE = "armv7ahf-neon" - -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" - -UBOOT_DTB_LOADADDRESS = "0x90000000" -UBOOT_ENTRYPOINT = "0x80008000" - -UBOOT_CONFIG ??= "qspi-secure-boot qspi" -UBOOT_CONFIG[qspi] = "ls1012ardb_qspi_defconfig,,u-boot-dtb.bin" -UBOOT_CONFIG[qspi-secure-boot] = "ls1012ardb_qspi_SECURE_BOOT_defconfig,,u-boot-dtb.bin" - -KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-rdb.dtb" -KERNEL_DEFCONFIG ?= "multi_v7_defconfig" - -EXTRA_IMAGEDEPENDS += "rcw" -USE_VT = "0" - -require conf/multilib.conf -MULTILIBS ?= "multilib:lib64" -DEFAULTTUNE_virtclass-multilib-lib64 ?= "aarch64" diff --git a/bsp/meta-freescale/conf/machine/ls1012ardb.conf b/bsp/meta-freescale/conf/machine/ls1012ardb.conf index f05507d7..6efd6b3d 100644 --- a/bsp/meta-freescale/conf/machine/ls1012ardb.conf +++ b/bsp/meta-freescale/conf/machine/ls1012ardb.conf @@ -10,6 +10,8 @@ MACHINEOVERRIDES =. "fsl-lsch2:ls1012a:" require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" @@ -20,9 +22,10 @@ UBOOT_CONFIG ??= "tfa-secure-boot tfa" UBOOT_CONFIG[tfa] = "ls1012ardb_tfa_defconfig,,u-boot-dtb.bin" UBOOT_CONFIG[tfa-secure-boot] = "ls1012ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin" -RCWQSPI ?= "R_SPNH_3508/rcw_1000_default.bin" +RCWQSPI ?= "R_SPNH_3508/rcw_1000" +RCWQSPISEC ?= "R_SPNH_3508/rcw_1000" -KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-rdb.dtb" +KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-rdb.dtb freescale/fsl-ls1012a-qds.dtb" KERNEL_DEFCONFIG ?= "defconfig" EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw atf" diff --git a/bsp/meta-freescale/conf/machine/ls1021atwr.conf b/bsp/meta-freescale/conf/machine/ls1021atwr.conf index a238fdca..aa0f0943 100644 --- a/bsp/meta-freescale/conf/machine/ls1021atwr.conf +++ b/bsp/meta-freescale/conf/machine/ls1021atwr.conf @@ -10,15 +10,17 @@ MACHINEOVERRIDES =. "ls102xa:" require conf/machine/include/qoriq-arm.inc require conf/machine/include/tune-cortexa7.inc +MACHINE_FEATURES += "optee" + DEFAULTTUNE = "cortexa7hf-neon" UBOOT_CONFIG ??= "sdcard-ifc-secure-boot sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor" -UBOOT_CONFIG[nor] = "ls1021atwr_nor_config,,u-boot-dtb.bin" -UBOOT_CONFIG[sdcard-ifc] = "ls1021atwr_sdcard_ifc_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[sdcard-qspi] = "ls1021atwr_sdcard_qspi_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_config,,u-boot-dtb.bin" -UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_config,,u-boot-dtb.bin" -UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_config,,u-boot-dtb.bin" +UBOOT_CONFIG[nor] = "ls1021atwr_nor_defconfig,,u-boot-dtb.bin" +UBOOT_CONFIG[sdcard-ifc] = "ls1021atwr_sdcard_ifc_defconfig,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[sdcard-qspi] = "ls1021atwr_sdcard_qspi_defconfig,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_defconfig,,u-boot-dtb.bin" +UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_defconfig,,u-boot-dtb.bin" +UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_defconfig,,u-boot-dtb.bin" UBOOT_CONFIG[sdcard-ifc-secure-boot] = "ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin" QE_UCODE="iram_Type_A_LS1021a_r1.0.bin" diff --git a/bsp/meta-freescale/conf/machine/ls1028ardb.conf b/bsp/meta-freescale/conf/machine/ls1028ardb.conf new file mode 100644 index 00000000..b0bbc5b8 --- /dev/null +++ b/bsp/meta-freescale/conf/machine/ls1028ardb.conf @@ -0,0 +1,38 @@ +#@TYPE: Machine +#@NAME: NXP LS1028ARDB +#@SOC: LSCH3 +#@DESCRIPTION: Machine configuration for running LS1028ARDB in 64-bit mode +#@MAINTAINER: Chunrong.Guo <chunrong.guo@nxp.com> + +require conf/machine/include/qoriq-arm64.inc +require conf/machine/include/arm/arch-arm64.inc + +MACHINE_FEATURES += "optee" + +MACHINEOVERRIDES =. "fsl-lsch3:ls1028a:" + +KERNEL_CLASSES = " kernel-fitimage " +KERNEL_IMAGETYPES = "fitImage" + +UBOOT_DTB_LOADADDRESS = "0x90000000" +UBOOT_ENTRYPOINT = "0x80080000" + +UBOOT_CONFIG ??= "tfa-secure-boot tfa" +UBOOT_CONFIG[tfa-secure-boot] = "ls1028ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin" +UBOOT_CONFIG[tfa] = "ls1028ardb_tfa_defconfig,,u-boot-dtb.bin" + +KERNEL_DEVICETREE ?= "freescale/fsl-ls1028a-rdb.dtb freescale/fsl-ls1028a-qds.dtb" +KERNEL_DEVICETREE_append_use-nxp-bsp = "\ + freescale/fsl-ls1028a-rdb-dpdk.dtb \ +" +KERNEL_DEFCONFIG ?= "defconfig" + +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" +SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" + +RCWSD ?= "R_SQPP_0x85bb/rcw_1500_gpu600" +RCWXSPI ?= "R_SQPP_0x85bb/rcw_1500_gpu600" +RCWEMMC ?= "R_SQPP_0x85bb/rcw_1500_gpu600" + +EXTRA_IMAGEDEPENDS += "rcw atf dp-firmware-cadence" +USE_VT = "0" diff --git a/bsp/meta-freescale/conf/machine/ls1043ardb-32b.conf b/bsp/meta-freescale/conf/machine/ls1043ardb-32b.conf deleted file mode 100644 index aa7f3f6f..00000000 --- a/bsp/meta-freescale/conf/machine/ls1043ardb-32b.conf +++ /dev/null @@ -1,39 +0,0 @@ -#@TYPE: Machine -#@NAME: NXP LS1043ARDB-32B -#@SOC: LSCH2 -#@DESCRIPTION: Machine configuration for running LS1043A in 32B mode -#@MAINTAINER: Ting Liu <ting.liu@nxp.com> - -MACHINEOVERRIDES =. "fsl-lsch2:fsl-lsch2-32b:ls1043a:" - -require conf/machine/include/qoriq-arm.inc -require conf/machine/include/arm/arch-arm64.inc - -DEFAULTTUNE = "armv7ahf-neon" - -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" - -UBOOT_DTB_LOADADDRESS = "0x9ffe0000" -UBOOT_ENTRYPOINT = "0x80008000" - -UBOOT_CONFIG ??= "nand sdcard nor" -UBOOT_CONFIG[nor] = "ls1043ardb_config,,u-boot-dtb.bin" -UBOOT_CONFIG[nand] = "ls1043ardb_nand_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[sdcard] = "ls1043ardb_sdcard_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[secure-boot] = "ls1043ardb_SECURE_BOOT_defconfig,,u-boot-dtb.bin" - -QE_UCODE = "iram_Type_A_LS1021a_r1.0.bin" - -KERNEL_DEVICETREE ?= "freescale/fsl-ls1043a-rdb-sdk.dtb freescale/fsl-ls1043a-rdb-usdpaa.dtb" -KERNEL_DEFCONFIG ?= "multi_v7_defconfig" - -SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyAMA0" -SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" - -EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode" -USE_VT = "0" - -require conf/multilib.conf -MULTILIBS ?= "multilib:lib64" -DEFAULTTUNE_virtclass-multilib-lib64 ?= "aarch64" diff --git a/bsp/meta-freescale/conf/machine/ls1043ardb-be.conf b/bsp/meta-freescale/conf/machine/ls1043ardb-be.conf deleted file mode 100644 index 3582162f..00000000 --- a/bsp/meta-freescale/conf/machine/ls1043ardb-be.conf +++ /dev/null @@ -1,40 +0,0 @@ -#@TYPE: Machine -#@NAME: Freescale LS1043ARDB -#@SOC: LSCH2 -#@DESCRIPTION: Machine configuration for running LS1043A in 64-bit mode -#@MAINTAINER: Chunrong Guo <nxa13725@nxp.com> - -DEFAULTTUNE = "aarch64_be" - -require conf/machine/include/qoriq-arm64.inc -require conf/machine/include/arm/arch-arm64.inc - -MACHINEOVERRIDES =. "fsl-lsch2:ls1043a:" - -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" - -UBOOT_DTB_LOADADDRESS = "0x90000000" -UBOOT_ENTRYPOINT = "0x80080000" - -UBOOT_CONFIG ??= "nand sdcard nor" -UBOOT_CONFIG[nor] = "ls1043ardb_config,,u-boot-dtb.bin" -UBOOT_CONFIG[nand] = "ls1043ardb_nand_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[sdcard] = "ls1043ardb_sdcard_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[secure-boot] = "ls1043ardb_SECURE_BOOT_defconfig,,u-boot-dtb.bin" -UBOOT_CONFIG[nand-secure-boot] = "ls1043ardb_nand_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[nand-spl-secure-boot] = "ls1043ardb_nand_SECURE_BOOT_defconfig,,spl/u-boot-spl.bin" -UBOOT_CONFIG[nand-dtb-secure-boot] = "ls1043ardb_nand_SECURE_BOOT_defconfig,,u-boot-dtb.bin" -UBOOT_CONFIG[sdcard-secure-boot] = "ls1043ardb_sdcard_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[sdcard-spl-secure-boot] = "ls1043ardb_sdcard_SECURE_BOOT_defconfig,,spl/u-boot-spl.bin" -UBOOT_CONFIG[sdcard-dtb-secure-boot] = "ls1043ardb_sdcard_SECURE_BOOT_defconfig,,u-boot-dtb.bin" - -QE_UCODE = "iram_Type_A_LS1021a_r1.0.bin" -LE_UBOOT_FOR_ARMBE_TARGET = "1" - -KERNEL_DEVICETREE ?= "freescale/fsl-ls1043a-rdb-sdk.dtb freescale/fsl-ls1043a-rdb-usdpaa.dtb" -KERNEL_DEFCONFIG ?= "defconfig" - -EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode" - -USE_VT = "0" diff --git a/bsp/meta-freescale/conf/machine/ls1043ardb.conf b/bsp/meta-freescale/conf/machine/ls1043ardb.conf index f9b0d3d9..6f1f7ea4 100644 --- a/bsp/meta-freescale/conf/machine/ls1043ardb.conf +++ b/bsp/meta-freescale/conf/machine/ls1043ardb.conf @@ -10,6 +10,8 @@ MACHINEOVERRIDES =. "fsl-lsch2:ls1043a:" require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" @@ -20,14 +22,23 @@ UBOOT_CONFIG ??= "tfa-secure-boot tfa" UBOOT_CONFIG[tfa] = "ls1043ardb_tfa_defconfig,,u-boot-dtb.bin" UBOOT_CONFIG[tfa-secure-boot] = "ls1043ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin" -KERNEL_DEVICETREE ?= "freescale/fsl-ls1043a-rdb-sdk.dtb freescale/fsl-ls1043a-rdb-usdpaa.dtb" +KERNEL_DEVICETREE ?= "\ + freescale/fsl-ls1043a-rdb.dtb \ + freescale/fsl-ls1043a-qds.dtb \ +" +# usdpaa dtb is used for dpdk. TODO: rename in kernel +KERNEL_DEVICETREE_append_use-nxp-bsp = "\ + freescale/fsl-ls1043a-rdb-sdk.dtb \ + freescale/fsl-ls1043a-rdb-usdpaa.dtb \ + freescale/fsl-ls1043a-qds-sdk.dtb \ +" KERNEL_DEFCONFIG ?= "defconfig" UEFI_NORBOOT ?= "LS1043ARDB_EFI_NORBOOT.fd" -RCWNOR ?= "RR_FQPP_1455/rcw_1600.bin" -RCWSD ?= "RR_FQPP_1455/rcw_1600_sdboot.bin" -RCWNAND ?= "RR_FQPP_1455/rcw_1600_nandboot.bin" +RCWNOR ?= "RR_FQPP_1455/rcw_1600" +RCWSD ?= "RR_FQPP_1455/rcw_1600_sdboot" +RCWNAND ?= "RR_FQPP_1455/rcw_1600_nandboot" QE_UCODE = "iram_Type_A_LS1021a_r1.0.bin" -EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode uefi atf" +EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode uefi atf ls2-phy" USE_VT = "0" diff --git a/bsp/meta-freescale/conf/machine/ls1046afrwy.conf b/bsp/meta-freescale/conf/machine/ls1046afrwy.conf new file mode 100644 index 00000000..884f7666 --- /dev/null +++ b/bsp/meta-freescale/conf/machine/ls1046afrwy.conf @@ -0,0 +1,41 @@ +#@TYPE: Machine +#@NAME: NXP LS1046AFRWY +#@SOC: LSCH2 +#@DESCRIPTION: Machine configuration for running LS1046A in 64-bit mode +#@MAINTAINER: Chunrong.guo <chunrong.guo@nxp.com> + +MACHINEOVERRIDES =. "fsl-lsch2:ls1046a:" + +require conf/machine/include/qoriq-arm64.inc +require conf/machine/include/arm/arch-arm64.inc + +MACHINE_FEATURES += "optee" + +KERNEL_CLASSES = " kernel-fitimage " +KERNEL_IMAGETYPES = "fitImage" + +UBOOT_DTB_LOADADDRESS = "0x90000000" +UBOOT_ENTRYPOINT = "0x80080000" + +UBOOT_CONFIG ??= "tfa-secure-boot tfa" +UBOOT_CONFIG[tfa] = "ls1046afrwy_tfa_defconfig,,u-boot-dtb.bin" +UBOOT_CONFIG[tfa-secure-boot] = "ls1046afrwy_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin" + +KERNEL_DEVICETREE ?= "\ + freescale/fsl-ls1046a-frwy.dtb \ +" +# usdpaa dtb is used for dpdk. TODO: rename in kernel +KERNEL_DEVICETREE_append_use-nxp-bsp = "\ + freescale/fsl-ls1046a-frwy-sdk.dtb \ + freescale/fsl-ls1046a-frwy-usdpaa.dtb \ +" +KERNEL_DEFCONFIG ?= "defconfig" + +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyAMA0 115200;ttyLP0" +SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" + +RCWQSPI ?= "NN_NNQNNPNP_3040_0506/rcw_1600_qspiboot" +RCWSD ?= "NN_NNQNNPNP_3040_0506/rcw_1600_sdboot" + +EXTRA_IMAGEDEPENDS += "fm-ucode rcw atf ls2-phy qe-ucode" +USE_VT = "0" diff --git a/bsp/meta-freescale/conf/machine/ls1046ardb-32b.conf b/bsp/meta-freescale/conf/machine/ls1046ardb-32b.conf deleted file mode 100644 index 4267c0f1..00000000 --- a/bsp/meta-freescale/conf/machine/ls1046ardb-32b.conf +++ /dev/null @@ -1,40 +0,0 @@ -#@TYPE: Machine -#@NAME: NXP LS1046ARDB -#@SOC: LSCH2 -#@DESCRIPTION: Machine configuration for running LS1046A in 32-bit mode -#@MAINTAINER: Zhenhua Luo <zhenhua.luo@nxp.com> - -MACHINEOVERRIDES =. "fsl-lsch2:fsl-lsch2-32b:ls1046a:" - -require conf/machine/include/qoriq-arm.inc -require conf/machine/include/arm/arch-arm64.inc - -DEFAULTTUNE = "armv7ahf-neon" - -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" - -UBOOT_DTB_LOADADDRESS = "0x9ffe0000" -UBOOT_ENTRYPOINT = "0x80008000" - -UBOOT_CONFIG ??= "emmc sdcard qspi-secure-boot qspi" -UBOOT_CONFIG[emmc] = "ls1046ardb_emmc_defconfig,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[sdcard] = "ls1046ardb_sdcard_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[qspi] = "ls1046ardb_qspi_config,,u-boot-dtb.bin" -UBOOT_CONFIG[qspi-secure-boot] = "ls1046ardb_qspi_SECURE_BOOT_config,,u-boot-dtb.bin" - -KERNEL_DEVICETREE ?= "\ - freescale/fsl-ls1046a-rdb-sdk.dtb \ - freescale/fsl-ls1046a-rdb-usdpaa.dtb \ -" -KERNEL_DEFCONFIG ?= "multi_v7_defconfig" - -SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyAMA0 115200;ttyLP0" -SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" - -EXTRA_IMAGEDEPENDS += "fm-ucode rcw" -USE_VT = "0" - -require conf/multilib.conf -MULTILIBS ?= "multilib:lib64" -DEFAULTTUNE_virtclass-multilib-lib64 ?= "aarch64" diff --git a/bsp/meta-freescale/conf/machine/ls1046ardb-be.conf b/bsp/meta-freescale/conf/machine/ls1046ardb-be.conf deleted file mode 100644 index 0f72d579..00000000 --- a/bsp/meta-freescale/conf/machine/ls1046ardb-be.conf +++ /dev/null @@ -1,37 +0,0 @@ -#@TYPE: Machine -#@NAME: NXP LS1046ARDB -#@SOC: LSCH2 -#@DESCRIPTION: Machine configuration for running LS1046A in 64-bit mode -#@MAINTAINER: Zhenhua Luo <zhenhua.luo@nxp.com> - -DEFAULTTUNE = "aarch64_be" - -MACHINEOVERRIDES =. "fsl-lsch2:ls1046a:" - -require conf/machine/include/qoriq-arm64.inc -require conf/machine/include/arm/arch-arm64.inc - -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" - -UBOOT_DTB_LOADADDRESS = "0x90000000" -UBOOT_ENTRYPOINT = "0x80080000" - -LE_UBOOT_FOR_ARMBE_TARGET = "1" -UBOOT_CONFIG ??= "emmc sdcard sdcard-dtb-secure-boot sdcard-spl-secure-boot sdcard-secure-boot qspi-secure-boot qspi" -UBOOT_CONFIG[emmc] = "ls1046ardb_emmc_defconfig,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[sdcard] = "ls1046ardb_sdcard_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[qspi] = "ls1046ardb_qspi_config,,u-boot-dtb.bin" -UBOOT_CONFIG[qspi-secure-boot] = "ls1046ardb_qspi_SECURE_BOOT_config,,u-boot-dtb.bin" -UBOOT_CONFIG[sdcard-secure-boot] = "ls1046ardb_sdcard_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[sdcard-spl-secure-boot] = "ls1046ardb_sdcard_SECURE_BOOT_defconfig,,spl/u-boot-spl.bin" -UBOOT_CONFIG[sdcard-dtb-secure-boot] = "ls1046ardb_sdcard_SECURE_BOOT_defconfig,,u-boot-dtb.bin" - -KERNEL_DEVICETREE ?= "\ - freescale/fsl-ls1046a-rdb-sdk.dtb \ - freescale/fsl-ls1046a-rdb-usdpaa.dtb \ -" -KERNEL_DEFCONFIG ?= "defconfig" - -EXTRA_IMAGEDEPENDS += "fm-ucode rcw" -USE_VT = "0" diff --git a/bsp/meta-freescale/conf/machine/ls1046ardb.conf b/bsp/meta-freescale/conf/machine/ls1046ardb.conf index 83309c95..e8773366 100644 --- a/bsp/meta-freescale/conf/machine/ls1046ardb.conf +++ b/bsp/meta-freescale/conf/machine/ls1046ardb.conf @@ -9,6 +9,8 @@ MACHINEOVERRIDES =. "fsl-lsch2:ls1046a:" require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" @@ -20,17 +22,23 @@ UBOOT_CONFIG[tfa] = "ls1046ardb_tfa_defconfig,,u-boot-dtb.bin" UBOOT_CONFIG[tfa-secure-boot] = "ls1046ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin" KERNEL_DEVICETREE ?= "\ + freescale/fsl-ls1046a-rdb.dtb \ + freescale/fsl-ls1046a-qds.dtb \ +" +# usdpaa dtb is used for dpdk. TODO: rename in kernel +KERNEL_DEVICETREE_append_use-nxp-bsp = "\ freescale/fsl-ls1046a-rdb-sdk.dtb \ freescale/fsl-ls1046a-rdb-usdpaa.dtb \ + freescale/fsl-ls1046a-qds-sdk.dtb \ " KERNEL_DEFCONFIG ?= "defconfig" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyAMA0 115200;ttyLP0" SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" -UEFI_NORBOOT ?= "LS1046ARDB_EFI_NORBOOT.fd" -RCWQSPI ?= "RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot.bin" -RCWSD ?= "RR_FFSSPPPH_1133_5559/rcw_1800_sdboot.bin" +UEFI_QSPIBOOT ?= "LS1046ARDB_EFI_QSPIBOOT.fd" +RCWQSPI ?= "RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot" +RCWSD ?= "RR_FFSSPPPH_1133_5559/rcw_1800_sdboot" -EXTRA_IMAGEDEPENDS += "fm-ucode rcw uefi atf" +EXTRA_IMAGEDEPENDS += "fm-ucode rcw uefi atf qe-ucode ls2-phy" USE_VT = "0" diff --git a/bsp/meta-freescale/conf/machine/ls1088ardb-be.conf b/bsp/meta-freescale/conf/machine/ls1088ardb-be.conf deleted file mode 100644 index 3460a9c1..00000000 --- a/bsp/meta-freescale/conf/machine/ls1088ardb-be.conf +++ /dev/null @@ -1,34 +0,0 @@ -#@TYPE: Machine -#@NAME: NXP LS1088ARDB -#@SOC: LSCH3 -#@DESCRIPTION: Machine configuration for running LS1088ARDB in 64-bit mode -#@MAINTAINER: Zongchun Yu <Zongchun.Yu@nxp.com> - -require conf/machine/include/qoriq-arm64.inc -require conf/machine/include/arm/arch-arm64.inc - -DEFAULTTUNE = "aarch64_be" - -LE_UBOOT_FOR_ARMBE_TARGET = "1" - -MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" - -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" - -UBOOT_DTB_LOADADDRESS = "0x90000000" -UBOOT_ENTRYPOINT = "0x80080000" - -UBOOT_CONFIG ??= "secure-boot sdcard-qspi qspi" -UBOOT_CONFIG[secure-boot] = "ls1088ardb_qspi_SECURE_BOOT_defconfig,,u-boot-dtb.bin" -UBOOT_CONFIG[qspi] = "ls1088ardb_qspi_defconfig,,u-boot-dtb.bin" -UBOOT_CONFIG[sdcard-qspi] = "ls1088ardb_sdcard_qspi_defconfig,,u-boot-with-spl.bin" - -KERNEL_DEVICETREE ?= "freescale/fsl-ls1088a-rdb.dtb" -KERNEL_DEFCONFIG ?= "defconfig" - -SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" -SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" - -EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex" -USE_VT = "0" diff --git a/bsp/meta-freescale/conf/machine/ls1088ardb-pb.conf b/bsp/meta-freescale/conf/machine/ls1088ardb-pb.conf index 3726efa2..2e456f1b 100644 --- a/bsp/meta-freescale/conf/machine/ls1088ardb-pb.conf +++ b/bsp/meta-freescale/conf/machine/ls1088ardb-pb.conf @@ -9,6 +9,8 @@ require conf/machine/include/arm/arch-arm64.inc MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" @@ -25,8 +27,8 @@ KERNEL_DEFCONFIG ?= "defconfig" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" -RCWSD ?= "FCSSRR_PPPP_0x1d_0x13/rcw_1600_sd.bin" -RCWQSPI ?= "FCSSRR_PPPP_0x1d_0x13/rcw_1600_qspi.bin" +RCWSD ?= "FCSSRR_PPPP_0x1d_0x13/rcw_1600_sd" +RCWQSPI ?= "FCSSRR_PPPP_0x1d_0x13/rcw_1600_qspi" EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex atf" diff --git a/bsp/meta-freescale/conf/machine/ls1088ardb.conf b/bsp/meta-freescale/conf/machine/ls1088ardb.conf index 13c8bf29..8f47f284 100644 --- a/bsp/meta-freescale/conf/machine/ls1088ardb.conf +++ b/bsp/meta-freescale/conf/machine/ls1088ardb.conf @@ -9,6 +9,8 @@ require conf/machine/include/arm/arch-arm64.inc MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" @@ -25,8 +27,8 @@ KERNEL_DEFCONFIG ?= "defconfig" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" -RCWSD ?= "FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_sd.bin" -RCWQSPI ?= "FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_qspi.bin" +RCWSD ?= "FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_sd" +RCWQSPI ?= "FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_qspi" EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex atf" USE_VT = "0" diff --git a/bsp/meta-freescale/conf/machine/ls2080ardb.conf b/bsp/meta-freescale/conf/machine/ls2080ardb.conf index d58a86a4..859a41be 100644 --- a/bsp/meta-freescale/conf/machine/ls2080ardb.conf +++ b/bsp/meta-freescale/conf/machine/ls2080ardb.conf @@ -16,5 +16,5 @@ UBOOT_CONFIG[nor] = "ls2080ardb_defconfig,,u-boot-dtb.bin" KERNEL_DEVICETREE ?= "freescale/fsl-ls2080a-rdb.dtb" KERNEL_DEFCONFIG ?= "defconfig" -EXTRA_IMAGEDEPENDS += "dpl-examples ls2-phy rcw management-complex" +EXTRA_IMAGEDEPENDS += "ls2-phy rcw management-complex" USE_VT = "0" diff --git a/bsp/meta-freescale/conf/machine/ls2088ardb-be.conf b/bsp/meta-freescale/conf/machine/ls2088ardb-be.conf deleted file mode 100644 index 71cf596d..00000000 --- a/bsp/meta-freescale/conf/machine/ls2088ardb-be.conf +++ /dev/null @@ -1,35 +0,0 @@ -#@TYPE: Machine -#@NAME: NXP LS2088ARDB -#@SOC: LSCH3 -#@DESCRIPTION: Machine configuration for running LS2088ARDB in 64-bit mode -#@MAINTAINER: Zongchun Yu <Zongchun.Yu@nxp.com> - -require conf/machine/include/qoriq-arm64.inc -require conf/machine/include/arm/arch-arm64.inc - -DEFAULTTUNE = "aarch64_be" - -LE_UBOOT_FOR_ARMBE_TARGET = "1" - -MACHINEOVERRIDES =. "fsl-lsch3:ls2088a:" - -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" - -UBOOT_DTB_LOADADDRESS = "0x90000000" -UBOOT_ENTRYPOINT = "0x80080000" - -UBOOT_CONFIG ??= "qspi-secure-boot qspi nand nor" -UBOOT_CONFIG[nor] = "ls2080ardb_defconfig,,u-boot-dtb.bin" -UBOOT_CONFIG[nand] = "ls2080ardb_nand_defconfig,,u-boot-dtb.bin" -UBOOT_CONFIG[qspi] = "ls2088ardb_qspi_defconfig,,u-boot-dtb.bin" -UBOOT_CONFIG[qspi-secure-boot] = "ls2088ardb_qspi_SECURE_BOOT_defconfig,,u-boot-dtb.bin" - -KERNEL_DEVICETREE ?= "freescale/fsl-ls2088a-rdb.dtb" -KERNEL_DEFCONFIG ?= "defconfig" - -SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" -SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" - -EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw management-complex" -USE_VT = "0" diff --git a/bsp/meta-freescale/conf/machine/ls2088ardb.conf b/bsp/meta-freescale/conf/machine/ls2088ardb.conf index 04f3bbdc..f920d601 100644 --- a/bsp/meta-freescale/conf/machine/ls2088ardb.conf +++ b/bsp/meta-freescale/conf/machine/ls2088ardb.conf @@ -9,6 +9,8 @@ require conf/machine/include/arm/arch-arm64.inc MACHINEOVERRIDES =. "fsl-lsch3:ls2088a:" +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" @@ -19,11 +21,11 @@ UBOOT_CONFIG ??= "tfa-secure-boot tfa" UBOOT_CONFIG[tfa] = "ls2088ardb_tfa_defconfig,,u-boot-dtb.bin" UBOOT_CONFIG[tfa-secure-boot] = "ls2088ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin" -RCWNOR ?= "FFFFFFFF_PP_HH_0x2a_0x41/rcw_1800.bin" -RCWQSPI?= "FFFFFFFF_PP_HH_0x2a_0x41/rcw_2000_qspi.bin" +RCWNOR ?= "FFFFFFFF_PP_HH_0x2a_0x41/rcw_1800" +RCWQSPI?= "FFFFFFFF_PP_HH_0x2a_0x41/rcw_2000_qspi" UEFI_NORBOOT ?= "LS2088ARDB_EFI_NORBOOT.fd" -KERNEL_DEVICETREE ?= "freescale/fsl-ls2088a-rdb.dtb" +KERNEL_DEVICETREE ?= "freescale/fsl-ls2088a-rdb.dtb freescale/fsl-ls2088a-qds.dtb" KERNEL_DEFCONFIG ?= "defconfig" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" diff --git a/bsp/meta-freescale/conf/machine/lx2160ardb.conf b/bsp/meta-freescale/conf/machine/lx2160ardb.conf index 44eba5d9..a8bbdbda 100644 --- a/bsp/meta-freescale/conf/machine/lx2160ardb.conf +++ b/bsp/meta-freescale/conf/machine/lx2160ardb.conf @@ -9,6 +9,8 @@ require conf/machine/include/arm/arch-arm64.inc MACHINEOVERRIDES =. "fsl-lsch3:lx2160a:" +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" @@ -19,15 +21,16 @@ UBOOT_CONFIG ??= "tfa-secure-boot tfa" UBOOT_CONFIG[tfa] = "lx2160ardb_tfa_defconfig,,u-boot-dtb.bin" UBOOT_CONFIG[tfa-secure-boot] = "lx2160ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin" -KERNEL_DEVICETREE ?= "freescale/fsl-lx2160a-rdb.dtb" +KERNEL_DEVICETREE ?= "freescale/fsl-lx2160a-rdb.dtb freescale/fsl-lx2160a-qds.dtb" KERNEL_DEFCONFIG ?= "defconfig" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" UEFI_XSPIBOOT ?= "LX2160ARDB_EFI_NORBOOT.fd" -RCWXSPI ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2.bin" -RCWSD ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2_sd.bin" +RCWXSPI ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2" +RCWSD ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2" +RCWEMMC ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2" EXTRA_IMAGEDEPENDS += "management-complex mc-utils rcw ls2-phy ddr-phy uefi atf inphi" USE_VT = "0" diff --git a/bsp/meta-freescale/conf/machine/mpc8548cds.conf b/bsp/meta-freescale/conf/machine/mpc8548cds.conf index 73194402..c7c49ddc 100644 --- a/bsp/meta-freescale/conf/machine/mpc8548cds.conf +++ b/bsp/meta-freescale/conf/machine/mpc8548cds.conf @@ -6,9 +6,9 @@ require conf/machine/include/e500v2.inc UBOOT_CONFIG ??= "nor" -UBOOT_CONFIG[nor] = "MPC8548CDS_defconfig,,u-boot.bin" +UBOOT_CONFIG[nor] = "MPC8548CDS_defconfig,,u-boot-with-dtb.bin" -KERNEL_DEVICETREE = "mpc8548cds_32b.dtb" +KERNEL_DEVICETREE = "fsl/mpc8548cds_32b.dtb" KERNEL_DEFCONFIG = "mpc85xx_defconfig" USE_VT ?= "0" diff --git a/bsp/meta-freescale/conf/machine/p1020rdb.conf b/bsp/meta-freescale/conf/machine/p1020rdb.conf index 50edba7d..974213c1 100644 --- a/bsp/meta-freescale/conf/machine/p1020rdb.conf +++ b/bsp/meta-freescale/conf/machine/p1020rdb.conf @@ -7,20 +7,20 @@ require conf/machine/include/e500v2.inc -MACHINEOVERRIDES =. "p1020" +MACHINEOVERRIDES =. "p1020:" BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat" UBOOT_CONFIG ??= "nand sdcard spi nor" -UBOOT_CONFIG[nor] = "P1020RDB-PD_config" -UBOOT_CONFIG[nand] = "P1020RDB-PD_NAND_config" -UBOOT_CONFIG[sdcard] = "P1020RDB-PD_SDCARD_config" -UBOOT_CONFIG[spi] = "P1020RDB-PD_SPIFLASH_config" +UBOOT_CONFIG[nor] = "P1020RDB-PD_config,,u-boot-with-dtb.bin" +UBOOT_CONFIG[nand] = "P1020RDB-PD_NAND_config,,u-boot-with-spl.bin" +UBOOT_CONFIG[sdcard] = "P1020RDB-PD_SDCARD_config,,u-boot-with-spl.bin" +UBOOT_CONFIG[spi] = "P1020RDB-PD_SPIFLASH_config,,u-boot-with-spl.bin" UBOOT_SOURCE_NAND = "u-boot-with-spl.bin" UBOOT_SOURCE_SPI = "u-boot-with-spl.bin" UBOOT_SOURCE_SD = "u-boot-with-spl.bin" -KERNEL_DEVICETREE ?= "p1020rdb-pd.dtb" +KERNEL_DEVICETREE ?= "fsl/p1020rdb-pd.dtb" KERNEL_DEFCONFIG ?= "mpc85xx_smp_defconfig" JFFS2_ERASEBLOCK = "0x20000" diff --git a/bsp/meta-freescale/conf/machine/p2020rdb.conf b/bsp/meta-freescale/conf/machine/p2020rdb.conf index 324186ca..40e279d2 100644 --- a/bsp/meta-freescale/conf/machine/p2020rdb.conf +++ b/bsp/meta-freescale/conf/machine/p2020rdb.conf @@ -11,16 +11,16 @@ MACHINEOVERRIDES =. "p2020:" BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat" UBOOT_CONFIG ??= "nand sdcard spi 36bit-nor 36bit-spi 36bit-nand 36bit-sdcard nor" -UBOOT_CONFIG[nor] = "P2020RDB-PC_config,,u-boot.bin" -UBOOT_CONFIG[nand] = "P2020RDB-PC_NAND_config,,u-boot.bin" -UBOOT_CONFIG[sdcard] = "P2020RDB-PC_SDCARD_config,,u-boot.bin" -UBOOT_CONFIG[spi] = "P2020RDB-PC_SPIFLASH_config,,u-boot.bin" -UBOOT_CONFIG[36bit-nor] = "P2020RDB-PC_36BIT_config,,u-boot.bin" -UBOOT_CONFIG[36bit-spi] = "P2020RDB-PC_36BIT_SPIFLASH_config,,u-boot.bin" -UBOOT_CONFIG[36bit-nand] = "P2020RDB-PC_36BIT_NAND_config,,u-boot.bin" -UBOOT_CONFIG[36bit-sdcard] = "P2020RDB-PC_36BIT_SDCARD_config,,u-boot.bin" +UBOOT_CONFIG[nor] = "P2020RDB-PC_config,,u-boot-with-dtb.bin" +UBOOT_CONFIG[nand] = "P2020RDB-PC_NAND_config,,u-boot-with-spl.bin" +UBOOT_CONFIG[sdcard] = "P2020RDB-PC_SDCARD_config,,u-boot-with-spl.bin" +UBOOT_CONFIG[spi] = "P2020RDB-PC_SPIFLASH_config,,u-boot-with-spl.bin" +UBOOT_CONFIG[36bit-nor] = "P2020RDB-PC_36BIT_config,,u-boot-with-dtb.bin" +UBOOT_CONFIG[36bit-spi] = "P2020RDB-PC_36BIT_SPIFLASH_config,,u-boot-with-spl.bin" +UBOOT_CONFIG[36bit-nand] = "P2020RDB-PC_36BIT_NAND_config,,u-boot-with-spl.bin" +UBOOT_CONFIG[36bit-sdcard] = "P2020RDB-PC_36BIT_SDCARD_config,,u-boot-with-spl.bin" -KERNEL_DEVICETREE ?= "p2020rdb-pc_32b.dtb" +KERNEL_DEVICETREE ?= "fsl/p2020rdb-pc_32b.dtb" KERNEL_DEFCONFIG ?= "mpc85xx_smp_defconfig" JFFS2_ERASEBLOCK = "0x20000" diff --git a/bsp/meta-freescale/conf/machine/p2041rdb.conf b/bsp/meta-freescale/conf/machine/p2041rdb.conf index 102cc8db..67fa16d1 100644 --- a/bsp/meta-freescale/conf/machine/p2041rdb.conf +++ b/bsp/meta-freescale/conf/machine/p2041rdb.conf @@ -7,18 +7,17 @@ require conf/machine/include/e500mc.inc -MACHINEOVERRIDES =. "p2041" +MACHINEOVERRIDES =. "p2041:" -UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" -UBOOT_CONFIG[nor] = "P2041RDB_config" +UBOOT_CONFIG ??= "nand sdcard spi nor" +UBOOT_CONFIG[nor] = "P2041RDB_config,,u-boot-with-dtb.bin" UBOOT_CONFIG[nand] = "P2041RDB_NAND_config,,u-boot.pbl" -UBOOT_CONFIG[secure-boot] = "P2041RDB_SECURE_BOOT_config" UBOOT_CONFIG[sdcard] = "P2041RDB_SDCARD_config,,u-boot.pbl" UBOOT_CONFIG[spi] = "P2041RDB_SPIFLASH_config,,u-boot.pbl" HV_CFG_M = "p2041rdb" -KERNEL_DEVICETREE ?= "p2041rdb.dtb" +KERNEL_DEVICETREE ?= "fsl/p2041rdb.dtb" KERNEL_DEFCONFIG ?= "corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/bsp/meta-freescale/conf/machine/p3041ds.conf b/bsp/meta-freescale/conf/machine/p3041ds.conf index c7ce4692..cb8099c2 100644 --- a/bsp/meta-freescale/conf/machine/p3041ds.conf +++ b/bsp/meta-freescale/conf/machine/p3041ds.conf @@ -7,18 +7,17 @@ require conf/machine/include/e500mc.inc -MACHINEOVERRIDES =. "p3041" +MACHINEOVERRIDES =. "p3041:" -UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" -UBOOT_CONFIG[nor] = "P3041DS_config" +UBOOT_CONFIG ??= "nand sdcard spi nor" +UBOOT_CONFIG[nor] = "P3041DS_config,,u-boot-with-dtb.bin" UBOOT_CONFIG[nand] = "P3041DS_NAND_config,,u-boot.pbl" -UBOOT_CONFIG[secure-boot] = "P3041DS_SECURE_BOOT_config" UBOOT_CONFIG[sdcard] = "P3041DS_SDCARD_config,,u-boot.pbl" UBOOT_CONFIG[spi] = "P3041DS_SPIFLASH_config,,u-boot.pbl" HV_CFG_M = "p3041ds" -KERNEL_DEVICETREE ?= "p3041ds.dtb" +KERNEL_DEVICETREE ?= "fsl/p3041ds.dtb" KERNEL_DEFCONFIG ?= "corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/bsp/meta-freescale/conf/machine/p4080ds.conf b/bsp/meta-freescale/conf/machine/p4080ds.conf index 23a7816b..e648a242 100644 --- a/bsp/meta-freescale/conf/machine/p4080ds.conf +++ b/bsp/meta-freescale/conf/machine/p4080ds.conf @@ -7,17 +7,16 @@ require conf/machine/include/e500mc.inc -MACHINEOVERRIDES =. "p4080" +MACHINEOVERRIDES =. "p4080:" -UBOOT_CONFIG ??= "secure-boot sdcard spi nor" -UBOOT_CONFIG[nor] = "P4080DS_config" -UBOOT_CONFIG[secure-boot] = "P4080DS_SECURE_BOOT_config" +UBOOT_CONFIG ??= "sdcard spi nor" +UBOOT_CONFIG[nor] = "P4080DS_config,,u-boot-with-dtb.bin" UBOOT_CONFIG[sdcard] = "P4080DS_SDCARD_config,,u-boot.pbl" UBOOT_CONFIG[spi] = "P4080DS_SPIFLASH_config,,u-boot.pbl" HV_CFG_M = "p4080ds" -KERNEL_DEVICETREE ?= "p4080ds.dtb" +KERNEL_DEVICETREE ?= "fsl/p4080ds.dtb" KERNEL_DEFCONFIG ?= "corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/bsp/meta-freescale/conf/machine/p5040ds-64b.conf b/bsp/meta-freescale/conf/machine/p5040ds-64b.conf index 161eb5e9..a6a29393 100644 --- a/bsp/meta-freescale/conf/machine/p5040ds-64b.conf +++ b/bsp/meta-freescale/conf/machine/p5040ds-64b.conf @@ -9,16 +9,15 @@ require conf/machine/include/e5500-64b.inc MACHINEOVERRIDES =. "p5040:" -UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" -UBOOT_CONFIG[nor] = "P5040DS_config" +UBOOT_CONFIG ??= "nand sdcard spi nor" +UBOOT_CONFIG[nor] = "P5040DS_config,,u-boot-with-dtb.bin" UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl" -UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config" UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl" UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl" HV_CFG_M = "p5040ds" -KERNEL_DEVICETREE ?= "p5040ds.dtb" +KERNEL_DEVICETREE ?= "fsl/p5040ds.dtb" KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/bsp/meta-freescale/conf/machine/p5040ds.conf b/bsp/meta-freescale/conf/machine/p5040ds.conf index af581f49..daa8d4cd 100644 --- a/bsp/meta-freescale/conf/machine/p5040ds.conf +++ b/bsp/meta-freescale/conf/machine/p5040ds.conf @@ -7,18 +7,17 @@ require conf/machine/include/e5500.inc -MACHINEOVERRIDES =. "p5040" +MACHINEOVERRIDES =. "p5040:" -UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" -UBOOT_CONFIG[nor] = "P5040DS_config" +UBOOT_CONFIG ??= "nand sdcard spi nor" +UBOOT_CONFIG[nor] = "P5040DS_config,,u-boot-with-dtb.bin" UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl" -UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config" UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl" UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl" HV_CFG_M = "p5040ds" -KERNEL_DEVICETREE ?= "p5040ds.dtb" +KERNEL_DEVICETREE ?= "fsl/p5040ds.dtb" KERNEL_DEFCONFIG ?= "corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/bsp/meta-freescale/conf/machine/t1024rdb-64b.conf b/bsp/meta-freescale/conf/machine/t1024rdb-64b.conf index 490c8491..92ccc0e6 100644 --- a/bsp/meta-freescale/conf/machine/t1024rdb-64b.conf +++ b/bsp/meta-freescale/conf/machine/t1024rdb-64b.conf @@ -9,16 +9,15 @@ require conf/machine/include/e5500-64b.inc MACHINEOVERRIDES =. "t1:t1024:" -UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" -UBOOT_CONFIG[nor] = "T1024RDB_config" +UBOOT_CONFIG ??= "nand sdcard spi nor" +UBOOT_CONFIG[nor] = "T1024RDB_config,,u-boot-with-dtb.bin" UBOOT_CONFIG[nand] = "T1024RDB_NAND_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config" HV_CFG_M = "t1024rdb" -KERNEL_DEVICETREE ?= "t1024rdb.dtb" +KERNEL_DEVICETREE ?= "fsl/t1024rdb.dtb" KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/bsp/meta-freescale/conf/machine/t1024rdb.conf b/bsp/meta-freescale/conf/machine/t1024rdb.conf index 616ce3f1..9d39958e 100644 --- a/bsp/meta-freescale/conf/machine/t1024rdb.conf +++ b/bsp/meta-freescale/conf/machine/t1024rdb.conf @@ -7,18 +7,17 @@ require conf/machine/include/e5500.inc -MACHINEOVERRIDES =. "t1:t1024" +MACHINEOVERRIDES =. "t1:t1024:" -UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" -UBOOT_CONFIG[nor] = "T1024RDB_config" +UBOOT_CONFIG ??= "nand sdcard spi nor" +UBOOT_CONFIG[nor] = "T1024RDB_config,,u-boot-with-dtb.bin" UBOOT_CONFIG[nand] = "T1024RDB_NAND_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config" HV_CFG_M = "t1024rdb" -KERNEL_DEVICETREE ?= "t1024rdb.dtb" +KERNEL_DEVICETREE ?= "fsl/t1024rdb.dtb" KERNEL_DEFCONFIG ?= "corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/bsp/meta-freescale/conf/machine/t1042d4rdb-64b.conf b/bsp/meta-freescale/conf/machine/t1042d4rdb-64b.conf index 873f206a..dd9acda1 100644 --- a/bsp/meta-freescale/conf/machine/t1042d4rdb-64b.conf +++ b/bsp/meta-freescale/conf/machine/t1042d4rdb-64b.conf @@ -9,16 +9,15 @@ require conf/machine/include/e5500-64b.inc MACHINEOVERRIDES =. "t1:t1042:" -UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" -UBOOT_CONFIG[nor] = "T1042D4RDB_config,,u-boot.bin" +UBOOT_CONFIG ??= "nand sdcard spi nor" +UBOOT_CONFIG[nor] = "T1042D4RDB_config,,u-boot-with-dtb.bin" UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config,,u-boot.bin" HV_CFG_M = "t1040rdb" -KERNEL_DEVICETREE ?= "t1042d4rdb.dtb" +KERNEL_DEVICETREE ?= "fsl/t1042d4rdb.dtb" KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/bsp/meta-freescale/conf/machine/t1042d4rdb.conf b/bsp/meta-freescale/conf/machine/t1042d4rdb.conf index 685b7cb1..52a792c7 100644 --- a/bsp/meta-freescale/conf/machine/t1042d4rdb.conf +++ b/bsp/meta-freescale/conf/machine/t1042d4rdb.conf @@ -9,16 +9,15 @@ require conf/machine/include/e5500.inc MACHINEOVERRIDES =. "t1:t1042:" -UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" -UBOOT_CONFIG[nor] = "T1042D4RDB_config,,u-boot.bin" +UBOOT_CONFIG ??= "nand sdcard spi nor" +UBOOT_CONFIG[nor] = "T1042D4RDB_config,,u-boot-with-dtb.bin" UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config,,u-boot.bin" HV_CFG_M = "t1040rdb" -KERNEL_DEVICETREE ?= "t1042d4rdb.dtb" +KERNEL_DEVICETREE ?= "fsl/t1042d4rdb.dtb" KERNEL_DEFCONFIG ?= "corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/bsp/meta-freescale/conf/machine/t2080rdb-64b.conf b/bsp/meta-freescale/conf/machine/t2080rdb-64b.conf index c46d94cf..2da8b3d2 100644 --- a/bsp/meta-freescale/conf/machine/t2080rdb-64b.conf +++ b/bsp/meta-freescale/conf/machine/t2080rdb-64b.conf @@ -9,17 +9,15 @@ require conf/machine/include/e6500-64b.inc MACHINEOVERRIDES =. "t2:t2080:" -UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor" -UBOOT_CONFIG[nor] = "T2080RDB_config" +UBOOT_CONFIG ??= "sdcard spi nand nor" +UBOOT_CONFIG[nor] = "T2080RDB_config,,u-boot-with-dtb.bin" UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[nand] = "T2080RDB_NAND_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config" -UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config" HV_CFG_M = "t2080rdb" -KERNEL_DEVICETREE ?= "t2080rdb.dtb" +KERNEL_DEVICETREE ?= "fsl/t2080rdb.dtb" KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/bsp/meta-freescale/conf/machine/t2080rdb.conf b/bsp/meta-freescale/conf/machine/t2080rdb.conf index bfcb7689..9b6a85ac 100644 --- a/bsp/meta-freescale/conf/machine/t2080rdb.conf +++ b/bsp/meta-freescale/conf/machine/t2080rdb.conf @@ -7,19 +7,17 @@ require conf/machine/include/e6500.inc -MACHINEOVERRIDES =. "t2:t2080" +MACHINEOVERRIDES =. "t2:t2080:" -UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor" -UBOOT_CONFIG[nor] = "T2080RDB_config" +UBOOT_CONFIG ??= "sdcard spi nand nor" +UBOOT_CONFIG[nor] = "T2080RDB_config,,u-boot-with-dtb.bin" UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[nand] = "T2080RDB_NAND_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config" -UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config" HV_CFG_M = "t2080rdb" -KERNEL_DEVICETREE ?= "t2080rdb.dtb" +KERNEL_DEVICETREE ?= "fsl/t2080rdb.dtb" KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/bsp/meta-freescale/conf/machine/t4240rdb-64b.conf b/bsp/meta-freescale/conf/machine/t4240rdb-64b.conf index 0ccfce7c..7073e2a9 100644 --- a/bsp/meta-freescale/conf/machine/t4240rdb-64b.conf +++ b/bsp/meta-freescale/conf/machine/t4240rdb-64b.conf @@ -10,11 +10,11 @@ require conf/machine/include/e6500-64b.inc MACHINEOVERRIDES =. "t4:t4240:" UBOOT_CONFIG ??= "nor" -UBOOT_CONFIG[nor] = "T4240RDB_config" +UBOOT_CONFIG[nor] = "T4240RDB_config,,u-boot-with-dtb.bin" HV_CFG_M = "t4240rdb" -KERNEL_DEVICETREE ?= "t4240rdb.dtb" +KERNEL_DEVICETREE ?= "fsl/t4240rdb.dtb" KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/bsp/meta-freescale/conf/machine/t4240rdb.conf b/bsp/meta-freescale/conf/machine/t4240rdb.conf index 9f86345e..1f8cb83c 100644 --- a/bsp/meta-freescale/conf/machine/t4240rdb.conf +++ b/bsp/meta-freescale/conf/machine/t4240rdb.conf @@ -7,14 +7,14 @@ require conf/machine/include/e6500.inc -MACHINEOVERRIDES =. "t4:t4240" +MACHINEOVERRIDES =. "t4:t4240:" UBOOT_CONFIG ??= "nor" -UBOOT_CONFIG[nor] = "T4240RDB_config" +UBOOT_CONFIG[nor] = "T4240RDB_config,,u-boot-with-dtb.bin" HV_CFG_M = "t4240rdb" -KERNEL_DEVICETREE ?= "t4240rdb.dtb" +KERNEL_DEVICETREE ?= "fsl/t4240rdb.dtb" KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" |