diff options
Diffstat (limited to 'meta-ti-bsp')
9 files changed, 17 insertions, 18 deletions
diff --git a/meta-ti-bsp/conf/machine/am57xx-evm.conf b/meta-ti-bsp/conf/machine/am57xx-evm.conf index ca635f43..b3525a0b 100644 --- a/meta-ti-bsp/conf/machine/am57xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am57xx-evm.conf | |||
@@ -2,7 +2,7 @@ | |||
2 | #@NAME: AM57xx EVM | 2 | #@NAME: AM57xx EVM |
3 | #@DESCRIPTION: Machine configuration for the TI AM57xx EVM | 3 | #@DESCRIPTION: Machine configuration for the TI AM57xx EVM |
4 | 4 | ||
5 | require conf/machine/include/dra7xx.inc | 5 | require conf/machine/include/am57xx.inc |
6 | 6 | ||
7 | MACHINE_FEATURES += "touchscreen" | 7 | MACHINE_FEATURES += "touchscreen" |
8 | 8 | ||
diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf index c7503266..b4279ae4 100644 --- a/meta-ti-bsp/conf/machine/beagle-x15.conf +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf | |||
@@ -2,7 +2,7 @@ | |||
2 | #@NAME: BeagleBoard X15 | 2 | #@NAME: BeagleBoard X15 |
3 | #@DESCRIPTION: Machine configuration for the BeagleBoard X15 | 3 | #@DESCRIPTION: Machine configuration for the BeagleBoard X15 |
4 | 4 | ||
5 | require conf/machine/include/dra7xx.inc | 5 | require conf/machine/include/am57xx.inc |
6 | 6 | ||
7 | KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb" | 7 | KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb" |
8 | 8 | ||
diff --git a/meta-ti-bsp/conf/machine/include/am57xx.inc b/meta-ti-bsp/conf/machine/include/am57xx.inc new file mode 100644 index 00000000..6c52883b --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/am57xx.inc | |||
@@ -0,0 +1,5 @@ | |||
1 | require conf/machine/include/omap-a15.inc | ||
2 | SOC_FAMILY:append = ":dra7xx" | ||
3 | SOC_FAMILY:append = ":am57xx" | ||
4 | |||
5 | MACHINE_FEATURES += "pci" | ||
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 9ccce938..4f298a2c 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 | |||
@@ -6,7 +6,7 @@ PR = "${INC_PR}.0" | |||
6 | 6 | ||
7 | CLEANBROKEN = "1" | 7 | CLEANBROKEN = "1" |
8 | 8 | ||
9 | COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" | 9 | COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" |
10 | 10 | ||
11 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 11 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
12 | 12 | ||
@@ -15,8 +15,7 @@ S = "${WORKDIR}/git" | |||
15 | TARGET = "" | 15 | TARGET = "" |
16 | TARGET:ti33x = "am335x-pru0-prueth-fw.elf am335x-pru1-prueth-fw.elf" | 16 | TARGET:ti33x = "am335x-pru0-prueth-fw.elf am335x-pru1-prueth-fw.elf" |
17 | TARGET:ti43x = "am437x-pru0-prueth-fw.elf am437x-pru1-prueth-fw.elf" | 17 | TARGET:ti43x = "am437x-pru0-prueth-fw.elf am437x-pru1-prueth-fw.elf" |
18 | TARGET:am57xx-evm = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf" | 18 | TARGET:am57xx = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf" |
19 | TARGET:am57xx-hs-evm = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf" | ||
20 | 19 | ||
21 | do_install() { | 20 | do_install() { |
22 | install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss | 21 | install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss |
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 4ffd13aa..69ccb31a 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 | |||
@@ -7,7 +7,7 @@ PR = "${INC_PR}.0" | |||
7 | 7 | ||
8 | CLEANBROKEN = "1" | 8 | CLEANBROKEN = "1" |
9 | 9 | ||
10 | COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" | 10 | COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" |
11 | 11 | ||
12 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 12 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
13 | 13 | ||
@@ -16,8 +16,7 @@ S = "${WORKDIR}/git" | |||
16 | TARGET = "" | 16 | TARGET = "" |
17 | TARGET:ti33x = "am335x-pru0-pruhsr-fw.elf am335x-pru1-pruhsr-fw.elf" | 17 | TARGET:ti33x = "am335x-pru0-pruhsr-fw.elf am335x-pru1-pruhsr-fw.elf" |
18 | TARGET:ti43x = "am437x-pru0-pruhsr-fw.elf am437x-pru1-pruhsr-fw.elf" | 18 | TARGET:ti43x = "am437x-pru0-pruhsr-fw.elf am437x-pru1-pruhsr-fw.elf" |
19 | TARGET:am57xx-evm = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf" | 19 | TARGET:am57xx = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf" |
20 | TARGET:am57xx-hs-evm = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf" | ||
21 | 20 | ||
22 | do_install() { | 21 | do_install() { |
23 | install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss | 22 | install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss |
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 23c422dd..f774db58 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 | |||
@@ -7,7 +7,7 @@ PR = "${INC_PR}.0" | |||
7 | 7 | ||
8 | CLEANBROKEN = "1" | 8 | CLEANBROKEN = "1" |
9 | 9 | ||
10 | COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" | 10 | COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" |
11 | 11 | ||
12 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 12 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
13 | 13 | ||
@@ -16,9 +16,7 @@ S = "${WORKDIR}/git" | |||
16 | TARGET = "" | 16 | TARGET = "" |
17 | TARGET:ti33x = "am335x-pru0-pruprp-fw.elf am335x-pru1-pruprp-fw.elf" | 17 | TARGET:ti33x = "am335x-pru0-pruprp-fw.elf am335x-pru1-pruprp-fw.elf" |
18 | TARGET:ti43x = "am437x-pru0-pruprp-fw.elf am437x-pru1-pruprp-fw.elf" | 18 | TARGET:ti43x = "am437x-pru0-pruprp-fw.elf am437x-pru1-pruprp-fw.elf" |
19 | TARGET:am57xx-evm = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf" | 19 | TARGET:am57xx = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf" |
20 | TARGET:am57xx-hs-evm = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf" | ||
21 | |||
22 | 20 | ||
23 | do_install() { | 21 | do_install() { |
24 | install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss | 22 | install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss |
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 8d784768..5b38a048 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 | |||
@@ -6,7 +6,7 @@ PR = "${INC_PR}.0" | |||
6 | 6 | ||
7 | CLEANBROKEN = "1" | 7 | CLEANBROKEN = "1" |
8 | 8 | ||
9 | COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" | 9 | COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" |
10 | 10 | ||
11 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 11 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
12 | 12 | ||
@@ -15,8 +15,7 @@ S = "${WORKDIR}/git" | |||
15 | TARGET = "" | 15 | TARGET = "" |
16 | TARGET:ti33x = "am335x-pru0-prusw-fw.elf am335x-pru1-prusw-fw.elf" | 16 | TARGET:ti33x = "am335x-pru0-prusw-fw.elf am335x-pru1-prusw-fw.elf" |
17 | TARGET:ti43x = "am437x-pru0-prusw-fw.elf am437x-pru1-prusw-fw.elf" | 17 | TARGET:ti43x = "am437x-pru0-prusw-fw.elf am437x-pru1-prusw-fw.elf" |
18 | TARGET:am57xx-evm = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf" | 18 | TARGET:am57xx = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf" |
19 | TARGET:am57xx-hs-evm = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf" | ||
20 | 19 | ||
21 | do_install() { | 20 | do_install() { |
22 | install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss | 21 | install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss |
diff --git a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc index 43cd31fe..61dcbcd8 100644 --- a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc +++ b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc | |||
@@ -12,8 +12,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " vpdma-fw" | |||
12 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " goodix-fw" | 12 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " goodix-fw" |
13 | 13 | ||
14 | # Add run-time dependency for PRU Ethernet firmware to the rootfs | 14 | # Add run-time dependency for PRU Ethernet firmware to the rootfs |
15 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-evm = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" | 15 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" |
16 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-hs-evm = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" | ||
17 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " prueth-fw pruhsr-fw pruprp-fw" | 16 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " prueth-fw pruhsr-fw pruprp-fw" |
18 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " prueth-fw pruhsr-fw pruprp-fw" | 17 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " prueth-fw pruhsr-fw pruprp-fw" |
19 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx = " prueth-fw-am65x" | 18 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx = " prueth-fw-am65x" |
diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc b/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc index 4962a3ec..ec1e71be 100644 --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc | |||
@@ -9,4 +9,4 @@ PLATFORM = "UNKNOWN" | |||
9 | PLATFORM:dra7xx = "DRA7XX" | 9 | PLATFORM:dra7xx = "DRA7XX" |
10 | PLATFORM:omapl138 = "OMAPL138" | 10 | PLATFORM:omapl138 = "OMAPL138" |
11 | 11 | ||
12 | ALT_PLATFORM:am57xx-evm = "AM572X AM571X" | 12 | ALT_PLATFORM:am57xx = "AM572X AM571X" |