diff options
author | Andrew Davis <afd@ti.com> | 2023-05-25 13:11:29 -0500 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-06-06 08:24:37 -0500 |
commit | 7b797da2ef43f4f450a546816b43b28f9379305a (patch) | |
tree | 178bb12627befa5ef95c5d2885dead2f97351e9a /meta-ti-bsp/recipes-bsp | |
parent | 0f9035a628c10ec0e0656387989e99b1365f184f (diff) | |
download | meta-ti-7b797da2ef43f4f450a546816b43b28f9379305a.tar.gz |
ti-sci-fw: Drop k3-image-gen and only provide firmware
This converts ti-sci-fw into a standard firmware provider package. We do
not need to do anything additional here with that firmware as U-Boot now
does that for us with binman.
Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp/recipes-bsp')
-rw-r--r-- | meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 14 | ||||
-rw-r--r-- | meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 144 |
2 files changed, 12 insertions, 146 deletions
diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc index c971321f..a0c2f79c 100644 --- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | SUMMARY = "TI SCI firmware (SYSFW)" | 1 | SUMMARY = "Common include for TI Linux firmware" |
2 | 2 | ||
3 | LICENSE = "TI-TFL" | 3 | LICENSE = "TI-TFL" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76" |
@@ -16,21 +16,13 @@ IMG_DEC_FW_VERSION = "1.0" | |||
16 | CNM_WAVE521_FW_VERSION = "1.0.00" | 16 | CNM_WAVE521_FW_VERSION = "1.0.00" |
17 | TIFS_LPM_STUB_FW_VERSION = "08.06.04" | 17 | TIFS_LPM_STUB_FW_VERSION = "08.06.04" |
18 | TI_DM_FW_VERSION = "08.06.04" | 18 | TI_DM_FW_VERSION = "08.06.04" |
19 | TI_SYSFW_VERSION = "08.06.04" | ||
19 | 20 | ||
20 | TI_LINUX_FW_SRCREV ?= "56819cfa9e72a4575b2aef6f8b986092d7d3efa9" | 21 | TI_LINUX_FW_SRCREV ?= "56819cfa9e72a4575b2aef6f8b986092d7d3efa9" |
21 | SRCREV = "${TI_LINUX_FW_SRCREV}" | 22 | SRCREV = "${TI_LINUX_FW_SRCREV}" |
22 | 23 | ||
23 | BRANCH ?= "ti-linux-firmware" | 24 | BRANCH ?= "ti-linux-firmware" |
24 | 25 | ||
25 | K3_IMAGE_GEN_SRCREV ?= "150f1956b4bdcba36e7dffc78a4342df602f8d6e" | 26 | SRC_URI = "git://git.ti.com/git/processor-firmware/ti-linux-firmware.git;protocol=https;branch=${BRANCH}" |
26 | SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}" | ||
27 | SRCREV_FORMAT = "imggen" | ||
28 | |||
29 | K3_IMAGE_GEN_BRANCH ?= "master" | ||
30 | |||
31 | SRC_URI = " \ | ||
32 | git://git.ti.com/git/processor-firmware/ti-linux-firmware.git;protocol=https;branch=${BRANCH} \ | ||
33 | git://git.ti.com/git/k3-image-gen/k3-image-gen.git;protocol=https;branch=${K3_IMAGE_GEN_BRANCH};destsuffix=imggen;name=imggen \ | ||
34 | " | ||
35 | 27 | ||
36 | S = "${WORKDIR}/git" | 28 | S = "${WORKDIR}/git" |
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index ee995fa5..6a4c03f9 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | |||
@@ -1,149 +1,23 @@ | |||
1 | require recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 1 | SUMMARY = "TI SYSFW/TIFS Firmware" |
2 | |||
3 | DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" | ||
4 | DEPENDS:remove:am65xx-evm-k3r5 = "virtual/bootloader" | ||
5 | DEPENDS:remove:am65xx-evm-k3r5-sr2 = "virtual/bootloader" | ||
6 | DEPENDS:remove:am65xx-hs-evm-k3r5 = "virtual/bootloader" | ||
7 | DEPENDS:remove:am65xx-hs-evm-k3r5-sr2 = "virtual/bootloader" | ||
8 | DEPENDS:remove:j721e-evm-k3r5 = "virtual/bootloader" | ||
9 | DEPENDS:remove:j721e-hs-evm-k3r5 = "virtual/bootloader" | ||
10 | DEPENDS:remove:j721e-hs-evm-k3r5-sr1-1 = "virtual/bootloader" | ||
11 | DEPENDS:remove:beaglebone-ai64-k3r5 = "virtual/bootloader" | ||
12 | |||
13 | CLEANBROKEN = "1" | ||
14 | PR = "${INC_PR}.2" | ||
15 | 2 | ||
16 | # Loaded by R5F core | 3 | require recipes-bsp/ti-linux-fw/ti-linux-fw.inc |
17 | COMPATIBLE_MACHINE = "k3r5" | ||
18 | COMPATIBLE_MACHINE:aarch64 = "null" | ||
19 | 4 | ||
20 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 5 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
21 | 6 | ||
22 | # Use TI SECDEV for signing | ||
23 | inherit ti-secdev | ||
24 | |||
25 | SYSFW_SOC ?= "unknown" | ||
26 | SYSFW_SUFFIX ?= "unknown" | ||
27 | SYSFW_CONFIG ?= "unknown" | ||
28 | |||
29 | SYSFW_PREFIX = "sci" | ||
30 | SYSFW_PREFIX:j721e-evm-k3r5 = "fs" | ||
31 | SYSFW_PREFIX:j721e-hs-evm-k3r5 = "fs" | ||
32 | SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "fs" | ||
33 | SYSFW_PREFIX:beaglebone-ai64-k3r5 = "fs" | ||
34 | SYSFW_PREFIX:j7200-evm-k3r5 = "fs" | ||
35 | SYSFW_PREFIX:j7200-hs-evm-k3r5 = "fs" | ||
36 | SYSFW_PREFIX:j721s2-evm-k3r5-gp = "fs" | ||
37 | SYSFW_PREFIX:j721s2-evm-k3r5-sr1-hs-fs = "fs" | ||
38 | SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs" | ||
39 | SYSFW_PREFIX:j784s4-evm-k3r5-gp = "fs" | ||
40 | SYSFW_PREFIX:j784s4-evm-k3r5-sr1-hs-fs = "fs" | ||
41 | SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs" | ||
42 | SYSFW_PREFIX:am62xx-evm-k3r5-gp = "fs" | ||
43 | SYSFW_PREFIX:am62xx-evm-k3r5-hs-se = "fs" | ||
44 | SYSFW_PREFIX:am62xx-evm-k3r5-hs-fs = "fs" | ||
45 | SYSFW_PREFIX:beagleplay-k3r5 = "fs" | ||
46 | SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs" | ||
47 | SYSFW_PREFIX:am62xx-lp-evm-k3r5-hs-se = "fs" | ||
48 | SYSFW_PREFIX:am62xx-lp-evm-k3r5-hs-fs = "fs" | ||
49 | SYSFW_PREFIX:am62axx-evm-k3r5-gp = "fs" | ||
50 | SYSFW_PREFIX:am62axx-evm-k3r5-hs-fs = "fs" | ||
51 | SYSFW_PREFIX:am62axx-evm-k3r5-hs-se = "fs" | ||
52 | |||
53 | SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" | ||
54 | |||
55 | SYSFW_TIBOOT3 = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.bin" | ||
56 | SYSFW_TIBOOT3_SYMLINK ?= "tiboot3.bin" | ||
57 | |||
58 | SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
59 | SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
60 | SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
61 | SYSFW_SYMLINK ?= "sysfw.itb" | ||
62 | |||
63 | SYSFW_VBINARY:am65xx-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
64 | SYSFW_VBINARY:am65xx-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
65 | SYSFW_VBINARY:am65xx-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
66 | SYSFW_VBINARY:am65xx-hs-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
67 | SYSFW_VBINARY:j721e-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
68 | SYSFW_VBINARY:j721e-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
69 | SYSFW_VBINARY:j721e-hs-evm-k3r5-sr1-1 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
70 | |||
71 | SYSFW_IMAGE:am65xx-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
72 | SYSFW_IMAGE:am65xx-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
73 | SYSFW_IMAGE:am65xx-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
74 | SYSFW_IMAGE:am65xx-hs-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
75 | SYSFW_IMAGE:j721e-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
76 | SYSFW_IMAGE:j721e-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
77 | SYSFW_IMAGE:j721e-hs-evm-k3r5-sr1-1 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | ||
78 | |||
79 | CFLAGS[unexport] = "1" | 7 | CFLAGS[unexport] = "1" |
80 | LDFLAGS[unexport] = "1" | 8 | LDFLAGS[unexport] = "1" |
81 | AS[unexport] = "1" | 9 | AS[unexport] = "1" |
82 | LD[unexport] = "1" | 10 | LD[unexport] = "1" |
83 | 11 | ||
84 | do_configure[noexec] = "1" | 12 | PV = "${TI_SYSFW_VERSION}" |
85 | 13 | PR = "${INC_PR}.0" | |
86 | EXTRA_OEMAKE = "\ | ||
87 | CROSS_COMPILE=${TARGET_PREFIX} SOC=${SYSFW_SOC} SOC_TYPE=${SYSFW_SUFFIX} \ | ||
88 | CONFIG=${SYSFW_CONFIG} SYSFW_DIR="${S}/ti-sysfw" \ | ||
89 | SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin" \ | ||
90 | " | ||
91 | EXTRA_OEMAKE:remove:am65xx-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" | ||
92 | EXTRA_OEMAKE:remove:am65xx-evm-k3r5-sr2 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" | ||
93 | EXTRA_OEMAKE:remove:am65xx-hs-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" | ||
94 | EXTRA_OEMAKE:remove:am65xx-hs-evm-k3r5-sr2 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" | ||
95 | EXTRA_OEMAKE:remove:j721e-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" | ||
96 | EXTRA_OEMAKE:remove:j721e-hs-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" | ||
97 | EXTRA_OEMAKE:remove:j721e-hs-evm-k3r5-sr1-1 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" | ||
98 | EXTRA_OEMAKE:remove:beaglebone-ai64-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" | ||
99 | 14 | ||
100 | do_compile() { | 15 | CLEANBROKEN = "1" |
101 | cd ${WORKDIR}/imggen/ | ||
102 | oe_runmake | ||
103 | } | ||
104 | 16 | ||
105 | do_install() { | 17 | do_install() { |
106 | install -d ${D}/boot | 18 | install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw |
107 | 19 | install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw | |
108 | if [ -f "${WORKDIR}/imggen/${SYSFW_BINARY}" ]; then | 20 | install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw |
109 | install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${D}/boot/${SYSFW_VBINARY} | ||
110 | ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_IMAGE} | ||
111 | if [ ! -z "${SYSFW_SYMLINK}" ]; then | ||
112 | ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_SYMLINK} | ||
113 | fi | ||
114 | fi | ||
115 | |||
116 | if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then | ||
117 | install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${D}/boot/${SYSFW_TIBOOT3} | ||
118 | if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then | ||
119 | ln -sf ${SYSFW_TIBOOT3} ${D}/boot/${SYSFW_TIBOOT3_SYMLINK} | ||
120 | fi | ||
121 | fi | ||
122 | } | ||
123 | |||
124 | FILES:${PN} = "/boot" | ||
125 | |||
126 | inherit deploy | ||
127 | |||
128 | do_deploy () { | ||
129 | install -d ${DEPLOYDIR} | ||
130 | |||
131 | if [ -f "${WORKDIR}/imggen/${SYSFW_BINARY}" ]; then | ||
132 | install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_VBINARY} | ||
133 | ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_IMAGE} | ||
134 | if [ ! -z "${SYSFW_SYMLINK}" ]; then | ||
135 | ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_SYMLINK} | ||
136 | install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ | ||
137 | fi | ||
138 | fi | ||
139 | |||
140 | if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then | ||
141 | install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3} | ||
142 | if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then | ||
143 | ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3_SYMLINK} | ||
144 | install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ | ||
145 | fi | ||
146 | fi | ||
147 | } | 21 | } |
148 | 22 | ||
149 | addtask deploy before do_build after do_compile | 23 | FILES:${PN} = "${nonarch_base_libdir}/firmware" |