Revert "wic: create SD card with 3 partitions for testing"

This reverts commit 6bca11098b.

README

@@ -8,7 +8,7 @@ This layer depends on:
 
 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: master
+branch: zeus
 
 
 The base BSP part of meta-ti should work with different OpenEmbedded/Yocto

classes/ti-pdk-fetch.bbclass

@@ -1,9 +1,9 @@
 TI_PDK_GIT_URI ?= "git://git.ti.com/processor-sdk/pdk.git"
 TI_PDK_GIT_BRANCH ?= "master"
 TI_PDK_GIT_PROTOCOL ?= "git"
-TI_PDK_SRCREV ?= "4d15e4d2654c48f48b91d7aa52828d66ece2cc12"
+TI_PDK_SRCREV ?= "9c04a8f4ac2ed95100ee50163b3189d28b9680f1"
 
-TI_PDK_VERSION ?= "2020.2.20"
+TI_PDK_VERSION ?= "2020.4.16"
 
 PV = "${TI_PDK_VERSION}"
 

recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb

@@ -14,11 +14,11 @@ CMB_ADDON_GIT_PROTOCOL = "git"
 CMB_ADDON_GIT_BRANCH = "master"
 CMB_ADDON_GIT_DESTSUFFIX = "git/ti/addon"
 
-# Below commit ID corresponds to "DEV.CMB.01.01.00.03"
-CMB_ADDON_SRCREV = "4b16dd77eb929708a5134714c3194fc5b5bc1808"
+# Below commit ID corresponds to "DEV.CMB.01.01.00.03A"
+CMB_ADDON_SRCREV = "3655aad07f17d3a167ec7dcecb52450c1d2fe8be"
 
 SRCREV = "${CMB_ADDON_SRCREV}"
-PV = "01.01.00.03"
+PV = "01.01.00.03A"
 PR = "r0"
 
 BRANCH = "${CMB_ADDON_GIT_BRANCH}"

recipes-bsp/common-csl-ip/common-csl-ip.inc

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"
 
 COMPATIBLE_MACHINE = "keystone|dra7xx|ti33x|ti43x|omapl1"
 
-PV = "03.03.00.16B"
+PV = "03.03.00.17B"
 INC_PR = "r0"
 PE = "1"
 
@@ -13,8 +13,8 @@ CSL_GIT_PROTOCOL ="git"
 CSL_GIT_BRANCH = "release"
 CSL_GIT_DESTSUFFIX = "git"
 
-# Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.16B"
-CSL_SRCREV = "8894e988f23f103f699411fa0aab4b4702d6c289"
+# Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.17B"
+CSL_SRCREV = "a5a9200fe11575a4eff965d87cb968c5f3377e9f"
 
 BRANCH="${CSL_GIT_BRANCH}"
 SRC_URI = "${CSL_GIT_URI};protocol=${CSL_GIT_PROTOCOL};branch=${BRANCH};destsuffix=${CSL_GIT_DESTSUFFIX}"

recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb

@@ -12,6 +12,7 @@ REMOTE_FWB_BIN_DIR = "${REMOTE_FW_DIR}/ipc_echo_testb/bin"
 RTOS_ALL_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex02_bios_multicore_echo_test/bin"
 RTOS_2_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex01_bios_2core_echo_test/bin"
 LINUX_2_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex03_linux_bios_2core_echo_test/bin"
+LINUX_2_CORES_BAREMETAL_BIN_DIR = "${REMOTE_FW_DIR}/ex04_linux_baremetal_2core_echo_test/bin"
 
 DST_BIN_PATH = "${base_libdir}/firmware/pdk-ipc"
 
@@ -20,9 +21,21 @@ TI_PDK_LIMIT_BOARDS_j7-evm = "j721e_evm"
 do_configure[noexec] = "1"
 
 do_compile() {
-    cd ${S}
+    cd "${PDK_INSTALL_PATH}/ti/build"
 
-    oe_runmake apps LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" LIMIT_CORES="${TI_PDK_LIMIT_CORES}" DEST_ROOT=${REMOTE_FW_DIR}
+    for board in ${TI_PDK_LIMIT_BOARDS}
+    do
+        for core in ${TI_PDK_LIMIT_CORES}
+        do
+            oe_runmake ipc_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR}
+            oe_runmake ex02_bios_multicore_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR}
+            oe_runmake ex01_bios_2core_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR}
+            oe_runmake ex03_linux_bios_2core_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR}
+            oe_runmake ex04_linux_baremetal_2core_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR}
+            oe_runmake ipc_echo_testb BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR}
+        done
+
+    done
 }
 
 do_install() {
@@ -66,6 +79,9 @@ do_install_append_j7-evm() {
     install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_1_release_strip.xer5f ${D}${DST_BIN_PATH}
 }
 
+do_install_append_am65xx-evm() {
+    cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex04_linux_baremetal_2core_echo_test/bin -d ${D}/ex04_linux_baremetal_2core_echo_test
+}
 
 # Set up names for the firmwares
 ALTERNATIVE_${PN}_am65xx = "\
@@ -138,6 +154,7 @@ FILES_${PN} += "${base_libdir}/firmware"
 FILES_${PN}-rtos += "ex02_bios_multicore_echo_test"
 FILES_${PN}-rtos += "ex01_bios_2core_echo_test"
 FILES_${PN}-rtos += "ex03_linux_bios_2core_echo_test"
+FILES_${PN}-rtos += "ex04_linux_baremetal_2core_echo_test"
 
 INSANE_SKIP_${PN} = "arch ldflags file-rdeps"
 INSANE_SKIP_${PN}-rtos = "arch ldflags file-rdeps"

recipes-bsp/ipc-lld/ipc-lld.inc

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7eae093f2b09fd39307f30028a068b91"
 COMPATIBLE_MACHINE = "k3"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-PR = "r3"
+PR = "r4"
 
 # Build with make instead of XDC
 TI_PDK_XDCMAKE = "0"

recipes-bsp/pm-lld/pm-lld-rtos_git.bb

@@ -20,8 +20,8 @@ PM_LLD_GIT_BRANCH_k2g = "int_pm_am335x"
 
 PM_LLD_GIT_DESTSUFFIX = "git/ti/drv/pm"
 
-# Below commit ID corresponds to "DEV.PM_LLD.01.08.00.23"
-PM_LLD_SRCREV = "7c064b93a0ae648441991abb5c71b99d2c209eeb"
+# Below commit ID corresponds to "DEV.PM_LLD.01.08.00.23A"
+PM_LLD_SRCREV = "59abc6ffb890d24b82de0248d204ad10c1bfc2af"
 
 # Below commit ID corresponds to "DEV.PM_LLD.01.04.00.05C"
 PM_LLD_SRCREV_ti33x = "dd1f8486e7738956631b7f4829c8238be2e49dd6"
@@ -32,7 +32,7 @@ BRANCH = "${PM_LLD_GIT_BRANCH}"
 SRC_URI = "${PM_LLD_GIT_URI};destsuffix=${PM_LLD_GIT_DESTSUFFIX};protocol=${PM_LLD_GIT_PROTOCOL};branch=${BRANCH}"
 
 SRCREV = "${PM_LLD_SRCREV}"
-PV = "01.08.00.23"
+PV = "01.08.00.23A"
 PR = "r0"
 
 S = "${WORKDIR}/${PM_LLD_GIT_DESTSUFFIX}"

recipes-bsp/sa-lld/sa-lld.inc

@@ -8,14 +8,14 @@ SA_LLD_GIT_PROTOCOL = "git"
 SA_LLD_GIT_BRANCH = "master"
 SA_LLD_GIT_DESTSUFFIX = "git/ti/drv/sa"
 
-# Below commit ID corresponding to "DEV.SA_LLD.04.00.00.03B"
-SA_LLD_SRCREV = "ac85eea98ccb73fa00006afca8ae03536e933134"
+# Below commit ID corresponding to "DEV.SA_LLD.04.00.00.03D"
+SA_LLD_SRCREV = "506491b586c13c90f307b527df5eaacd35af6d02"
 
 BRANCH = "${SA_LLD_GIT_BRANCH}"
 SRC_URI = "${SA_LLD_GIT_URI};destsuffix=${SA_LLD_GIT_DESTSUFFIX};protocol=${SA_LLD_GIT_PROTOCOL};branch=${BRANCH}"
 SRCREV = "${SA_LLD_SRCREV}"
 
-PV = "04.00.00.03B"
+PV = "04.00.00.03D"
 INC_PR = "r0"
 
 S = "${WORKDIR}/${SA_LLD_GIT_DESTSUFFIX}"

recipes-bsp/sciclient/sciclient-rtos_git.bb

@@ -25,6 +25,10 @@ SCICLIENT_ROOTPATH = "${SCICLIENT_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv
 export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
 export PDK_SCICLIENT_ROOT_PATH = "${SCICLIENT_PACKAGE_BASE}/package/all/pdk_/packages"
 
+BUILD_HS = ""
+BUILD_HS_am65xx-hs-evm = "yes"
+export BUILD_HS
+
 # Sciclient for am65x supports mcu1_1 in addition to the default cores in TI_PDK_LIMIT_CORES
 TI_PDK_LIMIT_CORES_append_am65xx = " mcu1_1"
 

recipes-bsp/starterware/starterware.inc

@@ -8,14 +8,14 @@ STARTERWARE_GIT_URI = "git://git.ti.com/keystone-rtos/starterware.git"
 STARTERWARE_GIT_PROTOCOL = "git"
 STARTERWARE_GIT_BRANCH = "master"
 
-# Below commit ID corresponds to "DEV.STARTERWARE.PROCSDK.02.01.01.12"
-STARTERWARE_SRCREV = "7f418b7471ca11ba4c6d91b4a7eb992a1dd55d7d"
+# Below commit ID corresponds to "DEV.STARTERWARE.PROCSDK.02.01.01.12A"
+STARTERWARE_SRCREV = "49a4d4cd4c72bacee738d44b8e72e7f59aa948cd"
 
 BRANCH = "${STARTERWARE_GIT_BRANCH}"
 SRC_URI = "${STARTERWARE_GIT_URI};protocol=${STARTERWARE_GIT_PROTOCOL};branch=${BRANCH}"
 
 SRCREV = "${STARTERWARE_SRCREV}"
-PV = "02.01.01.12"
+PV = "02.01.01.12A"
 INC_PR = "r0"
 
 S = "${WORKDIR}/git"

recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb

@@ -1,7 +1,7 @@
 require u-boot-ti.inc
 
-PR = "r6"
+PR = "r7"
 
 BRANCH = "ti-u-boot-2020.01"
 
-SRCREV = "9addfeb8bf8de5c60c9b33a6f77a72639878cd26"
+SRCREV = "ae8ceb7b6e3acb4bc90f730e33dafc7b65066591"

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 = "27ac613bbce13841a47fcc7341d7c14333b8e0e9"
-PV = "5.4.20+git${SRCPV}"
+SRCREV = "c3dd64420d144641f0a803523185dffa26250f8b"
+PV = "5.4.28+git${SRCPV}"

recipes-kernel/linux/linux-ti-staging_5.4.bb

@@ -60,8 +60,8 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.4.y"
 
-SRCREV = "70338004346078dd120c51a1cb22ed7d5bfdfca9"
-PV = "5.4.20+git${SRCPV}"
+SRCREV = "6f3bf13d53820fc12432d7052744be2ee046fc92"
+PV = "5.4.28+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR_append = "a"