meta-ti: use nonarch_base_libdir for firmware installations

Firmware images should always be installed under /lib and hence should use
nonarch_base_libdir, as regular base_libdir is configuration-specific and
doesn't always resolve to /lib.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

15 files changed, 47 insertions, 47 deletions

diff --git a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
index c975e8a4..f6797e2b 100644
--- a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
@@ -18,8 +18,8 @@ S = "${WORKDIR}/git"
 TARGET = "mhdp8546.bin"
 
 do_install() {
-        install -d ${D}${base_libdir}/firmware/cadence
-        install -m 0644 ${S}/cadence/${TARGET} ${D}${base_libdir}/firmware/cadence/${TARGET}
+        install -d ${D}${nonarch_base_libdir}/firmware/cadence
+        install -m 0644 ${S}/cadence/${TARGET} ${D}${nonarch_base_libdir}/firmware/cadence/${TARGET}
 }
 
-FILES:${PN} = "${base_libdir}/firmware"
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
diff --git a/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb b/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
index bd5c3693..00486677 100644
--- a/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
@@ -18,12 +18,12 @@ do_compile() {
 }
 
 do_install() {
-        install -d ${D}${base_libdir}/firmware
-        install -m 0644 bin/am335x-pm-firmware.elf ${D}${base_libdir}/firmware/
-        install -m 0644 bin/*-scale-data.bin ${D}${base_libdir}/firmware/
+        install -d ${D}${nonarch_base_libdir}/firmware
+        install -m 0644 bin/am335x-pm-firmware.elf ${D}${nonarch_base_libdir}/firmware/
+        install -m 0644 bin/*-scale-data.bin ${D}${nonarch_base_libdir}/firmware/
 }
 
-FILES:${PN} += "${base_libdir}/firmware"
+FILES:${PN} += "${nonarch_base_libdir}/firmware"
 
 COMPATIBLE_MACHINE = "(ti-soc)"
 TOOLCHAIN = "gcc"
diff --git a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
index ed36951f..371086c1 100755
--- a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
@@ -21,18 +21,18 @@ CPSW9G_FW_DIR = "${S}/ethfw"
 CPSW9G_FW_FILENAME = "app_remoteswitchcfg_server_pdk_mem_map_strip.xer5f"
 
 # make sure that lib/firmware, and all its contents are part of the package
-FILES:${PN} += "${base_libdir}/firmware"
+FILES:${PN} += "${nonarch_base_libdir}/firmware"
 
 do_install() {
-  install -d ${D}${base_libdir}/firmware
+  install -d ${D}${nonarch_base_libdir}/firmware
 # Ethernet firmware to be loaded on Main R5 core(needs read permission)
-  install -m 0644 ${CPSW9G_FW_DIR}/${CPSW9G_FW_FILENAME} ${D}${base_libdir}/firmware
+  install -m 0644 ${CPSW9G_FW_DIR}/${CPSW9G_FW_FILENAME} ${D}${nonarch_base_libdir}/firmware
 }
 
 TARGET_MAIN_R5FSS0_0 = "j7-main-r5f0_0-fw"
 ALTERNATIVE:${PN} = "j7-main-r5f0_0-fw"
-ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}"
-ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${CPSW9G_FW_FILENAME}"
+ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}"
+ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${CPSW9G_FW_FILENAME}"
 ALTERNATIVE_PRIORITY = "17"
 
 INHIBIT_PACKAGE_STRIP = "1"
diff --git a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
index 1f1c2b81..00a6e51b 100644
--- a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
@@ -19,8 +19,8 @@ ORIGIN = "DRA71x-RevA-GT9271_SpecDig_Config.bin"
 TARGET = "goodix_9271_cfg.bin"
 
 do_install() {
-        install -d ${D}${base_libdir}/firmware
-        install -m 0644 ${S}/ti-evm/${ORIGIN} ${D}${base_libdir}/firmware/${TARGET}
+        install -d ${D}${nonarch_base_libdir}/firmware
+        install -m 0644 ${S}/ti-evm/${ORIGIN} ${D}${nonarch_base_libdir}/firmware/${TARGET}
 }
 
-FILES:${PN} = "${base_libdir}/firmware"
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
diff --git a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb
index e398cc80..4eb48959 100644
--- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb
+++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb
@@ -23,12 +23,12 @@ TARGET = " \
 "
 
 do_install() {
-        install -d ${D}${base_libdir}/firmware/ti-pruss
+        install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
         for f in ${TARGET}; do
-                install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
+                install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
         done
 }
 
-FILES:${PN} = "${base_libdir}/firmware"
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
 
 INSANE_SKIP:${PN} = "arch"
diff --git a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb
index 804a563f..c656ceab 100644
--- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb
+++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb
@@ -21,12 +21,12 @@ TARGET = " \
 "
 
 do_install() {
-        install -d ${D}${base_libdir}/firmware/ti-pruss
+        install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
         for f in ${TARGET}; do
-                install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
+                install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
         done
 }
 
-FILES:${PN} = "${base_libdir}/firmware"
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
 
 INSANE_SKIP:${PN} = "arch"
diff --git a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb
index 4ca06be0..9ccce938 100644
--- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb
+++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb
@@ -19,13 +19,13 @@ TARGET:am57xx-evm = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf"
 TARGET:am57xx-hs-evm = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf"
 
 do_install() {
-        install -d ${D}${base_libdir}/firmware/ti-pruss
+        install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
         for f in ${TARGET}; do
-                install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
+                install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
         done
 }
 
 
-FILES:${PN} = "${base_libdir}/firmware"
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
 
 INSANE_SKIP:${PN} = "arch"
diff --git a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb
index 618b1ad6..4ffd13aa 100644
--- a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb
+++ b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb
@@ -20,12 +20,12 @@ TARGET:am57xx-evm = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf"
 TARGET:am57xx-hs-evm = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf"
 
 do_install() {
-        install -d ${D}${base_libdir}/firmware/ti-pruss
+        install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
         for f in ${TARGET}; do
-                install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
+                install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
         done
 }
 
-FILES:${PN} = "${base_libdir}/firmware"
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
 
 INSANE_SKIP:${PN} = "arch"
diff --git a/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb b/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb
index 707640b4..23c422dd 100644
--- a/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb
+++ b/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb
@@ -21,12 +21,12 @@ TARGET:am57xx-hs-evm = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf"
 
 
 do_install() {
-        install -d ${D}${base_libdir}/firmware/ti-pruss
+        install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
         for f in ${TARGET}; do
-                install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
+                install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
         done
 }
 
-FILES:${PN} = "${base_libdir}/firmware"
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
 
 INSANE_SKIP:${PN} = "arch"
diff --git a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb
index 2d0d3f9e..97adf6fc 100644
--- a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb
+++ b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb
@@ -23,12 +23,12 @@ TARGET = " \
 "
 
 do_install() {
-        install -d ${D}${base_libdir}/firmware/ti-pruss
+        install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
         for f in ${TARGET}; do
-                install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
+                install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
         done
 }
 
-FILES:${PN} = "${base_libdir}/firmware"
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
 
 INSANE_SKIP:${PN} = "arch"
diff --git a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb
index 3ded0dc4..8d784768 100644
--- a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb
+++ b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb
@@ -19,13 +19,13 @@ TARGET:am57xx-evm = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf"
 TARGET:am57xx-hs-evm = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf"
 
 do_install() {
-        install -d ${D}${base_libdir}/firmware/ti-pruss
+        install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
         for f in ${TARGET}; do
-                install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
+                install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
         done
 }
 
 
-FILES:${PN} = "${base_libdir}/firmware"
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
 
 INSANE_SKIP:${PN} = "arch"
diff --git a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb
index 3563cc7e..7727e9af 100644
--- a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb
@@ -17,8 +17,8 @@ S = "${WORKDIR}/git"
 TARGET = "pvdec_full_bin.fw"
 
 do_install() {
-        install -d ${D}${base_libdir}/firmware
-        install -m 0644 ${S}/ti-img/${TARGET} ${D}${base_libdir}/firmware/${TARGET}
+        install -d ${D}${nonarch_base_libdir}/firmware
+        install -m 0644 ${S}/ti-img/${TARGET} ${D}${nonarch_base_libdir}/firmware/${TARGET}
 }
 
-FILES:${PN} = "${base_libdir}/firmware"
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
diff --git a/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb b/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
index 498be36b..7d16ae39 100644
--- a/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
+++ b/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
@@ -18,16 +18,16 @@ DSPAPP = "dra7-dsp1-fw-radio.xe66"
 GPPAPP = "RadioApp"
 
 do_install() {
-    install -d ${D}${base_libdir}/firmware
+    install -d ${D}${nonarch_base_libdir}/firmware
     install -d ${D}${bindir}
-    install ${S}/prebuilt/${DSPAPP} ${D}${base_libdir}/firmware/${DSPAPP}
+    install ${S}/prebuilt/${DSPAPP} ${D}${nonarch_base_libdir}/firmware/${DSPAPP}
     install -m 0755 ${S}/prebuilt/${GPPAPP} ${D}${bindir}/${GPPAPP}
 }
 
 PACKAGES += "${PN}-fw"
 RDEPENDS:${PN} += "${PN}-fw"
 
-FILES:${PN}-fw += "${base_libdir}/firmware/${DSPAPP}"
+FILES:${PN}-fw += "${nonarch_base_libdir}/firmware/${DSPAPP}"
 
 INSANE_SKIP:${PN} = "ldflags"
 INSANE_SKIP:${PN}-fw = "arch"
diff --git a/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb b/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
index c7b2a7bb..673634da 100644
--- a/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
+++ b/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
@@ -16,10 +16,10 @@ S = "${WORKDIR}/vpdma-fw-${PV}"
 TARGET = "vpdma-1b8.bin"
 
 do_install() {
-    mkdir -p ${D}${base_libdir}/firmware
-    cp ${S}/${TARGET} ${D}${base_libdir}/firmware/${TARGET}
+    mkdir -p ${D}${nonarch_base_libdir}/firmware
+    cp ${S}/${TARGET} ${D}${nonarch_base_libdir}/firmware/${TARGET}
 }
 
-FILES:${PN} += "${base_libdir}/firmware/${TARGET}"
+FILES:${PN} += "${nonarch_base_libdir}/firmware/${TARGET}"
 
 PR = "r1"
diff --git a/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb b/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb
index 9447f44d..5ca6b62e 100644
--- a/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb
+++ b/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb
@@ -25,6 +25,6 @@ EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${FLOAT
 
 do_install() {
     oe_runmake DESTDIR="${D}" install
-    rm -rf ${D}${base_libdir}/firmware/vpdma-*.bin
-    rmdir -p ${D}${base_libdir}/firmware || true
+    rm -rf ${D}${nonarch_base_libdir}/firmware/vpdma-*.bin
+    rmdir -p ${D}${nonarch_base_libdir}/firmware || true
 }