MIRRORS/meta-freescale-3rdparty
1
0
Fork 0
mirror of https://github.com/Freescale/meta-freescale-3rdparty.git synced 2025-07-05 05:15:24 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #242 from chrisdimich/master

Browse Source 
u-boot-boundary: bump to 2022.04 and use imx-boot-container
This commit is contained in:
Otavio Salvador 2022-10-19 18:57:45 -03:00 committed by GitHub
commit 070f5cc7b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 77 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
conf/machine/nitrogen8m.conf
View File

@ -4,7 +4,7 @@
#@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8M
#@MAINTAINER: Chris Dimich <chris.dimich@boundarydevices.com>
MACHINEOVERRIDES =. "mx8mq:"
MACHINEOVERRIDES =. "mx8mq:imx-boot-container:"
IMX_DEFAULT_BSP ?= "nxp"
@ -28,27 +28,21 @@ 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_MAKE_TARGET = ""
UBOOT_SUFFIX = "bin"
# Used to define the U-Boot defconfig for different board variants. The naming
# is here as a safeguard mechanism so that a user doesn't build and flash the
# wrong configuration.
#
# This method will be optimized in the future, but for now, use this variable to
# define the defconfig to be built.
BOUNDARY_DEVICES_UBOOT_DEFCONFIG ?= "nitrogen8m"
UBOOT_CONFIG ??= "2g 2gr0 3g 4g som_2g som_2gr0 som_4g som_sd_2g som_sd_4g"
UBOOT_CONFIG[2g] = "${MACHINE}_2g_defconfig,sdcard"
UBOOT_CONFIG[2gr0] = "${MACHINE}_2gr0_defconfig,sdcard"
UBOOT_CONFIG[3g] = "${MACHINE}_3g_defconfig,sdcard"
UBOOT_CONFIG[4g] = "${MACHINE}_4g_defconfig,sdcard"
UBOOT_CONFIG[som_2g] = "${MACHINE}_som_2g_defconfig,sdcard"
UBOOT_CONFIG[som_2gr0] = "${MACHINE}_som_2gr0_defconfig,sdcard"
UBOOT_CONFIG[som_4g] = "${MACHINE}_som_4g_defconfig,sdcard"
UBOOT_CONFIG[som_sd_2g] = "${MACHINE}_som_sd_2g_defconfig,sdcard"
UBOOT_CONFIG[som_sd_4g] = "${MACHINE}_som_sd_4g_defconfig,sdcard"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard"
# Set ATF platform name
ATF_PLATFORM = "imx8mq"
IMXBOOT_TARGETS = "flash_evk"
IMX_BOOT_SOC_TARGET = "iMX8M"
DDR_FIRMWARE_NAME = "\
lpddr4_pmu_train_1d_imem.bin \
lpddr4_pmu_train_1d_dmem.bin \
@ -59,7 +53,15 @@ DDR_FIRMWARE_NAME = "\
IMAGE_BOOT_FILES:append = " \
boot.scr-${MACHINE};boot.scr \
upgrade.scr-${MACHINE};upgrade.scr \
imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \
flash.bin-${MACHINE}-2g;u-boot.${MACHINE}_2g \
flash.bin-${MACHINE}-2gr0;u-boot.${MACHINE}_2gr0 \
flash.bin-${MACHINE}-3g;u-boot.${MACHINE}_3g \
flash.bin-${MACHINE}-4g;u-boot.${MACHINE}_4g \
flash.bin-${MACHINE}-som_2g;u-boot.${MACHINE}_som_2g \
flash.bin-${MACHINE}-som_2gr0;u-boot.${MACHINE}_som_2gr0 \
flash.bin-${MACHINE}-som_4g;u-boot.${MACHINE}_som_4g \
flash.bin-${MACHINE}-som_sd_2g;u-boot.${MACHINE}_som_sd_2g \
flash.bin-${MACHINE}-som_sd_4g;u-boot.${MACHINE}_som_sd_4g \
"
# wic support

40
conf/machine/nitrogen8mm.conf
View File

@ -4,7 +4,7 @@
#@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8MM
#@MAINTAINER: Chris Dimich <chris.dimich@boundarydevices.com>
MACHINEOVERRIDES =. "mx8mm:"
MACHINEOVERRIDES =. "mx8mm:imx-boot-container:"
IMX_DEFAULT_BSP ?= "nxp"
@ -32,27 +32,22 @@ 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_rev2.dtb"
UBOOT_MAKE_TARGET = ""
UBOOT_SUFFIX = "bin"
# Used to define the U-Boot defconfig for different board variants. The naming
# is here as a safeguard mechanism so that a user doesn't build and flash the
# wrong configuration.
#
# This method will be optimized in the future, but for now, use this variable to
# define the defconfig to be built.
BOUNDARY_DEVICES_UBOOT_DEFCONFIG ?= "nitrogen8mm_rev2_2g"
UBOOT_CONFIG ??= "2g 2gr0 4g rev2_2g rev2_2gr0 rev2_4g som_1gr0 som_2g som_2gr0 som_4g"
UBOOT_CONFIG[2g] = "${MACHINE}_2g_defconfig,sdcard"
UBOOT_CONFIG[2gr0] = "${MACHINE}_2gr0_defconfig,sdcard"
UBOOT_CONFIG[4g] = "${MACHINE}_4g_defconfig,sdcard"
UBOOT_CONFIG[rev2_2g] = "${MACHINE}_rev2_2g_defconfig,sdcard"
UBOOT_CONFIG[rev2_2gr0] = "${MACHINE}_rev2_4g_defconfig,sdcard"
UBOOT_CONFIG[rev2_4g] = "${MACHINE}_2gr0_defconfig,sdcard"
UBOOT_CONFIG[som_1gr0] = "${MACHINE}_som_1gr0_defconfig,sdcard"
UBOOT_CONFIG[som_2g] = "${MACHINE}_som_2g_defconfig,sdcard"
UBOOT_CONFIG[som_2gr0] = "${MACHINE}_som_2g_defconfig,sdcard"
UBOOT_CONFIG[som_4g] = "${MACHINE}_som_4g_defconfig,sdcard"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard"
# Set ATF platform name
ATF_PLATFORM = "imx8mm"
IMXBOOT_TARGETS = "flash_evk"
IMX_BOOT_SOC_TARGET = "iMX8MM"
# Set DDR FIRMWARE
DDR_FIRMWARE_NAME = "\
lpddr4_pmu_train_1d_imem.bin \
@ -64,7 +59,16 @@ DDR_FIRMWARE_NAME = "\
IMAGE_BOOT_FILES:append = " \
boot.scr-${MACHINE};boot.scr \
upgrade.scr-${MACHINE};upgrade.scr \
imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \
flash.bin-${MACHINE}-2g;u-boot.${MACHINE}_2g \
flash.bin-${MACHINE}-2gr0;u-boot.${MACHINE}_2gr0 \
flash.bin-${MACHINE}-4g;u-boot.${MACHINE}_4g \
flash.bin-${MACHINE}-rev2_2g;u-boot.${MACHINE}_rev2_2g \
flash.bin-${MACHINE}-rev2_2gr0;u-boot.${MACHINE}_rev2_2gr0 \
flash.bin-${MACHINE}-rev2_4g;u-boot.${MACHINE}_rev2_4g \
flash.bin-${MACHINE}-som_1gr0;u-boot.${MACHINE}_som_1gr0 \
flash.bin-${MACHINE}-som_2g;u-boot.${MACHINE}_som_2g \
flash.bin-${MACHINE}-som_2gr0;u-boot.${MACHINE}_som_2gr0 \
flash.bin-${MACHINE}-som_4g;u-boot.${MACHINE}_som_4g \
"
# wic support

24
conf/machine/nitrogen8mn.conf
View File

@ -4,7 +4,7 @@
#@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8M Nano
#@MAINTAINER: Chris Dimich <chris.dimich@boundarydevices.com>
MACHINEOVERRIDES =. "mx8mn:"
MACHINEOVERRIDES =. "mx8mn:imx-boot-container:"
IMX_DEFAULT_BSP ?= "nxp"
@ -27,27 +27,14 @@ 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"
# Used to define the U-Boot defconfig for different board variants. The naming
# is here as a safeguard mechanism so that a user doesn't build and flash the
# wrong configuration.
#
# This method will be optimized in the future, but for now, use this variable to
# define the defconfig to be built.
BOUNDARY_DEVICES_UBOOT_DEFCONFIG ?= "nitrogen8_nano_8mn1gr0"
UBOOT_CONFIG ??= "1g som_1g"
UBOOT_CONFIG[1g] = "${MACHINE}_1g_defconfig,sdcard"
UBOOT_CONFIG[som_1g] = "${MACHINE}_som_1g_defconfig,sdcard"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard"
# Set ATF platform name
ATF_PLATFORM = "imx8mn"
IMXBOOT_TARGETS = "flash_evk"
IMX_BOOT_SOC_TARGET = "iMX8MN"
DDR_FIRMWARE_NAME = "\
lpddr4_pmu_train_1d_imem.bin \
lpddr4_pmu_train_1d_dmem.bin \
@ -58,7 +45,8 @@ DDR_FIRMWARE_NAME = "\
IMAGE_BOOT_FILES:append = " \
boot.scr-${MACHINE};boot.scr \
upgrade.scr-${MACHINE};upgrade.scr \
imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \
flash.bin-${MACHINE}-1g;u-boot.${MACHINE}_1g \
flash.bin-${MACHINE}-som_1g;u-boot.${MACHINE}_som_1g \
"
# wic support

32
conf/machine/nitrogen8mp.conf
View File

@ -4,7 +4,7 @@
#@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8MP
#@MAINTAINER: Chris Dimich <chris.dimich@boundarydevices.com>
MACHINEOVERRIDES =. "mx8mp:"
MACHINEOVERRIDES =. "mx8mp:imx-boot-container:"
IMX_DEFAULT_BSP ?= "nxp"
@ -26,25 +26,15 @@ 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 ?= "imx8mp-nitrogen8mp.dtb"
UBOOT_MAKE_TARGET = ""
UBOOT_SUFFIX = "bin"
# Used to define the U-Boot defconfig for different board variants. The naming
# is here as a safeguard mechanism so that a user doesn't build and flash the
# wrong configuration.
#
# This method will be optimized in the future, but for now, use this variable to
# define the defconfig to be built.
BOUNDARY_DEVICES_UBOOT_DEFCONFIG ?= "nitrogen8mp_2gr0"
UBOOT_CONFIG ??= "2g 2gr0 4g 8g"
UBOOT_CONFIG[2g] = "${MACHINE}_2g_defconfig,sdcard"
UBOOT_CONFIG[2gr0] = "${MACHINE}_2gr0_defconfig,sdcard"
UBOOT_CONFIG[4g] = "${MACHINE}_4g_defconfig,sdcard"
UBOOT_CONFIG[8g] = "${MACHINE}_8g_defconfig,sdcard"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard"
IMAGE_BOOTLOADER = "imx-boot"
ATF_PLATFORM = "imx8mp"
IMXBOOT_TARGETS = "flash_evk"
IMX_BOOT_SOC_TARGET = "iMX8MP"
DDR_FIRMWARE_NAME = "\
lpddr4_pmu_train_1d_imem_202006.bin \
@ -53,13 +43,17 @@ DDR_FIRMWARE_NAME = "\
lpddr4_pmu_train_2d_dmem_202006.bin \
"
# wic support
WKS_FILE = "sdimage-bootpart.wks"
IMAGE_BOOT_FILES:append = " \
boot.scr-${MACHINE};boot.scr \
upgrade.scr-${MACHINE};upgrade.scr \
imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \
flash.bin-${MACHINE}-2g;u-boot.${MACHINE}_2g \
flash.bin-${MACHINE}-2gr0;u-boot.${MACHINE}_2gr0 \
flash.bin-${MACHINE}-4g;u-boot.${MACHINE}_4g \
flash.bin-${MACHINE}-8g;u-boot.${MACHINE}_8g \
"
# wic support
WKS_FILE = "sdimage-bootpart.wks"
WKS_FILE_DEPENDS += "u-boot-script-boundary"
OPTEE_BIN_EXT = "8mp"

8
recipes-bsp/u-boot/u-boot-boundary-common_2020.10.inc → recipes-bsp/u-boot/u-boot-boundary-common_2022.04.inc
View File

@ -2,11 +2,11 @@ DESCRIPTION = "U-Boot for Boundary Devices boards"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
PV = "v2020.10+git${SRCPV}"
PV = "v2022.04+git${SRCPV}"
SRCREV = "3d5e7f60236b1f70ed244a2270a50238a2acfd72"
SRCBRANCH = "boundary-v2020.10"
SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH};protocol=https"
SRCREV = "951b0deec7d391435d0f77a141b7b7f5931663e3"
SRCBRANCH = "boundary-v2022.04"
SRC_URI = "git://github.com/boundarydevices/u-boot.git;branch=${SRCBRANCH};protocol=https"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"

18
recipes-bsp/u-boot/u-boot-boundary_2020.10.bb
View File

@ -1,18 +0,0 @@
require recipes-bsp/u-boot/u-boot.inc
require recipes-bsp/u-boot/u-boot-boundary-common_${PV}.inc
DEPENDS += "bison-native"
SRC_URI += "file://fw_env.config"
PROVIDES += "u-boot"
BOOT_TOOLS = "imx-boot-tools"
do_deploy:append:mx8-nxp-bsp () {
install -d ${DEPLOYDIR}/${BOOT_TOOLS}
install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG}
}
COMPATIBLE_MACHINE = "(nitrogen6x-lite|nitrogen6x|nitrogen6sx|nitrogen7|nitrogen8m|nitrogen8mm|nitrogen8mn|nitrogen8mp)"

12
recipes-bsp/u-boot/u-boot-boundary_2022.04.bb Normal file
View File

@ -0,0 +1,12 @@
require recipes-bsp/u-boot/u-boot.inc
require recipes-bsp/u-boot/u-boot-boundary-common_${PV}.inc
inherit deploy ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')}
DEPENDS += "bison-native dtc-native python3-setuptools-native"
SRC_URI += "file://fw_env.config"
PROVIDES += "u-boot"
COMPATIBLE_MACHINE = "(nitrogen6x-lite|nitrogen6x|nitrogen6sx|nitrogen7|nitrogen8m|nitrogen8mm|nitrogen8mn|nitrogen8mp)"

0
recipes-bsp/u-boot/u-boot-script-boundary_2020.10.bb → recipes-bsp/u-boot/u-boot-script-boundary_2022.04.bb
View File