[dunfell/master PATCH V3] trusted-firmware-a: Update SRCREV for AM64X support
praneeth
From: Praneeth Bajjuri <praneeth@...>
Update SRCREV to pick latest that includes AM64X support commit 65dd16b4e ("ti: k3: Introduce lite device board support") adds support of AM64X platform in ti-atf branch. This patch updates the SRCREV and also updates the BOARD to "lite" to build for the mentioned platform. Signed-off-by: Praneeth Bajjuri <praneeth@...> --- Changes since V2: - Update commit message adding more details on new platform Changes since V1: - Update TFA_BOARD target name for AM64 as "lite" recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 3ca4a204..a7ca43c3 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -2,11 +2,12 @@ PV_k3 = "2.4" LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" BRANCH_k3 = "ti-atf" SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa" -SRCREV_tfa_k3 = "f0a310d000fd6e8a1ed0ccc365b5931390393db1" +SRCREV_tfa_k3 = "65dd16b4ea5032752af62e94ca64cff41733a123" COMPATIBLE_MACHINE_k3 = "k3" TFA_BUILD_TARGET_k3 = "all" TFA_INSTALL_TARGET_k3 = "bl31" TFA_SPD_k3 = "opteed" +TFA_BOARD_am64xx-evm = "lite" do_compile_append_am65xx-hs-evm() { export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} -- 2.17.1
|
|
Re: [dunfell/master PATCH V2] trusted-firmware-a: Update SRCREV to pick latest
Dan Murphy <dmurphy@...>
Praneeth
On 12/15/20 2:59 PM, Bajjuri, Praneeth wrote: Thanks. Now if we can just get that in the commit message except for the URL target Dan
|
|
Re: [dunfell/master PATCH V2] trusted-firmware-a: Update SRCREV to pick latest
praneeth
On 12/15/2020 2:53 PM, Dan Murphy wrote:
PraneethThats the new target name for AM64 Ref: https://git.ti.com/cgit/atf/arm-trusted-firmware/commit/?h=ti-atf&id=65dd16b4ea5032752af62e94ca64cff41733a123 TARGET_BOARD=lite for AM64 TARGET_BOARD=generic (default for other devices) defined at conf/machine/include/k3.inc Dan
|
|
Re: [dunfell/master PATCH V2] trusted-firmware-a: Update SRCREV to pick latest
Dan Murphy <dmurphy@...>
Praneeth
On 12/15/20 2:51 PM, praneeth@... wrote: From: Praneeth Bajjuri <praneeth@...>You are doing just a bit more then this. What is the "lite" for now? Dan
|
|
[dunfell/master PATCH V2] trusted-firmware-a: Update SRCREV to pick latest
praneeth
From: Praneeth Bajjuri <praneeth@...>
Update SRCREV to pick latest that includes AM64 support Signed-off-by: Praneeth Bajjuri <praneeth@...> --- recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 4942bf46..39ef1171 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -2,11 +2,12 @@ PV_k3 = "2.4" LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" BRANCH_k3 = "ti-atf" SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa" -SRCREV_tfa_k3 = "f0a310d000fd6e8a1ed0ccc365b5931390393db1" +SRCREV_tfa_k3 = "65dd16b4ea5032752af62e94ca64cff41733a123" COMPATIBLE_MACHINE_k3 = "k3" TFA_BUILD_TARGET_k3 = "all" TFA_INSTALL_TARGET_k3 = "bl31" TFA_SPD_k3 = "opteed" +TFA_BOARD_am64xx-evm = "lite" do_compile_append_am65xx-hs-evm() { export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} -- 2.17.1
|
|
[dunfell/master] [PATCH 3/4] machine: am64xx-evm.conf: Remove commented code and update PDK values
Dan Murphy <dmurphy@...>
Signed-off-by: Dan Murphy <dmurphy@...>
--- conf/machine/include/am64xx.inc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc index 79a403a93937..5a04a4388665 100644 --- a/conf/machine/include/am64xx.inc +++ b/conf/machine/include/am64xx.inc @@ -1,7 +1,7 @@ require conf/machine/include/k3.inc SOC_FAMILY_append = ":am64xx" -MACHINE_FEATURES += "screen touchscreen gpu" +MACHINE_FEATURES += "screen touchscreen" SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" @@ -9,13 +9,10 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = " \ ti/k3-am642-evm.dtb \ " - -#IMAGE_BOOT_FILES += "sysfw-am64x-evm.itb" - OPTEEMACHINE = "k3-am65x" OPTEEOUTPUTMACHINE = "k3" # Set the list of device targets for ti-pdk class recipes TI_PDK_LIMIT_SOCS = "am64x" -TI_PDK_LIMIT_BOARDS = "am64xx_evm" -TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0" +TI_PDK_LIMIT_BOARDS = "am64x_evm" +TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0 mcu1_1 mcu2_0 mcu2_1" -- 2.29.2
|
|
[dunfell/master] [PATCH 1/4] linux-ti-staging: Update kernel to latest commit sha
Dan Murphy <dmurphy@...>
Signed-off-by: Dan Murphy <dmurphy@...>
--- recipes-kernel/linux/linux-ti-staging-rt_5.4.bb | 4 ++-- recipes-kernel/linux/linux-ti-staging_5.4.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb b/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb index 2f8fe2bfec9d..3fc37f01a7d3 100644 --- a/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb +++ b/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb @@ -6,5 +6,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:" BRANCH = "ti-rt-linux-5.4.y" -SRCREV = "a59ca20fbcdc436be90ca38c199f9b640671fdb7" -PV = "5.4.78+git${SRCPV}" +SRCREV = "6a28f3bdf16a8dda913d1544d093780a95f25fc2" +PV = "5.4.82+git${SRCPV}" diff --git a/recipes-kernel/linux/linux-ti-staging_5.4.bb b/recipes-kernel/linux/linux-ti-staging_5.4.bb index 8275988bb1a7..813a58a198e4 100644 --- a/recipes-kernel/linux/linux-ti-staging_5.4.bb +++ b/recipes-kernel/linux/linux-ti-staging_5.4.bb @@ -21,8 +21,8 @@ S = "${WORKDIR}/git" BRANCH = "ti-linux-5.4.y" -SRCREV = "7a5e2e57a39a097b4dde09bad8f72a2d31dc09c4" -PV = "5.4.78+git${SRCPV}" +SRCREV = "a859b16c71c3fc11b43ac895c7ec830f9d9f932a" +PV = "5.4.82+git${SRCPV}" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild MACHINE_KERNEL_PR_append = "a" -- 2.29.2
|
|
[dunfell/master] [PATCH 2/4] u-boot-ti: Remove unneeded variable for am64xx
Dan Murphy <dmurphy@...>
Signed-off-by: Dan Murphy <dmurphy@...>
--- recipes-bsp/u-boot/u-boot-ti.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc index 1770c3a1bda8..b7fd246aca6c 100644 --- a/recipes-bsp/u-boot/u-boot-ti.inc +++ b/recipes-bsp/u-boot/u-boot-ti.inc @@ -65,7 +65,6 @@ SPL_UART_BINARY_keystone = "" SPL_UART_BINARY_k3r5 = "" SPL_UART_BINARY_lego-ev3 = "" SPL_UART_BINARY_j7200-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY_am64xx-evm = "" SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" -- 2.29.2
|
|
[dunfell/master] [PATCH 4/4] ti-rtos: Update metadata and versions for RTOS firmware
Dan Murphy <dmurphy@...>
Signed-off-by: Dan Murphy <dmurphy@...>
--- recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 19 +++++++++++-------- recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index 74aac2c9fa0d..d80d365380a4 100644 --- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb @@ -17,11 +17,14 @@ include ${DEPLOY_DIR_IMAGE}/metadata.inc # Set some defaults for when metadata.inc is not available DEFAULT_RTOS_FAMILY = "jacinto" -DEFAULT_RTOS_VERSION = "07_01_00_38" -DEFAULT_RTOS_VERSION_DOT = "07.01.00.38" +DEFAULT_RTOS_VERSION = "07_01_00_45" +DEFAULT_RTOS_VERSION_DOT = "07.01.00.45" -DEFAULT_RTOS_VERSION_am64xx = "07_01_03_01" -DEFAULT_RTOS_VERSION_DOT_am64xx = "07.01.03.01" +DEFAULT_RTOS_VERSION_am65xx = "07_01_00_55" +DEFAULT_RTOS_VERSION_DOT_am65xx = "07.01.00.55" + +DEFAULT_RTOS_VERSION_am64xx = "07_01_03_09" +DEFAULT_RTOS_VERSION_DOT_am64xx = "07.01.03.09" DEFAULT_RTOS_SOC = "undefined" DEFAULT_RTOS_SOC_j7 = "j721e" @@ -40,10 +43,10 @@ DEFAULT_FIRMWARE_URL = "file://empty" DEFAULT_FIRMWARE_URL_k3 = "${CORESDK_RTOS_WEBLINK}/${DEFAULT_FIRMWARE_FILE}" DEFAULT_FIRMWARE_SHA256SUM = "unknown" -DEFAULT_FIRMWARE_SHA256SUM_j7 = "93e4d3742a922015f3295f5c20ef4bc2b9751139ffcd5620b8df7047bff50651" -DEFAULT_FIRMWARE_SHA256SUM_j7200-evm = "cd5071a8f6ddaec05346e4c2bbeed6dc7bcb376d6edc47f81b9aeaf38f151176" -DEFAULT_FIRMWARE_SHA256SUM_am65xx = "e54cc8da7fefa1ebf55454b184b42c364de3eebb34a328d244b8275b7763eb58" -DEFAULT_FIRMWARE_SHA256SUM_am64xx = "dc1a39b7a7f403235364a84ed5291666a84a5fa7fe8c136ec07d45848c1017f4" +DEFAULT_FIRMWARE_SHA256SUM_j7 = "23e8dec2b31f126e26953eb350e9bb252c1ea5135fa96eb6621691f00a54232b" +DEFAULT_FIRMWARE_SHA256SUM_j7200-evm = "b1c0663327fc91f280ac93be1da786f68d296abaea33a75798f3c38f8578418a" +DEFAULT_FIRMWARE_SHA256SUM_am65xx = "688127b48bdcb273bd66f035690bf56aa4ad396ce51100a75439ea00c7695456" +DEFAULT_FIRMWARE_SHA256SUM_am64xx = "78ef4d1b4e07995323b872ca4fa1259ff43f10cf88d40a32b84fa4ac9a5fee51" # Use weak assignment for CORESDK_RTOS_* variables to use defaults if not yet set CORESDK_RTOS_FAMILY ?= "${DEFAULT_RTOS_FAMILY}" diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb b/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb index d4f33443699a..5d5a12250311 100644 --- a/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +++ b/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb @@ -18,7 +18,7 @@ PLAT_SFX_am64xx = "/am64x" # Use weak assignment to set defaults to TI_RTOS_METADATA_* variables TI_RTOS_METADATA_URI ?= "git://git.ti.com/processor-sdk/coresdk_rtos_releases.git" TI_RTOS_METADATA_PROTOCOL ?= "git" -TI_RTOS_METADATA_SRCREV ?= "d946278e9a40632d05cd1e953f5f200011be69a9" +TI_RTOS_METADATA_SRCREV ?= "1c8107dd47298ea9b8518083ffcd2f7e91ea7c00" TI_RTOS_METADATA_BRANCH ?= "master" TI_RTOS_METADATA_DIR ?= "${PLAT_SFX}" TI_RTOS_METADATA_FILE ?= "${S}${TI_RTOS_METADATA_DIR}/metadata.inc" -- 2.29.2
|
|
Re: [dunfell/master PATCH] trusted-firmware-a: Update SRCREV to pick latest
Dan Murphy <dmurphy@...>
Hello
On 12/12/20 4:09 PM, Suman Anna wrote: Hi Praneeth,Is this something that needs to be added to the recipe. To be honest I have not yet reviewed the ATF patches to know Dan
|
|
Re: [dunfell/master PATCH] trusted-firmware-a: Update SRCREV to pick latest
Suman Anna
Hi Praneeth,
On 12/12/20 3:23 PM, praneeth@... wrote: From: Praneeth Bajjuri <praneeth@...>This by itself will not be enough for AM64, but that can be an add-on patch. Need to account for TARGET_BOARD=lite for AM64x. regards Suman
|
|
[dunfell/master PATCH] trusted-firmware-a: Update SRCREV to pick latest
praneeth
From: Praneeth Bajjuri <praneeth@...>
Update SRCREV to pick latest that includes AM64 support Signed-off-by: Praneeth Bajjuri <praneeth@...> --- recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 3ca4a204..7821ed3a 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -2,7 +2,7 @@ PV_k3 = "2.4" LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" BRANCH_k3 = "ti-atf" SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa" -SRCREV_tfa_k3 = "f0a310d000fd6e8a1ed0ccc365b5931390393db1" +SRCREV_tfa_k3 = "65dd16b4ea5032752af62e94ca64cff41733a123" COMPATIBLE_MACHINE_k3 = "k3" TFA_BUILD_TARGET_k3 = "all" TFA_INSTALL_TARGET_k3 = "bl31" -- 2.17.1
|
|
Re: [PATCH 2/4] linux-ti-staging: Update kernel to pick up AM64 platform
Dan Murphy <dmurphy@...>
Suman
On 12/12/20 1:03 AM, Suman Anna wrote: On 12/11/20 7:31 AM, Dan Murphy via lists.yoctoproject.org wrote:OK I will send another patch to update the SHA and revSigned-off-by: Dan Murphy <dmurphy@...>You can probably merge this patch first in preparation. Also, the SHA is already Dan
|
|
Re: [PATCH 4/4] ti-rtos: Update metadata with AM64 firmware
Suman Anna
On 12/11/20 7:32 AM, Dan Murphy via lists.yoctoproject.org wrote:
Signed-off-by: Dan Murphy <dmurphy@...>I believe this should be am64x, atleast thats the name used in the metadata.inc files. Did you submit the wrong patch? I see this as /am64x on the -next branch, which is correct. regards Suman
|
|
Re: [PATCH 3/4] u-boot-ti: Update u-boot to pick up AM64 architecture
Suman Anna
On 12/11/20 7:32 AM, Dan Murphy via lists.yoctoproject.org wrote:
Signed-off-by: Dan Murphy <dmurphy@...>Why do we need this? I don't see any for AM65xx. regards Suman
|
|
Re: [PATCH 2/4] linux-ti-staging: Update kernel to pick up AM64 platform
Suman Anna
On 12/11/20 7:31 AM, Dan Murphy via lists.yoctoproject.org wrote:
Signed-off-by: Dan Murphy <dmurphy@...>You can probably merge this patch first in preparation. Also, the SHA is already stale, might just pick the latest, even 5.4.82.. regards Suman PV = "5.4.78+git${SRCPV}"
|
|
Re: [PATCH 1/4] machine: am64xx-evm.conf: Add machine definition for AM64xx platform
Suman Anna
Hi Dan,
On 12/11/20 7:31 AM, Dan Murphy via lists.yoctoproject.org wrote: The AM64 is a follow on device of the AM65xx K3 multicore SoC architecture.Guess you are going to wait until ti-sci-fw recipe is updated. Alternatively, name this correctly, and do not include the ti-sci-fw recipe for now for AM64xx. This should be ready the next business day. +SYSFW_CONFIG = "evm"Hmm, is this list accurate actually? AFAIK, there's no GPU or does this signify something else? +Get rid of this line.. +The PDK SoC and board defined are am64x and am64x_evm as per the PDK sources. +TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0"You need to add additional cores, mcu1_1 mcu2_0 and mcu2_1 regards Suman
|
|
Re: [EXTERNAL] [meta-ti] [dunfell/master] [PATCH] ti-sysbios: upgrade 6.76.03.01 -> 6.76.04.02
Gowtham Tammana <g-tammana@...>
toggle quoted messageShow quoted text
-----Original Message-----Ah didn’t notice the underscores and dots here. The recipe naming convention is ${PN}_${PV}.bb and here it is being overridden in the recipe which is discouraged as per [1]. I see that file locations require the underscore notation, and perhaps the recipe name could be done without the PV as it is overridden anyway in the recipe to avoid confusion. [1]: https://docs.yoctoproject.org/ref-manual/ref-variables.html#term-PV Thanks, Gowtham BINFILE = "bios_${PV}.run"
|
|
Re: [EXTERNAL] [meta-ti] [dunfell/master] [PATCH] ti-sysbios: upgrade 6.76.03.01 -> 6.76.04.02
Dan Murphy <dmurphy@...>
Gowtham
On 12/11/20 8:51 AM, Tammana, Gowtham wrote: Actually that is not true. Recipe name is 6.76.04.02 PV has underscores 6_76_04_02 as the PV is used in the binary name from the download site-----Original Message-----PV not needed here as it is already specified in the recipe name. BINFILE = "bios_${PV}.run" Dan
|
|
Re: [EXTERNAL] [meta-ti] [dunfell/master] [PATCH] ti-sysbios: upgrade 6.76.03.01 -> 6.76.04.02
Gowtham Tammana <g-tammana@...>
toggle quoted messageShow quoted text
-----Original Message-----PV not needed here as it is already specified in the recipe name. Thanks, Gowtham PR = "r0"
|
|