meta-ti-bsp: Add am57xx.inc allowing use of SoC name over full EVM name
PATCH 1/1 meta-ti-bsp: Add am57xx.inc allowing use of SoC name over full EVM name
In many spots we have to use the full EVM name for each EVM using the AM57x SoC leading to missed features on some EVMs. Add the am57xx name so we can generically add for AM57x.
Signed-off-by Andrew Davis <[email protected]>
--- meta-ti-bsp/conf/machine/am57xx-evm.conf | 2 +- meta-ti-bsp/conf/machine/beagle-x15.conf | 2 +- meta-ti-bsp/conf/machine/include/am57xx.inc | 5 +++++ meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb | 5 ++--- meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb | 5 ++--- meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb | 6 ++---- meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb | 5 ++--- meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc | 3 +-- meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc | 2 +- 9 files changed, 17 insertions(+), 18 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/include/am57xx.inc
meta-ti-bsp/conf/machine/am57xx-evm.conf +1 -1
@@ -2,7 +2,7 @@ #@NAME: AM57xx EVM #@DESCRIPTION: Machine configuration for the TI AM57xx EVM -require conf/machine/include/dra7xx.inc +require conf/machine/include/am57xx.inc MACHINE_FEATURES += "touchscreen"
meta-ti-bsp/conf/machine/beagle-x15.conf +1 -1
@@ -2,7 +2,7 @@ #@NAME: BeagleBoard X15 #@DESCRIPTION: Machine configuration for the BeagleBoard X15 -require conf/machine/include/dra7xx.inc +require conf/machine/include/am57xx.inc KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"
meta-ti-bsp/conf/machine/include/am57xx.inc new file +5 -0
@@ -0,0 +1,5 @@ +require conf/machine/include/omap-a15.inc +SOC_FAMILY:append = ":dra7xx" +SOC_FAMILY:append = ":am57xx" + +MACHINE_FEATURES += "pci"
meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +2 -3
@@ -6,7 +6,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -15,8 +15,7 @@ S = "${WORKDIR}/git" TARGET = "" TARGET:ti33x = "am335x-pru0-prueth-fw.elf am335x-pru1-prueth-fw.elf" TARGET:ti43x = "am437x-pru0-prueth-fw.elf am437x-pru1-prueth-fw.elf" -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" +TARGET:am57xx = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb +2 -3
@@ -7,7 +7,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -16,8 +16,7 @@ S = "${WORKDIR}/git" TARGET = "" TARGET:ti33x = "am335x-pru0-pruhsr-fw.elf am335x-pru1-pruhsr-fw.elf" TARGET:ti43x = "am437x-pru0-pruhsr-fw.elf am437x-pru1-pruhsr-fw.elf" -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" +TARGET:am57xx = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb +2 -4
@@ -7,7 +7,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -16,9 +16,7 @@ S = "${WORKDIR}/git" TARGET = "" TARGET:ti33x = "am335x-pru0-pruprp-fw.elf am335x-pru1-pruprp-fw.elf" TARGET:ti43x = "am437x-pru0-pruprp-fw.elf am437x-pru1-pruprp-fw.elf" -TARGET:am57xx-evm = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf" -TARGET:am57xx-hs-evm = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf" - +TARGET:am57xx = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb +2 -3
@@ -6,7 +6,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -15,8 +15,7 @@ S = "${WORKDIR}/git" TARGET = "" TARGET:ti33x = "am335x-pru0-prusw-fw.elf am335x-pru1-prusw-fw.elf" TARGET:ti43x = "am437x-pru0-prusw-fw.elf am437x-pru1-prusw-fw.elf" -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" +TARGET:am57xx = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc +1 -2
@@ -12,8 +12,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " vpdma-fw" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " goodix-fw" # Add run-time dependency for PRU Ethernet firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-evm = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-hs-evm = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " prueth-fw pruhsr-fw pruprp-fw" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " prueth-fw pruhsr-fw pruprp-fw" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx = " prueth-fw-am65x"
meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc +1 -1
@@ -9,4 +9,4 @@ PLATFORM = "UNKNOWN" PLATFORM:dra7xx = "DRA7XX" PLATFORM:omapl138 = "OMAPL138" -ALT_PLATFORM:am57xx-evm = "AM572X AM571X" +ALT_PLATFORM:am57xx = "AM572X AM571X"
Signature · 1 line
2.38.1
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
In many spots we have to use the full EVM name for each EVM using the AM57x SoC leading to missed features on some EVMs. Add the am57xx name so we can generically add for AM57x.
Signed-off-by Andrew Davis <[email protected]>
Reviewed-by Denys Dmytriyenko <[email protected]>
Quoted 170 lines
--- meta-ti-bsp/conf/machine/am57xx-evm.conf | 2 +- meta-ti-bsp/conf/machine/beagle-x15.conf | 2 +- meta-ti-bsp/conf/machine/include/am57xx.inc | 5 +++++ meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb | 5 ++--- meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb | 5 ++--- meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb | 6 ++---- meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb | 5 ++--- meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc | 3 +-- meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc | 2 +- 9 files changed, 17 insertions(+), 18 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/include/am57xx.incmeta-ti-bsp/conf/machine/am57xx-evm.conf +1
-1@@ -2,7 +2,7 @@ #@NAME: AM57xx EVM #@DESCRIPTION: Machine configuration for the TI AM57xx EVM -require conf/machine/include/dra7xx.inc +require conf/machine/include/am57xx.inc MACHINE_FEATURES += "touchscreen"meta-ti-bsp/conf/machine/beagle-x15.conf +1
-1@@ -2,7 +2,7 @@ #@NAME: BeagleBoard X15 #@DESCRIPTION: Machine configuration for the BeagleBoard X15 -require conf/machine/include/dra7xx.inc +require conf/machine/include/am57xx.inc KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"meta-ti-bsp/conf/machine/include/am57xx.inc new file +5
-0@@ -0,0 +1,5 @@ +require conf/machine/include/omap-a15.inc +SOC_FAMILY:append = ":dra7xx" +SOC_FAMILY:append = ":am57xx" + +MACHINE_FEATURES += "pci"meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +2
-3@@ -6,7 +6,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}"@@ -15,8 +15,7 @@ S = "${WORKDIR}/git" TARGET = "" TARGET:ti33x = "am335x-pru0-prueth-fw.elf am335x-pru1-prueth-fw.elf" TARGET:ti43x = "am437x-pru0-prueth-fw.elf am437x-pru1-prueth-fw.elf" -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" +TARGET:am57xx = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-prussmeta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb +2
-3@@ -7,7 +7,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}"@@ -16,8 +16,7 @@ S = "${WORKDIR}/git" TARGET = "" TARGET:ti33x = "am335x-pru0-pruhsr-fw.elf am335x-pru1-pruhsr-fw.elf" TARGET:ti43x = "am437x-pru0-pruhsr-fw.elf am437x-pru1-pruhsr-fw.elf" -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" +TARGET:am57xx = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-prussmeta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb +2
-4@@ -7,7 +7,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}"@@ -16,9 +16,7 @@ S = "${WORKDIR}/git" TARGET = "" TARGET:ti33x = "am335x-pru0-pruprp-fw.elf am335x-pru1-pruprp-fw.elf" TARGET:ti43x = "am437x-pru0-pruprp-fw.elf am437x-pru1-pruprp-fw.elf" -TARGET:am57xx-evm = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf" -TARGET:am57xx-hs-evm = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf" - +TARGET:am57xx = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-prussmeta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb +2
-3@@ -6,7 +6,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}"@@ -15,8 +15,7 @@ S = "${WORKDIR}/git" TARGET = "" TARGET:ti33x = "am335x-pru0-prusw-fw.elf am335x-pru1-prusw-fw.elf" TARGET:ti43x = "am437x-pru0-prusw-fw.elf am437x-pru1-prusw-fw.elf" -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" +TARGET:am57xx = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-prussmeta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc +1
-2@@ -12,8 +12,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " vpdma-fw" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " goodix-fw" # Add run-time dependency for PRU Ethernet firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-evm = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-hs-evm = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " prueth-fw pruhsr-fw pruprp-fw" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " prueth-fw pruhsr-fw pruprp-fw" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx = " prueth-fw-am65x"meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc +1
-1@@ -9,4 +9,4 @@ PLATFORM = "UNKNOWN" PLATFORM:dra7xx = "DRA7XX" PLATFORM:omapl138 = "OMAPL138" -ALT_PLATFORM:am57xx-evm = "AM572X AM571X" +ALT_PLATFORM:am57xx = "AM572X AM571X"Signature · 1 line
2.38.1