[meta-arago] [rocko/master][PATCH 1/6] ti-sci-fw: deploy original firmware

[Jacob Stiffler]

* This can be used in the SDK to rebuild the sysfw.itb image.

Signed-off-by: Jacob Stiffler <j-***@ti.com>
---
meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2018.10.bb | 2 ++
1 file changed, 2 insertions(+)

diff --git a/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2018.10.bb b/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2018.10.bb
index c05582a..d7ba79c 100644
--- a/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2018.10.bb
+++ b/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2018.10.bb
@@ -42,6 +42,8 @@ do_install() {
install -d ${D}/boot
install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${D}/boot/${SYSFW_IMAGE}
ln -sf ${SYSFW_IMAGE} ${D}/boot/${SYSFW_BINARY}
+
+ install -m 644 ${S}/ti-sysfw/${SYSFW_TISCI} ${D}/boot/${SYSFW_TISCI}
}

FILES_${PN} = "/boot"

[Jacob Stiffler]

* This is is onyl provided within the k3 recipe, so only enable for
k3.
* This will be used to rebuild the sysfw.itb

Signed-off-by: Jacob Stiffler <j-***@ti.com>
---
meta-arago-distro/conf/distro/include/arago-source-ipk.inc | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
index 30a4739..0ec3138 100644
--- a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
+++ b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
@@ -375,3 +375,7 @@ SRCIPK_INSTALL_DIR_pn-vlib-c66x = "component-sources/vlib_c66x_${PV}"

CREATE_SRCIPK_pn-big-data-ipc-demo-linux = "1"
SRCIPK_INSTALL_DIR_pn-big-data-ipc-demo-linux = "example-applications/${PN}-${PV}"
+
+CREATE_SRCIPK_pn-ti-sci-fw_k3 = "1"
+SRCIPK_SRC_DIR_pn-ti-sci-fw_k3 = "${WORKDIR}/imggen"
+SRCIPK_INSTALL_DIR_pn-ti-sci-fw_k3 = "board-support/system-firmware-image-gen-${PV}"

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-***@ti.com>
---
meta-arago-distro/recipes-core/images/arago-core-tisdk-image.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.bb b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.bb
index eacf31b..529d9de 100644
--- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.bb
@@ -8,7 +8,7 @@ DEPLOY_SPL_NAME_k2e = ""
DEPLOY_SPL_NAME_k2g-hs-evm = ""
DEPLOY_SPL_NAME_k3 = "tispl.bin tiboot3.bin"

-DEPLOY_IMAGES_NAME_k3 = "bl31.bin bl32.bin sysfw.itb"
+DEPLOY_IMAGES_NAME_k3 = "bl31.bin bl32.bin sysfw.itb ti-sci-firmware-am65x-gp.bin"

ARAGO_TISDK_IMAGE ?= "arago-core-tisdk-image"
export IMAGE_BASENAME = "${ARAGO_TISDK_IMAGE}"

[Jacob Stiffler]

* The ti-sci-fw-src package enables recreating the sysfw.itb

Signed-off-by: Jacob Stiffler <j-***@ti.com>
---
.../packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
index b0736d4..59b5961 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
@@ -21,7 +21,7 @@ BOOT_MONITOR_keystone = "boot-monitor-src"
EXTRA_FILES = ""
EXTRA_FILES_ti43x = "tisdk-uenv"
EXTRA_FILES_omap-a15 = "tisdk-readme tisdk-uenv"
-EXTRA_FILES_k3 = "tisdk-readme tisdk-uenv"
+EXTRA_FILES_k3 = "tisdk-readme tisdk-uenv ti-sci-fw-src"

RDEPENDS_${PN} = "\
ti-tisdk-setup \

[Jacob Stiffler]

* Remove arguments that were only required to embedded the sysfw into
the R5 U-Boot image.

Signed-off-by: Jacob Stiffler <j-***@ti.com>
---
.../ti-tisdk-makefile/ti-tisdk-makefile/k3/Makefile_u-boot-spl | 2 --
1 file changed, 2 deletions(-)

diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/k3/Makefile_u-boot-spl b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/k3/Makefile_u-boot-spl
index 7a0ec22..d1a5ed0 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/k3/Makefile_u-boot-spl
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/k3/Makefile_u-boot-spl
@@ -41,8 +41,6 @@ u-boot-r5:
$(MAKE) -j $(MAKE_JOBS) -C $(TI_SDK_PATH)/board-support/u-boot-* CROSS_COMPILE=$(CROSS_COMPILE_ARMV7) \
$(UBOOT_MACHINE_R5) O=$(UBOOT_R5_BUILD_DIR)
$(MAKE) -j $(MAKE_JOBS) -C $(TI_SDK_PATH)/board-support/u-boot-* CROSS_COMPILE=$(CROSS_COMPILE_ARMV7) \
- CONFIG_MKIMAGE_DTC_PATH=$(UBOOT_R5_BUILD_DIR)/scripts/dtc/dtc \
- SYSFW=$(UBOOT_SYSFW) \
O=$(UBOOT_R5_BUILD_DIR)

u-boot-r5_clean:

[Jacob Stiffler]

* The sysfw-image target will create the sysfw.itb from the
ti-sci-firmware.

Signed-off-by: Jacob Stiffler <j-***@ti.com>
---
.../ti-tisdk-makefile/Makefile_sysfw-image | 21 +++++++++++++++++++++
.../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb | 4 +++-
2 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image

diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image
new file mode 100644
index 0000000..93c0a01
--- /dev/null
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image
@@ -0,0 +1,21 @@
+
+# Depend on linux-dtbs for the dtc utility
+system-firmware-image: linux-dtbs
+ @echo =============================
+ @echo Building SYSFW Image
+ @echo =============================
+ @cd board-support; cd `find . -name "*system-firmware-image*"`; \
+ make SYSFW_DL_URL="" SYSFW_PATH=$(TI_SDK_PATH)/board-support/prebuilt-images/ti-sci-firmware-am65x-gp.bin CROSS_COMPILE=$(CROSS_COMPILE_ARMV7) PATH=$(PATH):$(LINUXKERNEL_INSTALL_DIR)/scripts/dtc
+
+system-firmware-image_clean:
+ @echo =============================
+ @echo Cleaning SYSFW Image
+ @echo =============================
+ @cd board-support; cd `find . -name "*system-firmware-image*"`; make clean
+
+system-firmware-image_install:
+ @echo =============================
+ @echo Installing SYSFW Image
+ @echo =============================
+ @echo "Nothing to do"
+
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index a84eb27..f8eca68 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -49,9 +49,10 @@ SRC_URI = "\
file://Makefile_linalg-examples \
file://Makefile_ti-gc320-driver \
file://Makefile_barcode-roi \
+ file://Makefile_sysfw-image \
"

-PR = "r91"
+PR = "r92"

MAKEFILES_MATRIX_GUI = "matrix-gui-browser \
refresh-screen \
@@ -171,6 +172,7 @@ MAKEFILES_append_k3 = " u-boot-spl \
cryptodev \
ti-sgx-ddk-km-k3 \
pru-icss \
+ sysfw-image \
"

# Use this to export kernel arch to ARCH