diff options
Diffstat (limited to 'bsp')
274 files changed, 3579 insertions, 4029 deletions
diff --git a/bsp/meta-altera/conf/machine/cyclone5.conf b/bsp/meta-altera/conf/machine/cyclone5.conf index 3670c1cd..bee250bf 100644 --- a/bsp/meta-altera/conf/machine/cyclone5.conf +++ b/bsp/meta-altera/conf/machine/cyclone5.conf @@ -22,10 +22,9 @@ KERNEL_DEVICETREE ?= "\ socfpga_cyclone5_socdk.dtb \ socfpga_cyclone5_sockit.dtb \ socfpga_cyclone5_socrates.dtb \ - socfpga_cyclone5_de0_sockit.dtb \ + socfpga_cyclone5_de0_nano_soc.dtb \ socfpga_cyclone5_mcvevk.dtb \ socfpga_cyclone5_sodia.dtb \ - socfpga_cyclone5_trcom.dtb \ socfpga_cyclone5_vining_fpga.dtb \ " diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/0001-Fix-native-build-by-using-env-variables.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/0001-Fix-native-build-by-using-env-variables.patch deleted file mode 100644 index 5443bce4..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/0001-Fix-native-build-by-using-env-variables.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5aa1e2d99a26f1cab1774fa1e94b53de42897d1c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan-Simon=20M=C3=B6ller?= <jsmoeller@linuxfoundation.org> -Date: Thu, 10 Aug 2017 19:36:21 +0200 -Subject: [PATCH] Fix native build by using env variables -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 8ca1db5..fef1059 100644 ---- a/Makefile -+++ b/Makefile -@@ -254,8 +254,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ - else if [ -x /bin/bash ]; then echo /bin/bash; \ - else echo sh; fi ; fi) - --HOSTCC = cc --HOSTCXX = c++ -+HOSTCC = $(CC) -+HOSTCXX = $(CXX) - HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer \ - $(if $(CONFIG_TOOLS_DEBUG),-g) - HOSTCXXFLAGS = -O2 --- -2.1.4 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch deleted file mode 100644 index 18c5e748..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 07373b2e477ae61f9f6a0e2eff41be3276d92923 Mon Sep 17 00:00:00 2001 -From: yocto <yocto@yocto.org> -Date: Thu, 2 Jun 2016 03:21:51 -0500 -Subject: [PATCH] fix build error under gcc6 - -Fix the following error: -| ../include/linux/compiler-gcc.h:114:30: fatal error: linux/compiler-gcc6.h: No such file or directory -| #include gcc_header(__GNUC__) - -Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> - -Upstream-Status: Pending ---- - include/linux/compiler-gcc6.h | 65 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 65 insertions(+) - create mode 100644 include/linux/compiler-gcc6.h - -diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h -new file mode 100644 -index 0000000..c8c5659 ---- /dev/null -+++ b/include/linux/compiler-gcc6.h -@@ -0,0 +1,65 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead." -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -+ -+/* Mark functions as cold. gcc will assume any path leading to a call -+ to them will be unlikely. This means a lot of manual unlikely()s -+ are unnecessary now for any paths leading to the usual suspects -+ like BUG(), printk(), panic() etc. [but let's keep them for now for -+ older compilers] -+ -+ Early snapshots of gcc 4.3 don't support this and we can't detect this -+ in the preprocessor, but we can live with this because they're unreleased. -+ Maketime probing would be overkill here. -+ -+ gcc also has a __attribute__((__hot__)) to move hot functions into -+ a special section, but I don't see any sense in this right now in -+ the kernel context */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+ -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ --- -2.5.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2016.11/cyclone5-socdk.env b/bsp/meta-altera/recipes-bsp/u-boot/files/v2016.11/cyclone5-socdk.env deleted file mode 100644 index 15c329fe..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2016.11/cyclone5-socdk.env +++ /dev/null @@ -1,11 +0,0 @@ -baudrate=115200 -bootargs=console=ttyS0,115200 -bootcmd=run mmcload; run mmcboot -fdtimage=socfpga_cyclone5_socdk.dtb -bootimage=zImage -fdt_addr=100 -loadaddr=0x01000000 -mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} -mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage} -mmcroot=/dev/mmcblk0p3 -ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2016.11/de0-nano-soc.env b/bsp/meta-altera/recipes-bsp/u-boot/files/v2016.11/de0-nano-soc.env deleted file mode 100644 index b7d69cbe..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2016.11/de0-nano-soc.env +++ /dev/null @@ -1,11 +0,0 @@ -baudrate=115200 -bootargs=console=ttyS0,115200 -bootcmd=run mmcload; run mmcboot -fdtimage=socfpga_cyclone5_de0_sockit.dtb -bootimage=zImage -fdt_addr=100 -loadaddr=0x01000000 -mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} -mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage} -mmcroot=/dev/mmcblk0p3 -ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2017.07/cyclone5-socdk.env b/bsp/meta-altera/recipes-bsp/u-boot/files/v2017.07/cyclone5-socdk.env deleted file mode 100644 index 15c329fe..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2017.07/cyclone5-socdk.env +++ /dev/null @@ -1,11 +0,0 @@ -baudrate=115200 -bootargs=console=ttyS0,115200 -bootcmd=run mmcload; run mmcboot -fdtimage=socfpga_cyclone5_socdk.dtb -bootimage=zImage -fdt_addr=100 -loadaddr=0x01000000 -mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} -mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage} -mmcroot=/dev/mmcblk0p3 -ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2017.07/de0-nano-soc.env b/bsp/meta-altera/recipes-bsp/u-boot/files/v2017.07/de0-nano-soc.env deleted file mode 100644 index b7d69cbe..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2017.07/de0-nano-soc.env +++ /dev/null @@ -1,11 +0,0 @@ -baudrate=115200 -bootargs=console=ttyS0,115200 -bootcmd=run mmcload; run mmcboot -fdtimage=socfpga_cyclone5_de0_sockit.dtb -bootimage=zImage -fdt_addr=100 -loadaddr=0x01000000 -mmcboot=setenv bootargs console=ttyS0,115200 root=${mmcroot} rw rootwait;bootz ${loadaddr} - ${fdt_addr} -mmcload=mmc rescan;load mmc 0:1 ${loadaddr} ${bootimage};load mmc 0:1 ${fdt_addr} ${fdtimage} -mmcroot=/dev/mmcblk0p3 -ramboot=setenv bootargs console=ttyS0,115200;bootm ${loadaddr} - ${fdt_addr} diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0001-ARM-socfpga-Stratix10-Disable-CONFIG_PSCI_RESET.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0001-ARM-socfpga-Stratix10-Disable-CONFIG_PSCI_RESET.patch deleted file mode 100644 index e954ac07..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0001-ARM-socfpga-Stratix10-Disable-CONFIG_PSCI_RESET.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 45dd1ac82881153c73bd4243cd20f3b13955ad21 Mon Sep 17 00:00:00 2001 -From: Chee Hong Ang <chee.hong.ang@intel.com> -Date: Sat, 11 May 2019 00:09:46 +0800 -Subject: [PATCH] ARM: socfpga: Stratix10: Disable CONFIG_PSCI_RESET - -Avoid invoking 'SYSTEM_RESET' PSCI function because PSCI -function calls are not supported in u-boot running in EL3. - -Signed-off-by: Chee Hong Ang <chee.hong.ang@intel.com> ---- - arch/arm/cpu/armv8/Kconfig | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig -index 7405c3a4a1..409ee7ada0 100644 ---- a/arch/arm/cpu/armv8/Kconfig -+++ b/arch/arm/cpu/armv8/Kconfig -@@ -108,7 +108,8 @@ config PSCI_RESET - !TARGET_LS1046ARDB && !TARGET_LS1046AQDS && \ - !TARGET_LS2081ARDB && !TARGET_LX2160ARDB && \ - !TARGET_LX2160AQDS && \ -- !ARCH_UNIPHIER && !TARGET_S32V234EVB -+ !ARCH_UNIPHIER && !TARGET_S32V234EVB && \ -+ !TARGET_SOCFPGA_STRATIX10 - help - Most armv8 systems have PSCI support enabled in EL3, either through - ARM Trusted Firmware or other firmware. --- -2.13.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0001-ARM-socfpga-stratix10-Enable-PSCI-system-reset.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0001-ARM-socfpga-stratix10-Enable-PSCI-system-reset.patch deleted file mode 100644 index a4b78573..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0001-ARM-socfpga-stratix10-Enable-PSCI-system-reset.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 97f599b2a7b34d17067b4ccf6c468cdcc6805349 Mon Sep 17 00:00:00 2001 -From: "Ang, Chee Hong" <chee.hong.ang@intel.com> -Date: Mon, 29 Apr 2019 23:35:30 -0700 -Subject: [PATCH 01/12] ARM: socfpga: stratix10: Enable PSCI system reset - -Enable psci_system_reset support for Stratix10. This PSCI function -will eventually trigger the mailbox HPS_REBOOT to SDM. - -Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com> ---- - arch/arm/mach-socfpga/Makefile | 3 +++ - arch/arm/mach-socfpga/psci.c | 21 +++++++++++++++++++++ - 2 files changed, 24 insertions(+) - create mode 100644 arch/arm/mach-socfpga/psci.c - -diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile -index e66720447f..f77b229a38 100644 ---- a/arch/arm/mach-socfpga/Makefile -+++ b/arch/arm/mach-socfpga/Makefile -@@ -38,6 +38,9 @@ obj-y += system_manager_s10.o - obj-y += timer_s10.o - obj-y += wrap_pinmux_config_s10.o - obj-y += wrap_pll_config_s10.o -+ifndef CONFIG_SPL_BUILD -+obj-$(CONFIG_ARMV8_PSCI) += psci.o -+endif - endif - - ifdef CONFIG_SPL_BUILD -diff --git a/arch/arm/mach-socfpga/psci.c b/arch/arm/mach-socfpga/psci.c -new file mode 100644 -index 0000000000..9ef393110d ---- /dev/null -+++ b/arch/arm/mach-socfpga/psci.c -@@ -0,0 +1,21 @@ -+/* -+ * Copyright (C) 2017 Intel Corporation <www.intel.com> -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ */ -+ -+#include <common.h> -+#include <asm/io.h> -+#include <asm/psci.h> -+#include <errno.h> -+#include <asm/arch/mailbox_s10.h> -+#include <asm/secure.h> -+ -+void __noreturn __secure psci_system_reset(void) -+{ -+ mbox_send_cmd_psci(MBOX_ID_UBOOT, MBOX_REBOOT_HPS, -+ MBOX_CMD_DIRECT, 0, NULL, 0, 0, NULL); -+ -+ while (1) -+ ; -+} --- -2.21.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0002-ARM-socfpga-stratix10-Enable-PSCI-CPU_ON.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0002-ARM-socfpga-stratix10-Enable-PSCI-CPU_ON.patch deleted file mode 100644 index ebf6fe7e..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0002-ARM-socfpga-stratix10-Enable-PSCI-CPU_ON.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 257cff780ec1a50600a77cf361df27746801d684 Mon Sep 17 00:00:00 2001 -From: "Ang, Chee Hong" <chee.hong.ang@intel.com> -Date: Mon, 14 Jan 2019 01:07:50 -0800 -Subject: [PATCH 02/12] ARM: socfpga: stratix10: Enable PSCI CPU_ON - -Enable psci_cpu_on support for Stratix10. This PSCI function -will pass the cpu release address for CPU1-CPU3. Then send event -signal shall be triggered to get these CPUs running Linux code. - -Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com> ---- - arch/arm/mach-socfpga/psci.c | 35 +++++++++++++++++++++++++++++++++++ - 1 file changed, 35 insertions(+) - -diff --git a/arch/arm/mach-socfpga/psci.c b/arch/arm/mach-socfpga/psci.c -index 9ef393110d..0af3eb195c 100644 ---- a/arch/arm/mach-socfpga/psci.c -+++ b/arch/arm/mach-socfpga/psci.c -@@ -11,6 +11,9 @@ - #include <asm/arch/mailbox_s10.h> - #include <asm/secure.h> - -+static u64 psci_cpu_on_64_cpuid __secure_data; -+static u64 psci_cpu_on_64_entry_point __secure_data; -+ - void __noreturn __secure psci_system_reset(void) - { - mbox_send_cmd_psci(MBOX_ID_UBOOT, MBOX_REBOOT_HPS, -@@ -19,3 +22,35 @@ void __noreturn __secure psci_system_reset(void) - while (1) - ; - } -+ -+/* This function will handle multiple core release based PSCI */ -+void __secure psci_cpu_on_64_mpidr(void) -+{ -+ asm volatile( -+ ".align 5 \n" -+ "1: wfe \n" -+ " ldr x0, [%0] \n" -+ " ldr x1, [%1] \n" -+ " mrs x2, mpidr_el1 \n" -+ " and x2, x2, #0xff \n" -+ " cmp x0, x2 \n" -+ " b.ne 1b \n" -+ " br x1 \n" -+ : : "r"(&psci_cpu_on_64_cpuid), "r"(&psci_cpu_on_64_entry_point) -+ : "x0", "x1", "x2", "memory", "cc"); -+} -+ -+int __secure psci_cpu_on_64(u32 function_id, u64 cpuid, u64 entry_point) -+{ -+ /* Releases all secondary CPUs to jump into psci_cpu_on_64_mpidr */ -+ writeq(0, &psci_cpu_on_64_cpuid); -+ writeq(0, &psci_cpu_on_64_entry_point); -+ writeq((u64)&psci_cpu_on_64_mpidr, CPU_RELEASE_ADDR); -+ -+ /* to store in global so psci_cpu_on_64_mpidr function can refer */ -+ writeq(entry_point, &psci_cpu_on_64_entry_point); -+ writeq(cpuid, &psci_cpu_on_64_cpuid); -+ asm volatile("sev"); -+ -+ return ARM_PSCI_RET_SUCCESS; -+} --- -2.21.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0003-ARM-socfpga-stratix10-Enable-PSCI-support-for-Strati.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0003-ARM-socfpga-stratix10-Enable-PSCI-support-for-Strati.patch deleted file mode 100644 index ed60cc0f..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0003-ARM-socfpga-stratix10-Enable-PSCI-support-for-Strati.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 504f8bd14f703bfb2ffd5dccac7126d5fd22e0d1 Mon Sep 17 00:00:00 2001 -From: "Ang, Chee Hong" <chee.hong.ang@intel.com> -Date: Mon, 29 Apr 2019 23:18:38 -0700 -Subject: [PATCH 03/12] ARM: socfpga: stratix10: Enable PSCI support for - Stratix 10 - -The address of PSCI text, data and stack sections start at -0x00001000 (SDRAM). - -Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com> ---- - arch/arm/mach-socfpga/Kconfig | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig -index 48f02f08d4..755bab5dd2 100644 ---- a/arch/arm/mach-socfpga/Kconfig -+++ b/arch/arm/mach-socfpga/Kconfig -@@ -12,6 +12,12 @@ config SPL_SYS_MALLOC_F_LEN - config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE - default 0xa2 - -+config ARMV8_SECURE_BASE -+ default 0x00001000 if TARGET_SOCFPGA_STRATIX10 -+ -+config SYS_HAS_ARMV8_SECURE_BASE -+ default y if TARGET_SOCFPGA_STRATIX10 -+ - config SYS_MALLOC_F_LEN - default 0x2000 if TARGET_SOCFPGA_ARRIA10 - default 0x2000 if TARGET_SOCFPGA_GEN5 -@@ -56,8 +62,9 @@ config TARGET_SOCFPGA_GEN5 - config TARGET_SOCFPGA_STRATIX10 - bool - select ARMV8_MULTIENTRY -+ select ARMV8_PSCI -+ select ARMV8_SEC_FIRMWARE_SUPPORT - select ARMV8_SET_SMPEN -- select ARMV8_SPIN_TABLE - select FPGA_STRATIX10 - - choice --- -2.21.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0004-ARM-socfpga-stratix10-Enable-SMC-PSCI-calls-from-sla.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0004-ARM-socfpga-stratix10-Enable-SMC-PSCI-calls-from-sla.patch deleted file mode 100644 index 7d307066..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0004-ARM-socfpga-stratix10-Enable-SMC-PSCI-calls-from-sla.patch +++ /dev/null @@ -1,153 +0,0 @@ -From a859bc214aa913be022a7aa8f03723079a325b07 Mon Sep 17 00:00:00 2001 -From: Chee Hong Ang <chee.hong.ang@intel.com> -Date: Fri, 20 Apr 2018 18:28:07 +0800 -Subject: [PATCH 04/12] ARM: socfpga: stratix10: Enable SMC/PSCI calls from - slave CPUs - -Before this patch, only master CPU (CPU0) is able to -make SMC/PSCI calls to EL3 exception handler. This patch -allow SMC/PSCI calls from slave CPUs (CPU1/2/3) as well. - -Signed-off-by: Chee Hong Ang <chee.hong.ang@intel.com> ---- - arch/arm/mach-socfpga/Makefile | 1 + - arch/arm/mach-socfpga/lowlevel_init.S | 97 +++++++++++++++++++++++ - include/configs/socfpga_stratix10_socdk.h | 6 ++ - 3 files changed, 104 insertions(+) - create mode 100644 arch/arm/mach-socfpga/lowlevel_init.S - -diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile -index f77b229a38..d34198d159 100644 ---- a/arch/arm/mach-socfpga/Makefile -+++ b/arch/arm/mach-socfpga/Makefile -@@ -29,6 +29,7 @@ obj-y += reset_manager_arria10.o - endif - - ifdef CONFIG_TARGET_SOCFPGA_STRATIX10 -+obj-y += lowlevel_init.o - obj-y += clock_manager_s10.o - obj-y += mailbox_s10.o - obj-y += misc_s10.o -diff --git a/arch/arm/mach-socfpga/lowlevel_init.S b/arch/arm/mach-socfpga/lowlevel_init.S -new file mode 100644 -index 0000000000..832785a682 ---- /dev/null -+++ b/arch/arm/mach-socfpga/lowlevel_init.S -@@ -0,0 +1,97 @@ -+/* -+ * Copyright (C) 2018 Intel Corporation. All rights reserved -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ */ -+ -+#include <asm-offsets.h> -+#include <config.h> -+#include <linux/linkage.h> -+#include <asm/macro.h> -+ -+#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_ARMV8_PSCI) -+.align 3 -+_el3_exception_vectors: -+ .word el3_exception_vectors; -+ .word 0 -+#endif -+ -+ENTRY(lowlevel_init) -+ mov x29, lr /* Save LR */ -+ -+#if defined(CONFIG_GICV2) || defined(CONFIG_GICV3) -+ branch_if_slave x0, 1f -+ ldr x0, =GICD_BASE -+ bl gic_init_secure -+1: -+#if defined(CONFIG_GICV3) -+ ldr x0, =GICR_BASE -+ bl gic_init_secure_percpu -+#elif defined(CONFIG_GICV2) -+ ldr x0, =GICD_BASE -+ ldr x1, =GICC_BASE -+ bl gic_init_secure_percpu -+#endif -+#endif -+ -+#ifdef CONFIG_ARMV8_MULTIENTRY -+ branch_if_master x0, x1, 2f -+ -+ /* -+ * Slave should wait for master clearing spin table. -+ * This sync prevent slaves observing incorrect -+ * value of spin table and jumping to wrong place. -+ */ -+#if defined(CONFIG_GICV2) || defined(CONFIG_GICV3) -+#ifdef CONFIG_GICV2 -+ ldr x0, =GICC_BASE -+#endif -+ bl gic_wait_for_interrupt -+#endif -+ -+#ifdef CONFIG_SPL_BUILD -+ /* -+ * Read the u-boot's PSCI exception handler's vector base -+ * address from the sysmgr.boot_scratch_cold6 & 7 and update -+ * their VBAR_EL3 respectively. -+ */ -+wait_vbar_el3: -+ ldr x4, =VBAR_EL3_BASE_ADDR -+ ldr x5, [x4] -+ cbz x5, wait_vbar_el3 -+ msr vbar_el3, x5 -+#endif -+ /* -+ * All slaves will enter EL2 and optionally EL1. -+ */ -+ adr x4, lowlevel_in_el2 -+ ldr x5, =ES_TO_AARCH64 -+ bl armv8_switch_to_el2 -+ -+lowlevel_in_el2: -+#ifdef CONFIG_ARMV8_SWITCH_TO_EL1 -+ adr x4, lowlevel_in_el1 -+ ldr x5, =ES_TO_AARCH64 -+ bl armv8_switch_to_el1 -+ -+lowlevel_in_el1: -+#endif -+ -+#endif /* CONFIG_ARMV8_MULTIENTRY */ -+ -+2: -+#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_ARMV8_PSCI) -+ /* -+ * Write the u-boot PSCI exception handler's vector base address -+ * into a sysmgr.boot_scratch_cold6 & 7 so that other slave cpus -+ * are able to get the vector base address and update their VBAR_EL3 -+ * respectively. -+ */ -+ adr x0, _el3_exception_vectors -+ ldr x5, [x0] -+ ldr x4, =VBAR_EL3_BASE_ADDR -+ str x5, [x4] -+#endif -+ mov lr, x29 /* Restore LR */ -+ ret -+ENDPROC(lowlevel_init) -diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h -index 8d2971c6e2..39d757d737 100644 ---- a/include/configs/socfpga_stratix10_socdk.h -+++ b/include/configs/socfpga_stratix10_socdk.h -@@ -19,6 +19,12 @@ - #define CONFIG_REMAKE_ELF - /* sysmgr.boot_scratch_cold4 & 5 (64bit) will be used for PSCI_CPU_ON call */ - #define CPU_RELEASE_ADDR 0xFFD12210 -+/* -+ * sysmgr.boot_scratch_cold6 & 7 (64bit) will be used by master CPU to -+ * store its VBAR_EL3 value. Other slave CPUs will read from this -+ * location and update their VBAR_EL3 respectively -+ */ -+#define VBAR_EL3_BASE_ADDR 0xFFD12218 - #define CONFIG_SYS_CACHELINE_SIZE 64 - #define CONFIG_SYS_MEM_RESERVE_SECURE 0 /* using OCRAM, not DDR */ - --- -2.21.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0005-ARM-socfpga-stratix10-Add-SOCFPGA-bridges-reset-supp.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0005-ARM-socfpga-stratix10-Add-SOCFPGA-bridges-reset-supp.patch deleted file mode 100644 index fd43dd24..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0005-ARM-socfpga-stratix10-Add-SOCFPGA-bridges-reset-supp.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 16460c05fe576050cf485282151fd5623d6e862a Mon Sep 17 00:00:00 2001 -From: Dalon Westergreen <dalon.westergreen@intel.com> -Date: Wed, 22 May 2019 17:05:12 -0700 -Subject: [PATCH 05/12] ARM: socfpga: stratix10: Add SOCFPGA bridges reset - support for PSCI call - -Add SOCFPGA bridges reset support for FPGA configuration SMC services -to disable/enable the bridges before and after the FPGA configuration -process. - -Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com> -Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com> ---- - .../include/mach/reset_manager_s10.h | 1 + - arch/arm/mach-socfpga/reset_manager_s10.c | 25 ++++++++++++++++++- - 2 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h -index 452147b017..1939ffa149 100644 ---- a/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h -+++ b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h -@@ -11,6 +11,7 @@ void reset_cpu(ulong addr); - int cpu_has_been_warmreset(void); - - void socfpga_bridges_reset(int enable); -+void socfpga_bridges_reset_psci(int enable); - - void socfpga_per_reset(u32 reset, int set); - void socfpga_per_reset_all(void); -diff --git a/arch/arm/mach-socfpga/reset_manager_s10.c b/arch/arm/mach-socfpga/reset_manager_s10.c -index 499a84aff5..4494f6666f 100644 ---- a/arch/arm/mach-socfpga/reset_manager_s10.c -+++ b/arch/arm/mach-socfpga/reset_manager_s10.c -@@ -9,6 +9,7 @@ - #include <asm/arch/reset_manager.h> - #include <asm/arch/system_manager.h> - #include <dt-bindings/reset/altr,rst-mgr-s10.h> -+#include <asm/secure.h> - - DECLARE_GLOBAL_DATA_PTR; - -@@ -20,6 +21,8 @@ static const struct socfpga_system_manager *system_manager_base = - /* Assert or de-assert SoCFPGA reset manager reset. */ - void socfpga_per_reset(u32 reset, int set) - { -+ static const struct socfpga_reset_manager *reset_manager_base = -+ (void *)SOCFPGA_RSTMGR_ADDRESS; - const void *reg; - - if (RSTMGR_BANK(reset) == 0) -@@ -46,6 +49,8 @@ void socfpga_per_reset(u32 reset, int set) - */ - void socfpga_per_reset_all(void) - { -+ static const struct socfpga_reset_manager *reset_manager_base = -+ (void *)SOCFPGA_RSTMGR_ADDRESS; - const u32 l4wd0 = 1 << RSTMGR_RESET(SOCFPGA_RESET(L4WD0)); - - /* disable all except OCP and l4wd0. OCP disable later */ -@@ -55,8 +60,13 @@ void socfpga_per_reset_all(void) - writel(0xffffffff, &reset_manager_base->per1modrst); - } - --void socfpga_bridges_reset(int enable) -+static __always_inline void __socfpga_bridges_reset(int enable) - { -+ static const struct socfpga_reset_manager *reset_manager_base = -+ (void *)SOCFPGA_RSTMGR_ADDRESS; -+ static const struct socfpga_system_manager *system_manager_base = -+ (void *)SOCFPGA_SYSMGR_ADDRESS; -+ - if (enable) { - /* clear idle request to all bridges */ - setbits_le32(&system_manager_base->noc_idlereq_clr, ~0); -@@ -94,11 +104,24 @@ void socfpga_bridges_reset(int enable) - } - } - -+void socfpga_bridges_reset(int enable) -+{ -+ __socfpga_bridges_reset(enable); -+} -+ -+void __secure socfpga_bridges_reset_psci(int enable) -+{ -+ __socfpga_bridges_reset(enable); -+} -+ - /* - * Return non-zero if the CPU has been warm reset - */ - int cpu_has_been_warmreset(void) - { -+ static const struct socfpga_reset_manager *reset_manager_base = -+ (void *)SOCFPGA_RSTMGR_ADDRESS; -+ - return readl(&reset_manager_base->status) & - RSTMGR_L4WD_MPU_WARMRESET_MASK; - } --- -2.21.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0006-ARM-socfpga-stratix10-Add-Stratix10-FPGA-configurati.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0006-ARM-socfpga-stratix10-Add-Stratix10-FPGA-configurati.patch deleted file mode 100644 index cc0be27b..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0006-ARM-socfpga-stratix10-Add-Stratix10-FPGA-configurati.patch +++ /dev/null @@ -1,833 +0,0 @@ -From 04187fba93e6d359ebb4dd8e397dff282f53ec5a Mon Sep 17 00:00:00 2001 -From: "Ang, Chee Hong" <chee.hong.ang@intel.com> -Date: Mon, 29 Apr 2019 23:42:39 -0700 -Subject: [PATCH 06/12] ARM: socfpga: stratix10: Add Stratix10 FPGA - configuration PSCI services - -Allow PSCI layer to handle the S10 FPGA configuration (SiP) service -calls. All these services are also known as FPGA configuration service -layer for S10. This service layer support FPGA configuration service -requests from OS (EL1). It acts as the middle layer between SDM -(Secure Device Manager) and the OS. It enables OS (EL1) to invoke SMC -call to this service layer (EL3) and pass the FPGA bit stream to SDM -for FPGA configuration. - -Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com> ---- - arch/arm/mach-socfpga/Makefile | 1 + - arch/arm/mach-socfpga/include/mach/smc_s10.h | 42 ++ - arch/arm/mach-socfpga/smc_fpga_reconfig_s10.c | 422 ++++++++++++++++++ - include/linux/intel-smc.h | 311 +++++++++++++ - 4 files changed, 776 insertions(+) - create mode 100644 arch/arm/mach-socfpga/include/mach/smc_s10.h - create mode 100644 arch/arm/mach-socfpga/smc_fpga_reconfig_s10.c - create mode 100644 include/linux/intel-smc.h - -diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile -index d34198d159..88970e7555 100644 ---- a/arch/arm/mach-socfpga/Makefile -+++ b/arch/arm/mach-socfpga/Makefile -@@ -41,6 +41,7 @@ obj-y += wrap_pinmux_config_s10.o - obj-y += wrap_pll_config_s10.o - ifndef CONFIG_SPL_BUILD - obj-$(CONFIG_ARMV8_PSCI) += psci.o -+obj-$(CONFIG_FPGA_STRATIX10) += smc_fpga_reconfig_s10.o - endif - endif - -diff --git a/arch/arm/mach-socfpga/include/mach/smc_s10.h b/arch/arm/mach-socfpga/include/mach/smc_s10.h -new file mode 100644 -index 0000000000..9c82d863e5 ---- /dev/null -+++ b/arch/arm/mach-socfpga/include/mach/smc_s10.h -@@ -0,0 +1,42 @@ -+/* -+ * Copyright (C) 2018 Intel Corporation. All rights reserved -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ */ -+ -+#include <common.h> -+ -+#define SMC_ARG0 0 -+#define SMC_ARG1 (SMC_ARG0 + 1) -+#define SMC_ARG2 (SMC_ARG1 + 1) -+#define SMC_ARG3 (SMC_ARG2 + 1) -+#define SMC_RETURN_ARGS_MAX (SMC_ARG3 + 1) -+ -+/* Macro functions for allocation and read/write of -+ variables to be assigned to registers */ -+/* Allocate memory for variable */ -+#define SMC_ALLOC_REG_MEM(var) unsigned long var[SMC_RETURN_ARGS_MAX] -+/* Clear variable */ -+#define SMC_INIT_REG_MEM(var) \ -+ do { \ -+ int i; \ -+ for (i = 0; i < SMC_RETURN_ARGS_MAX; i++) \ -+ var[i] = 0; \ -+ } while (0) -+/* Read variable */ -+#define SMC_GET_REG_MEM(var, i) var[i] -+/* Write Variable */ -+#define SMC_ASSIGN_REG_MEM(var, i, val) \ -+ do { \ -+ var[i] = (val); \ -+ } while (0) -+/* Assign variables back to registers */ -+#define SMC_RET_REG_MEM(var) \ -+ do { \ -+ asm volatile("ldr x0, %0\n" \ -+ "ldr x1, %1\n" \ -+ "ldr x2, %2\n" \ -+ "ldr x3, %3\n" \ -+ : : "m" (var[0]), "m" (var[1]), \ -+ "m" (var[2]), "m" (var[3]) : ); \ -+ } while (0) -diff --git a/arch/arm/mach-socfpga/smc_fpga_reconfig_s10.c b/arch/arm/mach-socfpga/smc_fpga_reconfig_s10.c -new file mode 100644 -index 0000000000..0ed12e16b4 ---- /dev/null -+++ b/arch/arm/mach-socfpga/smc_fpga_reconfig_s10.c -@@ -0,0 +1,422 @@ -+/* -+ * Copyright (C) 2018 Intel Corporation. All rights reserved -+ * -+ * SPDX-License-Identifier: GPL-2.0 -+ */ -+ -+#include <common.h> -+#include <errno.h> -+#include <asm/io.h> -+#include <asm/psci.h> -+#include <asm/secure.h> -+#include <asm/arch/mailbox_s10.h> -+#include <asm/arch/smc_s10.h> -+#include <linux/intel-smc.h> -+#include <asm/arch/reset_manager.h> -+ -+/* Start of reserved memory */ -+#define FPGA_CONFIG_RESEVED_MEM_START (CONFIG_SYS_SDRAM_BASE + \ -+ 0x400000) -+/* End of reserved memory */ -+#define FPGA_CONFIG_RESERVED_MEM_END (CONFIG_SYS_SDRAM_BASE + \ -+ 0xFFFFFF) -+ -+#define FPGA_CONFIG_BUF_MAX 16 -+ -+#define FPGA_BUF_STAT_IDLE 0 -+#define FPGA_BUF_STAT_PENDING 1 -+#define FPGA_BUF_STAT_COMPLETED 2 -+#define FPGA_BUF_STAT_SUCCESS 3 -+#define FPGA_BUF_STAT_ERROR 4 -+ -+#define IS_BUF_FREE(x) (x.state == FPGA_BUF_STAT_IDLE) -+#define IS_BUF_PENDING(x) (x.state == FPGA_BUF_STAT_PENDING) -+#define IS_BUF_SUBMITTED(x) (x.state >= FPGA_BUF_STAT_PENDING && \ -+ x.submit_count > 0) -+#define IS_BUF_COMPLETED(x) (x.state == FPGA_BUF_STAT_COMPLETED && \ -+ x.submit_count > 0) -+#define IS_BUF_FULLY_COMPLETED(x) (x.state == FPGA_BUF_STAT_COMPLETED && \ -+ x.submit_count == 0) -+#define IS_BUF_SUCCESS(x) (x.state == FPGA_BUF_STAT_SUCCESS) -+#define IS_BUF_ERROR(x) (x.state == FPGA_BUF_STAT_ERROR) -+ -+static __secure_data struct fpga_buf_list { -+ u32 state; -+ u32 buf_id; -+ u64 buf_addr; -+ u64 buf_size; -+ u32 buf_off; -+ u32 submit_count; -+} fpga_buf_list[FPGA_CONFIG_BUF_MAX]; -+ -+static u8 __secure_data fpga_error = 1; -+static u8 __secure_data is_partial_reconfig; -+static u8 __secure_data fpga_buf_id = 1; -+static u32 __secure_data fpga_xfer_max = 4; -+static u32 __secure_data fpga_buf_read_index; -+static u32 __secure_data fpga_buf_write_index; -+static u32 __secure_data fpga_buf_count; -+/* 20bits DMA size with 8 bytes alignment */ -+static u32 __secure_data fpga_buf_size_max = 0xFFFF8; -+/* Number of data blocks received from OS(EL1) */ -+static u32 __secure_data fpga_buf_rcv_count; -+/* Number of data blocks submitted to SDM */ -+static u32 __secure_data fpga_xfer_submitted_count; -+ -+/* Check for any responses from SDM and update the status in buffer list */ -+static void __secure reclaim_completed_buf(void) -+{ -+ u32 i, j; -+ u32 resp_len; -+ u32 buf[MBOX_RESP_BUFFER_SIZE]; -+ -+ /* If no buffer has been submitted to SDM */ -+ if (!fpga_xfer_submitted_count) -+ return; -+ -+ /* Read the SDM responses asynchronously */ -+ resp_len = mbox_rcv_resp_psci(buf, MBOX_RESP_BUFFER_SIZE); -+ -+ for (i = 0; i < resp_len; i++) { -+ /* Skip mailbox response headers which are not belong to us */ -+ if (MBOX_RESP_LEN_GET(buf[i]) || -+ MBOX_RESP_CLIENT_GET(buf[i]) != MBOX_CLIENT_ID_UBOOT) -+ continue; -+ -+ for (j = 0; j < FPGA_CONFIG_BUF_MAX; j++) { -+ /* Check buffer id */ -+ if (fpga_buf_list[j].buf_id != -+ MBOX_RESP_ID_GET(buf[i])) -+ continue; -+ -+ if (IS_BUF_SUBMITTED(fpga_buf_list[j])) { -+ if (fpga_buf_list[j].submit_count) -+ fpga_buf_list[j].submit_count--; -+ fpga_xfer_submitted_count--; -+ /* Error occur in transaction */ -+ if (MBOX_RESP_ERR_GET(buf[i])) { -+ fpga_error = 1; -+ fpga_buf_list[j].state = -+ FPGA_BUF_STAT_ERROR; -+ fpga_buf_list[j].submit_count = 0; -+ } else if (IS_BUF_FULLY_COMPLETED( -+ fpga_buf_list[j])) { -+ /* Last chunk in buffer and no error */ -+ fpga_buf_list[j].state = -+ FPGA_BUF_STAT_SUCCESS; -+ } -+ break; -+ } else if (IS_BUF_ERROR(fpga_buf_list[j])) { -+ fpga_xfer_submitted_count--; -+ break; -+ } -+ } -+ } -+} -+ -+static void __secure do_xfer_buf(void) -+{ -+ u32 i = fpga_buf_read_index; -+ u32 args[3]; -+ int ret; -+ -+ /* No buffer found in buffer list or SDM can't handle xfer anymore */ -+ if (!fpga_buf_rcv_count || -+ fpga_xfer_submitted_count == fpga_xfer_max) -+ return; -+ -+ while (fpga_xfer_submitted_count < fpga_xfer_max) { -+ if (IS_BUF_FREE(fpga_buf_list[i]) || -+ IS_BUF_ERROR(fpga_buf_list[i])) -+ break; -+ if (IS_BUF_PENDING(fpga_buf_list[i])) { -+ /* -+ * Argument descriptor for RECONFIG_DATA -+ * must always be 1. -+ */ -+ args[0] = MBOX_ARG_DESC_COUNT(1); -+ args[1] = (u32)(fpga_buf_list[i].buf_addr + -+ fpga_buf_list[i].buf_off); -+ if ((fpga_buf_list[i].buf_size - -+ fpga_buf_list[i].buf_off) > fpga_buf_size_max) { -+ args[2] = fpga_buf_size_max; -+ fpga_buf_list[i].buf_off += fpga_buf_size_max; -+ } else { -+ args[2] = (u32)(fpga_buf_list[i].buf_size - -+ fpga_buf_list[i].buf_off); -+ fpga_buf_list[i].state = -+ FPGA_BUF_STAT_COMPLETED; -+ } -+ -+ ret = mbox_send_cmd_only_psci(fpga_buf_list[i].buf_id, -+ MBOX_RECONFIG_DATA, MBOX_CMD_INDIRECT, 3, -+ args); -+ if (ret) { -+ fpga_error = 1; -+ fpga_buf_list[i].state = -+ FPGA_BUF_STAT_ERROR; -+ fpga_buf_list[i].submit_count = 0; -+ break; -+ } else { -+ fpga_buf_list[i].submit_count++; -+ fpga_xfer_submitted_count++; -+ } -+ -+ if (fpga_xfer_submitted_count >= fpga_xfer_max) -+ break; -+ } -+ -+ if (IS_BUF_COMPLETED(fpga_buf_list[i]) || -+ IS_BUF_SUCCESS(fpga_buf_list[i])) { -+ i++; -+ i %= FPGA_CONFIG_BUF_MAX; -+ if (i == fpga_buf_write_index) -+ break; -+ } -+ } -+} -+ -+static void __secure smc_config_get_mem(unsigned long function_id) -+{ -+ SMC_ALLOC_REG_MEM(r); -+ -+ SMC_INIT_REG_MEM(r); -+ -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, INTEL_SIP_SMC_STATUS_OK); -+ /* Start physical address of reserved memory */ -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG1, FPGA_CONFIG_RESEVED_MEM_START); -+ /* Size of reserved memory */ -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG2, FPGA_CONFIG_RESERVED_MEM_END - -+ FPGA_CONFIG_RESEVED_MEM_START + 1); -+ -+ SMC_RET_REG_MEM(r); -+} -+ -+static void __secure smc_config_start(unsigned long function_id, -+ unsigned long config_type) -+{ -+ SMC_ALLOC_REG_MEM(r); -+ int ret, i; -+ u32 resp_len = 2; -+ u32 resp_buf[2]; -+ -+ /* Clear any previous pending SDM reponses */ -+ mbox_rcv_resp_psci(NULL, MBOX_RESP_BUFFER_SIZE); -+ -+ SMC_INIT_REG_MEM(r); -+ -+ fpga_error = 0; -+ -+ ret = mbox_send_cmd_psci(MBOX_ID_UBOOT, MBOX_RECONFIG, MBOX_CMD_DIRECT, -+ 0, NULL, 0, &resp_len, resp_buf); -+ if (ret) { -+ fpga_error = 1; -+ goto ret; -+ } -+ -+ /* Initialize the state of the buffer list */ -+ for (i = 0; i < FPGA_CONFIG_BUF_MAX; i++) { -+ fpga_buf_list[i].state = FPGA_BUF_STAT_IDLE; -+ fpga_buf_list[i].buf_id = 0; -+ } -+ -+ /* Read maximum transaction allowed by SDM */ -+ fpga_xfer_max = resp_buf[0]; -+ /* Read maximum buffer size allowed by SDM */ -+ fpga_buf_size_max = resp_buf[1]; -+ fpga_buf_count = 0; -+ fpga_buf_rcv_count = 0; -+ fpga_xfer_submitted_count = 0; -+ fpga_buf_read_index = 0; -+ fpga_buf_write_index = 0; -+ fpga_buf_id = 1; -+ -+ is_partial_reconfig = (u8)config_type; -+ -+ /* Check whether config type is full reconfiguration */ -+ if (!is_partial_reconfig) { -+ /* Disable bridge */ -+ socfpga_bridges_reset_psci(0); -+ } -+ -+ret: -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, INTEL_SIP_SMC_STATUS_OK); -+ -+ SMC_RET_REG_MEM(r); -+} -+ -+static void __secure smc_config_write(unsigned long function_id, -+ unsigned long phys_addr, -+ unsigned long phys_size) -+{ -+ SMC_ALLOC_REG_MEM(r); -+ -+ SMC_INIT_REG_MEM(r); -+ -+ reclaim_completed_buf(); -+ -+ if (fpga_error) { -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, -+ INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR); -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG1, -+ fpga_buf_list[fpga_buf_read_index]. -+ buf_addr); -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG2, -+ fpga_buf_list[fpga_buf_read_index]. -+ buf_size); -+ goto ret; -+ } -+ -+ do_xfer_buf(); -+ -+ if (fpga_buf_rcv_count == fpga_xfer_max || -+ (fpga_buf_count == FPGA_CONFIG_BUF_MAX && -+ fpga_buf_write_index == fpga_buf_read_index)) { -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, -+ INTEL_SIP_SMC_FPGA_CONFIG_STATUS_REJECTED); -+ goto ret; -+ } -+ -+ if (!phys_addr || !phys_size) { -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, -+ INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR); -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG1, phys_addr); -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG2, phys_size); -+ goto ret; -+ } -+ -+ /* Look for free buffer in buffer list */ -+ if (IS_BUF_FREE(fpga_buf_list[fpga_buf_write_index])) { -+ fpga_buf_list[fpga_buf_write_index].state = -+ FPGA_BUF_STAT_PENDING; -+ fpga_buf_list[fpga_buf_write_index].buf_addr = phys_addr; -+ fpga_buf_list[fpga_buf_write_index].buf_size = phys_size; -+ fpga_buf_list[fpga_buf_write_index].buf_off = 0; -+ fpga_buf_list[fpga_buf_write_index].buf_id = fpga_buf_id++; -+ /* Rollover buffer id */ -+ if (fpga_buf_id > 15) -+ fpga_buf_id = 1; -+ fpga_buf_count++; -+ fpga_buf_write_index++; -+ fpga_buf_write_index %= FPGA_CONFIG_BUF_MAX; -+ fpga_buf_rcv_count++; -+ if (fpga_buf_rcv_count == fpga_xfer_max) -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, -+ INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY); -+ else -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, -+ INTEL_SIP_SMC_STATUS_OK); -+ /* Attempt to submit new buffer to SDM */ -+ do_xfer_buf(); -+ } else { -+ /* No free buffer available in buffer list */ -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, -+ INTEL_SIP_SMC_FPGA_CONFIG_STATUS_REJECTED); -+ } -+ -+ret: -+ SMC_RET_REG_MEM(r); -+} -+ -+static void __secure smc_config_completed_write(unsigned long function_id) -+{ -+ SMC_ALLOC_REG_MEM(r); -+ int i; -+ int count = 3, r_index = 1; -+ -+ SMC_INIT_REG_MEM(r); -+ -+ reclaim_completed_buf(); -+ do_xfer_buf(); -+ -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, -+ INTEL_SIP_SMC_STATUS_OK); -+ -+ for (i = 0; i < FPGA_CONFIG_BUF_MAX; i++) { -+ if (IS_BUF_SUCCESS(fpga_buf_list[fpga_buf_read_index])) { -+ SMC_ASSIGN_REG_MEM(r, r_index++, -+ fpga_buf_list[fpga_buf_read_index].buf_addr); -+ fpga_buf_list[fpga_buf_read_index].state = -+ FPGA_BUF_STAT_IDLE; -+ fpga_buf_list[fpga_buf_read_index].buf_id = 0; -+ fpga_buf_count--; -+ fpga_buf_read_index++; -+ fpga_buf_read_index %= FPGA_CONFIG_BUF_MAX; -+ fpga_buf_rcv_count--; -+ count--; -+ if (!count) -+ break; -+ } else if (IS_BUF_ERROR(fpga_buf_list[fpga_buf_read_index]) && -+ !fpga_buf_list[fpga_buf_read_index].submit_count) { -+ SMC_INIT_REG_MEM(r); -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, -+ INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR); -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG1, -+ fpga_buf_list[fpga_buf_read_index].buf_addr); -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG2, -+ fpga_buf_list[fpga_buf_read_index].buf_size); -+ goto ret; -+ } -+ } -+ -+ /* No completed buffers found */ -+ if (r_index == 1 && fpga_xfer_submitted_count) -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, -+ INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY); -+ -+ret: -+ SMC_RET_REG_MEM(r); -+} -+ -+static void __secure smc_config_isdone(unsigned long function_id) -+{ -+ SMC_ALLOC_REG_MEM(r); -+ int ret; -+ -+ SMC_INIT_REG_MEM(r); -+ -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY); -+ -+ reclaim_completed_buf(); -+ do_xfer_buf(); -+ -+ if (fpga_error) { -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, -+ INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR); -+ goto ret; -+ } -+ -+ if (fpga_xfer_submitted_count) -+ goto ret; -+ -+ ret = mbox_get_fpga_config_status_psci(MBOX_RECONFIG_STATUS); -+ if (ret) { -+ if (ret != MBOX_CFGSTAT_STATE_CONFIG) { -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, -+ INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR); -+ fpga_error = 1; -+ } -+ goto ret; -+ } -+ -+ /* FPGA configuration completed successfully */ -+ SMC_ASSIGN_REG_MEM(r, SMC_ARG0, INTEL_SIP_SMC_STATUS_OK); -+ -+ /* Check whether config type is full reconfiguration */ -+ if (!is_partial_reconfig) -+ socfpga_bridges_reset_psci(1); /* Enable bridge */ -+ret: -+ SMC_RET_REG_MEM(r); -+} -+ -+DECLARE_SECURE_SVC(config_get_mem, INTEL_SIP_SMC_FPGA_CONFIG_GET_MEM, -+ smc_config_get_mem); -+DECLARE_SECURE_SVC(config_start, INTEL_SIP_SMC_FPGA_CONFIG_START, -+ smc_config_start); -+DECLARE_SECURE_SVC(config_write, INTEL_SIP_SMC_FPGA_CONFIG_WRITE, -+ smc_config_write); -+DECLARE_SECURE_SVC(config_completed_write, -+ INTEL_SIP_SMC_FPGA_CONFIG_COMPLETED_WRITE, -+ smc_config_completed_write); -+DECLARE_SECURE_SVC(config_isdone, INTEL_SIP_SMC_FPGA_CONFIG_ISDONE, -+ smc_config_isdone); -diff --git a/include/linux/intel-smc.h b/include/linux/intel-smc.h -new file mode 100644 -index 0000000000..5e4c156e42 ---- /dev/null -+++ b/include/linux/intel-smc.h -@@ -0,0 +1,311 @@ -+/* SPDX-License-Identifier: GPL-2.0 */ -+/* -+ * Copyright (C) 2017-2018, Intel Corporation -+ */ -+ -+#ifndef __INTEL_SMC_H -+#define __INTEL_SMC_H -+ -+#include <linux/arm-smccc.h> -+#include <linux/bitops.h> -+ -+/* -+ * This file defines the Secure Monitor Call (SMC) message protocol used for -+ * service layer driver in normal world (EL1) to communicate with secure -+ * monitor software in Secure Monitor Exception Level 3 (EL3). -+ * -+ * This file is shared with secure firmware (FW) which is out of kernel tree. -+ * -+ * An ARM SMC instruction takes a function identifier and up to 6 64-bit -+ * register values as arguments, and can return up to 4 64-bit register -+ * value. The operation of the secure monitor is determined by the parameter -+ * values passed in through registers. -+ -+ * EL1 and EL3 communicates pointer as physical address rather than the -+ * virtual address. -+ */ -+ -+/* -+ * Functions specified by ARM SMC Calling convention: -+ * -+ * FAST call executes atomic operations, returns when the requested operation -+ * has completed. -+ * STD call starts a operation which can be preempted by a non-secure -+ * interrupt. The call can return before the requested operation has -+ * completed. -+ * -+ * a0..a7 is used as register names in the descriptions below, on arm32 -+ * that translates to r0..r7 and on arm64 to w0..w7. -+ */ -+ -+#define INTEL_SIP_SMC_STD_CALL_VAL(func_num) \ -+ ARM_SMCCC_CALL_VAL(ARM_SMCCC_STD_CALL, ARM_SMCCC_SMC_64, \ -+ ARM_SMCCC_OWNER_SIP, (func_num)) -+ -+#define INTEL_SIP_SMC_FAST_CALL_VAL(func_num) \ -+ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, ARM_SMCCC_SMC_64, \ -+ ARM_SMCCC_OWNER_SIP, (func_num)) -+ -+/* -+ * Return values in INTEL_SIP_SMC_* call -+ * -+ * INTEL_SIP_SMC_RETURN_UNKNOWN_FUNCTION: -+ * Secure monitor software doesn't recognize the request. -+ * -+ * INTEL_SIP_SMC_STATUS_OK: -+ * FPGA configuration completed successfully, -+ * In case of FPGA configuration write operation, it means secure monitor -+ * software can accept the next chunk of FPGA configuration data. -+ * -+ * INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY: -+ * In case of FPGA configuration write operation, it means secure monitor -+ * software is still processing previous data & can't accept the next chunk -+ * of data. Service driver needs to issue -+ * INTEL_SIP_SMC_FPGA_CONFIG_COMPLETED_WRITE call to query the -+ * completed block(s). -+ * -+ * INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR: -+ * There is error during the FPGA configuration process. -+ * -+ * INTEL_SIP_SMC_REG_ERROR: -+ * There is error during a read or write operation of the protected -+ * registers. -+ */ -+#define INTEL_SIP_SMC_RETURN_UNKNOWN_FUNCTION 0xFFFFFFFF -+#define INTEL_SIP_SMC_STATUS_OK 0x0 -+#define INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY 0x1 -+#define INTEL_SIP_SMC_FPGA_CONFIG_STATUS_REJECTED 0x2 -+#define INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR 0x4 -+#define INTEL_SIP_SMC_REG_ERROR 0x5 -+#define INTEL_SIP_SMC_RSU_ERROR 0x7 -+ -+/* -+ * Request INTEL_SIP_SMC_FPGA_CONFIG_START -+ * -+ * Sync call used by service driver at EL1 to request the FPGA in EL3 to -+ * be prepare to receive a new configuration. -+ * -+ * Call register usage: -+ * a0: INTEL_SIP_SMC_FPGA_CONFIG_START. -+ * a1: flag for full or partial configuration -+ * 0 full reconfiguration. -+ * 1 partial reconfiguration. -+ * a2-7: not used. -+ * -+ * Return status: -+ * a0: INTEL_SIP_SMC_STATUS_OK, or INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR. -+ * a1-3: not used. -+ */ -+#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_START 1 -+#define INTEL_SIP_SMC_FPGA_CONFIG_START \ -+ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_START) -+ -+/* -+ * Request INTEL_SIP_SMC_FPGA_CONFIG_WRITE -+ * -+ * Async call used by service driver at EL1 to provide FPGA configuration data -+ * to secure world. -+ * -+ * Call register usage: -+ * a0: INTEL_SIP_SMC_FPGA_CONFIG_WRITE. -+ * a1: 64bit physical address of the configuration data memory block -+ * a2: Size of configuration data block. -+ * a3-7: not used. -+ * -+ * Return status: -+ * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY or -+ * INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR. -+ * a1: 64bit physical address of 1st completed memory block if any completed -+ * block, otherwise zero value. -+ * a2: 64bit physical address of 2nd completed memory block if any completed -+ * block, otherwise zero value. -+ * a3: 64bit physical address of 3rd completed memory block if any completed -+ * block, otherwise zero value. -+ */ -+#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_WRITE 2 -+#define INTEL_SIP_SMC_FPGA_CONFIG_WRITE \ -+ INTEL_SIP_SMC_STD_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_WRITE) -+ -+/* -+ * Request INTEL_SIP_SMC_FPGA_CONFIG_COMPLETED_WRITE -+ * -+ * Sync call used by service driver at EL1 to track the completed write -+ * transactions. This request is called after INTEL_SIP_SMC_FPGA_CONFIG_WRITE -+ * call returns INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY. -+ * -+ * Call register usage: -+ * a0: INTEL_SIP_SMC_FPGA_CONFIG_COMPLETED_WRITE. -+ * a1-7: not used. -+ * -+ * Return status: -+ * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY or -+ * INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR. -+ * a1: 64bit physical address of 1st completed memory block. -+ * a2: 64bit physical address of 2nd completed memory block if -+ * any completed block, otherwise zero value. -+ * a3: 64bit physical address of 3rd completed memory block if -+ * any completed block, otherwise zero value. -+ */ -+#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_COMPLETED_WRITE 3 -+#define INTEL_SIP_SMC_FPGA_CONFIG_COMPLETED_WRITE \ -+INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_COMPLETED_WRITE) -+ -+/* -+ * Request INTEL_SIP_SMC_FPGA_CONFIG_ISDONE -+ * -+ * Sync call used by service driver at EL1 to inform secure world that all -+ * data are sent, to check whether or not the secure world had completed -+ * the FPGA configuration process. -+ * -+ * Call register usage: -+ * a0: INTEL_SIP_SMC_FPGA_CONFIG_ISDONE. -+ * a1-7: not used. -+ * -+ * Return status: -+ * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY or -+ * INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR. -+ * a1-3: not used. -+ */ -+#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_ISDONE 4 -+#define INTEL_SIP_SMC_FPGA_CONFIG_ISDONE \ -+ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_ISDONE) -+ -+/* -+ * Request INTEL_SIP_SMC_FPGA_CONFIG_GET_MEM -+ * -+ * Sync call used by service driver at EL1 to query the physical address of -+ * memory block reserved by secure monitor software. -+ * -+ * Call register usage: -+ * a0:INTEL_SIP_SMC_FPGA_CONFIG_GET_MEM. -+ * a1-7: not used. -+ * -+ * Return status: -+ * a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR. -+ * a1: start of physical address of reserved memory block. -+ * a2: size of reserved memory block. -+ * a3: not used. -+ */ -+#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_GET_MEM 5 -+#define INTEL_SIP_SMC_FPGA_CONFIG_GET_MEM \ -+ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_GET_MEM) -+ -+/* -+ * Request INTEL_SIP_SMC_FPGA_CONFIG_LOOPBACK -+ * -+ * For SMC loop-back mode only, used for internal integration, debugging -+ * or troubleshooting. -+ * -+ * Call register usage: -+ * a0: INTEL_SIP_SMC_FPGA_CONFIG_LOOPBACK. -+ * a1-7: not used. -+ * -+ * Return status: -+ * a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR. -+ * a1-3: not used. -+ */ -+#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_LOOPBACK 6 -+#define INTEL_SIP_SMC_FPGA_CONFIG_LOOPBACK \ -+ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_LOOPBACK) -+ -+/* -+ * Request INTEL_SIP_SMC_REG_READ -+ * -+ * Read a protected register using SMCCC -+ * -+ * Call register usage: -+ * a0: INTEL_SIP_SMC_REG_READ. -+ * a1: register address. -+ * a2-7: not used. -+ * -+ * Return status: -+ * a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_REG_ERROR. -+ * a1: Value in the register -+ * a2-3: not used. -+ */ -+#define INTEL_SIP_SMC_FUNCID_REG_READ 7 -+#define INTEL_SIP_SMC_REG_READ \ -+ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_REG_READ) -+ -+/* -+ * Request INTEL_SIP_SMC_REG_WRITE -+ * -+ * Write a protected register using SMCCC -+ * -+ * Call register usage: -+ * a0: INTEL_SIP_SMC_REG_WRITE. -+ * a1: register address -+ * a2: value to program into register. -+ * a3-7: not used. -+ * -+ * Return status: -+ * a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_REG_ERROR. -+ * a1-3: not used. -+ */ -+#define INTEL_SIP_SMC_FUNCID_REG_WRITE 8 -+#define INTEL_SIP_SMC_REG_WRITE \ -+ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_REG_WRITE) -+ -+/* -+ * Request INTEL_SIP_SMC_FUNCID_REG_UPDATE -+ * -+ * Update one or more bits in a protected register using a -+ * read-modify-write operation. -+ * -+ * Call register usage: -+ * a0: INTEL_SIP_SMC_REG_UPDATE. -+ * a1: register address -+ * a2: Write Mask. -+ * a3: Value to write. -+ * a4-7: not used. -+ * -+ * Return status: -+ * a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_REG_ERROR. -+ * a1-3: Not used. -+ */ -+#define INTEL_SIP_SMC_FUNCID_REG_UPDATE 9 -+#define INTEL_SIP_SMC_REG_UPDATE \ -+ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_REG_UPDATE) -+ -+/* -+ * Request INTEL_SIP_SMC_RSU_STATUS -+ * -+ * Sync call used by service driver at EL1 to query the RSU status -+ * -+ * Call register usage: -+ * a0 INTEL_SIP_SMC_RSU_STATUS -+ * a1-7 not used -+ * -+ * Return status -+ * a0: Current Image -+ * a1: Last Failing Image -+ * a2: Version [width 32 bit] | State [width 32 bit] -+ * a3: Error details [width 32 bit] | Error location [width 32 bit] -+ * -+ * Or -+ * -+ * a0: INTEL_SIP_SMC_RSU_ERROR -+ */ -+#define INTEL_SIP_SMC_FUNCID_RSU_STATUS 11 -+#define INTEL_SIP_SMC_RSU_STATUS \ -+ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_RSU_STATUS) -+ -+/* -+ * Request INTEL_SIP_SMC_RSU_UPDATE -+ * -+ * Sync call used by service driver at EL1 to tell you next reboot is RSU_UPDATE -+ * -+ * Call register usage: -+ * a0 INTEL_SIP_SMC_RSU_UPDATE -+ * a1 64bit physical address of the configuration data memory in flash -+ * a2-7 not used -+ * -+ * Return status -+ * a0 INTEL_SIP_SMC_STATUS_OK -+ */ -+#define INTEL_SIP_SMC_FUNCID_RSU_UPDATE 12 -+#define INTEL_SIP_SMC_RSU_UPDATE \ -+ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_RSU_UPDATE) -+ -+ -+#endif --- -2.21.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0007-mmc-dwmmc-Enable-small-delay-before-returning-error.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0007-mmc-dwmmc-Enable-small-delay-before-returning-error.patch deleted file mode 100644 index 8da5892c..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0007-mmc-dwmmc-Enable-small-delay-before-returning-error.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 17366d3b46cf70a8fa4d807519790ef4b1b03772 Mon Sep 17 00:00:00 2001 -From: "Ang, Chee Hong" <chee.hong.ang@intel.com> -Date: Wed, 30 Jan 2019 21:47:36 -0800 -Subject: [PATCH 07/12] mmc: dwmmc: Enable small delay before returning error - -'SET_BLOCKLEN' may occasionally fail on first attempt. -This patch enable a small delay in dwmci_send_cmd() on -busy, I/O or CRC error to allow the MMC controller recovers -from the failure/error on subsequent retries. - -Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com> ---- - drivers/mmc/dw_mmc.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c -index 1992d61182..8b9c6a8e60 100644 ---- a/drivers/mmc/dw_mmc.c -+++ b/drivers/mmc/dw_mmc.c -@@ -294,8 +294,11 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, - if (data) - flags = dwmci_set_transfer_mode(host, data); - -- if ((cmd->resp_type & MMC_RSP_136) && (cmd->resp_type & MMC_RSP_BUSY)) -- return -1; -+ if ((cmd->resp_type & MMC_RSP_136) && -+ (cmd->resp_type & MMC_RSP_BUSY)) { -+ ret = -1; -+ goto delay_ret; -+ } - - if (cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION) - flags |= DWMCI_CMD_ABORT_STOP; -@@ -344,11 +347,13 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, - return -ETIMEDOUT; - } else if (mask & DWMCI_INTMSK_RE) { - debug("%s: Response Error.\n", __func__); -- return -EIO; -+ ret = -EIO; -+ goto delay_ret; - } else if ((cmd->resp_type & MMC_RSP_CRC) && - (mask & DWMCI_INTMSK_RCRC)) { - debug("%s: Response CRC Error.\n", __func__); -- return -EIO; -+ ret = -EIO; -+ goto delay_ret; - } - - -@@ -387,6 +392,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, - } - } - -+delay_ret: - udelay(100); - - return ret; --- -2.21.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0008-ARM-socfpga-stratix10-Enable-DMA330-DMA-controller.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0008-ARM-socfpga-stratix10-Enable-DMA330-DMA-controller.patch deleted file mode 100644 index 91505b7c..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0008-ARM-socfpga-stratix10-Enable-DMA330-DMA-controller.patch +++ /dev/null @@ -1,41 +0,0 @@ -From da0bd33c8c8f6a1b77ecaa4c676f8ee14997b9e9 Mon Sep 17 00:00:00 2001 -From: "Ang, Chee Hong" <chee.hong.ang@intel.com> -Date: Wed, 30 Jan 2019 21:29:09 -0800 -Subject: [PATCH 08/12] ARM: socfpga: stratix10: Enable DMA330 DMA controller - -Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com> ---- - arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | 1 + - arch/arm/mach-socfpga/spl_s10.c | 4 ++++ - 2 files changed, 5 insertions(+) - -diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h -index 1939ffa149..85424c28a6 100644 ---- a/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h -+++ b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h -@@ -97,6 +97,7 @@ struct socfpga_reset_manager { - #define RSTMGR_DMA RSTMGR_DEFINE(1, 16) - #define RSTMGR_SPIM0 RSTMGR_DEFINE(1, 17) - #define RSTMGR_SPIM1 RSTMGR_DEFINE(1, 18) -+#define RSTMGR_DMA_OCP RSTMGR_DEFINE(1, 21) - #define RSTMGR_L4WD0 RSTMGR_DEFINE(2, 0) - #define RSTMGR_L4WD1 RSTMGR_DEFINE(2, 1) - #define RSTMGR_L4WD2 RSTMGR_DEFINE(2, 2) -diff --git a/arch/arm/mach-socfpga/spl_s10.c b/arch/arm/mach-socfpga/spl_s10.c -index ec65e1ce64..04fa1a5696 100644 ---- a/arch/arm/mach-socfpga/spl_s10.c -+++ b/arch/arm/mach-socfpga/spl_s10.c -@@ -158,6 +158,10 @@ void board_init_f(ulong dummy) - writel(SYSMGR_DMA_IRQ_NS | SYSMGR_DMA_MGR_NS, &sysmgr_regs->dma); - writel(SYSMGR_DMAPERIPH_ALL_NS, &sysmgr_regs->dma_periph); - -+ /* enable DMA330 DMA */ -+ socfpga_per_reset(SOCFPGA_RESET(DMA), 0); -+ socfpga_per_reset(SOCFPGA_RESET(DMA_OCP), 0); -+ - spl_disable_firewall_l4_per(); - - spl_disable_firewall_l4_sys(); --- -2.21.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0009-ARM-socfpga-Stratix10-Fix-el3_exception_vectors-relo.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0009-ARM-socfpga-Stratix10-Fix-el3_exception_vectors-relo.patch deleted file mode 100644 index 54fa812e..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0009-ARM-socfpga-Stratix10-Fix-el3_exception_vectors-relo.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8569e08a1a4b3bd810f60083058053a39b27534e Mon Sep 17 00:00:00 2001 -From: Chee Hong Ang <chee.hong.ang@intel.com> -Date: Sat, 18 May 2019 16:42:10 +0800 -Subject: [PATCH 09/12] ARM: socfpga: Stratix10: Fix el3_exception_vectors - relocation issue - -New toolchain has issue relocating the 32-bit pointer to address of -el3_exception_vectors in secure section. This patch make sure the -address pointer to the secure section is 64-bit. - -Signed-off-by: Chee Hong Ang <chee.hong.ang@intel.com> ---- - arch/arm/mach-socfpga/lowlevel_init.S | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/arch/arm/mach-socfpga/lowlevel_init.S b/arch/arm/mach-socfpga/lowlevel_init.S -index 832785a682..342d5190b5 100644 ---- a/arch/arm/mach-socfpga/lowlevel_init.S -+++ b/arch/arm/mach-socfpga/lowlevel_init.S -@@ -12,8 +12,7 @@ - #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_ARMV8_PSCI) - .align 3 - _el3_exception_vectors: -- .word el3_exception_vectors; -- .word 0 -+ .quad el3_exception_vectors; - #endif - - ENTRY(lowlevel_init) --- -2.21.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0010-Makefile-Add-target-to-generate-hex-output-for-combi.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0010-Makefile-Add-target-to-generate-hex-output-for-combi.patch deleted file mode 100644 index 113d7672..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0010-Makefile-Add-target-to-generate-hex-output-for-combi.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 939875d39e56d6d2c965c2b63d5d2f20dff532e0 Mon Sep 17 00:00:00 2001 -From: Dalon Westergreen <dalon.westergreen@intel.com> -Date: Wed, 20 Mar 2019 11:21:20 -0700 -Subject: [PATCH 10/12] Makefile: Add target to generate hex output for - combined spl and dtb - -Some architectures, Stratix10, require a hex formatted spl that combines -the spl image and dtb. This adds a target to create said hex file with -and offset of SPL_TEXT_BASE. - -Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com> ---- - Makefile | 12 +++++++----- - scripts/Makefile.spl | 8 ++++++++ - 2 files changed, 15 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 059978bfe6..62d85ff279 100644 ---- a/Makefile -+++ b/Makefile -@@ -1121,11 +1121,6 @@ OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \ - $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) \ - $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR),-R .bootpg -R .resetvec) - --OBJCOPYFLAGS_u-boot-spl.hex = $(OBJCOPYFLAGS_u-boot.hex) -- --spl/u-boot-spl.hex: spl/u-boot-spl FORCE -- $(call if_changed,objcopy) -- - binary_size_check: u-boot-nodtb.bin FORCE - @file_size=$(shell wc -c u-boot-nodtb.bin | awk '{print $$1}') ; \ - map_size=$(shell cat u-boot.map | \ -@@ -1704,6 +1699,13 @@ u-boot.lds: $(LDSCRIPT) prepare FORCE - - spl/u-boot-spl.bin: spl/u-boot-spl - @: -+ -+spl/u-boot-spl-dtb.bin: spl/u-boot-spl -+ @: -+ -+spl/u-boot-spl-dtb.hex: spl/u-boot-spl -+ @: -+ - spl/u-boot-spl: tools prepare \ - $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SPL_OF_PLATDATA),dts/dt.dtb) \ - $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_TPL_OF_PLATDATA),dts/dt.dtb) -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index 7af6b120b6..3c90e2cd72 100644 ---- a/scripts/Makefile.spl -+++ b/scripts/Makefile.spl -@@ -216,6 +216,8 @@ ifneq ($(CONFIG_TARGET_SOCFPGA_GEN5)$(CONFIG_TARGET_SOCFPGA_ARRIA10),) - ALL-y += $(obj)/$(SPL_BIN).sfp - endif - -+ALL-$(CONFIG_TARGET_SOCFPGA_STRATIX10) += $(obj)/u-boot-spl-dtb.hex -+ - ifdef CONFIG_ARCH_SUNXI - ALL-y += $(obj)/sunxi-spl.bin - -@@ -363,6 +365,11 @@ endif - $(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE - $(call if_changed,mkimage) - -+OBJCOPYFLAGS_u-boot-spl-dtb.hex := -I binary -O ihex --change-address=$(CONFIG_SPL_TEXT_BASE) -+ -+$(obj)/u-boot-spl-dtb.hex: $(obj)/u-boot-spl-dtb.bin FORCE -+ $(call if_changed,objcopy) -+ - quiet_cmd_mksunxiboot = MKSUNXI $@ - cmd_mksunxiboot = $(objtree)/tools/mksunxiboot \ - --default-dt $(CONFIG_DEFAULT_DEVICE_TREE) $< $@ -@@ -463,3 +470,4 @@ ifdef CONFIG_ARCH_K3 - tispl.bin: $(obj)/u-boot-spl-nodtb.bin $(SHRUNK_ARCH_DTB) $(SPL_ITS) FORCE - $(call if_changed,mkfitimage) - endif -+ --- -2.21.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0011-ARM-socfpga-stratix10-Remove-CONFIG_OF_EMBED.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0011-ARM-socfpga-stratix10-Remove-CONFIG_OF_EMBED.patch deleted file mode 100644 index 21794d20..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0011-ARM-socfpga-stratix10-Remove-CONFIG_OF_EMBED.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 37814e55403a9ec5f852b58576618ba9a1936a20 Mon Sep 17 00:00:00 2001 -From: Dalon Westergreen <dalon.westergreen@intel.com> -Date: Fri, 10 May 2019 10:30:44 -0700 -Subject: [PATCH 11/12] ARM: socfpga: stratix10: Remove CONFIG_OF_EMBED - -CONFIG_OF_EMBED was primarily enabled to support the stratix10 -spl hex file requirements. Since this option now produces a -warning during build, and the spl hex can be created using -alternate methods, CONFIG_OF_EMBED is no longer needed. - -Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com> ---- - configs/socfpga_stratix10_defconfig | 1 - - include/configs/socfpga_stratix10_socdk.h | 4 ++-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig -index fbab388b43..f27180385d 100644 ---- a/configs/socfpga_stratix10_defconfig -+++ b/configs/socfpga_stratix10_defconfig -@@ -26,7 +26,6 @@ CONFIG_CMD_CACHE=y - CONFIG_CMD_EXT4=y - CONFIG_CMD_FAT=y - CONFIG_CMD_FS_GENERIC=y --CONFIG_OF_EMBED=y - CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" - CONFIG_ENV_IS_IN_MMC=y - CONFIG_NET_RANDOM_ETHADDR=y -diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h -index 39d757d737..e93c598be9 100644 ---- a/include/configs/socfpga_stratix10_socdk.h -+++ b/include/configs/socfpga_stratix10_socdk.h -@@ -197,7 +197,7 @@ unsigned int cm_get_l4_sys_free_clk_hz(void); - * 0x8000_0000 ...... End of SDRAM_1 (assume 2GB) - * - */ --#define CONFIG_SPL_TARGET "spl/u-boot-spl.hex" -+#define CONFIG_SPL_TARGET "spl/u-boot-spl-dtb.hex" - #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE - #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR - #define CONFIG_SPL_BSS_MAX_SIZE 0x100000 /* 1 MB */ -@@ -210,6 +210,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void); - - /* SPL SDMMC boot support */ - #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 --#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" - - #endif /* __CONFIG_H */ --- -2.21.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0012-ARM-socfpga-stratix10-Temporarily-revert-to-2GB-DRAM.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0012-ARM-socfpga-stratix10-Temporarily-revert-to-2GB-DRAM.patch deleted file mode 100644 index c7f73bab..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0012-ARM-socfpga-stratix10-Temporarily-revert-to-2GB-DRAM.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 97d491bda1dea7d2afe74a7c3fb4ea43a83a79ff Mon Sep 17 00:00:00 2001 -From: Dalon Westergreen <dalon.westergreen@intel.com> -Date: Fri, 10 May 2019 10:31:15 -0700 -Subject: [PATCH 12/12] ARM: socfpga: stratix10: Temporarily revert to 2GB DRAM - -The current shipping GHRD still has the DDR configured as a -2GB DDR. This reverts the devicetree to use 2GB instead of -4GB. - -Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com> ---- - arch/arm/dts/socfpga_stratix10_socdk.dts | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/arch/arm/dts/socfpga_stratix10_socdk.dts b/arch/arm/dts/socfpga_stratix10_socdk.dts -index 2745050810..1caae0ab6f 100755 ---- a/arch/arm/dts/socfpga_stratix10_socdk.dts -+++ b/arch/arm/dts/socfpga_stratix10_socdk.dts -@@ -37,8 +37,7 @@ - memory { - device_type = "memory"; - /* 4GB */ -- reg = <0 0x00000000 0 0x80000000>, -- <1 0x80000000 0 0x80000000>; -+ reg = <0 0x00000000 0 0x80000000>; - u-boot,dm-pre-reloc; - }; - }; --- -2.21.0 - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-mkenvimage_v2016.11.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-mkenvimage_v2016.11.bb deleted file mode 100644 index 19ea6c60..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-mkenvimage_v2016.11.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "U-Boot bootloader environment image creation tool" - -HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" -SECTION = "bootloaders" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" - -PV_append = "+git${SRCPV}" - -SRC_URI = "git://git.denx.de/u-boot.git;branch=master" -SRC_URI += "file://0001-Fix-native-build-by-using-env-variables.patch" - -S = "${WORKDIR}/git" - -# This revision corresponds to the tag "v2016.11" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "29e0cfb4f77f7aa369136302cee14a91e22dca71" - -EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' - -do_compile () { - oe_runmake sandbox_defconfig - oe_runmake cross_tools NO_SDL=1 -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 tools/mkenvimage ${D}${bindir}/uboot-mkenvimage - ln -sf uboot-mkenvimage ${D}${bindir}/mkenvimage -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga-common.inc b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga-common.inc index 06f09922..2038545e 100644 --- a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga-common.inc +++ b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga-common.inc @@ -1,9 +1,12 @@ HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" SECTION = "bootloaders" +DEPENDS += "flex-native bison-native" -PV_append = "+git${SRCPV}" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" +PE = "1" -SRC_URI = "git://git.denx.de/u-boot.git;branch=master" +PV_append = "+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2013.01.01.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2013.01.01.bb deleted file mode 100644 index 449f6c33..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2013.01.01.bb +++ /dev/null @@ -1,23 +0,0 @@ -require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc -PR="r1" - -SRCREV = "95ab599e1ad7840e08be0aa567eea3fca357572f" - -UBOOT_BRANCH ?= "socfpga_${PV}" -UBOOT_REPO ?= "git://github.com/altera-opensource/u-boot-socfpga.git" -UBOOT_PROT ?= "https" - -SRC_URI = "\ - ${UBOOT_REPO};protocol=${UBOOT_PROT};branch=${UBOOT_BRANCH} \ - file://fix-build-error-under-gcc6.patch \ - " - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://README;md5=176c127db28f1a9e8d88f682a2a34963" - -DEPENDS += "dtc-native" - -UBOOT_CONFIG[cyclone5-socdk] = "socfpga_cyclone5_config" - -SPL_BINARY_cyclone5 = "spl/u-boot-spl.bin" -SPL_BINARY_arria5 = "spl/u-boot-spl.bin" diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2014.10.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2014.10.bb deleted file mode 100644 index 3b9b8852..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2014.10.bb +++ /dev/null @@ -1,21 +0,0 @@ -require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc -PR="r1" -# This revision corresponds to the SoCEDS 16.1 release -SRCREV = "ab2181dd766157a74b309d12e0b61c4f3cdc8564" - -UBOOT_BRANCH ?= "socfpga_${PV}_arria10_bringup" -UBOOT_REPO ?= "git://github.com/altera-opensource/u-boot-socfpga.git" -UBOOT_PROT ?= "https" - -SRC_URI = "\ - ${UBOOT_REPO};protocol=${UBOOT_PROT};branch=${UBOOT_BRANCH} \ - file://fix-build-error-under-gcc6.patch \ - " - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" - -DEPENDS += "dtc-native" - -UBOOT_BINARY = "u-boot-dtb.bin" - diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2016.05.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2016.05.bb deleted file mode 100644 index 68a529db..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2016.05.bb +++ /dev/null @@ -1,12 +0,0 @@ -require u-boot-socfpga-common.inc -require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" - -# This revision corresponds to the tag "v2016.05" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "aeaec0e682f45b9e0c62c522fafea353931f73ed" -PR = "r1" -DEPENDS += "dtc-native" diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb deleted file mode 100644 index 1337c8a8..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb +++ /dev/null @@ -1,23 +0,0 @@ -require u-boot-socfpga-common.inc -require u-boot-socfpga-env.inc -require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc - -FILESEXTRAPATHS =. "${THISDIR}/files/v2016.11:" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" - -# This revision corresponds to the tag "v2016.11" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "29e0cfb4f77f7aa369136302cee14a91e22dca71" - -PR = "r1" - -SRC_URI_append = "\ - file://de0-nano-soc.env \ - file://cyclone5-socdk.env \ - " - -DEPENDS += "dtc-native bc-native" -DEPENDS += "u-boot-mkimage-native" diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2017.07.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2017.07.bb deleted file mode 100644 index c41b4689..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2017.07.bb +++ /dev/null @@ -1,20 +0,0 @@ -require u-boot-socfpga-common.inc -require u-boot-socfpga-env.inc -require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc - -FILESEXTRAPATHS =. "${THISDIR}/files/v2017.07:" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" - -# This revision corresponds to the tag "v2017.07" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "d85ca029f257b53a96da6c2fb421e78a003a9943" - -SRC_URI_append = "\ - file://de0-nano-soc.env \ - file://cyclone5-socdk.env \ - " - -DEPENDS += "dtc-native bc-native u-boot-mkimage-native" diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2017.09.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2017.09.bb deleted file mode 100644 index 389020a1..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2017.09.bb +++ /dev/null @@ -1,18 +0,0 @@ -require u-boot-socfpga-common.inc -require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc - -FILESEXTRAPATHS =. "${THISDIR}/files/v2017.09:" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" - -SRCREV = "c98ac3487e413c71e5d36322ef3324b21c6f60f9" - -# Stratix10 is not mainlined yet -SRCREV_stratix10 = "53ce6e587a478bf613b1af42b49b5beba2dd2f3a" -SRC_URI_stratix10 = "git://github.com/altera-opensource/u-boot-socfpga.git;branch=socfpga_v2017.09;prot=https" - -SRC_URI_append = "\ - " - -DEPENDS += "dtc-native bc-native u-boot-mkimage-native" diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2018.03.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2018.03.bb deleted file mode 100644 index 9e0d937f..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2018.03.bb +++ /dev/null @@ -1,14 +0,0 @@ -require u-boot-socfpga-common.inc -require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc - -FILESEXTRAPATHS =. "${THISDIR}/files/v2018.03:" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" - -SRCREV = "f95ab1fb6e37f0601f397091bb011edf7a98b890" - -SRC_URI_append = "\ - " - -DEPENDS += "dtc-native bc-native u-boot-mkimage-native" diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2018.05.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2018.05.bb deleted file mode 100644 index b0358f1c..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2018.05.bb +++ /dev/null @@ -1,14 +0,0 @@ -require u-boot-socfpga-common.inc -require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc - -FILESEXTRAPATHS =. "${THISDIR}/files/v2018.05:" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" - -SRCREV = "890e79f2b1c26c5ba1a86d179706348aec7feef7" - -SRC_URI_append = "\ - " - -DEPENDS += "dtc-native bc-native u-boot-mkimage-native" diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2019.01.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2019.01.bb deleted file mode 100644 index d3c80e78..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2019.01.bb +++ /dev/null @@ -1,14 +0,0 @@ -require u-boot-socfpga-common.inc -require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" - -FILESEXTRAPATHS =. "${THISDIR}/files/v2019.01:" - -SRCREV = "d3689267f92c5956e09cc7d1baa4700141662bff" - -SRC_URI_append = "\ - " - -DEPENDS += "dtc-native bc-native bison-native u-boot-mkimage-native" diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2019.04.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2019.04.bb new file mode 100644 index 00000000..8c7ec331 --- /dev/null +++ b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2019.04.bb @@ -0,0 +1,7 @@ +require u-boot-socfpga-common.inc +require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc + +SRC_URI = "git://github.com/altera-opensource/u-boot-socfpga.git;branch=socfpga_v2019.04" +SRCREV = "83e929c739beecff17529a0cf0fdd5c74fbe3c72" + +DEPENDS += "dtc-native bc-native u-boot-mkimage-native" diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2019.07.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2019.07.bb deleted file mode 100644 index 48a517d0..00000000 --- a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2019.07.bb +++ /dev/null @@ -1,29 +0,0 @@ -require u-boot-socfpga-common.inc -require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" - -PR = "2" - -FILESEXTRAPATHS =. "${THISDIR}/files/v2019.07:" - -SRCREV = "7e090b466c5ba874d31c1bf22c3a130d516cdc32" - -SRC_URI_append = "\ - file://0001-ARM-socfpga-stratix10-Enable-PSCI-system-reset.patch \ - file://0002-ARM-socfpga-stratix10-Enable-PSCI-CPU_ON.patch \ - file://0003-ARM-socfpga-stratix10-Enable-PSCI-support-for-Strati.patch \ - file://0004-ARM-socfpga-stratix10-Enable-SMC-PSCI-calls-from-sla.patch \ - file://0005-ARM-socfpga-stratix10-Add-SOCFPGA-bridges-reset-supp.patch \ - file://0006-ARM-socfpga-stratix10-Add-Stratix10-FPGA-configurati.patch \ - file://0007-mmc-dwmmc-Enable-small-delay-before-returning-error.patch \ - file://0008-ARM-socfpga-stratix10-Enable-DMA330-DMA-controller.patch \ - file://0009-ARM-socfpga-Stratix10-Fix-el3_exception_vectors-relo.patch \ - file://0010-Makefile-Add-target-to-generate-hex-output-for-combi.patch \ - file://0011-ARM-socfpga-stratix10-Remove-CONFIG_OF_EMBED.patch \ - file://0012-ARM-socfpga-stratix10-Temporarily-revert-to-2GB-DRAM.patch \ - file://0001-ARM-socfpga-Stratix10-Disable-CONFIG_PSCI_RESET.patch \ - " - -DEPENDS += "dtc-native bc-native bison-native u-boot-mkimage-native" diff --git a/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2019.10.bb b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2019.10.bb new file mode 100644 index 00000000..9176f9ac --- /dev/null +++ b/bsp/meta-altera/recipes-bsp/u-boot/u-boot-socfpga_v2019.10.bb @@ -0,0 +1,7 @@ +require u-boot-socfpga-common.inc +require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc + +SRC_URI = "git://github.com/altera-opensource/u-boot-socfpga.git;branch=socfpga_v2019.10" +SRCREV = "7298985146c70ca8af8d43dd963b3e8aa3900d87" + +DEPENDS += "dtc-native bc-native u-boot-mkimage-native" diff --git a/bsp/meta-altera/recipes-kernel/linux/config/lbdaf.scc b/bsp/meta-altera/recipes-kernel/linux/config/lbdaf.scc new file mode 100644 index 00000000..c1a6dd07 --- /dev/null +++ b/bsp/meta-altera/recipes-kernel/linux/config/lbdaf.scc @@ -0,0 +1 @@ +kconf non-hardware config_lbdaf.cfg diff --git a/bsp/meta-altera/recipes-kernel/linux/linux-altera-configs.inc b/bsp/meta-altera/recipes-kernel/linux/linux-altera-configs.inc index d97217cb..3e4fd8b9 100644 --- a/bsp/meta-altera/recipes-kernel/linux/linux-altera-configs.inc +++ b/bsp/meta-altera/recipes-kernel/linux/linux-altera-configs.inc @@ -1,7 +1,3 @@ KBUILD_DEFCONFIG ?= "socfpga_defconfig" -KBUILD_DEFCONFIG_stratix10swvp ?= "defconfig" -KBUILD_DEFCONFIG_stratix10 ?= "defconfig" -KBUILD_DEFCONFIG_10m50 ?= "10m50_defconfig" - KCONFIG_MODE ?= "--alldefconfig" diff --git a/bsp/meta-altera/recipes-kernel/linux/linux-altera-lts_5.4.13.bb b/bsp/meta-altera/recipes-kernel/linux/linux-altera-lts_5.4.13.bb new file mode 100644 index 00000000..1ddccee0 --- /dev/null +++ b/bsp/meta-altera/recipes-kernel/linux/linux-altera-lts_5.4.13.bb @@ -0,0 +1,15 @@ +LINUX_VERSION = "5.4.13" +LINUX_VERSION_SUFFIX = "-lts" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +SRCREV = "44239fc38eaefd29c66ec3bb4a547b1a4541bb13" + +include linux-altera.inc + +FILESEXTRAPATHS_prepend := "${THISDIR}/config:" + +SRC_URI_append_cyclone5 = " file://lbdaf.scc " +SRC_URI_append_arria5 = " file://lbdaf.scc " +SRC_URI_append_arria10 = " file://lbdaf.scc " + diff --git a/bsp/meta-altera/recipes-kernel/linux/linux-altera-lts_5.4.3.bb b/bsp/meta-altera/recipes-kernel/linux/linux-altera-lts_5.4.3.bb new file mode 100644 index 00000000..65b522b9 --- /dev/null +++ b/bsp/meta-altera/recipes-kernel/linux/linux-altera-lts_5.4.3.bb @@ -0,0 +1,15 @@ +LINUX_VERSION = "5.4.3" +LINUX_VERSION_SUFFIX = "-lts" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +SRCREV = "d2466b12e55dda297f3b1a4787b5ea3160994ee9" + +include linux-altera.inc + +FILESEXTRAPATHS_prepend := "${THISDIR}/config:" + +SRC_URI_append_cyclone5 = " file://lbdaf.scc " +SRC_URI_append_arria5 = " file://lbdaf.scc " +SRC_URI_append_arria10 = " file://lbdaf.scc " + diff --git a/bsp/meta-altera/recipes-kernel/linux/linux-altera-ltsi-rt_4.14-73.bb b/bsp/meta-altera/recipes-kernel/linux/linux-altera-ltsi-rt_4.14-73.bb deleted file mode 100644 index 76350306..00000000 --- a/bsp/meta-altera/recipes-kernel/linux/linux-altera-ltsi-rt_4.14-73.bb +++ /dev/null @@ -1,17 +0,0 @@ -LINUX_VERSION = "4.14.73" -LINUX_VERSION_SUFFIX = "-ltsi-rt" - -SRCREV = "d28435f2010b6fa334bd6abe709f7cd890ccc22c" - -include linux-altera.inc - -FILESEXTRAPATHS_prepend := "${THISDIR}/config:" - -#DE0 dts name changed in later kernels -KERNEL_DEVICETREE_remove_cyclone5 = "socfpga_cyclone5_de0_nano_soc.dtb" -KERNEL_DEVICETREE_append_cyclone5 = "socfpga_cyclone5_de0_sockit.dtb" - -SRC_URI_append_cyclone5 = " file://config_lbdaf.cfg " -SRC_URI_append_arria5 = " file://config_lbdaf.cfg " -SRC_URI_append_arria10 = " file://config_lbdaf.cfg " - diff --git a/bsp/meta-altera/recipes-kernel/linux/linux-altera-ltsi-rt_4.14.126.bb b/bsp/meta-altera/recipes-kernel/linux/linux-altera-ltsi-rt_4.14.126.bb new file mode 100644 index 00000000..9bada4a4 --- /dev/null +++ b/bsp/meta-altera/recipes-kernel/linux/linux-altera-ltsi-rt_4.14.126.bb @@ -0,0 +1,13 @@ +LINUX_VERSION = "4.14.126" +LINUX_VERSION_SUFFIX = "-ltsi-rt" + +SRCREV = "652711a08dbe255d0aa3c2dd7231d6c6bfc61817" + +include linux-altera.inc + +FILESEXTRAPATHS_prepend := "${THISDIR}/config:" + +SRC_URI_append_cyclone5 = " file://lbdaf.scc " +SRC_URI_append_arria5 = " file://lbdaf.scc " +SRC_URI_append_arria10 = " file://lbdaf.scc " + diff --git a/bsp/meta-altera/recipes-kernel/linux/linux-altera-ltsi_4.14.130.bb b/bsp/meta-altera/recipes-kernel/linux/linux-altera-ltsi_4.14.130.bb new file mode 100644 index 00000000..22efe0a4 --- /dev/null +++ b/bsp/meta-altera/recipes-kernel/linux/linux-altera-ltsi_4.14.130.bb @@ -0,0 +1,13 @@ +LINUX_VERSION = "4.14.130" +LINUX_VERSION_SUFFIX = "-ltsi" + +SRCREV = "cae629555019eb0d3f63d9e8e639a982e994e80f" + +include linux-altera.inc + +FILESEXTRAPATHS_prepend := "${THISDIR}/config:" + +SRC_URI_append_cyclone5 = " file://lbdaf.scc " +SRC_URI_append_arria5 = " file://lbdaf.scc " +SRC_URI_append_arria10 = " file://lbdaf.scc " + diff --git a/bsp/meta-altera/recipes-kernel/linux/linux-altera-ltsi_4.14.73.bb b/bsp/meta-altera/recipes-kernel/linux/linux-altera-ltsi_4.14.73.bb deleted file mode 100644 index bb013a95..00000000 --- a/bsp/meta-altera/recipes-kernel/linux/linux-altera-ltsi_4.14.73.bb +++ /dev/null @@ -1,17 +0,0 @@ -LINUX_VERSION = "4.14.73" -LINUX_VERSION_SUFFIX = "-ltsi" - -SRCREV = "d6b8a5d4b162e7b67f73fc1cd69d8c69c895d787" - -include linux-altera.inc - -FILESEXTRAPATHS_prepend := "${THISDIR}/config:" - -#DE0 dts name changed in later kernels -KERNEL_DEVICETREE_remove_cyclone5 = "socfpga_cyclone5_de0_nano_soc.dtb" -KERNEL_DEVICETREE_append_cyclone5 = "socfpga_cyclone5_de0_sockit.dtb" - -SRC_URI_append_cyclone5 = " file://config_lbdaf.cfg " -SRC_URI_append_arria5 = " file://config_lbdaf.cfg " -SRC_URI_append_arria10 = " file://config_lbdaf.cfg " - diff --git a/bsp/meta-altera/recipes-kernel/linux/linux-altera_4.20.bb b/bsp/meta-altera/recipes-kernel/linux/linux-altera_4.20.bb deleted file mode 100644 index 47043b0f..00000000 --- a/bsp/meta-altera/recipes-kernel/linux/linux-altera_4.20.bb +++ /dev/null @@ -1,13 +0,0 @@ -LINUX_VERSION = "4.20" - -SRCREV = "5d7c07471661af5094a59c751b83a24fdf6d51bb" - -include linux-altera.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -FILESEXTRAPATHS_prepend := "${THISDIR}/config:" - -SRC_URI_append_cyclone5 = " file://config_lbdaf.cfg " -SRC_URI_append_arria5 = " file://config_lbdaf.cfg " -SRC_URI_append_arria10 = " file://config_lbdaf.cfg " diff --git a/bsp/meta-altera/recipes-kernel/linux/linux-altera_5.0.bb b/bsp/meta-altera/recipes-kernel/linux/linux-altera_5.0.bb deleted file mode 100644 index abc8d28c..00000000 --- a/bsp/meta-altera/recipes-kernel/linux/linux-altera_5.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -LINUX_VERSION = "5.0" - -SRCREV = "0ac4bbee4a6aa918e8e9bf2552770517cf6472fc" - -include linux-altera.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -FILESEXTRAPATHS_prepend := "${THISDIR}/config:" - -SRC_URI_append_cyclone5 = " file://config_lbdaf.cfg " -SRC_URI_append_arria5 = " file://config_lbdaf.cfg " -SRC_URI_append_arria10 = " file://config_lbdaf.cfg " diff --git a/bsp/meta-altera/recipes-kernel/linux/linux-altera_5.2.bb b/bsp/meta-altera/recipes-kernel/linux/linux-altera_5.2.bb new file mode 100644 index 00000000..254dc896 --- /dev/null +++ b/bsp/meta-altera/recipes-kernel/linux/linux-altera_5.2.bb @@ -0,0 +1,13 @@ +LINUX_VERSION = "5.2" + +SRCREV = "969da0f16f5b914bd1e53e8c5051ef9df4f561f2" + +include linux-altera.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +FILESEXTRAPATHS_prepend := "${THISDIR}/config:" + +SRC_URI_append_cyclone5 = " file://lbdaf.scc " +SRC_URI_append_arria5 = " file://lbdaf.scc " +SRC_URI_append_arria10 = " file://lbdaf.scc " diff --git a/bsp/meta-altera/recipes-kernel/linux/linux-altera_5.3.bb b/bsp/meta-altera/recipes-kernel/linux/linux-altera_5.3.bb new file mode 100644 index 00000000..5adcee1c --- /dev/null +++ b/bsp/meta-altera/recipes-kernel/linux/linux-altera_5.3.bb @@ -0,0 +1,13 @@ +LINUX_VERSION = "5.3" + +SRCREV = "ac41821dcd29b0425004ac710e22ad84af94b0e1" + +include linux-altera.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +FILESEXTRAPATHS_prepend := "${THISDIR}/config:" + +SRC_URI_append_cyclone5 = " file://lbdaf.scc " +SRC_URI_append_arria5 = " file://lbdaf.scc " +SRC_URI_append_arria10 = " file://lbdaf.scc " diff --git a/bsp/meta-altera/recipes-kernel/linux/linux-altera_5.4.bb b/bsp/meta-altera/recipes-kernel/linux/linux-altera_5.4.bb new file mode 100644 index 00000000..a05df88a --- /dev/null +++ b/bsp/meta-altera/recipes-kernel/linux/linux-altera_5.4.bb @@ -0,0 +1,13 @@ +LINUX_VERSION = "5.4" + +SRCREV = "526ec9a1b00cde3534dbee9a2ed215b82d9dc6ec" + +include linux-altera.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +FILESEXTRAPATHS_prepend := "${THISDIR}/config:" + +SRC_URI_append_cyclone5 = " file://lbdaf.scc " +SRC_URI_append_arria5 = " file://lbdaf.scc " +SRC_URI_append_arria10 = " file://lbdaf.scc " diff --git a/bsp/meta-boundary/conf/machine/nitrogen8mm.conf b/bsp/meta-boundary/conf/machine/nitrogen8mm.conf index 446fe9db..c8003a3d 100644 --- a/bsp/meta-boundary/conf/machine/nitrogen8mm.conf +++ b/bsp/meta-boundary/conf/machine/nitrogen8mm.conf @@ -11,11 +11,14 @@ require conf/machine/include/arm/arch-arm64.inc # Kernel configuration PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary" +PREFERRED_VERSION_linux-boundary = "4.14%" KERNEL_DEVICETREE = "freescale/imx8mq-nitrogen8m.dtb \ freescale/imx8mq-nitrogen8m-m4.dtb \ freescale/imx8mm-nitrogen8mm.dtb \ + freescale/imx8mm-nitrogen8mm_som.dtb \ " KERNEL_IMAGETYPE = "Image" +KERNEL_DEFCONFIG = "boundary_defconfig" RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" # U-Boot configuration diff --git a/bsp/meta-boundary/recipes-boundary/images/boundary-image-multimedia-full.bb b/bsp/meta-boundary/recipes-boundary/images/boundary-image-multimedia-full.bb index 42cfaa87..348f6cce 100644 --- a/bsp/meta-boundary/recipes-boundary/images/boundary-image-multimedia-full.bb +++ b/bsp/meta-boundary/recipes-boundary/images/boundary-image-multimedia-full.bb @@ -12,5 +12,6 @@ CORE_IMAGE_EXTRA_INSTALL += " \ mmc-utils \ openssh \ spitools \ - connman \ + networkmanager \ + tslib-tests tslib-calibrate \ " diff --git a/bsp/meta-boundary/recipes-bsp/imx-mkimage/imx-boot_%.bbappend b/bsp/meta-boundary/recipes-bsp/imx-mkimage/imx-boot_%.bbappend index 9d0f2fec..a05fcd7b 100644 --- a/bsp/meta-boundary/recipes-bsp/imx-mkimage/imx-boot_%.bbappend +++ b/bsp/meta-boundary/recipes-bsp/imx-mkimage/imx-boot_%.bbappend @@ -3,7 +3,7 @@ SRC_URI = "git://github.com/boundarydevices/imx-mkimage.git;branch=${SRCBRANCH}" SRCREV = "${AUTOREV}" PV = "1.0+git${SRCPV}" -IMXBOOT_TARGETS = "${@bb.utils.contains('MACHINE', 'nitrogen8mm', "u-boot-lpddr4-iMX8MM-2g.nohdmibin", "u-boot-lpddr4-iMX8M-2g.hdmibin", d)}" +IMXBOOT_TARGETS = "${@bb.utils.contains('MACHINE', 'nitrogen8mm', "u-boot-lpddr4-iMX8MM-2g.nohdmibin", "u-boot-lpddr4-iMX8MQ-2g.hdmibin", d)}" UBOOT_NAME = "u-boot-${MACHINE}.bin" BOOT_CONFIG_MACHINE = "${BOOT_NAME}-${MACHINE}.bin" diff --git a/bsp/meta-boundary/recipes-bsp/u-boot/u-boot-boundary_%.bbappend b/bsp/meta-boundary/recipes-bsp/u-boot/u-boot-boundary_%.bbappend index 9e62e546..c07a54aa 100644 --- a/bsp/meta-boundary/recipes-bsp/u-boot/u-boot-boundary_%.bbappend +++ b/bsp/meta-boundary/recipes-bsp/u-boot/u-boot-boundary_%.bbappend @@ -1,4 +1,4 @@ -SRCREV = "62132ae8ca90f821ae23bad8a70dfe50e1eaa62c" +SRCREV = "${AUTOREV}" SRCBRANCH = "boundary-v2018.07" PV = "v2018.07+git${SRCPV}" COMPATIBLE_MACHINE = "(nitrogen6x|nitrogen6x-lite|nitrogen6sx|nitrogen7|nitrogen8m|nitrogen8mm|imx6-acl)" diff --git a/bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary_%.bbappend b/bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary_%.bbappend index 62735957..bc2fb062 100644 --- a/bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary_%.bbappend +++ b/bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary_%.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" -SRCREV = "62132ae8ca90f821ae23bad8a70dfe50e1eaa62c" +SRCREV = "${AUTOREV}" SRCBRANCH = "boundary-v2018.07" PV = "v2018.07+git${SRCPV}" COMPATIBLE_MACHINE = "(nitrogen6x|nitrogen6x-lite|nitrogen6sx|nitrogen7|nitrogen8m|nitrogen8mm|imx6-acl)" diff --git a/bsp/meta-boundary/recipes-connectivity/networkmanager/files/NetworkManager.conf b/bsp/meta-boundary/recipes-connectivity/networkmanager/files/NetworkManager.conf new file mode 100644 index 00000000..ecd45c6b --- /dev/null +++ b/bsp/meta-boundary/recipes-connectivity/networkmanager/files/NetworkManager.conf @@ -0,0 +1,6 @@ +[main] +plugins=ifupdown + +[ifupdown] +managed=true + diff --git a/bsp/meta-boundary/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/bsp/meta-boundary/recipes-connectivity/networkmanager/networkmanager_%.bbappend new file mode 100644 index 00000000..d812c254 --- /dev/null +++ b/bsp/meta-boundary/recipes-connectivity/networkmanager/networkmanager_%.bbappend @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI_append = " \ + file://NetworkManager.conf \ +" + +do_install_append() { + + install -m 755 ${WORKDIR}/NetworkManager.conf ${D}/etc/NetworkManager + +} + diff --git a/bsp/meta-boundary/recipes-graphics/tslib_%.bbappend b/bsp/meta-boundary/recipes-graphics/tslib_%.bbappend new file mode 100644 index 00000000..2b692897 --- /dev/null +++ b/bsp/meta-boundary/recipes-graphics/tslib_%.bbappend @@ -0,0 +1,8 @@ +SRC_URI = "git://github.com/boundarydevices/tslib.git;branch=${SRCBRANCH} \ +" +SRCBRANCH = "boundary-kergoth" +SRCREV = "${AUTOREV}" + +PACKAGECONFIG = "debounce dejitter linear pthres variance input" + +COMPATIBLE_MACHINE = "(nitrogen6x|nitrogen6x-lite|nitrogen6sx|nitrogen7|nitrogen8m|nitrogen8mm)" diff --git a/bsp/meta-boundary/recipes-graphics/wayland/weston/mx8mm/weston.ini b/bsp/meta-boundary/recipes-graphics/wayland/weston/mx8mm/weston.ini new file mode 100644 index 00000000..913b13e5 --- /dev/null +++ b/bsp/meta-boundary/recipes-graphics/wayland/weston/mx8mm/weston.ini @@ -0,0 +1,29 @@ +[core] +# i.MX: Disable idle timeout +idle-time=0 +gbm-format=argb8888 +backend=drm-backend.so + +#[output] +#name=HDMI-A-1 +#mode=1920x1080@60 +#transform=90 + +[output] +name=DSI-1 +mode=current + +[shell] +#size=1920x1080 + +#[output] +#name=HDMI-A-2 +#mode=off +# WIDTHxHEIGHT Resolution size width and height in pixels +# off Disables the output +# preferred Uses the preferred mode +# current Uses the current crt controller mode +#transform=90 + +[screen-share] +command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize diff --git a/bsp/meta-boundary/recipes-graphics/wayland/weston/mx8mq/weston.ini b/bsp/meta-boundary/recipes-graphics/wayland/weston/mx8mq/weston.ini new file mode 100644 index 00000000..3a98b988 --- /dev/null +++ b/bsp/meta-boundary/recipes-graphics/wayland/weston/mx8mq/weston.ini @@ -0,0 +1,25 @@ +[core] +# i.MX: Disable idle timeout +idle-time=0 +gbm-format=argb8888 +backend=fbdev-backend.so + +#[output] +#name=HDMI-A-1 +#mode=1920x1080@60 +#transform=90 + +[shell] +size=1920x1080 + +#[output] +#name=HDMI-A-2 +#mode=off +# WIDTHxHEIGHT Resolution size width and height in pixels +# off Disables the output +# preferred Uses the preferred mode +# current Uses the current crt controller mode +#transform=90 + +[screen-share] +command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize diff --git a/bsp/meta-boundary/recipes-graphics/wayland/weston_4.0.0.imx.bbappend b/bsp/meta-boundary/recipes-graphics/wayland/weston_4.0.0.imx.bbappend new file mode 100644 index 00000000..6401f1a6 --- /dev/null +++ b/bsp/meta-boundary/recipes-graphics/wayland/weston_4.0.0.imx.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/weston:" + +SRC_URI_append = "${@bb.utils.contains('MACHINE', 'nitrogen8mm', "file://mx8mm/weston.ini", "", d)}" +SRC_URI_append = "${@bb.utils.contains('MACHINE', 'nitrogen8m', "file://mx8mq/weston.ini", "", d)}" + +do_install_append_mx8mm() { + + # install default weston.ini + install -D -m 0644 ${WORKDIR}/mx8mm/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini +} + diff --git a/bsp/meta-boundary/recipes-graphics/xorg-xserver/xserver-xorg/0001-v2-xserver-xorg-Fix-X-server-crash.patch b/bsp/meta-boundary/recipes-graphics/xorg-xserver/xserver-xorg/0001-v2-xserver-xorg-Fix-X-server-crash.patch new file mode 100644 index 00000000..37693d65 --- /dev/null +++ b/bsp/meta-boundary/recipes-graphics/xorg-xserver/xserver-xorg/0001-v2-xserver-xorg-Fix-X-server-crash.patch @@ -0,0 +1,45 @@ +From eaeaa8b1d84310d40cf30803b24c2155ce1ee4cb Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Mon, 20 May 2019 20:52:15 +0000 +Subject: [PATCH] [v2] xserver-xorg: Fix X server crash + +Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of +useSIGIO option: + +xfree86 SIGIO support is reworked to use internal versions of +OsBlockSIGIO and OsReleaseSIGIO + +The check for useSIGIO is no longer needed. + +Upstream-Status: Pending + +Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> +Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> +--- + hw/xfree86/os-support/shared/sigio.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c +index 884a71c..be76498 100644 +--- a/hw/xfree86/os-support/shared/sigio.c ++++ b/hw/xfree86/os-support/shared/sigio.c +@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure) + int i; + int installed = FALSE; + +- if (!xf86Info.useSIGIO) +- return 0; +- + for (i = 0; i < MAX_FUNCS; i++) { + if (!xf86SigIOFuncs[i].f) { + if (xf86IsPipe(fd)) +@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd) + int max; + int ret; + +- if (!xf86Info.useSIGIO) +- return 0; +- + max = 0; + ret = 0; + for (i = 0; i < MAX_FUNCS; i++) { diff --git a/bsp/meta-boundary/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bbappend b/bsp/meta-boundary/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bbappend new file mode 100644 index 00000000..7ea8cddd --- /dev/null +++ b/bsp/meta-boundary/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://0001-v2-xserver-xorg-Fix-X-server-crash.patch" + diff --git a/bsp/meta-boundary/recipes-kernel/linux-firmware/linux-firmware-gslx680_1.0.bb b/bsp/meta-boundary/recipes-kernel/linux-firmware/linux-firmware-gslx680_1.0.bb index 219ac32d..ff67b998 100644 --- a/bsp/meta-boundary/recipes-kernel/linux-firmware/linux-firmware-gslx680_1.0.bb +++ b/bsp/meta-boundary/recipes-kernel/linux-firmware/linux-firmware-gslx680_1.0.bb @@ -22,8 +22,8 @@ inherit allarch update-alternatives CLEANBROKEN = "1" do_install() { - mkdir -p ${D}/lib/firmware/ - install -m 0644 ${WORKDIR}/gsl1680.fw ${D}/lib/firmware/ + mkdir -p ${D}/lib/firmware/silead + install -m 0644 ${WORKDIR}/gsl1680.fw ${D}/lib/firmware/silead/ } FILES_${PN} += "/lib/firmware/*" diff --git a/bsp/meta-boundary/recipes-kernel/linux/files/arm64/defconfig b/bsp/meta-boundary/recipes-kernel/linux/files/arm64/defconfig deleted file mode 100644 index 261e0cb1..00000000 --- a/bsp/meta-boundary/recipes-kernel/linux/files/arm64/defconfig +++ /dev/null @@ -1,591 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_NO_HZ_IDLE=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CPUSETS=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -CONFIG_USER_NS=y -CONFIG_SCHED_AUTOGROUP=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -# CONFIG_COMPAT_BRK is not set -CONFIG_PROFILING=y -CONFIG_JUMP_LABEL=y -CONFIG_CC_STACKPROTECTOR_STRONG=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_IOSCHED_DEADLINE is not set -CONFIG_ARCH_FSL_IMX8QM=y -CONFIG_ARCH_FSL_IMX8QP=y -CONFIG_ARCH_FSL_IMX8QXP=y -CONFIG_ARCH_FSL_IMX8MQ=y -CONFIG_ARCH_FSL_IMX8MM=y -CONFIG_PCI=y -CONFIG_PCI_IOV=y -CONFIG_PCI_IMX6=y -CONFIG_PCI_HOST_GENERIC=y -CONFIG_PCI_HISI=y -CONFIG_ARM64_VA_BITS_48=y -CONFIG_SCHED_MC=y -CONFIG_PREEMPT=y -CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_CMA=y -CONFIG_SECCOMP=y -CONFIG_KEXEC=y -CONFIG_XEN=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_COMPAT=y -CONFIG_PM_DEBUG=y -CONFIG_PM_TEST_SUSPEND=y -CONFIG_ARM_CPUIDLE=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -CONFIG_CPU_FREQ_GOV_INTERACTIVE=y -CONFIG_CPUFREQ_DT=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=y -CONFIG_ARM_IMX8_CPUFREQ=y -CONFIG_ARM_IMX8MQ_CPUFREQ=y -CONFIG_ARM_SCPI_CPUFREQ=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=m -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_SYN_COOKIES=y -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_IPV6_SIT=m -CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -CONFIG_NETFILTER_XT_TARGET_LOG=m -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_IPVS=m -CONFIG_IP_VS=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_MANGLE=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_NAT=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_VLAN_8021Q=m -CONFIG_VLAN_8021Q_GVRP=y -CONFIG_VLAN_8021Q_MVRP=y -CONFIG_LLC2=y -CONFIG_NET_SWITCHDEV=y -CONFIG_BPF_JIT=y -CONFIG_CAN=y -CONFIG_CAN_FLEXCAN=y -CONFIG_CAN_MCP251X=m -CONFIG_BT=y -CONFIG_BT_RFCOMM=y -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y -CONFIG_BT_LEDS=y -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_BCM=y -CONFIG_BT_HCIUART_QCA=y -CONFIG_BT_HCIVHCI=y -CONFIG_CFG80211=y -CONFIG_CFG80211_WEXT=y -CONFIG_MAC80211=y -CONFIG_MAC80211_LEDS=y -CONFIG_RFKILL=y -CONFIG_RFKILL_GPIO=y -CONFIG_NET_9P=y -CONFIG_NET_9P_VIRTIO=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_DMA_CMA=y -CONFIG_CMA_SIZE_MBYTES=320 -CONFIG_VEXPRESS_CONFIG=y -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_RAM=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_SLRAM=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_GPMI_NAND=y -CONFIG_MTD_SPI_NOR=y -# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set -CONFIG_SPI_FSL_FLEXSPI=y -CONFIG_MTD_UBI=y -CONFIG_OF_OVERLAY=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=65536 -CONFIG_XEN_BLKDEV_BACKEND=m -CONFIG_VIRTIO_BLK=y -CONFIG_BLK_DEV_NVME=m -CONFIG_SENSORS_FXOS8700=y -CONFIG_SENSORS_FXAS2100X=y -CONFIG_SRAM=y -CONFIG_EEPROM_AT24=m -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_SAS_ATA=y -CONFIG_SCSI_HISI_SAS=y -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_AHCI_PLATFORM=y -CONFIG_AHCI_IMX=y -CONFIG_AHCI_CEVA=y -CONFIG_AHCI_XGENE=y -CONFIG_AHCI_QORIQ=y -CONFIG_SATA_SIL24=y -CONFIG_PATA_PLATFORM=y -CONFIG_PATA_OF_PLATFORM=y -CONFIG_NETDEVICES=y -CONFIG_MACVLAN=m -CONFIG_MACVTAP=m -CONFIG_TUN=y -CONFIG_VETH=m -CONFIG_VIRTIO_NET=y -CONFIG_AMD_XGBE=y -CONFIG_MACB=y -CONFIG_HNS_DSAF=y -CONFIG_HNS_ENET=y -CONFIG_E1000E=y -CONFIG_IGB=y -CONFIG_IGBVF=y -CONFIG_SKY2=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -CONFIG_STMMAC_ETH=m -CONFIG_MDIO_BITBANG=y -CONFIG_AT803X_PHY=y -CONFIG_MICREL_PHY=y -CONFIG_REALTEK_PHY=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_RTL8152=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SR9800=m -CONFIG_USB_NET_SMSC75XX=m -CONFIG_USB_NET_SMSC95XX=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_ATH10K=y -CONFIG_ATH10K_PCI=y -CONFIG_ATH10K_AHB=y -CONFIG_ATH10K_DEBUGFS=y -CONFIG_BCMDHD_1363=y -CONFIG_BCMDHD_PCIE=y -CONFIG_RTL_CARDS=m -# CONFIG_WLAN_VENDOR_TI is not set -CONFIG_INPUT_POLLDEV=y -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_IMX_SC_PWRKEY=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_FT5X06=m -CONFIG_TOUCHSCREEN_GOODIX=m -CONFIG_TOUCHSCREEN_SITRONIX_I2C_TOUCH=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_MPL3115=y -CONFIG_INPUT_ISL29023=y -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIO_AMBAKMI=y -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_DW=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIAL_IMX_CONSOLE=y -CONFIG_SERIAL_XILINX_PS_UART=y -CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y -CONFIG_SERIAL_FSL_LPUART=y -CONFIG_SERIAL_FSL_LPUART_CONSOLE=y -CONFIG_FSL_OTP=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MUX_PCA954x=y -CONFIG_I2C_DESIGNWARE_PLATFORM=y -CONFIG_I2C_IMX=y -CONFIG_I2C_IMX_LPI2C=y -CONFIG_I2C_CROS_EC_TUNNEL=y -CONFIG_I2C_SLAVE=y -CONFIG_SPI=y -CONFIG_SPI_IMX=y -CONFIG_SPI_FSL_LPSPI=y -CONFIG_SPI_PL022=y -CONFIG_SPI_SPIDEV=m -CONFIG_SPMI=y -CONFIG_PINCTRL_SINGLE=y -CONFIG_PINCTRL_MAX77620=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_DWAPB=y -CONFIG_GPIO_PL061=y -CONFIG_GPIO_XGENE=y -CONFIG_GPIO_MAX732X=y -CONFIG_GPIO_PCA953X=y -CONFIG_GPIO_PCA953X_IRQ=y -CONFIG_GPIO_MAX77620=y -CONFIG_POWER_RESET_SNVS=y -CONFIG_POWER_RESET_VEXPRESS=y -CONFIG_POWER_RESET_XGENE=y -CONFIG_POWER_RESET_SYSCON=y -CONFIG_BATTERY_BQ27XXX=y -CONFIG_SENSORS_ARM_SCPI=y -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_INA2XX=m -# CONFIG_MXC_MMA8451 is not set -CONFIG_THERMAL_WRITABLE_TRIPS=y -CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y -CONFIG_CPU_THERMAL=y -CONFIG_THERMAL_EMULATION=y -CONFIG_IMX8M_THERMAL=y -CONFIG_IMX_SC_THERMAL=y -CONFIG_DEVICE_THERMAL=y -CONFIG_WATCHDOG=y -CONFIG_IMX2_WDT=y -CONFIG_IMX8_WDT=y -CONFIG_MFD_CROS_EC=y -CONFIG_MFD_CROS_EC_I2C=y -CONFIG_MFD_MAX77620=y -CONFIG_MFD_SEC_CORE=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_GPIO=y -CONFIG_REGULATOR_MAX77620=y -CONFIG_REGULATOR_PF8X00=y -CONFIG_REGULATOR_PFUZE100=y -CONFIG_REGULATOR_PWM=y -CONFIG_REGULATOR_QCOM_SPMI=y -CONFIG_REGULATOR_S2MPS11=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_USB_VIDEO_CLASS=m -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_MXC_CAPTURE=y -CONFIG_VIDEO_MX8_CAPTURE=y -CONFIG_GMSL_MAX9286=y -CONFIG_VIDEO_MXC_CSI_CAMERA=y -CONFIG_MXC_MIPI_CSI=y -CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m -CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_IMX_DPU_CORE=y -CONFIG_IMX_DCSS_CORE=y -CONFIG_IMX_LCDIF_CORE=y -CONFIG_DRM=y -CONFIG_DRM_LOAD_EDID_FIRMWARE=y -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m -CONFIG_DRM_VIVANTE=m -CONFIG_DRM_PANEL_SIMPLE=y -CONFIG_DRM_PANEL_RAYDIUM_RM67191=y -CONFIG_DRM_SEC_MIPI_DSIM=y -CONFIG_DRM_I2C_ADV7511=y -CONFIG_DRM_ITE_IT6263=y -CONFIG_DRM_IMX_PARALLEL_DISPLAY=y -CONFIG_DRM_IMX_TVE=y -CONFIG_DRM_IMX_LDB=y -CONFIG_DRM_IMX_HDMI=y -CONFIG_DRM_IMX_NWL_DSI=y -CONFIG_DRM_IMX_SEC_DSIM=m -CONFIG_DRM_IMX_HDP=y -CONFIG_IMX_HDP_CEC=y -CONFIG_DRM_MXSFB=y -CONFIG_FB_IMX64=y -CONFIG_FB_IMX64_DEBUG=y -CONFIG_FB_ARMCLCD=y -CONFIG_FB_MXC_DISP_FRAMEWORK=y -CONFIG_BACKLIGHT_GENERIC=m -CONFIG_BACKLIGHT_PWM=y -CONFIG_BACKLIGHT_LP855X=m -CONFIG_SN65DSI83=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_SOC=y -CONFIG_SND_SOC_FSL_ACM=y -CONFIG_SND_IMX_SOC=y -CONFIG_SND_SOC_IMX_AK4458=y -CONFIG_SND_SOC_IMX_AK5558=y -CONFIG_SND_SOC_IMX_AK4497=y -CONFIG_SND_SOC_IMX_WM8960=y -CONFIG_SND_SOC_IMX_WM8524=y -CONFIG_SND_SOC_IMX_CS42888=y -CONFIG_SND_SOC_IMX_WM8962=y -CONFIG_SND_SOC_IMX_MQS=y -CONFIG_SND_SOC_IMX_SPDIF=y -CONFIG_SND_SOC_IMX_AMIX=y -CONFIG_SND_SOC_IMX_CDNHDMI=y -CONFIG_SND_SOC_AK4613=y -CONFIG_SND_SIMPLE_CARD=y -CONFIG_HID_MULTITOUCH=y -CONFIG_USB=y -CONFIG_USB_OTG=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PLATFORM=y -CONFIG_USB_ACM=m -CONFIG_USB_STORAGE=y -CONFIG_USB_DWC3=y -CONFIG_USB_DWC2=y -CONFIG_USB_CHIPIDEA=y -CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_ISP1760=y -CONFIG_USB_ISP1760_HOST_ROLE=y -CONFIG_USB_CDNS3=y -CONFIG_USB_CDNS3_GADGET=y -CONFIG_USB_CDNS3_HOST=y -CONFIG_USB_TEST=m -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_USB_HSIC_USB3503=y -CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_GPIO_VBUS=y -CONFIG_USB_MXS_PHY=y -CONFIG_USB_ULPI=y -CONFIG_USB_GADGET=y -CONFIG_USB_CONFIGFS=y -CONFIG_USB_CONFIGFS_SERIAL=y -CONFIG_USB_CONFIGFS_ACM=y -CONFIG_USB_CONFIGFS_OBEX=y -CONFIG_USB_CONFIGFS_NCM=y -CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_ECM_SUBSET=y -CONFIG_USB_CONFIGFS_RNDIS=y -CONFIG_USB_CONFIGFS_EEM=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_FSL_UTP=y -CONFIG_USB_CONFIGFS_F_LB_SS=y -CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_USB_CONFIGFS_F_UAC1=y -CONFIG_USB_CONFIGFS_F_UAC2=y -CONFIG_USB_CONFIGFS_F_MIDI=y -CONFIG_USB_CONFIGFS_F_HID=y -CONFIG_USB_ZERO=m -CONFIG_USB_AUDIO=m -CONFIG_GADGET_UAC1=y -CONFIG_USB_ETH=m -CONFIG_USB_ETH_EEM=y -CONFIG_USB_G_NCM=m -CONFIG_USB_FUNCTIONFS=m -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_CDC_COMPOSITE=m -CONFIG_MMC=y -CONFIG_MMC_BLOCK_MINORS=32 -CONFIG_MMC_ARMMMCI=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_ACPI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_ESDHC_IMX=y -CONFIG_MMC_SPI=y -# CONFIG_MXC_GPU_VIV is not set -CONFIG_MXC_SIM=y -CONFIG_MXC_EMVSIM=y -CONFIG_MXC_MLB150=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_PWM=y -CONFIG_LEDS_SYSCON=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_MAX77686=y -CONFIG_RTC_DRV_M41T80=y -CONFIG_RTC_DRV_M41T80_WDT=y -CONFIG_RTC_DRV_S5M=y -CONFIG_RTC_DRV_DS3232=y -CONFIG_RTC_DRV_EFI=y -CONFIG_RTC_DRV_PL031=y -CONFIG_RTC_DRV_SNVS=y -CONFIG_RTC_DRV_IMX_SC=y -CONFIG_DMADEVICES=y -CONFIG_FSL_EDMA_V3=y -CONFIG_IMX_SDMA=y -CONFIG_MXS_DMA=y -CONFIG_PL330_DMA=y -CONFIG_QCOM_HIDMA_MGMT=y -CONFIG_QCOM_HIDMA=y -CONFIG_SYNC_FILE=y -CONFIG_VIRTIO_PCI=y -CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_MMIO=y -CONFIG_XEN_GNTDEV=y -CONFIG_XEN_GRANT_DEV_ALLOC=y -CONFIG_STAGING=y -CONFIG_STAGING_MEDIA=y -CONFIG_MEDIA_CEC=y -CONFIG_ION=y -CONFIG_ION_MXC=y -CONFIG_TYPEC_TCPM=y -CONFIG_TYPEC_TCPCI=y -CONFIG_COMMON_CLK_VERSATILE=y -CONFIG_CLK_SP810=y -CONFIG_COMMON_CLK_SCPI=y -CONFIG_CLK_QORIQ=y -# CONFIG_COMMON_CLK_XGENE is not set -CONFIG_COMMON_CLK_PWM=y -CONFIG_ARM_TIMER_SP804=y -CONFIG_CLKSRC_IMX_SYS_CNT=y -CONFIG_MAILBOX=y -CONFIG_ARM_MHU=y -CONFIG_BCM_PDC_MBOX=y -CONFIG_ARM_SMMU=y -CONFIG_ARCH_MXC_ARM64=y -CONFIG_EXTCON_PTN5150=y -CONFIG_IIO=y -CONFIG_PWM=y -CONFIG_PWM_IMX=y -CONFIG_PHY_SAMSUNG_USB2=y -CONFIG_PHY_XGENE=y -CONFIG_IMX8_DDR_PERF=y -CONFIG_NVMEM=y -CONFIG_NVMEM_IMX_OCOTP=y -CONFIG_NVMEM_IMX_SCU_OCOTP=y -CONFIG_TEE=y -CONFIG_OPTEE=y -CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_ACPI=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_BTRFS_FS=m -CONFIG_BTRFS_FS_POSIX_ACL=y -CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y -CONFIG_QUOTA=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=y -CONFIG_CUSE=m -CONFIG_OVERLAY_FS=m -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_HUGETLBFS=y -CONFIG_EFIVAR_FS=y -CONFIG_ECRYPT_FS=y -CONFIG_ECRYPT_FS_MESSAGING=y -CONFIG_JFFS2_FS=y -CONFIG_UBIFS_FS=y -CONFIG_SQUASHFS=y -CONFIG_SQUASHFS_XZ=y -CONFIG_NFS_FS=y -CONFIG_NFS_V4=y -CONFIG_NFS_V4_1=y -CONFIG_NFS_V4_2=y -CONFIG_ROOT_NFS=y -CONFIG_9P_FS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_KVM=y -CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_FS=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_LOCKUP_DETECTOR=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_FTRACE is not set -CONFIG_MEMTEST=y -CONFIG_STRICT_DEVMEM=y -CONFIG_SECURITY=y -CONFIG_LSM_MMAP_MIN_ADDR=0 -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SMACK=y -CONFIG_SECURITY_APPARMOR=y -CONFIG_DEFAULT_SECURITY_APPARMOR=y -CONFIG_CRYPTO_RSA=y -CONFIG_CRYPTO_AUTHENC=y -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_CHACHA20POLY1305=y -CONFIG_CRYPTO_ECHAINIV=y -CONFIG_CRYPTO_CTS=y -CONFIG_CRYPTO_LRW=y -CONFIG_CRYPTO_XTS=y -CONFIG_CRYPTO_MD4=y -CONFIG_CRYPTO_RMD128=y -CONFIG_CRYPTO_RMD160=y -CONFIG_CRYPTO_RMD256=y -CONFIG_CRYPTO_RMD320=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_SHA3=y -CONFIG_CRYPTO_TGR192=y -CONFIG_CRYPTO_WP512=y -CONFIG_CRYPTO_BLOWFISH=y -CONFIG_CRYPTO_CAMELLIA=y -CONFIG_CRYPTO_CAST5=y -CONFIG_CRYPTO_CAST6=y -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_SERPENT=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRYPTO_ANSI_CPRNG=y -CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y -CONFIG_ARM64_CRYPTO=y -CONFIG_CRYPTO_SHA1_ARM64_CE=y -CONFIG_CRYPTO_SHA2_ARM64_CE=y -CONFIG_CRYPTO_GHASH_ARM64_CE=y -CONFIG_CRYPTO_AES_ARM64_CE_CCM=y -CONFIG_CRYPTO_AES_ARM64_CE_BLK=y -CONFIG_CRYPTO_CRC32_ARM64=y - diff --git a/bsp/meta-boundary/recipes-kernel/linux/linux-boundary_%.bbappend b/bsp/meta-boundary/recipes-kernel/linux/linux-boundary_%.bbappend index b92300e6..a2457cb7 100644 --- a/bsp/meta-boundary/recipes-kernel/linux/linux-boundary_%.bbappend +++ b/bsp/meta-boundary/recipes-kernel/linux/linux-boundary_%.bbappend @@ -1,10 +1,23 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files/arm64:" +FILESEXTRAPATHS_prepend_mx6 := "${THISDIR}/files/arm:" +FILESEXTRAPATHS_prepend_mx7 := "${THISDIR}/files/arm:" +FILESEXTRAPATHS_prepend_mx8 := "${THISDIR}/files/arm64:" SRC_URI = "git://github.com/boundarydevices/linux-imx6.git;branch=${SRCBRANCH} \ - file://defconfig \ " -LOCALVERSION = "-1.0.0-ga+yocto" -SRCBRANCH = "boundary-imx_4.14.x_1.0.0_ga" +LOCALVERSION = "-2.0.0-ga+yocto" SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(nitrogen6x|nitrogen6x-lite|nitrogen6sx|nitrogen7|nitrogen8m|nitrogen8mm)" + +S = "${WORKDIR}/git" + +do_merge_default_config() { + + if [ -f ${S}/arch/${ARCH}/configs/${KERNEL_DEFCONFIG} ]; then + # create config with make config + oe_runmake -C ${S} O=${KBUILD_OUTPUT} ${KERNEL_DEFCONFIG} + cp ${KBUILD_OUTPUT}/.config ${WORKDIR}/defconfig + fi + +} +addtask merge_default_config before do_preconfigure after do_patch diff --git a/bsp/meta-boundary/recipes-kernel/linux/linux-boundary_4.14.x.bb b/bsp/meta-boundary/recipes-kernel/linux/linux-boundary_4.14.x.bb new file mode 100644 index 00000000..96cf9cf4 --- /dev/null +++ b/bsp/meta-boundary/recipes-kernel/linux/linux-boundary_4.14.x.bb @@ -0,0 +1,22 @@ +# Adapted from linux-imx.inc, copyright (C) 2013, 2014 O.S. Systems Software LTDA +# Released under the MIT license (see COPYING.MIT for the terms) + +require recipes-kernel/linux/linux-imx.inc + +SUMMARY = "Linux kernel for Boundary Devices boards" + +FILESEXTRAPATHS_prepend_mx6 := "${THISDIR}/${PN}-${PV}/arm:" +FILESEXTRAPATHS_prepend_mx7 := "${THISDIR}/${PN}-${PV}/arm:" +FILESEXTRAPATHS_prepend_mx8 := "${THISDIR}/${PN}-${PV}/arm64:" + +SRC_URI = "git://github.com/boundarydevices/linux-imx6.git;branch=${SRCBRANCH} \ + file://defconfig \ +" + +LOCALVERSION = "-2.0.0-ga+yocto" +SRCBRANCH = "boundary-imx_4.14.x_2.0.0_ga" +SRCREV = "${AUTOREV}" +DEPENDS += "lzop-native bc-native" +COMPATIBLE_MACHINE = "(nitrogen6x|nitrogen6x-lite|nitrogen6sx|nitrogen7|nitrogen8m)" + +KERNEL_DEFCONFIG = "boundary_defconfig" diff --git a/bsp/meta-boundary/recipes-kernel/linux/linux-imx-headers_4.14.x.bb b/bsp/meta-boundary/recipes-kernel/linux/linux-imx-headers_4.14.x.bb new file mode 100644 index 00000000..2040c02f --- /dev/null +++ b/bsp/meta-boundary/recipes-kernel/linux/linux-imx-headers_4.14.x.bb @@ -0,0 +1,58 @@ +# Copyright 2017-2018 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Installs i.MX-specific kernel headers" +DESCRIPTION = "Installs i.MX-specific kernel headers to userspace. \ +New headers are installed in ${includedir}/imx." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" + +LOCALVERSION = "-imx" +SRC_URI = "git://github.com/boundarydevices/linux-imx6.git;branch=${SRCBRANCH}" +SRCBRANCH = "boundary-imx_4.14.x_2.0.0_ga" +SRCREV = "${AUTOREV}" + +S = "${WORKDIR}/git" + +do_compile[noexec] = "1" + +IMX_UAPI_HEADERS = " \ + dma-buf.h \ + hantrodec.h \ + hx280enc.h \ + ion.h \ + ipu.h \ + isl29023.h \ + mxc_asrc.h \ + mxc_dcic.h \ + mxc_mlb.h \ + mxc_sim_interface.h \ + mxc_v4l2.h \ + mxcfb.h \ + pxp_device.h \ + pxp_dma.h \ + version.h \ + videodev2.h \ +" + +do_install() { + # We install all headers inside of B so we can copy only the + # whitelisted ones, and there is no risk of a new header to be + # installed by mistake. + oe_runmake headers_install INSTALL_HDR_PATH=${B}${exec_prefix} + + # FIXME: The ion.h is still on staging so "promote" it for now + cp ${S}/drivers/staging/android/uapi/ion.h ${B}${includedir}/linux + + # Install whitelisted headers only + for h in ${IMX_UAPI_HEADERS}; do + install -D -m 0644 ${B}${includedir}/linux/$h \ + ${D}${includedir}/imx/linux/$h + done +} + +ALLOW_EMPTY_${PN} = "1" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_HOST_imx = ".*" +COMPATIBLE_HOST ?= "(none)" diff --git a/bsp/meta-boundary/recipes-sato/images/boundary-eval-image.bb b/bsp/meta-boundary/recipes-sato/images/boundary-eval-image.bb index 1e7ec2f4..57950464 100644 --- a/bsp/meta-boundary/recipes-sato/images/boundary-eval-image.bb +++ b/bsp/meta-boundary/recipes-sato/images/boundary-eval-image.bb @@ -18,7 +18,7 @@ CORE_IMAGE_BASE_INSTALL += "\ packagegroup-core-x11-sato-games \ nodejs \ packagegroup-fsl-gstreamer1.0-full \ - \ + tslib-tests tslib-calibrate \ flex \ gcc \ git \ @@ -42,7 +42,8 @@ CORE_IMAGE_BASE_INSTALL += "\ # Video input demos only on nitrogen6x/sx/7 platform # Chromium not on nitrogen7 -CORE_IMAGE_BASE_INSTALL_append_nitrogen6x += "video-input-icon chromium firefox qt5everywheredemo cinematicexperience" +CORE_IMAGE_BASE_INSTALL_append_nitrogen6x += "video-input-icon firefox qt5everywheredemo cinematicexperience" +#CORE_IMAGE_BASE_INSTALL_append_nitrogen6x += "chromium" CORE_IMAGE_BASE_INSTALL_append_nitrogen6x-lite += "chromium firefox" CORE_IMAGE_BASE_INSTALL_append_nitrogen6sx += "video-input-icon chromium firefox" CORE_IMAGE_BASE_INSTALL_append_nitrogen7 += "video-input-icon" diff --git a/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0001-MLK-11719-4-mtd-gpmi-change-the-BCH-layout-setting-f.patch b/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0001-MLK-11719-4-mtd-gpmi-change-the-BCH-layout-setting-f.patch index c2b81030..d8133ad2 100644 --- a/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0001-MLK-11719-4-mtd-gpmi-change-the-BCH-layout-setting-f.patch +++ b/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0001-MLK-11719-4-mtd-gpmi-change-the-BCH-layout-setting-f.patch @@ -58,10 +58,10 @@ Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com> 3 files changed, 248 insertions(+), 49 deletions(-) diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c -index 88ea2203e263..a4cd9523e220 100644 +index a4768df5083f..72ace805f8c6 100644 --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c -@@ -212,7 +212,8 @@ void gpmi_dump_info(struct gpmi_nand_data *this) +@@ -213,7 +213,8 @@ void gpmi_dump_info(struct gpmi_nand_data *this) "ECC Strength : %u\n" "Page Size in Bytes : %u\n" "Metadata Size in Bytes : %u\n" @@ -71,7 +71,7 @@ index 88ea2203e263..a4cd9523e220 100644 "ECC Chunk Count : %u\n" "Payload Size in Bytes : %u\n" "Auxiliary Size in Bytes: %u\n" -@@ -223,7 +224,8 @@ void gpmi_dump_info(struct gpmi_nand_data *this) +@@ -224,7 +225,8 @@ void gpmi_dump_info(struct gpmi_nand_data *this) geo->ecc_strength, geo->page_size, geo->metadata_size, @@ -81,7 +81,7 @@ index 88ea2203e263..a4cd9523e220 100644 geo->ecc_chunk_count, geo->payload_size, geo->auxiliary_size, -@@ -238,7 +240,8 @@ int bch_set_geometry(struct gpmi_nand_data *this) +@@ -239,7 +241,8 @@ int bch_set_geometry(struct gpmi_nand_data *this) struct resources *r = &this->resources; struct bch_geometry *bch_geo = &this->bch_geometry; unsigned int block_count; @@ -91,7 +91,7 @@ index 88ea2203e263..a4cd9523e220 100644 unsigned int metadata_size; unsigned int ecc_strength; unsigned int page_size; -@@ -250,7 +253,8 @@ int bch_set_geometry(struct gpmi_nand_data *this) +@@ -251,7 +254,8 @@ int bch_set_geometry(struct gpmi_nand_data *this) return ret; block_count = bch_geo->ecc_chunk_count - 1; @@ -101,7 +101,7 @@ index 88ea2203e263..a4cd9523e220 100644 metadata_size = bch_geo->metadata_size; ecc_strength = bch_geo->ecc_strength >> 1; page_size = bch_geo->page_size; -@@ -277,13 +281,13 @@ int bch_set_geometry(struct gpmi_nand_data *this) +@@ -276,13 +280,13 @@ int bch_set_geometry(struct gpmi_nand_data *this) | BF_BCH_FLASH0LAYOUT0_META_SIZE(metadata_size) | BF_BCH_FLASH0LAYOUT0_ECC0(ecc_strength, this) | BF_BCH_FLASH0LAYOUT0_GF(gf_len, this) @@ -118,7 +118,7 @@ index 88ea2203e263..a4cd9523e220 100644 /* Set *all* chip selects to use layout 0. */ diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c -index 1c1ebbc82824..bc4a364e5696 100644 +index ed405c9434fe..0dd9d586a934 100644 --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c @@ -179,6 +179,36 @@ static inline bool gpmi_check_ecc(struct gpmi_nand_data *this) @@ -373,7 +373,7 @@ index 1c1ebbc82824..bc4a364e5696 100644 } struct dma_chan *get_dma_chan(struct gpmi_nand_data *this) -@@ -997,7 +1156,8 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip, +@@ -991,7 +1150,8 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip, /* Read ECC bytes into our internal raw_buffer */ offset = nfc_geo->metadata_size * 8; @@ -383,7 +383,7 @@ index 1c1ebbc82824..bc4a364e5696 100644 offset -= eccbits; bitoffset = offset % 8; eccbytes = DIV_ROUND_UP(offset + eccbits, 8); -@@ -1034,19 +1194,19 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip, +@@ -1028,19 +1188,19 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip, if (i == 0) { /* The first block includes metadata */ flips = nand_check_erased_ecc_chunk( @@ -414,7 +414,7 @@ index 1c1ebbc82824..bc4a364e5696 100644 } if (flips > 0) { -@@ -1134,9 +1294,24 @@ static int gpmi_ecc_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, +@@ -1128,9 +1288,24 @@ static int gpmi_ecc_read_subpage(struct nand_chip *chip, uint32_t offs, } } @@ -436,11 +436,11 @@ index 1c1ebbc82824..bc4a364e5696 100644 + else + col = meta + (size + ecc_parity_size) * first; + -+ chip->cmdfunc(mtd, NAND_CMD_RNDOUT, col, -1); ++ chip->legacy.cmdfunc(chip, NAND_CMD_RNDOUT, col, -1); meta = 0; buf = buf + first * size; } -@@ -1149,21 +1324,37 @@ static int gpmi_ecc_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, +@@ -1143,21 +1318,37 @@ static int gpmi_ecc_read_subpage(struct nand_chip *chip, uint32_t offs, /* change the BCH registers and bch_geometry{} */ n = last - first + 1; @@ -481,8 +481,8 @@ index 1c1ebbc82824..bc4a364e5696 100644 geo->auxiliary_status_offset = ALIGN(meta, 4); dev_dbg(this->dev, "page:%d(%d:%d)%d, chunk:(%d:%d), BCH PG size:%d\n", -@@ -1386,7 +1577,7 @@ static int gpmi_ecc_read_page_raw(struct mtd_info *mtd, - { +@@ -1381,7 +1572,7 @@ static int gpmi_ecc_read_page_raw(struct nand_chip *chip, uint8_t *buf, + struct mtd_info *mtd = nand_to_mtd(chip); struct gpmi_nand_data *this = nand_get_controller_data(chip); struct bch_geometry *nfc_geo = &this->bch_geometry; - int eccsize = nfc_geo->ecc_chunk_size; @@ -490,8 +490,8 @@ index 1c1ebbc82824..bc4a364e5696 100644 int eccbits = nfc_geo->ecc_strength * nfc_geo->gf_len; u8 *tmp_buf = this->raw_buffer; size_t src_bit_off; -@@ -1471,7 +1662,7 @@ static int gpmi_ecc_write_page_raw(struct mtd_info *mtd, - { +@@ -1465,7 +1656,7 @@ static int gpmi_ecc_write_page_raw(struct nand_chip *chip, const uint8_t *buf, + struct mtd_info *mtd = nand_to_mtd(chip); struct gpmi_nand_data *this = nand_get_controller_data(chip); struct bch_geometry *nfc_geo = &this->bch_geometry; - int eccsize = nfc_geo->ecc_chunk_size; @@ -499,7 +499,7 @@ index 1c1ebbc82824..bc4a364e5696 100644 int eccbits = nfc_geo->ecc_strength * nfc_geo->gf_len; u8 *tmp_buf = this->raw_buffer; uint8_t *oob = chip->oob_poi; -@@ -1847,7 +2038,7 @@ static int gpmi_init_last(struct gpmi_nand_data *this) +@@ -1845,7 +2036,7 @@ static int gpmi_init_last(struct gpmi_nand_data *this) ecc->read_oob_raw = gpmi_ecc_read_oob_raw; ecc->write_oob_raw = gpmi_ecc_write_oob_raw; ecc->mode = NAND_ECC_HW; @@ -509,7 +509,7 @@ index 1c1ebbc82824..bc4a364e5696 100644 mtd_set_ooblayout(mtd, &gpmi_ooblayout_ops); diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h -index 69cd0cbde4f2..ef4e57256d30 100644 +index d0b79bac2728..4a9dab7c0859 100644 --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h @@ -30,9 +30,9 @@ struct resources { diff --git a/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0002-cpufreq-imx6q-read-OCOTP-through-nvmem-for-imx6ul-im.patch b/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0002-cpufreq-imx6q-read-OCOTP-through-nvmem-for-imx6ul-im.patch deleted file mode 100644 index 26f6ba89..00000000 --- a/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0002-cpufreq-imx6q-read-OCOTP-through-nvmem-for-imx6ul-im.patch +++ /dev/null @@ -1,113 +0,0 @@ -From: Anson Huang <Anson.Huang@nxp.com> -Date: Mon, 8 Oct 2018 14:07:34 +0800 -Subject: [PATCH] cpufreq: imx6q: read OCOTP through nvmem for imx6ul/imx6ull - -On i.MX6UL/i.MX6ULL, accessing OCOTP directly is wrong because -the ocotp clock needs to be enabled first. Add support for reading -OCOTP through the nvmem API, and keep the old method there to -support old dtb. - -Signed-off-by: Anson Huang <Anson.Huang@nxp.com> -Acked-by: Viresh Kumar <viresh.kumar@linaro.org> -Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> -(cherry picked from commit 2733fb0d0699246711cf622e0e2faf02a05b69dc) ---- - drivers/cpufreq/imx6q-cpufreq.c | 52 +++++++++++++++++++++++++++-------------- - 1 file changed, 35 insertions(+), 17 deletions(-) - -diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c -index b2ff423ad7f8..8cfee0ab804b 100644 ---- a/drivers/cpufreq/imx6q-cpufreq.c -+++ b/drivers/cpufreq/imx6q-cpufreq.c -@@ -12,6 +12,7 @@ - #include <linux/cpu_cooling.h> - #include <linux/err.h> - #include <linux/module.h> -+#include <linux/nvmem-consumer.h> - #include <linux/of.h> - #include <linux/of_address.h> - #include <linux/pm_opp.h> -@@ -290,20 +291,32 @@ static void imx6q_opp_check_speed_grading(struct device *dev) - #define OCOTP_CFG3_6ULL_SPEED_792MHZ 0x2 - #define OCOTP_CFG3_6ULL_SPEED_900MHZ 0x3 - --static void imx6ul_opp_check_speed_grading(struct device *dev) -+static int imx6ul_opp_check_speed_grading(struct device *dev) - { -- struct device_node *np; -- void __iomem *base; - u32 val; -+ int ret = 0; - -- np = of_find_compatible_node(NULL, NULL, "fsl,imx6ul-ocotp"); -- if (!np) -- return; -+ if (of_find_property(dev->of_node, "nvmem-cells", NULL)) { -+ ret = nvmem_cell_read_u32(dev, "speed_grade", &val); -+ if (ret) -+ return ret; -+ } else { -+ struct device_node *np; -+ void __iomem *base; -+ -+ np = of_find_compatible_node(NULL, NULL, "fsl,imx6ul-ocotp"); -+ if (!np) -+ return -ENOENT; -+ -+ base = of_iomap(np, 0); -+ of_node_put(np); -+ if (!base) { -+ dev_err(dev, "failed to map ocotp\n"); -+ return -EFAULT; -+ } - -- base = of_iomap(np, 0); -- if (!base) { -- dev_err(dev, "failed to map ocotp\n"); -- goto put_node; -+ val = readl_relaxed(base + OCOTP_CFG3); -+ iounmap(base); - } - - /* -@@ -314,7 +327,6 @@ static void imx6ul_opp_check_speed_grading(struct device *dev) - * 2b'11: 900000000Hz on i.MX6ULL only; - * We need to set the max speed of ARM according to fuse map. - */ -- val = readl_relaxed(base + OCOTP_CFG3); - val >>= OCOTP_CFG3_SPEED_SHIFT; - val &= 0x3; - -@@ -334,9 +346,7 @@ static void imx6ul_opp_check_speed_grading(struct device *dev) - dev_warn(dev, "failed to disable 900MHz OPP\n"); - } - -- iounmap(base); --put_node: -- of_node_put(np); -+ return ret; - } - - static int imx6q_cpufreq_probe(struct platform_device *pdev) -@@ -394,10 +404,18 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) - } - - if (of_machine_is_compatible("fsl,imx6ul") || -- of_machine_is_compatible("fsl,imx6ull")) -- imx6ul_opp_check_speed_grading(cpu_dev); -- else -+ of_machine_is_compatible("fsl,imx6ull")) { -+ ret = imx6ul_opp_check_speed_grading(cpu_dev); -+ if (ret == -EPROBE_DEFER) -+ return ret; -+ if (ret) { -+ dev_err(cpu_dev, "failed to read ocotp: %d\n", -+ ret); -+ return ret; -+ } -+ } else { - imx6q_opp_check_speed_grading(cpu_dev); -+ } - - /* Because we have added the OPPs here, we must free them */ - free_opp = true; diff --git a/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0003-ARM-dts-imx6ul-use-nvmem-cells-for-cpu-speed-grading.patch b/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0003-ARM-dts-imx6ul-use-nvmem-cells-for-cpu-speed-grading.patch deleted file mode 100644 index e8c6d16a..00000000 --- a/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0003-ARM-dts-imx6ul-use-nvmem-cells-for-cpu-speed-grading.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Anson Huang <Anson.Huang@nxp.com> -Date: Fri, 14 Sep 2018 10:59:21 +0800 -Subject: [PATCH] ARM: dts: imx6ul: use nvmem-cells for cpu speed grading - -On i.MX6UL, accessing OCOTP directly is wrong because the ocotp clock -needs to be enabled first, so use the nvmem-cells binding instead. - -Signed-off-by: Anson Huang <Anson.Huang@nxp.com> -Signed-off-by: Shawn Guo <shawnguo@kernel.org> -(cherry picked from commit 92f0eb08c66a73594cf200e65689e767f7f0da5e) ---- - arch/arm/boot/dts/imx6ul.dtsi | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi -index 6dc0b569acdf..c670d8e4e0a9 100644 ---- a/arch/arm/boot/dts/imx6ul.dtsi -+++ b/arch/arm/boot/dts/imx6ul.dtsi -@@ -89,6 +89,8 @@ - "pll1_sys"; - arm-supply = <®_arm>; - soc-supply = <®_soc>; -+ nvmem-cells = <&cpu_speed_grade>; -+ nvmem-cell-names = "speed_grade"; - }; - }; - -@@ -932,6 +934,10 @@ - tempmon_temp_grade: temp-grade@20 { - reg = <0x20 4>; - }; -+ -+ cpu_speed_grade: speed-grade@10 { -+ reg = <0x10 4>; -+ }; - }; - - lcdif: lcdif@21c8000 { diff --git a/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc_%.bbappend b/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc_%.bbappend index 5621c499..53a8ace1 100644 --- a/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc_%.bbappend +++ b/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc_%.bbappend @@ -10,8 +10,6 @@ SRC_URI_append_imx6qdl-variscite-som_use-mainline-bsp = " \ SRC_URI_append_ccimx6ul = " \ file://0001-MLK-11719-4-mtd-gpmi-change-the-BCH-layout-setting-f.patch \ - file://0002-cpufreq-imx6q-read-OCOTP-through-nvmem-for-imx6ul-im.patch \ - file://0003-ARM-dts-imx6ul-use-nvmem-cells-for-cpu-speed-grading.patch \ " do_configure_prepend_imx6qdl-variscite-som() { diff --git a/bsp/meta-freescale/recipes-bsp/imx-mkimage/imx-boot_0.2.bb b/bsp/meta-freescale/recipes-bsp/imx-mkimage/imx-boot_0.2.bb index 68492a9b..32d5aa28 100644 --- a/bsp/meta-freescale/recipes-bsp/imx-mkimage/imx-boot_0.2.bb +++ b/bsp/meta-freescale/recipes-bsp/imx-mkimage/imx-boot_0.2.bb @@ -111,7 +111,7 @@ do_compile() { # mkimage for i.MX8 for target in ${IMXBOOT_TARGETS}; do bbnote "building ${SOC_TARGET} - ${target}" - make SOC=${SOC_TARGET} ${target} + make SOC=${SOC_TARGET} dtbs=${UBOOT_DTB_NAME} ${target} if [ -e "${BOOT_STAGING}/flash.bin" ]; then cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE}-${target} fi diff --git a/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb b/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb index 81799add..d5cb0339 100644 --- a/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb +++ b/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb @@ -2,5 +2,7 @@ # Copyright (C) 2014-2016 Freescale Semiconductor # Copyright 2017 NXP +FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-imx:" + require u-boot-imx_${PV}.bb require u-boot-mfgtool.inc diff --git a/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx/0001-tools-allow-to-override-python.patch b/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx/0001-tools-allow-to-override-python.patch new file mode 100755 index 00000000..f96de538 --- /dev/null +++ b/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx/0001-tools-allow-to-override-python.patch @@ -0,0 +1,46 @@ +From b48bfc74ee410b1e6681c620633ffef32aafaba0 Mon Sep 17 00:00:00 2001 +From: Stefano Babic <sbabic@denx.de> +Date: Wed, 5 Apr 2017 17:46:41 +0200 +Subject: [PATCH] tools: allow to override python + +Not force to use python from PATH. Issue was noted when building with +Yocto, because python from the distro is always taken instead of +python-native built during Yocto process. + +Signed-off-by: Stefano Babic <sbabic@denx.de> +CC: Simon Glass <sjg@chromium.org> +Reviewed-by: Simon Glass <sjg@chromium.org> +--- + Makefile | 2 +- + tools/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 09b597d450..8d4e6050b3 100644 +--- a/Makefile ++++ b/Makefile +@@ -348,7 +348,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy + OBJDUMP = $(CROSS_COMPILE)objdump + AWK = awk + PERL = perl +-PYTHON = python ++PYTHON ?= python + DTC = dtc + CHECK = sparse + +diff --git a/tools/Makefile b/tools/Makefile +index fa1b85bdae..2fc4a583d4 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -120,7 +120,7 @@ _libfdt.so-sharedobjs += $(LIBFDT_OBJS) + libfdt: + + tools/_libfdt.so: $(patsubst %.o,%.c,$(LIBFDT_OBJS)) tools/libfdt_wrap.c +- LDFLAGS="$(HOSTLDFLAGS)" python $(srctree)/lib/libfdt/setup.py \ ++ LDFLAGS="$(HOSTLDFLAGS)" ${PYTHON} $(srctree)/lib/libfdt/setup.py \ + "$(_hostc_flags)" $^ + mv _libfdt.so $@ + +-- +2.17.1 + diff --git a/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx_2017.03.bb b/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx_2017.03.bb index 705ff164..f85ed994 100644 --- a/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx_2017.03.bb +++ b/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx_2017.03.bb @@ -11,7 +11,9 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRCBRANCH = "imx_v2017.03_4.9.123_imx8mm_ga" -SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH} \ + file://0001-tools-allow-to-override-python.patch \ + " SRCREV = "8be98e9322040c655b9e5c9fb2c494e002e3fad9" S = "${WORKDIR}/git" @@ -35,7 +37,7 @@ do_deploy_append_mx8m() { install -d ${DEPLOYDIR}/${BOOT_TOOLS} install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} install -m 0777 ${B}/${config}/tools/mkimage ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_uboot - install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} + install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin fi done unset j diff --git a/bsp/meta-freescale/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/bsp/meta-freescale/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index 8348c1b4..45f257e6 100644 --- a/bsp/meta-freescale/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/bsp/meta-freescale/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -62,7 +62,7 @@ IMX_PACKAGES_GBM = "" IMX_PACKAGES_GBM_mx8 = "libgbm-imx libgbm-imx-dev" PACKAGES =+ "libclc-imx libclc-imx-dev \ libgl-imx libgl-imx-dev \ - libgles-imx libgles-imx-dev \ + libgles1-imx libgles1-imx-dev \ libgles2-imx libgles2-imx-dev \ libgles3-imx-dev \ libglslc-imx libglslc-imx-dev \ @@ -110,9 +110,9 @@ python __anonymous() { # they don't get Debian-renamed (which would remove the -imx suffix). for p in (("libegl", "libegl1"), ("libgl", "libgl1"), ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), - ("libgles3",) , ("libvulkan",)): + ("libgles3",) , ("libvulkan",), ("libgbm",)): fullp = p[0] + "-imx" - pkgs = " ".join(p) + pkgs = "".join(' %s' % i for i in p) d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") d.appendVar("RREPLACES_" + fullp, pkgs) d.appendVar("RPROVIDES_" + fullp, pkgs) @@ -318,9 +318,11 @@ FILES_libgl-imx = "${libdir}/libGL${REALSOLIBS}" FILES_libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL" # libEGL needs to open libGLESv1.so -INSANE_SKIP_libgles-imx += "dev-so" -FILES_libgles-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" -FILES_libgles-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc" +INSANE_SKIP_libgles1-imx += "dev-so" +FILES_libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" +FILES_libgles1-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc" +RPROVIDES_libgles1-imx = "libgles-imx" +RPROVIDES_libgles1-imx-dev = "libgles-imx-dev" # libEGL needs to open libGLESv2.so INSANE_SKIP_libgles2-imx += "dev-so" diff --git a/bsp/meta-intel/recipes-kernel/linux/linux-intel-rt_4.14.bb b/bsp/meta-intel/recipes-kernel/linux/linux-intel-rt_4.14.bb index 0611304c..6967ec25 100644 --- a/bsp/meta-intel/recipes-kernel/linux/linux-intel-rt_4.14.bb +++ b/bsp/meta-intel/recipes-kernel/linux/linux-intel-rt_4.14.bb @@ -5,7 +5,7 @@ require linux-intel.inc # to build multiple virtual/kernel providers, e.g. as dependency of # core-image-rt-sdk, core-image-rt. python () { - if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": + if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") } @@ -17,8 +17,8 @@ SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch" DEPENDS += "elfutils-native openssl-native util-linux-native" -LINUX_VERSION ?= "4.14.106" -SRCREV_machine ?= "5cfa4c85d15168b84e40bd38b7d31a62a01e40d3" +LINUX_VERSION ?= "4.14.134" +SRCREV_machine ?= "09a421a9b2ba044daf4ab9ea2f54a33cf7a2fac1" SRCREV_meta ?= "bc35d5bd224ab031440a69f9806d839db382f05c" LINUX_KERNEL_TYPE = "preempt-rt" diff --git a/bsp/meta-intel/recipes-kernel/linux/linux-intel-rt_4.19.bb b/bsp/meta-intel/recipes-kernel/linux/linux-intel-rt_4.19.bb index 0fd47585..edf32af0 100644 --- a/bsp/meta-intel/recipes-kernel/linux/linux-intel-rt_4.19.bb +++ b/bsp/meta-intel/recipes-kernel/linux/linux-intel-rt_4.19.bb @@ -5,7 +5,7 @@ require linux-intel.inc # to build multiple virtual/kernel providers, e.g. as dependency of # core-image-rt-sdk, core-image-rt. python () { - if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": + if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") } @@ -17,8 +17,8 @@ KMETA_BRANCH = "yocto-4.19" DEPENDS += "elfutils-native openssl-native util-linux-native" -LINUX_VERSION ?= "4.19.31" -SRCREV_machine ?= "8b4bc03e27be3bd3b23249205d11185b2ed21ec6" -SRCREV_meta ?= "d85f07e03c980eca5ffd5ba058985d6ed3a83801" +LINUX_VERSION ?= "4.19.59" +SRCREV_machine ?= "d6dc301c71aea6098e5e19ef3f265d0ba9981167" +SRCREV_meta ?= "960be4218436fbbb3500e019f7abf02fa94e6aac" LINUX_KERNEL_TYPE = "preempt-rt" diff --git a/bsp/meta-intel/recipes-kernel/linux/linux-intel-rt_4.9.bb b/bsp/meta-intel/recipes-kernel/linux/linux-intel-rt_4.9.bb index fd82cfa6..8f51c087 100644 --- a/bsp/meta-intel/recipes-kernel/linux/linux-intel-rt_4.9.bb +++ b/bsp/meta-intel/recipes-kernel/linux/linux-intel-rt_4.9.bb @@ -6,7 +6,7 @@ require linux-intel.inc # to build multiple virtual/kernel providers, e.g. as dependency of # core-image-rt-sdk, core-image-rt. python () { - if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": + if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") } diff --git a/bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14.bb b/bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14.bb index cc100fe8..e00eb88b 100644 --- a/bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14.bb +++ b/bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14.bb @@ -10,8 +10,8 @@ SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch \ DEPENDS += "elfutils-native openssl-native util-linux-native" -LINUX_VERSION ?= "4.14.110" -SRCREV_machine ?= "f93147df5d96922347d0a4143ad06ae5d45d1caf" +LINUX_VERSION ?= "4.14.138" +SRCREV_machine ?= "3f695bb28f52f6317f034efbf42b052c66dee0e6" SRCREV_meta ?= "bc35d5bd224ab031440a69f9806d839db382f05c" # For Crystalforest and Romley diff --git a/bsp/meta-intel/recipes-kernel/linux/linux-intel_4.19.bb b/bsp/meta-intel/recipes-kernel/linux/linux-intel_4.19.bb index c3f1a9d1..eb2839bb 100644 --- a/bsp/meta-intel/recipes-kernel/linux/linux-intel_4.19.bb +++ b/bsp/meta-intel/recipes-kernel/linux/linux-intel_4.19.bb @@ -9,9 +9,9 @@ SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurs DEPENDS += "elfutils-native openssl-native util-linux-native" -LINUX_VERSION ?= "4.19.40" -SRCREV_machine ?= "106e1f78760b7e980a9598098ee45ec0a683c7ed" -SRCREV_meta ?= "6fface2df8bc35e72aaf3d79352413fd84175879" +LINUX_VERSION ?= "4.19.62" +SRCREV_machine ?= "c8c1c2f3f330f4f93279a8ad842f68d40ae6fb3d" +SRCREV_meta ?= "960be4218436fbbb3500e019f7abf02fa94e6aac" # For Crystalforest and Romley KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" diff --git a/bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9.bb b/bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9.bb index d1ba3004..8b467c4f 100644 --- a/bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9.bb +++ b/bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9.bb @@ -8,9 +8,9 @@ SRC_URI_append = " \ file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \ " -LINUX_VERSION ?= "4.9.183" -SRCREV_machine ?= "107e98ee74a588750a5a80ffe11f52628295e461" -SRCREV_meta ?= "f9e90afd4e47920e990dacb73cd6508917ca5422" +LINUX_VERSION ?= "4.9.195" +SRCREV_machine ?= "f1bbb927291ee709a47bb3124aa53e819e936e7b" +SRCREV_meta ?= "01eb2cf9a6626c65a4c117249d03a002f683222d" # For Crystalforest and Romley KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" diff --git a/bsp/meta-renesas-rcar-gen3/.gitreview b/bsp/meta-renesas-rcar-gen3/.gitreview index e9deebd9..a247a4dd 100644 --- a/bsp/meta-renesas-rcar-gen3/.gitreview +++ b/bsp/meta-renesas-rcar-gen3/.gitreview @@ -1,5 +1,5 @@ [gerrit] -defaultbranch=master host=gerrit.automotivelinux.org port=29418 project=AGL/meta-renesas-rcar-gen3 +defaultbranch=icefish diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/include/checksum_control_files.inc b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/include/checksum_control_files.inc index ff1f0093..86fe65ad 100644 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/include/checksum_control_files.inc +++ b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/include/checksum_control_files.inc @@ -1,7 +1,7 @@ CTL_CHECKSUM[r8a77951_linux_gsx_binaries_gles.tar.bz2]="40ef703b7b6bbd2931722810fe7ff46f" CTL_CHECKSUM[r8a77960_linux_gsx_binaries_gles.tar.bz2]="1cf07eae93757a5752d16cdc351a59eb" -CTL_CHECKSUM[GSX_KM_H3.tar.bz2]="17e468c94e3669326637bbf7a893f70f" -CTL_CHECKSUM[GSX_KM_M3.tar.bz2]="417d2eb2fdc9bf6abbc8a7ab8ac60793" +CTL_CHECKSUM[GSX_KM_H3.tar.bz2]="ab1ee4534a1d4b1852478dc6d8fa5eb9" +CTL_CHECKSUM[GSX_KM_M3.tar.bz2]="531b91b53ad7ffaf13e33aec2d499278" CTL_CHECKSUM[RCG3VUDRL4101ZDO.tar.bz2]="43a8921d5c2a257ccc0bf491c737f5be" CTL_CHECKSUM[EVARTM0AC0000XCMCTL30SL41C.tar.bz2]="3714b73b8cc317372a22a8335c74e103" CTL_CHECKSUM[EVARTM0AC0000XV264D30SL41C.tar.bz2]="efcbb6493f61d714b64f6340503fa1d3" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-examples/0001-secure_storage-ta-Add-a-missing-include-file.patch b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-examples/0001-secure_storage-ta-Add-a-missing-include-file.patch new file mode 100644 index 00000000..7627a066 --- /dev/null +++ b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-examples/0001-secure_storage-ta-Add-a-missing-include-file.patch @@ -0,0 +1,29 @@ +From be7079678aeb1503e0f681d977c47c44fd7b4f8c Mon Sep 17 00:00:00 2001 +From: Pierre Marzin <pierre.marzin@iot.bzh> +Date: Mon, 19 Aug 2019 09:33:17 +0000 +Subject: [PATCH] secure_storage: ta: Add a missing include file + +The commit 9890a50d3c26b377dcb27f5db680018e15a5a3de fix a size type by +using a format macro contant 'PRIu32' into a printf. This needs the +inttypes.h header file to build correctly with aarch64-linux-gnu-gcc. + +Signed-off-by: Pierre Marzin <pierre.marzin@iot.bzh> +--- + secure_storage/ta/secure_storage_ta.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/secure_storage/ta/secure_storage_ta.c b/secure_storage/ta/secure_storage_ta.c +index 3ccc12d..cfdfbb6 100644 +--- a/secure_storage/ta/secure_storage_ta.c ++++ b/secure_storage/ta/secure_storage_ta.c +@@ -28,6 +28,7 @@ + #include <secure_storage_ta.h> + #include <tee_internal_api.h> + #include <tee_internal_api_extensions.h> ++#include <inttypes.h> + + static TEE_Result delete_object(uint32_t param_types, TEE_Param params[4]) + { +-- +2.11.0 + diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb new file mode 100644 index 00000000..ccfe3fe3 --- /dev/null +++ b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb @@ -0,0 +1,61 @@ +SUMMARY = "OP-TEE examples" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=cd95ab417e23b94f381dafc453d70c30" + + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit pythonnative + +PV = "3.6.0+git${SRCPV}" + +SRCREV = "292da2fd8db0176e0e96989268c63ef9ab910a6c" + +SRC_URI = " \ + git://github.com/linaro-swg/optee_examples;branch=master;name=master \ + file://0001-secure_storage-ta-Add-a-missing-include-file.patch \ +" + +COMPATIBLE_MACHINE = "(salvator-x|h3ulcb|m3ulcb|m3nulcb|ebisu)" +PLATFORM = "rcar" + +DEPENDS = "optee-os optee-client python-pycrypto-native" + +CFLAGS += "-Wno-extra -Wno-error=format" +TARGET_CFLAGS += "-Wno-extra -Wno-error=format" + +TARGET_CC_ARCH += "${LDFLAGS}" +INSANE_SKIP_${PN} = "ldflags" + +TA_DEV_KIT_DIR = "${STAGING_DIR_TARGET}/usr/share/optee/export-ta_arm64" + +OPTEE_CLIENT_EXPORT = "${STAGING_DIR_TARGET}/usr" + +TEEC_EXPORT = "${STAGING_DIR_TARGET}/usr" + +S = "${WORKDIR}/git" +EXTRA_OEMAKE = "\ + TEEC_EXPORT=${TEEC_EXPORT} \ + OPTEE_CLIENT_EXPORT=${OPTEE_CLIENT_EXPORT} \ + TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ + HOST_CROSS_COMPILE=${TARGET_PREFIX} \ + TA_CROSS_COMPILE=${TARGET_PREFIX} \ + PLATFORM=${PLATFORM} \ + V=1 \ + " + +do_compile() { + oe_runmake +} + +do_install () { + mkdir -p ${D}${nonarch_base_libdir}/optee_armtz + mkdir -p ${D}${bindir} + install -D -p -m0755 ${S}/out/ca/* ${D}${bindir} + install -D -p -m0444 ${S}/out/ta/* ${D}${nonarch_base_libdir}/optee_armtz + mkdir -p ${D}${includedir} + cp ${S}/hello_world/ta/include/* ${D}${includedir} +} + +FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb index aeea185b..e338631b 100644 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb +++ b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb @@ -50,8 +50,10 @@ do_compile() { oe_runmake PLATFORM=${PLATFORM} CFG_ARM64_core=y } -# do_install() nothing -do_install[noexec] = "1" +do_install() { + install -d ${D}/usr/share/optee + cp -r ${S}/out/arm-plat-${PLATFORM}/export-ta_arm64 ${D}/usr/share/optee +} do_deploy() { # Create deploy folder @@ -63,3 +65,6 @@ do_deploy() { install -m 0644 ${S}/out/arm-plat-${PLATFORM}/core/tee.srec ${DEPLOYDIR}/tee-${MACHINE}.srec } addtask deploy before do_build after do_compile + +FILES_${PN}-staticdev += "${datadir}/optee/export-ta_arm64/lib/*.a" +FILES_${PN}-dev += "${datadir}/optee/export-ta_arm64" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-test/optee_xtest_fix.diff b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-test/optee_xtest_fix.diff new file mode 100644 index 00000000..5067086f --- /dev/null +++ b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-test/optee_xtest_fix.diff @@ -0,0 +1,13 @@ +diff --git a/host/xtest/regression_6000.c b/host/xtest/regression_6000.c +index 336ea14..2379e43 100644 +--- a/host/xtest/regression_6000.c ++++ b/host/xtest/regression_6000.c +@@ -82,6 +82,8 @@ static uint32_t fs_id_for_tee_storage_private(void) + return TEE_STORAGE_PRIVATE_REE; + #elif defined(CFG_RPMB_FS) + return TEE_STORAGE_PRIVATE_RPMB; ++#else ++ return TEE_STORAGE_PRIVATE; + #endif + } + diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb new file mode 100644 index 00000000..ea58e24c --- /dev/null +++ b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb @@ -0,0 +1,55 @@ +DESCRIPTION = "OP-TEE TEST" + +LICENSE = "GPLv2 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://${S}/host/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit pythonnative + +PV = "3.1.0+git${SRCPV}" + +SRCREV = "45218eb59b006ad20cc7610904f291dd85157a43" + +SRC_URI = " \ + git://github.com/OP-TEE/optee_test.git;branch=master;name=master \ + file://optee_xtest_fix.diff \ +" + +COMPATIBLE_MACHINE = "(salvator-x|h3ulcb|m3ulcb|m3nulcb|ebisu)" +PLATFORM = "rcar" + +DEPENDS = "optee-os optee-client python-pycrypto-native" + +export CROSS_COMPILE64="${TARGET_PREFIX}" + +# Let the Makefile handle setting up the flags as it is a standalone application +LD[unexport] = "1" +LDFLAGS[unexport] = "1" +export CCcore="${CC}" +export LDcore="${LD}" +libdir[unexport] = "1" + +CFLAGS += "-Wno-extra -Wno-error=stringop-overflow -Wno-error=array-bounds" +TARGET_CFLAGS += "-Wno-extra -Wno-error=stringop-overflow -Wno-error=array-bounds" + +TARGET_CC_ARCH += "${LDFLAGS}" +INSANE_SKIP_${PN} = "ldflags" + +S = "${WORKDIR}/git" +EXTRA_OEMAKE = "-e MAKEFLAGS=" + +do_compile() { + oe_runmake CROSS_COMPILE=${CROSS_COMPILE64} PLATFORM=${PLATFORM} OPTEE_CLIENT_EXPORT=${STAGING_DIR_TARGET}/usr --no-builtin-variables TA_DEV_KIT_DIR="${STAGING_DIR_TARGET}/usr/share/optee/export-ta_arm64" +} + +do_install () { + install -D -p -m0755 ${S}/out/xtest/xtest ${D}${bindir}/xtest + + # install path should match the value set in optee-client/tee-supplicant + # default TEEC_LOAD_PATH is /lib + mkdir -p ${D}${nonarch_base_libdir}/optee_armtz/ + install -D -p -m0444 ${S}/out/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/ +} + +FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb new file mode 100644 index 00000000..8d45a3c2 --- /dev/null +++ b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb @@ -0,0 +1,57 @@ +SUMMARY = "OP-TEE user_app_template" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=cd95ab417e23b94f381dafc453d70c30" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit pythonnative + +PV = "0.1+git${SRCPV}" + +SRCREV = "0.1" + +SRC_URI = " \ + git://github.com/iotbzh/optee_user_app_template;branch=master \ +" + +COMPATIBLE_MACHINE = "(salvator-x|h3ulcb|m3ulcb|m3nulcb|ebisu)" +PLATFORM = "rcar" + +DEPENDS = "optee-os optee-client python-pycrypto-native" + +CFLAGS += "-Wno-extra -Wno-error=format" +TARGET_CFLAGS += "-Wno-extra -Wno-error=format" + +TARGET_CC_ARCH += "${LDFLAGS}" +INSANE_SKIP_${PN} = "ldflags" + +TA_DEV_KIT_DIR = "${STAGING_DIR_TARGET}/usr/share/optee/export-ta_arm64" + +OPTEE_CLIENT_EXPORT = "${STAGING_DIR_TARGET}/usr" + +TEEC_EXPORT = "${STAGING_DIR_TARGET}/usr" + +S = "${WORKDIR}/git" +EXTRA_OEMAKE = "\ + TEEC_EXPORT=${TEEC_EXPORT} \ + OPTEE_CLIENT_EXPORT=${OPTEE_CLIENT_EXPORT} \ + TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ + HOST_CROSS_COMPILE=${TARGET_PREFIX} \ + TA_CROSS_COMPILE=${TARGET_PREFIX} \ + PLATFORM=${PLATFORM} \ + V=1 \ + " + +do_compile() { + oe_runmake +} + +do_install () { + mkdir -p ${D}${nonarch_base_libdir}/optee_armtz + mkdir -p ${D}${bindir} + install -D -p -m0755 ${S}/out/ca/* ${D}${bindir} + install -D -p -m0444 ${S}/out/ta/* ${D}${nonarch_base_libdir}/optee_armtz +} + +FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.4.bbappend b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.4.bbappend index 81515f9d..583a9c3b 100644 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.4.bbappend +++ b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.4.bbappend @@ -10,7 +10,7 @@ require include/rcar-gen3-path-common.inc DEPENDS += "omx-user-module mmngrbuf-user-module" -SRCREV = "2542e931c13b6f3e0dfa97d7b6230ca584ca11bc" +SRCREV = "ac0a9d331ef492f216e90753bd7aae7d0811bcc5" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://omx/gstomx.h;beginline=1;endline=22;md5=e2c6664eda77dc22095adbed9cb6c6e4 \ diff --git a/bsp/meta-rtlwifi/conf/layer.conf b/bsp/meta-rtlwifi/conf/layer.conf index ca6c3745..7281f63f 100644 --- a/bsp/meta-rtlwifi/conf/layer.conf +++ b/bsp/meta-rtlwifi/conf/layer.conf @@ -4,7 +4,7 @@ BBPATH .= ":${LAYERDIR}" # Append recipe dir to BBFILES BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" -LAYERSERIES_COMPAT_rtlwifi = "rocko sumo thud" +LAYERSERIES_COMPAT_rtlwifi = "rocko sumo thud warrior zeus dunfell" BBFILE_COLLECTIONS += "rtlwifi" BBFILE_PRIORITY_rtlwifi = "1" diff --git a/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8723bu.bb b/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8723bu.bb index 38cb38a2..a703d997 100644 --- a/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8723bu.bb +++ b/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8723bu.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://Kconfig;md5=ce4c7adf40ddcf6cfca7ee2b333165f0" PV = "1.0-git" -SRCREV = "db024b4c130283a0372d2f89a015a3a5c36f9419" +SRCREV = "a8bd4b6c0481479408e67ac2e1c6fd5dc499e37f" SRC_URI = "git://github.com/lwfinger/rtl8723bu.git;protocol=https \ file://0002-realtek-Disable-IPS-mode.patch " diff --git a/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8812au.bb b/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8812au.bb index 1d358323..17133e57 100644 --- a/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8812au.bb +++ b/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8812au.bb @@ -1,29 +1,17 @@ -SUMMARY = "RTL8812AU kernel driver (wifi)" -DESCRIPTION = "RTL8812AU kernel driver" +SUMMARY = "Realtek 802.11n WLAN Adapter Linux driver" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://Kconfig;md5=4b85004ff83dd932ff28f7f348fb2a28" - -SRC_URI = "git://github.com/EmbeddedAndroid/rtl8812AU_8821AU_linux.git;protocol=https" -SRCREV = "d1f7e7a3675c5895d9eb00f5b303e350fdccc0b2" - -S = "${WORKDIR}/git" - -PV = "1.0-git" - -DEPENDS = "virtual/kernel" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" inherit module -EXTRA_OEMAKE = "ARCH=${ARCH}" -EXTRA_OEMAKE += "KSRC=${STAGING_KERNEL_BUILDDIR}" +SRC_URI = " \ + git://github.com/gordboy/rtl8812au.git;protocol=https \ + file://0001-Use-modules_install-as-wanted-by-yocto.patch \ +" -do_compile () { - unset LDFLAGS - oe_runmake -} +SRCREV = "30d47a0a3f43ccb19e8fd59fe93d74a955147bf2" -do_install () { - install -d ${D}/lib/modules/${KERNEL_VERSION} - install -m 0755 ${B}/rtl8812au.ko ${D}/lib/modules/${KERNEL_VERSION}/rtl8812au.ko -} +S = "${WORKDIR}/git" +EXTRA_OEMAKE_append = " KSRC=${STAGING_KERNEL_DIR}" diff --git a/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8812au/0001-Use-modules_install-as-wanted-by-yocto.patch b/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8812au/0001-Use-modules_install-as-wanted-by-yocto.patch new file mode 100644 index 00000000..c68020c2 --- /dev/null +++ b/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8812au/0001-Use-modules_install-as-wanted-by-yocto.patch @@ -0,0 +1,28 @@ +From 30836d3579b3536ce174082f451acf7fea638a8d Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei@resin.io> +Date: Mon, 1 Aug 2016 23:51:45 +0200 +Subject: [PATCH] Use modules_install as wanted by yocto + +Upstream-Status: Pending + +Signed-off-by: Andrei Gherzan <andrei@resin.io> +--- + Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Makefile b/Makefile +index 70c609a..b5ecf55 100644 +--- a/Makefile ++++ b/Makefile +@@ -1051,6 +1051,9 @@ all: modules + modules: + $(MAKE) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KSRC) M=$(shell pwd) modules + ++modules_install: ++ $(MAKE) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KSRC) M=$(shell pwd) modules_install ++ + strip: + $(CROSS_COMPILE)strip $(MODULE_NAME).ko --strip-unneeded + +-- +2.1.4 diff --git a/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8821cu.bb b/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8821cu.bb new file mode 100644 index 00000000..1aa4f3b4 --- /dev/null +++ b/bsp/meta-rtlwifi/recipes-bsp/drivers/rtl8821cu.bb @@ -0,0 +1,29 @@ +SUMMARY = "RTL8821CU kernel driver (wifi)" +DESCRIPTION = "RTL8821CU kernel driver" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://Kconfig;md5=bc2a2406eb72158dee196a8486a2aec9" + +SRCREV = "3d9d2401a8912fd96efdec3bf0c88a4e8bab2d76" +SRC_URI = "git://github.com/spriteguard/rtl8821CU;protocol=https " + +S = "${WORKDIR}/git" + +PV = "1.0-git" + +DEPENDS = "virtual/kernel" + +inherit module + +EXTRA_OEMAKE = "ARCH=${ARCH}" +EXTRA_OEMAKE += "KSRC=${STAGING_KERNEL_BUILDDIR}" + +MODULES_INSTALL_TARGET="install" + +do_install () { + install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless + install -m 0644 ${B}/8821cu.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/rtl8821cu.ko +} + +FILES_${PN} += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/rtl8821cu.ko" +RPROVIDES_${PN} += "kernel-module-${PN}-${KERNEL_VERSION}" + diff --git a/bsp/meta-sancloud/conf/machine/bbe.conf b/bsp/meta-sancloud/conf/machine/bbe.conf index 96408b59..cc58b098 100644 --- a/bsp/meta-sancloud/conf/machine/bbe.conf +++ b/bsp/meta-sancloud/conf/machine/bbe.conf @@ -9,6 +9,7 @@ MACHINE_EXTRA_RDEPENDS += " \ kernel-modules linux-firmware-rtl8723 usbutils \ iw crda rtl8723bu kernel-module-8723bu \ " +ARAGO_IMAGE_EXTRA_INSTALL += "packagegroup-base" EXTRA_IMAGEDEPENDS += "u-boot-bbe" @@ -23,7 +24,11 @@ PREFERRED_PROVIDER_virtual/kernel_bbe = '${@oe.utils.conditional("BBE_RT_KERNEL" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bbe" PREFERRED_PROVIDER_u-boot = "u-boot-bbe" -KERNEL_DEVICETREE = "am335x-sancloud-bbe.dtb" +KERNEL_DEVICETREE = " \ + am335x-sancloud-bbe.dtb \ + am335x-sancloud-bbei-wifi.dtb \ + am335x-sancloud-bbe-icu4.dtb \ + " KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" SPL_BINARY = "MLO" diff --git a/bsp/meta-sancloud/recipes-bsp/u-boot/u-boot-bbe_2019.04.bb b/bsp/meta-sancloud/recipes-bsp/u-boot/u-boot-bbe.bb index 19d0c77d..85c56a15 100644 --- a/bsp/meta-sancloud/recipes-bsp/u-boot/u-boot-bbe_2019.04.bb +++ b/bsp/meta-sancloud/recipes-bsp/u-boot/u-boot-bbe.bb @@ -7,9 +7,9 @@ DEPENDS += "flex-native bison-native" require recipes-bsp/u-boot/u-boot.inc -SRC_URI = "git://github.com/SanCloudLtd/u-boot.git;protocol=https;branch=uboot-bbe-2019.04" -SRCREV = "38b97ce10fdb2061f5f6e7bd7b0bd9d24bc367e2" -PV = "2019.04+git${SRCPV}" +SRC_URI = "git://github.com/SanCloudLtd/u-boot.git;protocol=https;branch=uboot-bbe-2019.10" +SRCREV = "81a1432e5c4514cc3ca1fec78023afbee638c4f0" +PV = "2019.10+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19.inc b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19.inc index 72353b11..2bf8992a 100644 --- a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19.inc +++ b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19.inc @@ -13,9 +13,6 @@ FILESEXTRAPATHS_prepend = "${THISDIR}/linux-bbe-4.19:" SRC_URI = "git://github.com/SanCloudLtd/linux.git;protocol=https;branch=${BRANCH}" -# Apply DTS changes to support Automotive Cape if requested -SRC_URI += '${@oe.utils.conditional("BBE_ENABLE_AUTOMOTIVE_CAPE", "1", "file://0001-Update-DTS-for-Automotive-Cape-ICU.patch", "", d)}' - S = "${WORKDIR}/git" do_configure_append() { diff --git a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19/0001-Update-DTS-for-Automotive-Cape-ICU.patch b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19/0001-Update-DTS-for-Automotive-Cape-ICU.patch deleted file mode 100644 index b1bb2214..00000000 --- a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19/0001-Update-DTS-for-Automotive-Cape-ICU.patch +++ /dev/null @@ -1,305 +0,0 @@ -From 86446c29c1818abdff438440b70b34a9390eb4b3 Mon Sep 17 00:00:00 2001 -From: Paul Barker <paul.barker@sancloud.co.uk> -Date: Mon, 20 May 2019 15:57:15 +0000 -Subject: [PATCH] Update DTS for Automotive Cape (ICU) - -Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk> ---- - arch/arm/boot/dts/am335x-sancloud-bbe.dts | 154 ++++++++++++++++++ - .../dt-bindings/board/am335x-bbw-bbb-base.h | 108 ++++++++++++ - 2 files changed, 262 insertions(+) - create mode 100644 include/dt-bindings/board/am335x-bbw-bbb-base.h - -diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe.dts b/arch/arm/boot/dts/am335x-sancloud-bbe.dts -index f2ec84683109..cb35368c975b 100644 ---- a/arch/arm/boot/dts/am335x-sancloud-bbe.dts -+++ b/arch/arm/boot/dts/am335x-sancloud-bbe.dts -@@ -10,6 +10,7 @@ - #include "am33xx.dtsi" - #include "am335x-bone-common.dtsi" - #include "am335x-boneblack-common.dtsi" -+#include <dt-bindings/board/am335x-bbw-bbb-base.h> - #include <dt-bindings/interrupt-controller/irq.h> - - / { -@@ -97,6 +98,46 @@ - AM33XX_IOPAD(0x868, PIN_INPUT | MUX_MODE7) /* gpmc_a10.gpio1_26 */ - >; - }; -+ -+ icu_led_pins: pinmux_icu_led_pins { -+ pinctrl-single,pins = < -+ BONE_P9_27 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* LED_1 */ -+ BONE_P9_25 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* LED_2 */ -+ BONE_P9_23 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* LED_3 */ -+ BONE_P9_42 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* LED_4 */ -+ BONE_P9_15 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* LED_5 */ -+ BONE_P9_24 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* LED_6 */ -+ >; -+ }; -+ -+ icu_i2c1_pins: pinmux_icu_i2c1_pins { -+ pinctrl-single,pins = < -+ BONE_P9_18 (PIN_INPUT_PULLUP | SLEWCTRL_SLOW | MUX_MODE2) /* I2C1_SDA */ -+ BONE_P9_17 (PIN_INPUT_PULLUP | SLEWCTRL_SLOW | MUX_MODE2) /* I2C1_SCL */ -+ >; -+ }; -+ -+ icu_can0_pins: pinmux_icu_can0_pins { -+ pinctrl-single,pins = < -+ BONE_P9_19 (PIN_INPUT_PULLUP | MUX_MODE2) /* CAN0_RXD */ -+ BONE_P9_20 (PIN_OUTPUT_PULLUP | MUX_MODE2) /* CAN0_TXD */ -+ >; -+ }; -+ -+ icu_vda_pins: pinmux_icu_vda_pins { -+ pinctrl-single,pins = < -+ BONE_P8_18 (PIN_INPUT | MUX_MODE7) /* RADIO */ -+ BONE_P8_15 (PIN_INPUT | MUX_MODE7) /* BEAM */ -+ BONE_P8_17 (PIN_INPUT | WAKEUP_EN | MUX_MODE7) /* IGNITION */ -+ >; -+ }; -+ -+ icu_wireless_pins: pinmux_icu_wireless_pins { -+ pinctrl-single,pins = < -+ BONE_P8_27 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* WIRELESS_OFF_N */ -+ BONE_P9_26 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* WIRELESS_RST_N */ -+ >; -+ }; - }; - - &mac { -@@ -142,3 +183,116 @@ - /* wifi on port 4 */ - }; - }; -+ -+&i2c1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&icu_i2c1_pins>; -+ status = "okay"; -+ clock-frequency = <400000>; -+ -+ rtc1@68 { -+ compatible = "dallas,ds1337"; -+ reg = <0x68>; -+ status = "okay"; -+ }; -+}; -+ -+&i2c2 { -+ /* Disable I2C2 as it shares pins with CAN0 */ -+ pinctrl-0 = ""; -+ status = "disabled"; -+}; -+ -+&dcan0 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&icu_can0_pins>; -+ status = "okay"; -+}; -+ -+/ { -+ icu_leds { -+ compatible = "gpio-leds"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&icu_led_pins>; -+ status = "okay"; -+ -+ icu_led@2 { -+ label = "beaglebone:red:led1"; -+ gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "mmc0"; -+ default-state = "off"; -+ }; -+ -+ icu_led@3 { -+ label = "beaglebone:green:led2"; -+ gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "heartbeat"; -+ default-state = "off"; -+ }; -+ -+ icu_led@1 { -+ label = "beaglebone:red:led3"; -+ gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "none"; -+ default-state = "off"; -+ }; -+ -+ icu_led@6 { -+ label = "beaglebone:green:led4"; -+ gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "none"; -+ default-state = "off"; -+ }; -+ -+ icu_led@5 { -+ label = "beaglebone:red:led5"; -+ gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "none"; -+ default-state = "off"; -+ }; -+ -+ icu_led@4 { -+ label = "beaglebone:green:led6"; -+ gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "none"; -+ default-state = "off"; -+ }; -+ }; -+ -+ icu_vda { -+ compatible = "gpio-keys"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&icu_vda_pins>; -+ status = "okay"; -+ -+ radio_pin { -+ label = "radio"; -+ linux,code = <0x3b>; /* KEY_F1 */ -+ gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; -+ gpio-key; -+ debounce-interval = <10>; -+ }; -+ -+ ignition_pin { -+ label = "ignition"; -+ linux,code = <0x8f>; /* KEY_WAKEUP */ -+ gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; -+ wakeup-source; -+ debounce-interval = <10>; -+ }; -+ -+ beam_pin { -+ label = "beam"; -+ linux,code = <0x3c>; /* KEY_F2 */ -+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; -+ gpio-key; -+ debounce-interval = <10>; -+ }; -+ }; -+}; -diff --git a/include/dt-bindings/board/am335x-bbw-bbb-base.h b/include/dt-bindings/board/am335x-bbw-bbb-base.h -new file mode 100644 -index 000000000000..ad745f042c70 ---- /dev/null -+++ b/include/dt-bindings/board/am335x-bbw-bbb-base.h -@@ -0,0 +1,108 @@ -+/* -+ * This header provides constants for bbw/bbb pinctrl bindings. -+ * -+ * Copyright (C) 2014 Robert Nelson <robertcnelson@gmail.com> -+ * -+ * Numbers Based on: https://github.com/derekmolloy/boneDeviceTree/tree/master/docs -+ */ -+ -+#ifndef _DT_BINDINGS_BOARD_AM335X_BBW_BBB_BASE_H -+#define _DT_BINDINGS_BOARD_AM335X_BBW_BBB_BASE_H -+ -+#define BONE_P8_03 0x018 -+#define BONE_P8_04 0x01C -+ -+#define BONE_P8_05 0x008 -+#define BONE_P8_06 0x00C -+#define BONE_P8_07 0x090 -+#define BONE_P8_08 0x094 -+ -+#define BONE_P8_09 0x09C -+#define BONE_P8_10 0x098 -+#define BONE_P8_11 0x034 -+#define BONE_P8_12 0x030 -+ -+#define BONE_P8_13 0x024 -+#define BONE_P8_14 0x028 -+#define BONE_P8_15 0x03C -+#define BONE_P8_16 0x038 -+ -+#define BONE_P8_17 0x02C -+#define BONE_P8_18 0x08C -+#define BONE_P8_19 0x020 -+#define BONE_P8_20 0x084 -+ -+#define BONE_P8_21 0x080 -+#define BONE_P8_22 0x014 -+#define BONE_P8_23 0x010 -+#define BONE_P8_24 0x004 -+ -+#define BONE_P8_25 0x000 -+#define BONE_P8_26 0x07C -+#define BONE_P8_27 0x0E0 -+#define BONE_P8_28 0x0E8 -+ -+#define BONE_P8_29 0x0E4 -+#define BONE_P8_30 0x0EC -+#define BONE_P8_31 0x0D8 -+#define BONE_P8_32 0x0DC -+ -+#define BONE_P8_33 0x0D4 -+#define BONE_P8_34 0x0CC -+#define BONE_P8_35 0x0D0 -+#define BONE_P8_36 0x0C8 -+ -+#define BONE_P8_37 0x0C0 -+#define BONE_P8_38 0x0C4 -+#define BONE_P8_39 0x0B8 -+#define BONE_P8_40 0x0BC -+ -+#define BONE_P8_41 0x0B0 -+#define BONE_P8_42 0x0B4 -+#define BONE_P8_43 0x0A8 -+#define BONE_P8_44 0x0AC -+ -+#define BONE_P8_45 0x0A0 -+#define BONE_P8_46 0x0A4 -+ -+#define BONE_P9_11 0x070 -+#define BONE_P9_12 0x078 -+ -+#define BONE_P9_13 0x074 -+#define BONE_P9_14 0x048 -+#define BONE_P9_15 0x040 -+#define BONE_P9_16 0x04C -+ -+#define BONE_P9_17 0x15C -+#define BONE_P9_18 0x158 -+#define BONE_P9_19 0x17C -+#define BONE_P9_20 0x178 -+ -+#define BONE_P9_21 0x154 -+#define BONE_P9_22 0x150 -+#define BONE_P9_23 0x044 -+#define BONE_P9_24 0x184 -+ -+#define BONE_P9_25 0x1AC -+#define BONE_P9_26 0x180 -+#define BONE_P9_27 0x1A4 -+#define BONE_P9_28 0x19C -+ -+#define BONE_P9_29 0x194 -+#define BONE_P9_30 0x198 -+#define BONE_P9_31 0x190 -+ -+/* Shared P21 of P11 */ -+#define BONE_P9_41 0x1B4 -+#define BONE_P9_41A 0x1B4 -+#define BONE_P9_41B 0x1A8 -+#define BONE_P9_91 0x1A8 -+ -+/* Shared P22 of P11 */ -+#define BONE_P9_42 0x164 -+#define BONE_P9_42A 0x164 -+#define BONE_P9_42B 0x1A0 -+#define BONE_P9_92 0x1A0 -+ -+#endif -+ --- -2.17.1 - diff --git a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-rt_4.19.bb b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-rt_4.19.bb index 13e59971..cea5de6e 100644 --- a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-rt_4.19.bb +++ b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-rt_4.19.bb @@ -1,5 +1,5 @@ BRANCH = "linux-sancloud-rt-4.19.y" -SRCREV = "9e7b03b168d0a75192cd186b7b1c952f6bbccc2c" -PV = "4.19.38+git${SRCPV}" +SRCREV = "8cab3d65bea71044d2efbe2b30cfa6ca5c1cd1ad" +PV = "4.19.94+git${SRCPV}" require linux-bbe-4.19.inc diff --git a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_4.19.bb b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_4.19.bb index f63ecee8..0aeabaef 100644 --- a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_4.19.bb +++ b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_4.19.bb @@ -1,5 +1,5 @@ BRANCH = "linux-sancloud-4.19.y" -SRCREV = "566ac4d5bf1a121d73a8355a87bbe97865b9a7dd" -PV = "4.19.38+git${SRCPV}" +SRCREV = "1657cbc7b7cf883f629ce5c0b05761401cbbf292" +PV = "4.19.94+git${SRCPV}" require linux-bbe-4.19.inc diff --git a/bsp/meta-ti/classes/ti-pdk-fetch.bbclass b/bsp/meta-ti/classes/ti-pdk-fetch.bbclass new file mode 100644 index 00000000..7108d001 --- /dev/null +++ b/bsp/meta-ti/classes/ti-pdk-fetch.bbclass @@ -0,0 +1,46 @@ +TI_PDK_GIT_URI ?= "git://git.ti.com/processor-sdk/pdk.git" +TI_PDK_GIT_BRANCH ?= "master" +TI_PDK_GIT_PROTOCOL ?= "git" +TI_PDK_SRCREV ?= "5ddf121a09af4ac58a18103848d4ab8e741e23d6" + +TI_PDK_VERSION ?= "2020.1.22" + +PV = "${TI_PDK_VERSION}" + +TI_PDK_COMP ?= "" +TI_PDK_COMP_PATH = "${@'${TI_PDK_COMP}'.replace('.','/')}" + +TI_PDK_SOURCE_PN = "ti-pdk-source" +TI_PDK_SOURCE_WORKDIR = "${TMPDIR}/work-shared/ti-pdk-${PV}" +TI_PDK_SOURCE = "${TI_PDK_SOURCE_WORKDIR}/git" + +S = "${WORKDIR}/git/${TI_PDK_COMP_PATH}" + +# Hard-link only required sources from PDK +python do_unpack_append() { + if len(d.getVar('TI_PDK_COMP') or '') > 0: + import shutil + + # Get src/dst paths + src = os.path.join(d.getVar('TI_PDK_SOURCE'),'packages',d.getVar('TI_PDK_COMP_PATH')) + s = d.getVar('S') + + # Set up the directory structure, except for the root of the sources + # hard-linked. + bb.utils.mkdirhier(s) + os.rmdir(s) + + # Recursively hard-link the sources + shutil.copytree(src, s, copy_function=os.link) + + # Recursively hard-link the git directory + shutil.copytree(os.path.join(d.getVar('TI_PDK_SOURCE'),'.git'), os.path.join(s,'.git'), copy_function=os.link) +} + +# Make sure that ti-pdk-source is unpacked before we set up the hardlinks. +python __anonymous () { + pn = d.getVar('PN') + pdk_src_pn = d.getVar('TI_PDK_SOURCE_PN') + if pn != pdk_src_pn: + d.appendVarFlag('do_unpack', 'depends', ' ${TI_PDK_SOURCE_PN}:do_unpack') +} diff --git a/bsp/meta-ti/classes/ti-pdk.bbclass b/bsp/meta-ti/classes/ti-pdk.bbclass index f0e6f2d2..a07fdbb3 100644 --- a/bsp/meta-ti/classes/ti-pdk.bbclass +++ b/bsp/meta-ti/classes/ti-pdk.bbclass @@ -9,8 +9,10 @@ DEPENDS_append_omap-a15 = " ti-cgt-arm-native" DEPENDS_remove_ti33x = "ti-cgt6x-native" DEPENDS_remove_ti43x = "ti-cgt6x-native" DEPENDS_append_omapl1 = " ti-cgt-arm-native" -DEPENDS_remove_k3 = "gcc-arm-none-eabi-native ti-cgt6x-native" -DEPENDS_append_k3 = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native" +DEPENDS_remove_am65xx = "gcc-arm-none-eabi-native ti-cgt6x-native" +DEPENDS_append_am65xx = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native" +DEPENDS_remove_j7-evm = "gcc-arm-none-eabi-native" +DEPENDS_append_j7-evm = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native ti-cgt7x-native" S = "${WORKDIR}/git" B = "${WORKDIR}/build" @@ -43,6 +45,7 @@ export TOOLCHAIN_PATH_A15 = "${GCC_ARM_NONE_TOOLCHAIN}" export TOOLCHAIN_PATH_M4 = "${M4_TOOLCHAIN_INSTALL_DIR}" export TOOLCHAIN_PATH_Arm9 = "${M4_TOOLCHAIN_INSTALL_DIR}" export C6X_GEN_INSTALL_PATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" +export C7X_GEN_INSTALL_PATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c7x" export TOOLCHAIN_PATH_EVE = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-arp32" export CL_PRU_INSTALL_PATH = "${TI_CGT_PRU_INSTALL_DIR}" export TOOLCHAIN_PATH_GCC_ARCH64 = "${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN}" @@ -59,7 +62,7 @@ export SECTTI="perl ${CG_XML_INSTALL_DIR}/ofd/sectti.pl" TI_PDK_XDCMAKE ?= "1" # By default, only build the cores with available toolchains -TI_PDK_LIMIT_CORES ?= "a15_0 ipu1_0 ipu1_1 ipu2_0 ipu2_1 c66x c66xdsp_1 c66xdsp_2 arm9_0 c674x a9host a8host pru_0 pru_1" +TI_PDK_LIMIT_CORES ?= "a15_0 ipu1_0 ipu1_1 ipu2_0 ipu2_1 mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66x c66xdsp_1 c66xdsp_2 c7x_1 arm9_0 c674x a9host a8host pru_0 pru_1" TI_PDK_LIMIT_SOCS ?= "" TI_PDK_LIMIT_BOARDS ?= "" TI_PDK_MAKE_TARGET ?= "release" @@ -68,7 +71,7 @@ TI_PDK_DOXYGEN_SUPPORT ?= "1" TI_PDK_XDC_ARGS ?= "${TI_PDK_LIMIT_SOCS}" -PARALLEL_XDC = "--jobs=${BB_NUMBER_THREADS}" +PARALLEL_XDC = "${@oe.utils.parallel_make_argument(d, '--jobs=%d')}" PARALLEL_MAKE = "" def get_doxygen_support(d): diff --git a/bsp/meta-ti/conf/machine/am335x-evm.conf b/bsp/meta-ti/conf/machine/am335x-evm.conf index 8bab7f07..3cb97d30 100644 --- a/bsp/meta-ti/conf/machine/am335x-evm.conf +++ b/bsp/meta-ti/conf/machine/am335x-evm.conf @@ -24,7 +24,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # UBI: logical eraseblock size: 126976 bytes # from ubiattach stdout: # UBI device number 0, total 1988 LEBs -MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8800" +MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 10200" # do ubiattach /dev/ubi_ctrl -m 7 -O 2048 # from dmesg: @@ -32,4 +32,4 @@ MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8800" # UBI: physical eraseblock size: 131072 bytes (128 KiB) # UBI: sub-page size: 512 # UBI: VID header offset: 2048 (aligned 2048) -UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048" +UBINIZE_ARGS ?= "-m 2048 -p 128KiB -s 512 -O 2048" diff --git a/bsp/meta-ti/conf/machine/am335x-hs-evm.conf b/bsp/meta-ti/conf/machine/am335x-hs-evm.conf index 5f789659..7caa5bfd 100644 --- a/bsp/meta-ti/conf/machine/am335x-hs-evm.conf +++ b/bsp/meta-ti/conf/machine/am335x-hs-evm.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: AM335x HS EVM -#@DESCRIPTION: Machine configuration for the TI AM435x HS EVM +#@DESCRIPTION: Machine configuration for the TI AM335x HS EVM require conf/machine/am335x-evm.conf diff --git a/bsp/meta-ti/conf/machine/am437x-evm.conf b/bsp/meta-ti/conf/machine/am437x-evm.conf index 8fdd5005..bd1053a4 100644 --- a/bsp/meta-ti/conf/machine/am437x-evm.conf +++ b/bsp/meta-ti/conf/machine/am437x-evm.conf @@ -22,7 +22,7 @@ SERIAL_CONSOLES = "115200;ttyS0" # UBI: logical eraseblock size: 253952 bytes # from ubiattach stdout: # UBI device number 0, total 994 LEBs -MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 4200" +MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 5000" # do ubiattach /dev/ubi_ctrl -m 11 -O 4096 # from dmesg: diff --git a/bsp/meta-ti/conf/machine/am57xx-evm.conf b/bsp/meta-ti/conf/machine/am57xx-evm.conf index cbfe2510..a0b1b532 100644 --- a/bsp/meta-ti/conf/machine/am57xx-evm.conf +++ b/bsp/meta-ti/conf/machine/am57xx-evm.conf @@ -12,6 +12,7 @@ SERIAL_CONSOLES = "115200;ttyS2" KERNEL_DEVICETREE = " \ am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb \ + am5729-beagleboneai.dtb \ am57xx-evm.dtb am57xx-evm-cam-mt9t111.dtb am57xx-evm-cam-ov10635.dtb \ am57xx-evm-reva3.dtb am57xx-evm-reva3-cam-mt9t111.dtb am57xx-evm-reva3-cam-ov10635.dtb \ am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb \ diff --git a/bsp/meta-ti/conf/machine/am65xx-evm.conf b/bsp/meta-ti/conf/machine/am65xx-evm.conf index 1113dbc9..82959ce3 100644 --- a/bsp/meta-ti/conf/machine/am65xx-evm.conf +++ b/bsp/meta-ti/conf/machine/am65xx-evm.conf @@ -8,7 +8,8 @@ MACHINE_FEATURES += "touchscreen" IMAGE_FSTYPES += "tar.xz wic.xz" -SERIAL_CONSOLES = "115200;ttyS2" +SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = " \ ti/k3-am654-base-board.dtb ti/k3-am654-gp.dtbo \ @@ -16,6 +17,8 @@ KERNEL_DEVICETREE = " \ ti/k3-am654-evm-csi2-ov490.dtbo ti/k3-am654-evm-csi2-ov5640.dtbo \ ti/k3-am654-evm-oldi-lcd1evm.dtbo ti/k3-am654-evm-tc358876.dtbo \ ti/k3-am654-pcie-usb2.dtbo ti/k3-am654-pcie-usb3.dtbo \ + ti/k3-am654-base-board-jailhouse.dtbo \ + ti/k3-am654-evm-prupwm.dtbo \ " UBOOT_MACHINE = "am65x_evm_a53_defconfig" @@ -24,7 +27,10 @@ OPTEEMACHINE = "k3" OPTEEFLAVOR = "am65x" OPTEEOUTPUTMACHINE = "k3" -WKS_FILE = "sdimage-bootpart.wks" -IMAGE_BOOT_FILES = "u-boot.img" +# Please note that booting AM65xx platform also requires +# tiboot3.bin and sysfw.itb, which are provided by meta-arago +# u-boot-k3-r5 and ti-sci-fw recipes +IMAGE_BOOT_FILES = "tispl.bin u-boot.img" +WKS_FILE ?= "sdimage-bootpart.wks" -do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy" +do_image_wic[depends] += "u-boot:do_deploy" diff --git a/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf b/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf index 97afd317..f9897504 100644 --- a/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf +++ b/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf @@ -6,10 +6,13 @@ require conf/machine/am65xx-evm.conf UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" +UBOOT_ENTRYPOINT = "0x80080000" +UBOOT_LOADADDRESS = "0x80080000" +UBOOT_RD_LOADADDRESS = "0x84000000" +UBOOT_RD_ENTRYPOINT = "0x84000000" +UBOOT_DTB_LOADADDRESS = "0x83000000" +UBOOT_DTBO_LOADADDRESS = "0x83080000" +UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" SPL_BINARYNAME = "tispl.bin" diff --git a/bsp/meta-ti/conf/machine/beagle-x15.conf b/bsp/meta-ti/conf/machine/beagle-x15.conf index 275a5ce0..d5e05ec7 100644 --- a/bsp/meta-ti/conf/machine/beagle-x15.conf +++ b/bsp/meta-ti/conf/machine/beagle-x15.conf @@ -12,12 +12,10 @@ SERIAL_CONSOLES = "115200;ttyS2" UBOOT_MACHINE = "am57xx_evm_config" -WKS_FILE = "sdimage-bootpart.wks" +WKS_FILE ?= "sdimage-bootpart.wks" IMAGE_BOOT_FILES = "MLO u-boot.img" IMAGE_FSTYPES += "tar.xz wic.xz" -do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" - # UBI information. Note that this is board and kernel specific. Changes # in your kernel port may require changes in these variables. For more # details about this board please see diff --git a/bsp/meta-ti/conf/machine/beaglebone.conf b/bsp/meta-ti/conf/machine/beaglebone.conf index 450a1893..d8fd4062 100644 --- a/bsp/meta-ti/conf/machine/beaglebone.conf +++ b/bsp/meta-ti/conf/machine/beaglebone.conf @@ -13,9 +13,8 @@ MACHINE_GUI_CLASS = "bigscreen" SERIAL_CONSOLES = "115200;ttyS0" -WKS_FILE = "sdimage-bootpart.wks" +WKS_FILE ?= "sdimage-bootpart.wks" -do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY}" IMAGE_FSTYPES += "tar.xz wic.xz" diff --git a/bsp/meta-ti/conf/machine/include/k3.inc b/bsp/meta-ti/conf/machine/include/k3.inc index 22fdeb9c..8b836ea8 100644 --- a/bsp/meta-ti/conf/machine/include/k3.inc +++ b/bsp/meta-ti/conf/machine/include/k3.inc @@ -29,5 +29,5 @@ MACHINE_GUI_CLASS = "smallscreen" UBI_VOLNAME = "rootfs" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci sgx" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci gpu" # Not ready yet - dsp mmip diff --git a/bsp/meta-ti/conf/machine/include/omap-a15.inc b/bsp/meta-ti/conf/machine/include/omap-a15.inc index 233b45f4..cc055365 100644 --- a/bsp/meta-ti/conf/machine/include/omap-a15.inc +++ b/bsp/meta-ti/conf/machine/include/omap-a15.inc @@ -36,4 +36,4 @@ MACHINE_GUI_CLASS = "smallscreen" UBI_VOLNAME = "rootfs" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx mmip dsp" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp" diff --git a/bsp/meta-ti/conf/machine/include/omap3.inc b/bsp/meta-ti/conf/machine/include/omap3.inc index 9270cbb1..489f1f9a 100644 --- a/bsp/meta-ti/conf/machine/include/omap3.inc +++ b/bsp/meta-ti/conf/machine/include/omap3.inc @@ -39,4 +39,4 @@ UBOOT_LOADADDRESS = "0x80008000" EXTRA_IMAGEDEPENDS += "u-boot" # List common SoC features, may need to add touchscreen/ethernet for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa sgx" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa gpu" diff --git a/bsp/meta-ti/conf/machine/include/ti33x.inc b/bsp/meta-ti/conf/machine/include/ti33x.inc index 5a0ad541..5ff6efea 100644 --- a/bsp/meta-ti/conf/machine/include/ti33x.inc +++ b/bsp/meta-ti/conf/machine/include/ti33x.inc @@ -30,8 +30,9 @@ KERNEL_DEVICETREE = " \ am335x-evm.dtb am335x-evmsk.dtb \ am335x-icev2.dtb am335x-icev2-prueth.dtb \ am335x-pocketbeagle.dtb am335x-bone.dtb am335x-boneblue.dtb \ - am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \ + am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ + am335x-boneblack-prusuart.dtb am335x-sancloud-bbe.dtb \ " KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}" @@ -52,7 +53,7 @@ UBI_VOLNAME = "rootfs" EXTRA_IMAGEDEPENDS += "u-boot" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu" # Set the list of device targets for ti-pdk class recipes TI_PDK_LIMIT_SOCS = "am335x" diff --git a/bsp/meta-ti/conf/machine/include/ti43x.inc b/bsp/meta-ti/conf/machine/include/ti43x.inc index d966eaf2..a0cc9cc7 100644 --- a/bsp/meta-ti/conf/machine/include/ti43x.inc +++ b/bsp/meta-ti/conf/machine/include/ti43x.inc @@ -50,7 +50,7 @@ UBI_VOLNAME = "rootfs" EXTRA_IMAGEDEPENDS += "u-boot" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu" # Set the list of device targets for ti-pdk class recipes TI_PDK_LIMIT_SOCS = "am437x" diff --git a/bsp/meta-ti/conf/machine/j7-evm.conf b/bsp/meta-ti/conf/machine/j7-evm.conf new file mode 100644 index 00000000..318435d9 --- /dev/null +++ b/bsp/meta-ti/conf/machine/j7-evm.conf @@ -0,0 +1,37 @@ +#@TYPE: Machine +#@NAME: J7 EVM +#@DESCRIPTION: Machine configuration for the TI J7 EVM + +require conf/machine/include/k3.inc + +IMAGE_FSTYPES += "tar.xz wic.xz" + +SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +KERNEL_DEVICETREE = " \ + ti/k3-j721e-common-proc-board.dtb \ + ti/k3-j721e-proc-board-tps65917.dtb \ + ti/k3-j721e-common-proc-board-infotainment.dtbo \ + ti/k3-j721e-common-proc-board-infotainment-display-sharing.dtbo \ + ti/k3-j721e-common-proc-board-jailhouse.dtbo \ +" + +UBOOT_MACHINE = "j721e_evm_a72_config" + +OPTEEMACHINE = "k3" +OPTEEFLAVOR = "j7" +OPTEEOUTPUTMACHINE = "k3" + +# Please note that booting J7 platform also requires +# tiboot3.bin and sysfw.itb, which are provided by meta-arago +# u-boot-k3-r5 and ti-sci-fw recipes +IMAGE_BOOT_FILES = "tispl.bin u-boot.img" +WKS_FILE ?= "sdimage-bootpart.wks" + +do_image_wic[depends] += "u-boot:do_deploy" + +# Set the list of device targets for ti-pdk class recipes +TI_PDK_LIMIT_SOCS = "j721e j7200" +TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm" +TI_PDK_LIMIT_CORES = "mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66xdsp_1 c66xdsp_2 c7x_1" diff --git a/bsp/meta-ti/conf/machine/k2e-evm.conf b/bsp/meta-ti/conf/machine/k2e-evm.conf index e9f500f1..662f5c89 100644 --- a/bsp/meta-ti/conf/machine/k2e-evm.conf +++ b/bsp/meta-ti/conf/machine/k2e-evm.conf @@ -22,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = "" # UBI: logical eraseblock size: 126976 bytes # from ubiattach stdout: # UBI device number 0, total 3856 LEBs -MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4000" +MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856" # do ubiattach /dev/ubi_ctrl -m 4 # from dmesg: diff --git a/bsp/meta-ti/conf/machine/k2g-evm.conf b/bsp/meta-ti/conf/machine/k2g-evm.conf index a8ddc667..7681a752 100644 --- a/bsp/meta-ti/conf/machine/k2g-evm.conf +++ b/bsp/meta-ti/conf/machine/k2g-evm.conf @@ -25,7 +25,7 @@ SYSVINIT_ENABLED_GETTYS = "" # UBI: logical eraseblock size: 253952 bytes # from ubiattach stdout: # UBI device number 0, total 1926 LEBs -MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2000" +MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1926" # do ubiattach /dev/ubi_ctrl -m 4 # from dmesg: diff --git a/bsp/meta-ti/conf/machine/k2hk-evm.conf b/bsp/meta-ti/conf/machine/k2hk-evm.conf index de79de9a..89386f1d 100644 --- a/bsp/meta-ti/conf/machine/k2hk-evm.conf +++ b/bsp/meta-ti/conf/machine/k2hk-evm.conf @@ -22,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = "" # UBI: logical eraseblock size: 126976 bytes # from ubiattach stdout: # UBI device number 0, total 3856 LEBs -MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4000" +MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856" # do ubiattach /dev/ubi_ctrl -m 4 # from dmesg: diff --git a/bsp/meta-ti/conf/machine/k2l-evm.conf b/bsp/meta-ti/conf/machine/k2l-evm.conf index e326ba24..dddc01f1 100644 --- a/bsp/meta-ti/conf/machine/k2l-evm.conf +++ b/bsp/meta-ti/conf/machine/k2l-evm.conf @@ -22,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = "" # UBI: logical eraseblock size: 253952 bytes # from ubiattach stdout: # UBI device number 0, total 1926 LEBs -MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2000" +MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1926" # do ubiattach /dev/ubi_ctrl -m 4 # from dmesg: diff --git a/bsp/meta-ti/conf/machine/lego-ev3.conf b/bsp/meta-ti/conf/machine/lego-ev3.conf index 5c425221..5b89a6a7 100644 --- a/bsp/meta-ti/conf/machine/lego-ev3.conf +++ b/bsp/meta-ti/conf/machine/lego-ev3.conf @@ -17,6 +17,6 @@ KERNEL_DEVICETREE_BUNDLE = "1" SERIAL_CONSOLES = "115200;ttyS1" IMAGE_FSTYPES += " wic" -WKS_FILE = "sdimage-bootpart.wks" +WKS_FILE ?= "sdimage-bootpart.wks" WIC_CREATE_EXTRA_ARGS += " --no-fstab-update" IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPES}" diff --git a/bsp/meta-ti/conf/machine/pandaboard.conf b/bsp/meta-ti/conf/machine/pandaboard.conf index f01472d9..edfc612b 100644 --- a/bsp/meta-ti/conf/machine/pandaboard.conf +++ b/bsp/meta-ti/conf/machine/pandaboard.conf @@ -13,4 +13,4 @@ KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb" SERIAL_CONSOLES = "115200;ttyS2" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx" +MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat gpu" diff --git a/bsp/meta-ti/recipes-bsp/aif2-lld/aif2-lld.inc b/bsp/meta-ti/recipes-bsp/aif2-lld/aif2-lld.inc index 65b12cb4..718f3a7f 100644 --- a/bsp/meta-ti/recipes-bsp/aif2-lld/aif2-lld.inc +++ b/bsp/meta-ti/recipes-bsp/aif2-lld/aif2-lld.inc @@ -2,21 +2,13 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea" -AIF2_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/aif2-lld.git" -AIF2_LLD_GIT_PROTOCOL = "git" -AIF2_LLD_GIT_BRANCH = "master" -AIF2_LLD_GIT_DESTSUFFIX = "git/ti/drv/aif2" +inherit ti-pdk-fetch -# The following commit correspond to DEV.AIF2LLD.01.02.00.02A -AIF2_LLD_SRCREV = "3eecba9b3b07b0c8fc39daa79fe4e8204e5d0e0e" +TI_PDK_COMP = "ti.drv.aif2" -BRANCH = "${AIF2_LLD_GIT_BRANCH}" -SRC_URI = "${AIF2_LLD_GIT_URI};destsuffix=${AIF2_LLD_GIT_DESTSUFFIX};protocol=${AIF2_LLD_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${AIF2_LLD_SRCREV}" +PE = "1" -PV = "1.2.0.2A" INC_PR = "r0" COMPATIBLE_MACHINE = "k2hk" -S = "${WORKDIR}/${AIF2_LLD_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/aif2-lld/aif2-lld_git.bb b/bsp/meta-ti/recipes-bsp/aif2-lld/aif2-lld_git.bb index f310b17b..12b1d06d 100644 --- a/bsp/meta-ti/recipes-bsp/aif2-lld/aif2-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/aif2-lld/aif2-lld_git.bb @@ -14,4 +14,5 @@ do_compile () { do_install () { oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} + chown -R root:root ${D} } diff --git a/bsp/meta-ti/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.0.bb b/bsp/meta-ti/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb index 25f82f12..f15570cf 100644 --- a/bsp/meta-ti/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.0.bb +++ b/bsp/meta-ti/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb @@ -7,7 +7,7 @@ Power State Coordination Interface (PSCI), Trusted Board Boot Requirements \ HOMEPAGE = "http://infocenter.arm.com/help/topic/com.arm.doc.dui0928e/CJHIDGJF.html" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://license.rst;md5=c709b197e22b81ede21109dbffd5f363" +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" inherit deploy @@ -22,7 +22,7 @@ PV_append = "+git${SRCPV}" BRANCH = "ti-atf" SRC_URI = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH}" -SRCREV ?= "ee0d515f0577d96ca32278e7cccb6fd768d1b83d" +SRCREV ?= "e516a389ac12fbe1597f61fea80ed3f230b9c5fd" # Make ATF "aware" of OPTEE, no build dependency PACKAGECONFIG[optee] = "SPD=opteed" diff --git a/bsp/meta-ti/recipes-bsp/bcp-lld/bcp-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/bcp-lld/bcp-lld-rtos_git.bb index 61b4dfc0..62cee07b 100644 --- a/bsp/meta-ti/recipes-bsp/bcp-lld/bcp-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/bcp-lld/bcp-lld-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI Bit Coprocessor (BCP) low level driver" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.bcp" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://bcp.h;beginline=1;endline=40;md5=4f6e6128dd075a89548c0287a39b8896" @@ -8,22 +12,8 @@ LIC_FILES_CHKSUM = "file://bcp.h;beginline=1;endline=40;md5=4f6e6128dd075a89548c COMPATIBLE_MACHINE = "k2hk|k2l|c667x-evm" PACKAGE_ARCH = "${MACHINE_ARCH}" -BCP_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/bcp-lld.git" -BCP_LLD_GIT_PROTOCOL = "git" -BCP_LLD_GIT_BRANCH = "master" -BCP_LLD_GIT_DESTSUFFIX = "git/ti/drv/bcp" - -# Below commit ID corresponds to "DEV.BCP_LLD.02.01.00.07A" -BCP_LLD_SRCREV = "da66f02398ebef70f69a8703e6755985010eb422" - -BRANCH = "${BCP_LLD_GIT_BRANCH}" -SRC_URI = "${BCP_LLD_GIT_URI};destsuffix=${BCP_LLD_GIT_DESTSUFFIX};protocol=${BCP_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${BCP_LLD_SRCREV}" -PV = "02.01.00.07A" PR = "r0" -S = "${WORKDIR}/${BCP_LLD_GIT_DESTSUFFIX}" DEPENDS_append = " qmss-lld-rtos \ cppi-lld-rtos \ diff --git a/bsp/meta-ti/recipes-bsp/board-rtos/board-rtos_git.bb b/bsp/meta-ti/recipes-bsp/board-rtos/board-rtos_git.bb index d85f8c94..99530d19 100644 --- a/bsp/meta-ti/recipes-bsp/board-rtos/board-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/board-rtos/board-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI RTOS Board Library" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.board" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://board.h;beginline=1;endline=32;md5=9bed8e4ac2fb37fc627cefe49eb1c919" @@ -8,18 +12,8 @@ LIC_FILES_CHKSUM = "file://board.h;beginline=1;endline=32;md5=9bed8e4ac2fb37fc62 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c66x|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -BOARD_GIT_URI = "git://git.ti.com/keystone-rtos/board.git" -BOARD_GIT_PROTOCOL = "git" -BOARD_GIT_BRANCH = "master" - -# Below commit ID corresponds to "DEV.BOARD.01.00.10.04C" -BOARD_SRCREV = "e794b8d6a58dc800cb406b05f45b46652c9d4f4c" -BRANCH ="${BOARD_GIT_BRANCH}" -SRC_URI = "${BOARD_GIT_URI};protocol=${BOARD_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${BOARD_SRCREV}" -PV = "01.00.10.04C" PR = "r0" DEPENDS_append = " i2c-lld-rtos \ @@ -61,10 +55,13 @@ DEPENDS_append_dra7xx = " pm-lld-rtos \ mmcsd-lld-rtos \ " -DEPENDS_append_k3 = " sciclient-rtos \ +DEPENDS_append_am65xx = " sciclient-rtos \ pm-lld-rtos \ " - +DEPENDS_append_j7-evm = " udma-lld-rtos \ + sciclient-rtos \ + mmcsd-lld-rtos \ +" # Build with make instead of XDC TI_PDK_XDCMAKE = "0" diff --git a/bsp/meta-ti/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb b/bsp/meta-ti/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb new file mode 100644 index 00000000..70c28671 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb @@ -0,0 +1,28 @@ +SUMMARY = "Cadence MHDP DP bridge firmware" + +LICENSE = "BSD-3-Clause | Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0" + +PV = "1.2.17" +PR = "r0" + +CLEANBROKEN = "1" + +COMPATIBLE_MACHINE = "j7-evm" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +SRCREV = "7bad9a69a343e01056ece5ce6da4d4060c42f6bc" +BRANCH ?= "ti-linux-firmware" + +SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}" + +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} +} + +FILES_${PN} = "${base_libdir}/firmware" diff --git a/bsp/meta-ti/recipes-bsp/cal-lld/cal-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/cal-lld/cal-lld-rtos_git.bb new file mode 100644 index 00000000..f3c780f6 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/cal-lld/cal-lld-rtos_git.bb @@ -0,0 +1,76 @@ +SUMMARY = "TI RTOS low level driver for CAL" + +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.cal" + +PE = "1" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://cal.h;beginline=1;endline=31;md5=83d177cf3df55c16b27ae4102b6ade9a" + +COMPATIBLE_MACHINE = "k3" +PACKAGE_ARCH = "${MACHINE_ARCH}" + + +PR = "r0" + +DEPENDS_append = " osal-rtos \ + fvid2-rtos \ +" + +# Build with make instead of XDC +TI_PDK_XDCMAKE = "0" + +CAL_PACKAGE_BASE = "${WORKDIR}/cal_base" +CAL_LLD_ROOTPATH = "${CAL_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv/cal" + +export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages" +export PDK_CAL_ROOT_PATH = "${CAL_PACKAGE_BASE}/package/all/pdk_/packages" + +LIMSOCS = "" +LIMSOCS_am65xx-evm = "am65xx" +LIMSOCS_am65xx-hs-evm = "am65xx" + +LIMBOARDS = "" +LIMBOARDS_am65xx-evm = "am65xx_evm" +LIMBOARDS_am65xx-hs-evm = "am65xx_evm" + +BOARD_PACKAGE = "" +BOARD_PACKAGE_am65xx-evm = "am65xx_evm" +BOARD_PACKAGE_am65xx-hs-evm = "am65xx_evm" + +# HTML doc link params +PDK_COMP_LINK_TEXT = "CAL" + +do_configure() { + rm -rf ${CAL_PACKAGE_BASE} + cd ${S} + + # remove any previous package + rm -f ${CAL_PACKAGE_BASE} + + # make the release package before building it + make package BOARD=${BOARD_PACKAGE} DEST_ROOT=${CAL_PACKAGE_BASE} PDK_CAL_COMP_PATH=${S} +} + +do_compile() { + echo "cal lld root path is ${CAL_LLD_ROOTPATH}" + cd ${CAL_LLD_ROOTPATH} + + # Build am65xx libraries + make clean lib xdc_meta doxygen LIMIT_SOCS="${LIMSOCS}" LIMIT_BOARDS="${LIMBOARDS}" + + #archive + tar -cf cal_lld.tar --exclude='*.tar' ./* +} + +do_install() { + cd ${CAL_LLD_ROOTPATH} + install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/cal + find -name "*.tar" -exec tar xf {} --no-same-owner -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/cal \; +} + +FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages" + +INSANE_SKIP_${PN} = "arch ldflags" diff --git a/bsp/meta-ti/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb b/bsp/meta-ti/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb index b9a3b0fa..bbbc3ec1 100644 --- a/bsp/meta-ti/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb +++ b/bsp/meta-ti/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb @@ -24,5 +24,6 @@ do_install() { } FILES_${PN} += "${base_libdir}/firmware" -COMPATIBLE_HOST ?= "null" -COMPATIBLE_HOST_ti-soc = "(.*)" + +COMPATIBLE_MACHINE = "(ti-soc)" +TOOLCHAIN = "gcc" diff --git a/bsp/meta-ti/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb b/bsp/meta-ti/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb index 0a6d5f28..98b2d136 100644 --- a/bsp/meta-ti/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb @@ -19,3 +19,4 @@ PDK_COMP_LINK_TEXT = "CSL-Chip Support Library" # Workaround: dra7xx build requires am57xx CSL libraries for opencl-monitor TI_PDK_LIMIT_SOCS_append_dra7xx = " am571x am572x am574x" +TI_PDK_LIMIT_BOARDS_append_dra7xx = " evmAM571x evmAM572x idkAM574x" diff --git a/bsp/meta-ti/recipes-bsp/common-csl-ip/common-csl-ip.inc b/bsp/meta-ti/recipes-bsp/common-csl-ip/common-csl-ip.inc index ff6b9c9c..e728dbae 100644 --- a/bsp/meta-ti/recipes-bsp/common-csl-ip/common-csl-ip.inc +++ b/bsp/meta-ti/recipes-bsp/common-csl-ip/common-csl-ip.inc @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21" COMPATIBLE_MACHINE = "keystone|dra7xx|ti33x|ti43x|omapl1" -PV = "03.03.00.14D" +PV = "03.03.00.16B" INC_PR = "r0" PE = "1" @@ -13,8 +13,8 @@ CSL_GIT_PROTOCOL ="git" CSL_GIT_BRANCH = "release" CSL_GIT_DESTSUFFIX = "git" -# Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.14D" -CSL_SRCREV = "192be8698c81d31ba096892ca252a25089923823" +# Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.16B" +CSL_SRCREV = "8a2d724e8ef850c32a7ba8e12f729ce611171469" BRANCH="${CSL_GIT_BRANCH}" SRC_URI = "${CSL_GIT_URI};protocol=${CSL_GIT_PROTOCOL};branch=${BRANCH};destsuffix=${CSL_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/common-csl-ip/csl-rti-dwwdtest-fw_git.bb b/bsp/meta-ti/recipes-bsp/common-csl-ip/csl-rti-dwwdtest-fw_git.bb new file mode 100644 index 00000000..55e583b4 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/common-csl-ip/csl-rti-dwwdtest-fw_git.bb @@ -0,0 +1,77 @@ +SUMMARY = "MCU Watchdog test firmware" +DESCRIPTION = "Firmware for the R5F core to test the detection of watchdog timeout events to trigger SOC reset though DMSC." + +require recipes-bsp/common-csl-ip/common-csl-ip.inc +require recipes-ti/includes/ti-paths.inc + +LIC_FILES_CHKSUM = "file://../../../COPYING.txt;md5=5857833e20836213677fac33f9aded21" + +S = "${WORKDIR}/${CSL_GIT_DESTSUFFIX}/example/rti/rti_dwwdtest_app" + +COMPATIBLE_MACHINE = "am65xx" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +DEPENDS = "ti-cgt-arm-native \ + ti-pdk-build-rtos \ + uart-lld-rtos \ + board-rtos \ + sciclient-rtos \ + udma-lld-rtos" + +export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages" +export TOOLCHAIN_PATH_R5 = "${M4_TOOLCHAIN_INSTALL_DIR}" + +EXTRA_OEMAKE = "WDT_RESET=enable DEST_ROOT=${S}" + +do_compile() { + for soc in ${TI_PDK_LIMIT_SOCS} + do + for board in ${TI_PDK_LIMIT_BOARDS} + do + oe_runmake SOC=$soc BOARD=$board + done + done +} + +do_install() { + install -d ${D}${base_libdir}/firmware/rti_dwwdtest + + for board in ${TI_PDK_LIMIT_BOARDS} + do + install -d ${D}${base_libdir}/firmware/rti_dwwdtest/$board + install -m 0644 csl_rti_dwwd_test_app/bin/$board/csl_rti_dwwd_test_app_mcu1_0_release.xer5f \ + ${D}${base_libdir}/firmware/rti_dwwdtest/$board + done +} + +# Create separate package for each firmware so we can utilize +# update-alternatives. +PACKAGES =+ "${PN}-evm ${PN}-idk" +RDEPENDS_${PN} = "${PN}-evm ${PN}-idk" +ALLOW_EMPTY_${PN} = "1" + +FILES_${PN}-evm = "${base_libdir}/firmware/rti_dwwdtest/am65xx_evm" +FILES_${PN}-idk = "${base_libdir}/firmware/rti_dwwdtest/am65xx_idk" + +# We are packaging R5 firmware +INSANE_SKIP_${PN}-evm = "arch" +INSANE_SKIP_${PN}-idk = "arch" + +# Configure update-alternatives as there may be other firmwares provided in an +# image. +inherit update-alternatives + +# It might be nice to dynamically declare the following based on +# TI_PDK_LIMIT_BOARDS, but that is probably overkill. +ALTERNATIVE_${PN}-evm = "am65x-mcu-r5f0_0-fw" +ALTERNATIVE_${PN}-idk = "am65x-mcu-r5f0_0-fw" + +ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/am65x-mcu-r5f0_0-fw" + +ALTERNATIVE_TARGET_${PN}-evm = "${base_libdir}/firmware/rti_dwwdtest/am65xx_evm/csl_rti_dwwd_test_app_mcu1_0_release.xer5f" +ALTERNATIVE_TARGET_${PN}-idk = "${base_libdir}/firmware/rti_dwwdtest/am65xx_idk/csl_rti_dwwd_test_app_mcu1_0_release.xer5f" + +# Use a lesser priority than ipc example fw +# See meta-ti/recipes-ti/ipc/ti-ipc-rtos_git.bb +ALTERNATIVE_PRIORITY_${PN}-evm = "4" +ALTERNATIVE_PRIORITY_${PN}-idk = "3" diff --git a/bsp/meta-ti/recipes-bsp/cppi-lld/cppi-lld.inc b/bsp/meta-ti/recipes-bsp/cppi-lld/cppi-lld.inc index 5aea1ebe..40810f7f 100644 --- a/bsp/meta-ti/recipes-bsp/cppi-lld/cppi-lld.inc +++ b/bsp/meta-ti/recipes-bsp/cppi-lld/cppi-lld.inc @@ -4,19 +4,12 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/cppi/COPYING.txt;md5=e8f6789acd COMPATIBLE_MACHINE = "keystone" PACKAGE_ARCH = "${MACHINE_ARCH}" -CPPI_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/cppi-lld.git" -CPPI_LLD_GIT_PROTOCOL = "git" -CPPI_LLD_GIT_BRANCH = "master" -CPPI_LLD_GIT_DESTSUFFIX = "git/ti/drv/cppi" +inherit ti-pdk-fetch -# Below Commit ID corresponds to "DEV.CPPI_LLD.02.01.00.14" -CPPI_LLD_SRCREV = "10d3fbc0231073027991d797e9406a9585058691" +TI_PDK_COMP = "ti.drv.cppi" -BRANCH = "${CPPI_LLD_GIT_BRANCH}" -SRC_URI = "${CPPI_LLD_GIT_URI};destsuffix=${CPPI_LLD_GIT_DESTSUFFIX};protocol=${CPPI_LLD_GIT_PROTOCOL};branch=${BRANCH}" +PE = "1" -SRCREV = "${CPPI_LLD_SRCREV}" -PV = "02.01.00.14" INC_PR = "r0" DEVICELIST = "k2h k2k k2l k2e" @@ -24,4 +17,3 @@ DEVICELIST_k2hk = "k2h k2k" DEVICELIST_k2l = "k2l" DEVICELIST_k2e = "k2e" -S = "${WORKDIR}/${CPPI_LLD_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb b/bsp/meta-ti/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb new file mode 100644 index 00000000..cbd71f2d --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb @@ -0,0 +1,43 @@ +SUMMARY = "R5 PSDK CPSW9G Ethernet Switch Firmware" + +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=04ad0a015d4bb63c2b9e7b112debf3db" + +PV = "6.2+git${SRCPV}" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit deploy +inherit update-alternatives + +PROTOCOL = "git" +BRANCH = "master" +SRCREV = "4da71504488450f34d65459c1de949da1f984471" + +SRC_URI = "git://git.ti.com/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}" + +S = "${WORKDIR}/git" + +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" + +do_install() { + install -d ${D}${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 +} + +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_PRIORITY = "17" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INSANE_SKIP_${PN} += "arch" + +do_compile[noexec] = "1" +do_configure[noexec] = "1" diff --git a/bsp/meta-ti/recipes-bsp/cuia/cuia_1.0.0.13.bb b/bsp/meta-ti/recipes-bsp/cuia/cuia_1.0.0.13.bb index a7caf504..0422b0ef 100644 --- a/bsp/meta-ti/recipes-bsp/cuia/cuia_1.0.0.13.bb +++ b/bsp/meta-ti/recipes-bsp/cuia/cuia_1.0.0.13.bb @@ -26,3 +26,5 @@ do_install() { COMPATIBLE_HOST ?= "null" COMPATIBLE_HOST_ti-soc = "(.*)" + +INSANE_SKIP_${PN} += "textrel" diff --git a/bsp/meta-ti/recipes-bsp/dfe-lld/dfe-lld.inc b/bsp/meta-ti/recipes-bsp/dfe-lld/dfe-lld.inc index 01177578..9ac317d4 100644 --- a/bsp/meta-ti/recipes-bsp/dfe-lld/dfe-lld.inc +++ b/bsp/meta-ti/recipes-bsp/dfe-lld/dfe-lld.inc @@ -2,21 +2,13 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=1f4217b705bf98762a302fd720649dcc" -DFE_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/dfe-lld.git" -DFE_LLD_GIT_PROTOCOL = "git" -DFE_LLD_GIT_BRANCH = "master" -DFE_LLD_GIT_DESTSUFFIX = "git/ti/drv/dfe" +inherit ti-pdk-fetch -# Below commit ID corresponds to "DEV.DFE_LLD.01.00.00.09" -DFE_LLD_SRCREV = "da6a84069837b5c9b7a4bdb8824d8a4295866b14" +TI_PDK_COMP = "ti.drv.dfe" -BRANCH = "${DFE_LLD_GIT_BRANCH}" -SRC_URI = "${DFE_LLD_GIT_URI};destsuffix=${DFE_LLD_GIT_DESTSUFFIX};protocol=${DFE_LLD_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${DFE_LLD_SRCREV}" +PE = "1" -PV = "1.0.0.9" INC_PR = "r0" COMPATIBLE_MACHINE = "k2l" -S = "${WORKDIR}/${DFE_LLD_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/edma3-lld/edma3-lld.inc b/bsp/meta-ti/recipes-bsp/edma3-lld/edma3-lld.inc index 9efb076c..34d3170f 100644 --- a/bsp/meta-ti/recipes-bsp/edma3-lld/edma3-lld.inc +++ b/bsp/meta-ti/recipes-bsp/edma3-lld/edma3-lld.inc @@ -6,12 +6,12 @@ EDMA3_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git" EDMA3_LLD_GIT_PROTOCOL = "git" EDMA3_LLD_GIT_BRANCH = "master" -# Below commit ID corresponds to version 2.12.05.30D -EDMA3_LLD_SRCREV = "20750e17302116f3760aba68f8323ae110d1cbd0" +# Below commit ID corresponds to version 2.12.05.30E +EDMA3_LLD_SRCREV = "ce5ced2ac5eb1e0f1515288d279f5690813b5413" BRANCH = "${EDMA3_LLD_GIT_BRANCH}" SRC_URI = "${EDMA3_LLD_GIT_URI};protocol=${EDMA3_LLD_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${EDMA3_LLD_SRCREV}" -PV = "2.12.05.30D" -INC_PR = "r0" +PV = "2.12.05.30E" +INC_PR = "r1" diff --git a/bsp/meta-ti/recipes-bsp/emac-lld/emac-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/emac-lld/emac-lld-rtos_git.bb index efa45284..bbf56b49 100644 --- a/bsp/meta-ti/recipes-bsp/emac-lld/emac-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/emac-lld/emac-lld-rtos_git.bb @@ -2,33 +2,23 @@ SUMMARY = "TI RTOS low level driver for Ethernet MAC (EMAC) peripheral" inherit ti-pdk +require emac-lld.inc + +PR = "r0" + LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://emacver.h;beginline=1;endline=47;md5=f66bb3695972ca2a85d990a390f45d88" COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1|c665x-evm|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -EMAC_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/emac-lld.git" -EMAC_LLD_GIT_PROTOCOL = "git" -EMAC_LLD_GIT_BRANCH = "master" - -# Below commit ID corresponds to "DEV.EMAC_LLD.01.00.03.14B" -EMAC_LLD_SRCREV = "9ad95cde88aae23aaedf95d2146cab4a388e70d3" - -BRANCH ="${EMAC_LLD_GIT_BRANCH}" -SRC_URI = "${EMAC_LLD_GIT_URI};protocol=${EMAC_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${EMAC_LLD_SRCREV}" -PV = "01.00.03.14B" -PR = "r0" - DEPENDS_append = " board-rtos osal-rtos" DEPENDS_append_ti33x = " starterware-rtos" DEPENDS_append_ti43x = " starterware-rtos" DEPENDS_append_k2g = " cppi-lld-rtos qmss-lld-rtos" DEPENDS_remove_k3 = "board-rtos " -DEPENDS_append_k3 = " udma-lld-rtos " +DEPENDS_append_k3 = " udma-lld-rtos trace-rtos" # Build with make instead of XDC TI_PDK_XDCMAKE = "0" diff --git a/bsp/meta-ti/recipes-bsp/emac-lld/emac-lld.inc b/bsp/meta-ti/recipes-bsp/emac-lld/emac-lld.inc new file mode 100644 index 00000000..eea56b31 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/emac-lld/emac-lld.inc @@ -0,0 +1,7 @@ +inherit ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.emac" + +PE = "1" + +# The LLD version diff --git a/bsp/meta-ti/recipes-bsp/fatfs-rtos/fatfs-rtos_git.bb b/bsp/meta-ti/recipes-bsp/fatfs-rtos/fatfs-rtos_git.bb index 353d9a15..20d8ba8c 100644 --- a/bsp/meta-ti/recipes-bsp/fatfs-rtos/fatfs-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/fatfs-rtos/fatfs-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI RTOS driver for FAT filesystem" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.fs.fatfs" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://FATFS.h;beginline=1;endline=32;md5=6619832755598d1cc2b01f2e6a1801d6" @@ -8,18 +12,6 @@ LIC_FILES_CHKSUM = "file://FATFS.h;beginline=1;endline=32;md5=6619832755598d1cc2 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -FATFS_GIT_URI = "git://git.ti.com/keystone-rtos/fatfs.git" -FATFS_GIT_PROTOCOL = "git" -FATFS_GIT_BRANCH = "master" - -# Below commit ID corresponds to "DEV.FATFS_LLD.01.00.00.13" -FATFS_SRCREV = "33735fe2575b433bbe6495839f3a69ccef66ce2f" - -BRANCH = "${FATFS_GIT_BRANCH}" -SRC_URI = "${FATFS_GIT_URI};protocol=${FATFS_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${FATFS_SRCREV}" -PV = "01.00.00.13" PR = "r0" DEPENDS_append = " mmcsd-lld-rtos \ diff --git a/bsp/meta-ti/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb b/bsp/meta-ti/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb index aed56373..bf8aba6a 100644 --- a/bsp/meta-ti/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb @@ -13,14 +13,14 @@ FAULT_MANAGEMENT_GIT_PROTOCOL = "git" FAULT_MANAGEMENT_GIT_BRANCH = "master" FAULT_MANAGEMENT_GIT_DESTSUFFIX = "git/ti/instrumentation/fault_mgmt" -# Below commit ID corresponds to "DEV.FAULT_MGMT.01.00.01.04" -FAULT_MANAGEMENT_SRCREV = "f96fd9d9de8a6c658f444a0d5cabbdbbf43b34f0" +# Below commit ID corresponds to "DEV.FAULT_MGMT.01.00.01.04A" +FAULT_MANAGEMENT_SRCREV = "67becdff0e3d181ab7b8fada226f5737517c1c52" BRANCH = "${FAULT_MANAGEMENT_GIT_BRANCH}" SRC_URI = "${FAULT_MANAGEMENT_GIT_URI};destsuffix=${FAULT_MANAGEMENT_GIT_DESTSUFFIX};protocol=${FAULT_MANAGEMENT_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${FAULT_MANAGEMENT_SRCREV}" -PV = "01.00.01.04" +PV = "01.00.01.04A" PR = "r0" S = "${WORKDIR}/${FAULT_MANAGEMENT_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/fftc-lld/fftc-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/fftc-lld/fftc-lld-rtos_git.bb index 73666e26..c8668c99 100644 --- a/bsp/meta-ti/recipes-bsp/fftc-lld/fftc-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/fftc-lld/fftc-lld-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI FFT Coprocessor (FFTC) low level driver " -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.fftc" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://fftc.h;beginline=1;endline=39;md5=2f1010c47d364414644caf6d30a2b7df" @@ -8,24 +12,8 @@ LIC_FILES_CHKSUM = "file://fftc.h;beginline=1;endline=39;md5=2f1010c47d364414644 COMPATIBLE_MACHINE = "k2hk|k2l" PACKAGE_ARCH = "${MACHINE_ARCH}" -FFTC_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/fftc-lld.git" -FFTC_LLD_GIT_PROTOCOL = "git" -FFTC_LLD_GIT_BRANCH = "master" -FFTC_LLD_GIT_DESTSUFFIX = "git/ti/drv/fftc" - -# Below commit ID corresponds to "DEV.FFTC_LLD.02.02.00.07A" -FFTC_LLD_SRCREV = "7d3b64f42d190260f873b0e6d16489c65ef820b1" - -BRANCH = "${FFTC_LLD_GIT_BRANCH}" -SRC_URI = "${FFTC_LLD_GIT_URI};destsuffix=${FFTC_LLD_GIT_DESTSUFFIX};protocol=${FFTC_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${FFTC_LLD_SRCREV}" -PV = "02.02.00.07A" PR = "r0" -S = "${WORKDIR}/${FFTC_LLD_GIT_DESTSUFFIX}" - - DEPENDS_append= " qmss-lld-rtos \ cppi-lld-rtos \ " diff --git a/bsp/meta-ti/recipes-bsp/fvid2/fvid2-rtos_git.bb b/bsp/meta-ti/recipes-bsp/fvid2/fvid2-rtos_git.bb new file mode 100755 index 00000000..db1f9e1c --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/fvid2/fvid2-rtos_git.bb @@ -0,0 +1,68 @@ +SUMMARY = "TI RTOS Video Driver Interface" + +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.fvid2" + +PE = "1" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://fvid2.h;beginline=1;endline=31;md5=83d177cf3df55c16b27ae4102b6ade9a" + +COMPATIBLE_MACHINE = "k3" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +PR = "r0" + +DEPENDS_append = " osal-rtos \ +" + +# Build with make instead of XDC +TI_PDK_XDCMAKE = "0" + +FVID2_PACKAGE_BASE = "${WORKDIR}/fvid2_base" +FVID2_ROOTPATH = "${FVID2_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv/fvid2" + +export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages" +export PDK_FVID2_ROOT_PATH = "${FVID2_PACKAGE_BASE}/package/all/pdk_/packages" + + +BOARD_PACKAGE = "" +BOARD_PACKAGE_am65xx-evm = "am65xx_evm" +BOARD_PACKAGE_am65xx-hs-evm = "am65xx_evm" +BOARD_PACKAGE_j7-evm = "j721e_evm" + +# HTML doc link params +PDK_COMP_LINK_TEXT = "FVID2" + +do_configure() { + rm -rf ${FVID2_PACKAGE_BASE} + cd ${S} + + # remove any previous package + rm -f ${FVID2_PACKAGE_BASE} + + # make the release package before building it + make package BOARD=${BOARD_PACKAGE} DEST_ROOT=${FVID2_PACKAGE_BASE} PDK_FVID2_COMP_PATH=${S} +} + +do_compile() { + echo "fvid2 root path is ${FVID2_ROOTPATH}" + cd ${FVID2_ROOTPATH} + + # Build am65xx libraries + make clean lib xdc_meta LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" LIMIT_CORES="${TI_PDK_LIMIT_CORES}" + + #archive + tar -cf fvid2.tar --exclude='*.tar' ./* +} + +do_install() { + cd ${FVID2_ROOTPATH} + install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/fvid2 + find -name "*.tar" -exec tar xf {} --no-same-owner -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/fvid2 \; +} + +FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages" + +INSANE_SKIP_${PN} = "arch ldflags" diff --git a/bsp/meta-ti/recipes-bsp/gpio-lld/gpio-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/gpio-lld/gpio-lld-rtos_git.bb index d37583ff..bfdb16ce 100644 --- a/bsp/meta-ti/recipes-bsp/gpio-lld/gpio-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/gpio-lld/gpio-lld-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI RTOS driver for General Purpose IO (GPIO)" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.gpio" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://GPIO.h;beginline=1;endline=31;md5=8580f9c5c0de8d5d13518cf18a0122b8" @@ -8,22 +12,8 @@ LIC_FILES_CHKSUM = "file://GPIO.h;beginline=1;endline=31;md5=8580f9c5c0de8d5d135 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c667x-evm|c665x-evm|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -GPIO_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/gpio-lld.git" -GPIO_LLD_GIT_PROTOCOL = "git" -GPIO_LLD_GIT_BRANCH = "master" -GPIO_LLD_GIT_DESTSUFFIX = "git/ti/drv/gpio" - -# Below commit ID corresponds to "DEV.GPIO_LLD.01.00.00.14" -GPIO_LLD_SRCREV = "44d3cfcd49bfffe4d02d61c541398db3ffac7ef3" - -BRANCH = "${GPIO_LLD_GIT_BRANCH}" -SRC_URI = "${GPIO_LLD_GIT_URI};destsuffix=${GPIO_LLD_GIT_DESTSUFFIX};protocol=${GPIO_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${GPIO_LLD_SRCREV}" -PV = "01.00.00.14" PR = "r0" -S = "${WORKDIR}/${GPIO_LLD_GIT_DESTSUFFIX}" DEPENDS_append = " osal-rtos \ " diff --git a/bsp/meta-ti/recipes-bsp/gpmc-lld/gpmc-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/gpmc-lld/gpmc-lld-rtos_git.bb index b9f0088d..6054d6b7 100644 --- a/bsp/meta-ti/recipes-bsp/gpmc-lld/gpmc-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/gpmc-lld/gpmc-lld-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI RTOS low level driver for General Purpose Memory Controller (GPMC)" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.gpmc" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://GPMC.h;beginline=1;endline=31;md5=485ec97c36f809bf92323fde3e988c72" @@ -8,18 +12,7 @@ LIC_FILES_CHKSUM = "file://GPMC.h;beginline=1;endline=31;md5=485ec97c36f809bf923 COMPATIBLE_MACHINE = "ti33x|ti43x" PACKAGE_ARCH = "${MACHINE_ARCH}" -GPMC_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/gpmc-lld.git" -GPMC_LLD_GIT_PROTOCOL = "git" -GPMC_LLD_GIT_BRANCH = "master" - -# Below commit ID corresponds to "DEV.GPMC_LLD.01.00.00.03A" -GPMC_LLD_SRCREV = "9169c04d80fae0a50734527e54ec4f4f53c3a1ef" - -BRANCH = "${GPMC_LLD_GIT_BRANCH}" -SRC_URI = "${GPMC_LLD_GIT_URI};protocol=${GPMC_LLD_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${GPMC_LLD_SRCREV}" -PV = "01.00.00.03A" PR = "r0" DEPENDS_append = " osal-rtos \ diff --git a/bsp/meta-ti/recipes-bsp/hyplnk-lld/hyplnk-lld.inc b/bsp/meta-ti/recipes-bsp/hyplnk-lld/hyplnk-lld.inc index 34e7acbf..849c2eee 100644 --- a/bsp/meta-ti/recipes-bsp/hyplnk-lld/hyplnk-lld.inc +++ b/bsp/meta-ti/recipes-bsp/hyplnk-lld/hyplnk-lld.inc @@ -6,24 +6,16 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" LLDNAME="hyplnk" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${HYPLNK_GIT_DESTSUFFIX}/COPYING.txt;md5=623325cc19e613a4e770fbb749922592" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=623325cc19e613a4e770fbb749922592" -HYPLNK_GIT_URI = "git://git.ti.com/keystone-rtos/hyplnk-lld.git" -HYPLNK_GIT_PROTOCOL = "git" -HYPLNK_GIT_BRANCH = "master" -HYPLNK_GIT_DESTSUFFIX = "git/ti/drv/${LLDNAME}" +inherit ti-pdk-fetch -# Following commit corresponds to tag DEV.HYPLNK_LLD.02.01.00.08 -HYPLNK_SRCREV = "2f54bb32fbf08bd2e20446497341e29498702931" +TI_PDK_COMP = "ti.drv.hyplnk" -BRANCH="${HYPLNK_GIT_BRANCH}" -SRC_URI = "${HYPLNK_GIT_URI};destsuffix=${HYPLNK_GIT_DESTSUFFIX};protocol=${HYPLNK_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${HYPLNK_SRCREV}" +PE = "1" -PV = "2.1.0.8" INC_PR = "r0" DEVICELIST_k2hk = "k2h k2k" DEVICELIST_k2e = "k2e" -S = "${WORKDIR}/${HYPLNK_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb b/bsp/meta-ti/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb index 8ef3c823..08124d7c 100644 --- a/bsp/meta-ti/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb @@ -18,6 +18,7 @@ do_install () { make -f makefile_armv7 install PDK_INSTALL_PATH="${STAGING_INCDIR}" \ INSTALL_INC_BASE_DIR="${D}/${includedir}" \ INSTALL_LIB_BASE_DIR="${D}${libdir}" HYPLNK_SRC_DIR="${S}" + chown -R root:root ${D} # Set the generic device library symbolic link to default k2h cd ${D}${libdir} diff --git a/bsp/meta-ti/recipes-bsp/i2c-lld/i2c-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/i2c-lld/i2c-lld-rtos_git.bb index 2b3931ed..1cd1c998 100644 --- a/bsp/meta-ti/recipes-bsp/i2c-lld/i2c-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/i2c-lld/i2c-lld-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI RTOS low level driver for Inter-IC module (I2C)" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.i2c" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://I2C.h;beginline=1;endline=32;md5=50084375278c1a2779571be134f98f7c" @@ -8,19 +12,7 @@ LIC_FILES_CHKSUM = "file://I2C.h;beginline=1;endline=32;md5=50084375278c1a277957 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c66x|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -I2C_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/i2c-lld.git" -I2C_LLD_GIT_PROTOCOL = "git" -I2C_LLD_GIT_BRANCH = "master" -I2C_LLD_GIT_DESTSUFFIX = "git/ti/drv/i2c" - -# Below commit ID corresponds to "DEV.I2C_LLD.01.00.00.14" -I2C_LLD_SRCREV = "639374a5f9d9cf01f0e922063c13b579f6b1b908" -BRANCH = "${I2C_LLD_GIT_BRANCH}" -SRC_URI = "${I2C_LLD_GIT_URI};destsuffix=${I2C_LLD_GIT_DESTSUFFIX};protocol=${I2C_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${I2C_LLD_SRCREV}" -PV = "01.00.00.14" PR = "r0" DEPENDS_append = " osal-rtos \ @@ -37,10 +29,12 @@ DEPENDS_append_am57xx-evm = " pruss-lld-rtos \ DEPENDS_append_k2g = " pruss-lld-rtos \ " +DEPENDS_append_j7-evm = " sciclient-rtos \ +" + # Build with make instead of XDC TI_PDK_XDCMAKE = "0" -S = "${WORKDIR}/${I2C_LLD_GIT_DESTSUFFIX}" export PDK_I2C_ROOT_PATH ="${WORKDIR}/build" export DEST_ROOT="${S}" diff --git a/bsp/meta-ti/recipes-bsp/ibl-boot/ibl-boot-rtos_git.bb b/bsp/meta-ti/recipes-bsp/ibl-boot/ibl-boot-rtos_git.bb index ed30ef45..59b75b3a 100644 --- a/bsp/meta-ti/recipes-bsp/ibl-boot/ibl-boot-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/ibl-boot/ibl-boot-rtos_git.bb @@ -9,15 +9,27 @@ LIC_FILES_CHKSUM = "file://src/ibl.h;beginline=1;endline=34;md5=ee7d7a3305d1e524 require recipes-ti/includes/ti-paths.inc -DEPENDS = "ti-cgt6x-7-native" +DEPENDS = " ti-cgt6x-7-native \ + bison-native \ + flex-native \ +" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "c66x" -BRANCH = "master" -SRC_URI = "git://git.ti.com/keystone-rtos/ibl.git;protocol=git;branch=${BRANCH}" -SRCREV = "f7ed32cc8911e3353dd01080da9b725b44a12285" -PR = "r0" +CLEANBROKEN = "1" + +IBL_BOOT_GIT_URI = "git://git.ti.com/keystone-rtos/ibl.git" +IBL_BOOT_GIT_PROTOCOL = "git" +IBL_BOOT_GIT_BRANCH = "master" +IBL_BOOT_SRCREV = "ed3f0989d8cdc813b7ca1ed899c4d84b63de3a75" + +BRANCH = "${IBL_BOOT_GIT_BRANCH}" +SRC_URI = "${IBL_BOOT_GIT_URI};protocol=${IBL_BOOT_GIT_PROTOCOL};branch=${BRANCH}" +SRCREV = "${IBL_BOOT_SRCREV}" + + +PR = "r2" S = "${WORKDIR}/git" @@ -28,8 +40,8 @@ IBLTARGETS_c665x-evm = "evm_c6657_i2c" IBLTARGETS_c667x-evm = "evm_c6678_i2c" IBLENDIAN = "" -IBLENDIAN_c665x-evm = "little big" -IBLENDIAN_c667x-evm = "little big" +IBLENDIAN_c665x-evm = "little" +IBLENDIAN_c667x-evm = "little" export C6X_BASE_DIR="${TI_CGT6X_7_INSTALL_DIR}" export TOOLSC6X="${C6X_BASE_DIR}" diff --git a/bsp/meta-ti/recipes-bsp/icss-emac-lld/icss-emac-lld.inc b/bsp/meta-ti/recipes-bsp/icss-emac-lld/icss-emac-lld.inc index 9c93b752..db205a99 100644 --- a/bsp/meta-ti/recipes-bsp/icss-emac-lld/icss-emac-lld.inc +++ b/bsp/meta-ti/recipes-bsp/icss-emac-lld/icss-emac-lld.inc @@ -1,28 +1,14 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=76cafd87d8495b42c2355f7681de15a2" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g" +COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -ICSS_EMAC_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/icss-emac.git" -ICSS_EMAC_LLD_GIT_PROTOCOL = "git" -ICSS_EMAC_LLD_GIT_BRANCH = "master" -ICSS_EMAC_LLD_GIT_DESTSUFFIX = "git/ti/drv/icss_emac" +inherit ti-pdk-fetch -# Below commit ID corresponds to "DEV.ICSS_EMAC_LLD.01.00.00.15A" -ICSS_EMAC_LLD_SRCREV = "94536e4f3087b87e0787f00637b00878ee085d1d" +TI_PDK_COMP = "ti.drv.icss_emac" -BRANCH = "${ICSS_EMAC_LLD_GIT_BRANCH}" -SRC_URI = "${ICSS_EMAC_LLD_GIT_URI};destsuffix=${ICSS_EMAC_LLD_GIT_DESTSUFFIX};protocol=${ICSS_EMAC_LLD_GIT_PROTOCOL};branch=${BRANCH}" +PE = "1" -SRCREV = "${ICSS_EMAC_LLD_SRCREV}" +INC_PR = "r1" -# The LLD version -PV = "01.00.00.15A" - -# The FW version(s) -PV_DUALEMAC_FW = "5.2.7" - -INC_PR = "r0" - -S = "${WORKDIR}/${ICSS_EMAC_LLD_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/iolink-lld/iolink-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/iolink-lld/iolink-lld-rtos_git.bb new file mode 100644 index 00000000..c0c27b60 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/iolink-lld/iolink-lld-rtos_git.bb @@ -0,0 +1,33 @@ +SUMMARY = "TI RTOS low level driver for IO-Link Master" + +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.iolink" + +PE = "1" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://IOLINK.h;beginline=1;endline=32;md5=da669339a4b8594ed3edbe7ca30c726e" + +COMPATIBLE_MACHINE = "ti43x" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +PR = "r2" + +DEPENDS_append = " osal-rtos \ +" +DEPENDS_append_ti43x = " starterware-rtos \ + pruss-lld-rtos \ +" + +# Build with make instead of XDC +TI_PDK_XDCMAKE = "0" + + +export PDK_IOLINK_ROOT_PATH ="${WORKDIR}/build" +export DEST_ROOT="${S}" + +INSANE_SKIP_${PN} = "arch" + +# HTML doc link params +PDK_COMP_LINK_TEXT = "IOLINK LLD" diff --git a/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb new file mode 100644 index 00000000..fa3ea89d --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb @@ -0,0 +1,151 @@ +SUMMARY = "echo_test for IPC-LLD" + +require ipc-lld.inc + +inherit update-alternatives + +DEPENDS += " ipc-lld-rtos common-csl-ip-rtos sciclient-rtos board-rtos" + +REMOTE_FW_DIR = "${S}/examples/yocto_bin" +REMOTE_FW_BIN_DIR = "${REMOTE_FW_DIR}/ipc_echo_test/bin" +REMOTE_FWB_BIN_DIR = "${REMOTE_FW_DIR}/ipc_echo_testb/bin" +RTOS_ALL_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex02_bios_multicore_echo_test/bin" +RTOS_2_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex01_bios_2core_echo_test/bin" +LINUX_2_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex03_linux_bios_2core_echo_test/bin" + +DST_BIN_PATH = "${base_libdir}/firmware/pdk-ipc" + +TI_PDK_LIMIT_BOARDS_j7-evm = "j721e_evm" + +do_configure[noexec] = "1" + +do_compile() { + cd ${S} + + for board in ${TI_PDK_LIMIT_BOARDS} + do + for core in ${TI_PDK_LIMIT_CORES} + do + oe_runmake examples BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR} + done + done +} + +do_install() { + CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" + install -d ${D}${DST_BIN_PATH} + + cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex02_bios_multicore_echo_test/bin -d ${D}/ex02_bios_multicore_echo_test + cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex01_bios_2core_echo_test/bin -d ${D}/ex01_bios_2core_echo_test + cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex03_linux_bios_2core_echo_test/bin -d ${D}/ex03_linux_bios_2core_echo_test + + for board in ${TI_PDK_LIMIT_BOARDS} + do + for core in ${TI_PDK_LIMIT_CORES} + do + install -m 0644 ${REMOTE_FW_BIN_DIR}/$board/ipc_echo_test_${core}_release* ${D}${DST_BIN_PATH} + + #removing map files copied in previous line + rm ${D}${DST_BIN_PATH}/*.map + done + + #remove mpu binarires + rm ${D}${DST_BIN_PATH}/ipc_echo_test_mpu1_0_release.xa* + + done +} + +do_install_append_j7-evm() { + #copy ipc_echo_testb binaries for J721 + install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_0_release.xer5f ${D}${DST_BIN_PATH} + install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_1_release.xer5f ${D}${DST_BIN_PATH} + install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu2_0_release.xer5f ${D}${DST_BIN_PATH} + install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu2_1_release.xer5f ${D}${DST_BIN_PATH} + install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_0_release.xer5f ${D}${DST_BIN_PATH} + install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_1_release.xer5f ${D}${DST_BIN_PATH} + + install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_0_release_strip.xer5f ${D}${DST_BIN_PATH} + install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_1_release_strip.xer5f ${D}${DST_BIN_PATH} + install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu2_0_release_strip.xer5f ${D}${DST_BIN_PATH} + install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu2_1_release_strip.xer5f ${D}${DST_BIN_PATH} + install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_0_release_strip.xer5f ${D}${DST_BIN_PATH} + install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_1_release_strip.xer5f ${D}${DST_BIN_PATH} +} + + +# Set up names for the firmwares +ALTERNATIVE_${PN}_am65xx = "\ + am65x-mcu-r5f0_0-fw \ + am65x-mcu-r5f0_1-fw \ + " +ALTERNATIVE_${PN}_j7-evm = "\ + j7-mcu-r5f0_0-fw \ + j7-mcu-r5f0_1-fw \ + j7-main-r5f0_0-fw \ + j7-main-r5f0_1-fw \ + j7-main-r5f1_0-fw \ + j7-main-r5f1_1-fw \ + j7-c66_0-fw \ + j7-c66_1-fw \ + j7-c71_0-fw\ + " + +# Set up link names for the firmwares + +TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1_am65xx = "am65x-mcu-r5f0_1-fw" + +TARGET_MCU_R5FSS0_0_j7-evm = "j7-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1_j7-evm = "j7-mcu-r5f0_1-fw" +TARGET_MAIN_R5FSS0_0_j7-evm = "j7-main-r5f0_0-fw" +TARGET_MAIN_R5FSS0_1_j7-evm = "j7-main-r5f0_1-fw" +TARGET_MAIN_R5FSS1_0_j7-evm = "j7-main-r5f1_0-fw" +TARGET_MAIN_R5FSS1_1_j7-evm = "j7-main-r5f1_1-fw" +TARGET_C66_0_j7-evm = "j7-c66_0-fw" +TARGET_C66_1_j7-evm = "j7-c66_1-fw" +TARGET_C7X_j7-evm = "j7-c71_0-fw" + +ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" +ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" + +ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" +ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}" +ALTERNATIVE_LINK_NAME[j7-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0}" +ALTERNATIVE_LINK_NAME[j7-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" +ALTERNATIVE_LINK_NAME[j7-c66_0-fw] = "${base_libdir}/firmware/${TARGET_C66_0}" +ALTERNATIVE_LINK_NAME[j7-c66_1-fw] = "${base_libdir}/firmware/${TARGET_C66_1}" +ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X}" + +# Create the firmware alternatives + +ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_0_release_strip.xer5f" +ALTERNATIVE_TARGET[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" + +ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" +ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release_strip.xer5f" +ALTERNATIVE_TARGET[j7-main-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j7-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f" +ALTERNATIVE_TARGET[j7-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j7-c66_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_1_release_strip.xe66" +ALTERNATIVE_TARGET[j7-c66_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_2_release_strip.xe66" +ALTERNATIVE_TARGET[j7-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71" + +ALTERNATIVE_PRIORITY = "10" + +#add source and all rtos binaries package +PACKAGES =+ "${PN}-rtos" + +# make sure that lib/firmware, and all its contents are part of the package +FILES_${PN} += "${base_libdir}/firmware" + +FILES_${PN}-rtos += "ex02_bios_multicore_echo_test" +FILES_${PN}-rtos += "ex01_bios_2core_echo_test" +FILES_${PN}-rtos += "ex03_linux_bios_2core_echo_test" + +INSANE_SKIP_${PN} = "arch ldflags file-rdeps" +INSANE_SKIP_${PN}-rtos = "arch ldflags file-rdeps" + +INSANE_SKIP_${PN}-dbg = "arch" diff --git a/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb new file mode 100644 index 00000000..df992762 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb @@ -0,0 +1,196 @@ +SUMMARY = "R5 and DSP IPC Echo Test Firmware Binaries" + +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7eae093f2b09fd39307f30028a068b91" + +inherit deploy +inherit update-alternatives + +COMPATIBLE_MACHINE = "k3" + +PV = "1.0-git${SRCPV}" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +PROTOCOL = "git" +BRANCH = "master" +SRCREV = "c9f7cfe61b67998a053fe145344ce0c9b5bb22aa" + +SRC_URI = "git://git.ti.com/keystone-rtos/ipc-lld.git;protocol=${PROTOCOL};branch=${BRANCH}" + +S = "${WORKDIR}/git" + +AM65X_R5_FW_DIR = "${S}/examples/echo_test/binaries/am65xx" +J721E_R5_DSP_FW_DIR = "${S}/examples/echo_test/binaries/j721e" + +PLATFORM_am65xx = "am65xx" +PLATFORM_j7-evm = "j7-evm" + +# make sure that lib/firmware, and all its contents are part of the package +FILES_${PN} += "${base_libdir}/firmware" + +# install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level +do_install() { + install -d ${D}${base_libdir}/firmware/pdk-ipc +} + +do_install_append_am65xx() { + install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ +} + +do_install_append_j7-evm() { + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_1_release.xe66 ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_1_release.strip.xe66 ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_2_release.xe66 ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_2_release.strip.xe66 ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c7x_1_release.xe71 ${D}${base_libdir}/firmware/pdk-ipc/ + install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c7x_1_release.strip.xe71 ${D}${base_libdir}/firmware/pdk-ipc/ +} + +# Set up names for the firmwares +ALTERNATIVE_${PN}_am65xx = "\ + am65x-mcu-r5f0_0-fw \ + am65x-mcu-r5f0_1-fw \ + " +ALTERNATIVE_${PN}_j7-evm = "\ + j7-mcu-r5f0_0-fw \ + j7-mcu-r5f0_1-fw \ + j7-main-r5f0_0-fw \ + j7-main-r5f0_1-fw \ + j7-main-r5f1_0-fw \ + j7-main-r5f1_1-fw \ + j7-c66_0-fw \ + j7-c66_1-fw \ + j7-c71_0-fw\ + " + +# Set up link names for the firmwares + +TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1_am65xx = "am65x-mcu-r5f0_1-fw" + +TARGET_MCU_R5FSS0_0_j7-evm = "j7-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1_j7-evm = "j7-mcu-r5f0_1-fw" +TARGET_MAIN_R5FSS0_0_j7-evm = "j7-main-r5f0_0-fw" +TARGET_MAIN_R5FSS0_1_j7-evm = "j7-main-r5f0_1-fw" +TARGET_MAIN_R5FSS1_0_j7-evm = "j7-main-r5f1_0-fw" +TARGET_MAIN_R5FSS1_1_j7-evm = "j7-main-r5f1_1-fw" +TARGET_C66_0_j7-evm = "j7-c66_0-fw" +TARGET_C66_1_j7-evm = "j7-c66_1-fw" +TARGET_C7X_j7-evm = "j7-c71_0-fw" + +ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" +ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" + +ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" +ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}" +ALTERNATIVE_LINK_NAME[j7-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0}" +ALTERNATIVE_LINK_NAME[j7-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" +ALTERNATIVE_LINK_NAME[j7-c66_0-fw] = "${base_libdir}/firmware/${TARGET_C66_0}" +ALTERNATIVE_LINK_NAME[j7-c66_1-fw] = "${base_libdir}/firmware/${TARGET_C66_1}" +ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X}" + +# Create the firmware alternatives + +ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_0_release.strip.xer5f" +ALTERNATIVE_TARGET[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release.strip.xer5f" + +ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release.strip.xer5f" +ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release.strip.xer5f" +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release.strip.xer5f" +ALTERNATIVE_TARGET[j7-main-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release.strip.xer5f" +ALTERNATIVE_TARGET[j7-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release.strip.xer5f" +ALTERNATIVE_TARGET[j7-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release.strip.xer5f" +ALTERNATIVE_TARGET[j7-c66_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_1_release.strip.xe66" +ALTERNATIVE_TARGET[j7-c66_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_2_release.strip.xe66" +ALTERNATIVE_TARGET[j7-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release.strip.xe71" + +ALTERNATIVE_PRIORITY = "10" + +# copy the executables into the deploy directory + +do_deploy() { + : +} + +do_deploy_am65xx() { + install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${DEPLOYDIR}/ + install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${DEPLOYDIR}/ + install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.xer5f ${DEPLOYDIR}/ + install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${DEPLOYDIR}/ +} + +do_deploy_j7-evm() { + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.strip.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_1_release.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_1_release.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_1_release.strip.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_0_release.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_0_release.strip.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_0_release.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_0_release.strip.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_1_release.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_1_release.strip.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_1_release.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_1_release.strip.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_0_release.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_0_release.strip.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_0_release.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_0_release.strip.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_1_release.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_1_release.strip.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_1_release.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_1_release.strip.xer5f ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_1_release.xe66 ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_1_release.strip.xe66 ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_2_release.xe66 ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_2_release.strip.xe66 ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c7x_1_release.xe71 ${DEPLOYDIR}/ + install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c7x_1_release.strip.xe71 ${DEPLOYDIR}/ +} + +addtask deploy after do_install before do_build + +# This is used to prevent the build system to strip the executables +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +# This is used to prevent the build system to split the debug info in a separate file +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP +INSANE_SKIP_${PN} += "arch" + +# we don't want to configure and build the source code +do_compile[noexec] = "1" +do_configure[noexec] = "1" diff --git a/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-rtos_git.bb new file mode 100644 index 00000000..e005ea70 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-rtos_git.bb @@ -0,0 +1,45 @@ +SUMMARY = "TI RTOS low level driver for IPC" + +require ipc-lld.inc + +DEPENDS += " osal-rtos common-csl-ip-rtos sciclient-rtos" + +do_configure() { + # remove any previous package + rm -rf ${IPCLLD_PACKAGE_BASE} + cd ${S} + + mkdir -p ${IPCLLD_ROOTPATH} + + for board in ${TI_PDK_LIMIT_BOARDS} + do + # make the release package before building it + oe_runmake package BOARD=$board DEST_ROOT=${IPCLLD_PACKAGE_BASE} PDK_IPC_COMP_PATH=${S} + done + +} + +do_compile() { + cd ${IPCLLD_ROOTPATH} + + oe_runmake lib LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" PDK_IPC_COMP_PATH=${IPCLLD_ROOTPATH} +} + +do_install() { + cd ${IPCLLD_ROOTPATH} + + #remove prebuilt binaries + rm -rf examples/echo_test/binaries + + #archive + tar -cf ipc-lld.tar --exclude='*.tar' ./* + + install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/ipc + find -name "*.tar" -exec tar xf {} --no-same-owner -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/ipc \; +} + +FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages" + +INSANE_SKIP_${PN} = "arch ldflags file-rdeps" + +INSANE_SKIP_${PN}-dbg = "arch" diff --git a/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld.inc b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld.inc new file mode 100644 index 00000000..66bbf321 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld.inc @@ -0,0 +1,29 @@ +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.ipc" + +PE = "1" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7eae093f2b09fd39307f30028a068b91" + +COMPATIBLE_MACHINE = "k3" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +PR = "r2" + +# Build with make instead of XDC +TI_PDK_XDCMAKE = "0" + +IPCLLD_PACKAGE_BASE = "${WORKDIR}/ipclld_base" +IPCLLD_ROOTPATH = "${IPCLLD_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv/ipc" + +export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages" +export PDK_IPC_ROOT_PATH = "${IPCLLD_PACKAGE_BASE}/package/all/pdk_/packages" + +# HTML doc link params +PDK_COMP_LINK_TEXT = "IPCLLD" + +EXTRA_OEMAKE = "PDK_INSTALL_PATH=${PDK_INSTALL_PATH} " + +TI_PDK_LIMIT_CORES_append_am65xx-evm = " mcu1_1 " diff --git a/bsp/meta-ti/recipes-bsp/iqn2-lld/iqn2-lld.inc b/bsp/meta-ti/recipes-bsp/iqn2-lld/iqn2-lld.inc index 27375625..078509fc 100644 --- a/bsp/meta-ti/recipes-bsp/iqn2-lld/iqn2-lld.inc +++ b/bsp/meta-ti/recipes-bsp/iqn2-lld/iqn2-lld.inc @@ -1,21 +1,13 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea" LICENSE = "BSD-3-Clause" -IQN2_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/iqn2-lld.git" -IQN2_LLD_GIT_PROTOCOL = "git" -IQN2_LLD_GIT_BRANCH = "master" -IQN2_LLD_GIT_DESTSUFFIX = "git/ti/drv/iqn2" +inherit ti-pdk-fetch -# Following commit corresponds to DEV.IQN_LLD.01.00.00.11 -IQN2_LLD_SRCREV = "cf78b793523e42867f2c538ae19227d2ae764b86" +TI_PDK_COMP = "ti.drv.iqn2" -BRANCH = "${IQN2_LLD_GIT_BRANCH}" -SRC_URI = "${IQN2_LLD_GIT_URI};destsuffix=${IQN2_LLD_GIT_DESTSUFFIX};protocol=${IQN2_LLD_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${IQN2_LLD_SRCREV}" +PE = "1" -PV = "1.0.0.11" INC_PR = "r0" COMPATIBLE_MACHINE = "k2l" -S = "${WORKDIR}/${IQN2_LLD_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/ivshmem-uio/ivshmem-uio-driver_git.bb b/bsp/meta-ti/recipes-bsp/ivshmem-uio/ivshmem-uio-driver_git.bb new file mode 100644 index 00000000..39a75533 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ivshmem-uio/ivshmem-uio-driver_git.bb @@ -0,0 +1,29 @@ +SUMMARY = "Kernel driver for IVSHMEM based UIO driver" +DESCRIPTION = "Kernel module which registers a UIO (userspace io) device for inter VM shared memory" +HOMEPAGE = "https://github.com/henning-schild-work/ivshmem-guest-code" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0546a27aad86c83b75ad4ee6133e9d5e" + +inherit module + +RDEPENDS_${PN} = "jailhouse" + +PROTOCOL = "git" +BRANCH = "jailhouse" +SRCREV = "f3ad79881bebb6c6068966ee3d265d8034c20492" +SRC_URI = "git://github.com/henning-schild-work/ivshmem-guest-code.git;protocol=${PROTOCOL};branch=${BRANCH}" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE += 'KDIR="${STAGING_KERNEL_DIR}"' + +COMPATIBLE_MACHINE = "(ti-soc)" + +do_compile_prepend() { + cd ${S}/kernel_module/uio +} + +do_install() { + install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra + install -m 644 ${S}/kernel_module/uio/uio_ivshmem.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra +} diff --git a/bsp/meta-ti/recipes-bsp/mcasp-lld/mcasp-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/mcasp-lld/mcasp-lld-rtos_git.bb index 0b10081d..5775d84b 100644 --- a/bsp/meta-ti/recipes-bsp/mcasp-lld/mcasp-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/mcasp-lld/mcasp-lld-rtos_git.bb @@ -1,29 +1,20 @@ SUMMARY = "TI RTOS low level driver for Multi channel Audio Serial port (McASP)" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.mcasp" + +PE = "1" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://mcaspver.h;beginline=1;endline=47;md5=25868d96216e5d6f286d5fb05a3be9f4" +LIC_FILES_CHKSUM = "file://mcaspver.h;beginline=19;endline=47;md5=75a9adc782a6df0d3a5419743e9a9f18" COMPATIBLE_MACHINE = "ti43x|omap-a15|k2g|ti33x|omapl1|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -MCASP_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/mcasp-lld.git" -MCASP_LLD_GIT_PROTOCOL = "git" -MCASP_LLD_GIT_BRANCH = "master" -MCASP_LLD_GIT_DESTSUFFIX = "git/ti/drv/mcasp" - -# Below commit ID corresponds to "DEV.MCASP_LLD.01.01.00.13" -MCASP_LLD_SRCREV = "81bb0c58f736485f9e15102f8396aea3ecec591e" - -BRANCH = "${MCASP_LLD_GIT_BRANCH}" -SRC_URI = "${MCASP_LLD_GIT_URI};destsuffix=${MCASP_LLD_GIT_DESTSUFFIX};protocol=${MCASP_LLD_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${MCASP_LLD_SRCREV}" -PV = "01.01.00.13" PR = "r0" -S = "${WORKDIR}/${MCASP_LLD_GIT_DESTSUFFIX}" DEPENDS_append = " edma3-lld-rtos \ osal-rtos \ diff --git a/bsp/meta-ti/recipes-bsp/mcbsp-lld/mcbsp-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/mcbsp-lld/mcbsp-lld-rtos_git.bb index 10c782e7..96ac5d75 100644 --- a/bsp/meta-ti/recipes-bsp/mcbsp-lld/mcbsp-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/mcbsp-lld/mcbsp-lld-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI RTOS low level driver for Multi-channel Buffered Serial Port (McBSP)" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.mcbsp" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://mcbspver.h;beginline=1;endline=47;md5=a8a39efd13fa6fe66da5461b898d620e" @@ -8,22 +12,8 @@ LIC_FILES_CHKSUM = "file://mcbspver.h;beginline=1;endline=47;md5=a8a39efd13fa6fe COMPATIBLE_MACHINE = "k2g|c665x-evm|omapl1" PACKAGE_ARCH = "${MACHINE_ARCH}" -MCBSP_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/mcbsp-lld.git" -MCBSP_LLD_GIT_PROTOCOL = "git" -MCBSP_LLD_GIT_BRANCH = "master" -MCBSP_LLD_GIT_DESTSUFFIX = "git/ti/drv/mcbsp" - -# Below commit ID corresponds to "DEV.MCBSP_LLD.01.00.00.12" -MCBSP_LLD_SRCREV = "cd201419a8b4e4aefee6b9323d9a84f4ea467d6a" - -BRANCH = "${MCBSP_LLD_GIT_BRANCH}" -SRC_URI = "${MCBSP_LLD_GIT_URI};destsuffix=${MCBSP_LLD_GIT_DESTSUFFIX};protocol=${MCBSP_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${MCBSP_LLD_SRCREV}" -PV = "01.00.00.12" PR = "r0" -S = "${WORKDIR}/${MCBSP_LLD_GIT_DESTSUFFIX}" DEPENDS_append = " edma3-lld-rtos \ " diff --git a/bsp/meta-ti/recipes-bsp/mmap-lld/mmap-lld.inc b/bsp/meta-ti/recipes-bsp/mmap-lld/mmap-lld.inc index e6c4cd62..7e11a4c5 100644 --- a/bsp/meta-ti/recipes-bsp/mmap-lld/mmap-lld.inc +++ b/bsp/meta-ti/recipes-bsp/mmap-lld/mmap-lld.inc @@ -9,14 +9,14 @@ MMAP_LLD_GIT_PROTOCOL = "git" MMAP_LLD_GIT_BRANCH = "master" MMAP_LLD_GIT_DESTSUFFIX = "git/ti/runtime/mmap" -# Commit correspond to DEV.MMAP.02.00.00.08A -MMAP_LLD_SRCREV = "bbccde8da6c87f59af3b0494e2d75ba52c69df20" +# Commit correspond to DEV.MMAP.02.00.00.08C +MMAP_LLD_SRCREV = "62e75191ab7144604102dabaa288c5fd5048fc49" BRANCH="${MMAP_LLD_GIT_BRANCH}" SRC_URI = "${MMAP_LLD_GIT_URI};destsuffix=${MMAP_LLD_GIT_DESTSUFFIX};protocol=${MMAP_LLD_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${MMAP_LLD_SRCREV}" -PV = "2.0.0.8A" +PV = "2.0.0.8C" INC_PR = "r0" S = "${WORKDIR}/git/ti/runtime/mmap" diff --git a/bsp/meta-ti/recipes-bsp/mmcsd-lld/mmcsd-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/mmcsd-lld/mmcsd-lld-rtos_git.bb index e0a04509..8c027cdd 100644 --- a/bsp/meta-ti/recipes-bsp/mmcsd-lld/mmcsd-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/mmcsd-lld/mmcsd-lld-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI Multimedia card(MMC)/Secure Digital(SD) low level driver for RTOS " -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.mmcsd" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://MMCSD.h;beginline=1;endline=32;md5=f74069541d4d165a000a66b4043cb065" @@ -8,22 +12,9 @@ LIC_FILES_CHKSUM = "file://MMCSD.h;beginline=1;endline=32;md5=f74069541d4d165a00 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -MMCSD_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/sd-mmc.git" -MMCSD_LLD_GIT_PROTOCOL = "git" -MMCSD_LLD_GIT_BRANCH = "master" -MMCSD_LLD_GIT_DESTSUFFIX = "git/ti/drv/mmcsd" - -# Below commit ID corresponds to "DEV.MMCSD_LLD.01.00.00.15A" -MMCSD_LLD_SRCREV = "612a2d6dc91a73cdf290e4060228b0df5e209992" - -BRANCH = "${MMCSD_LLD_GIT_BRANCH}" -SRC_URI = "${MMCSD_LLD_GIT_URI};destsuffix=${MMCSD_LLD_GIT_DESTSUFFIX};protocol=${MMCSD_LLD_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${MMCSD_LLD_SRCREV}" -PV = "01.00.00.15A" PR = "r0" -S = "${WORKDIR}/${MMCSD_LLD_GIT_DESTSUFFIX}" DEPENDS_append = " edma3-lld-rtos \ osal-rtos \ diff --git a/bsp/meta-ti/recipes-bsp/nwal-lld/nwal-lld.inc b/bsp/meta-ti/recipes-bsp/nwal-lld/nwal-lld.inc index 679ae9f1..3a593c70 100644 --- a/bsp/meta-ti/recipes-bsp/nwal-lld/nwal-lld.inc +++ b/bsp/meta-ti/recipes-bsp/nwal-lld/nwal-lld.inc @@ -1,25 +1,18 @@ LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462" COMPATIBLE_MACHINE = "keystone" PACKAGE_ARCH = "${MACHINE_ARCH}" -NWAL_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/nwal-lld.git" -NWAL_LLD_GIT_PROTOCOL = "git" -NWAL_LLD_GIT_BRANCH = "master" +inherit ti-pdk-fetch -# Below commit ID corresponds to "DEV.NWAL.02.01.00.12" -NWAL_LLD_SRCREV = "fef9d609f446c6a229c571473727ee5d1ad49630" +TI_PDK_COMP = "ti.drv.nwal" -BRANCH = "${NWAL_LLD_GIT_BRANCH}" -SRC_URI = "${NWAL_LLD_GIT_URI};protocol=${NWAL_LLD_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${NWAL_LLD_SRCREV}" +PE = "1" -PV = "02.01.00.12" INC_PR = "r0" BASEDIR = "${WORKDIR}/git" -S = "${BASEDIR}/ti/drv/nwal" DEVICELIST_k2hk = "k2h k2k" DEVICELIST_k2l = "k2l" diff --git a/bsp/meta-ti/recipes-bsp/osal/osal-rtos_git.bb b/bsp/meta-ti/recipes-bsp/osal/osal-rtos_git.bb index 62d1f997..a718f7ca 100644 --- a/bsp/meta-ti/recipes-bsp/osal/osal-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/osal/osal-rtos_git.bb @@ -5,8 +5,6 @@ PR = "${INC_PR}.0" COMPATIBLE_MACHINE_append = "|c66x|k3" -S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}" - DEPENDS_append_ti33x = " starterware-rtos" DEPENDS_append_ti43x = " starterware-rtos" diff --git a/bsp/meta-ti/recipes-bsp/osal/osal-test_git.bb b/bsp/meta-ti/recipes-bsp/osal/osal-test_git.bb index 58156e3b..354aa797 100644 --- a/bsp/meta-ti/recipes-bsp/osal/osal-test_git.bb +++ b/bsp/meta-ti/recipes-bsp/osal/osal-test_git.bb @@ -6,8 +6,6 @@ include osal.inc PR = "${INC_PR}.1" -S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}" - EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} OSAL_SRC_DIR=${S}" do_compile () { diff --git a/bsp/meta-ti/recipes-bsp/osal/osal.inc b/bsp/meta-ti/recipes-bsp/osal/osal.inc index aacf0df0..1f0a0778 100644 --- a/bsp/meta-ti/recipes-bsp/osal/osal.inc +++ b/bsp/meta-ti/recipes-bsp/osal/osal.inc @@ -4,17 +4,11 @@ LIC_FILES_CHKSUM = "file://osal.h;beginline=1;endline=31;md5=6fbde6922f8bca1e6cd COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1" PACKAGE_ARCH = "${MACHINE_ARCH}" -OSAL_GIT_URI = "git://git.ti.com/keystone-rtos/osal.git" -OSAL_GIT_PROTOCOL = "git" -OSAL_GIT_BRANCH = "master" -OSAL_GIT_DESTSUFFIX = "git/ti/osal" +inherit ti-pdk-fetch -# Below commit ID corresponding to "DEV.OSAL.01.00.00.14A" -OSAL_SRCREV = "f57cf90ba4c7dff6a016f60f2e343d777f20e06e" +TI_PDK_COMP = "ti.osal" -BRANCH = "${OSAL_GIT_BRANCH}" -SRC_URI = "${OSAL_GIT_URI};destsuffix=${OSAL_GIT_DESTSUFFIX};protocol=${OSAL_GIT_PROTOCOL};branch=${BRANCH}" +PE = "1" -SRCREV = "${OSAL_SRCREV}" -PV = "01.00.00.14A" INC_PR = "r0" + diff --git a/bsp/meta-ti/recipes-bsp/osal/osal_git.bb b/bsp/meta-ti/recipes-bsp/osal/osal_git.bb index 8f589376..4f881d2e 100644 --- a/bsp/meta-ti/recipes-bsp/osal/osal_git.bb +++ b/bsp/meta-ti/recipes-bsp/osal/osal_git.bb @@ -6,8 +6,6 @@ include osal.inc PR = "${INC_PR}.1" -S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}" - EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}" do_compile () { diff --git a/bsp/meta-ti/recipes-bsp/pa-lld/pa-lld.inc b/bsp/meta-ti/recipes-bsp/pa-lld/pa-lld.inc index 4a232437..83c57e31 100644 --- a/bsp/meta-ti/recipes-bsp/pa-lld/pa-lld.inc +++ b/bsp/meta-ti/recipes-bsp/pa-lld/pa-lld.inc @@ -4,22 +4,14 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/pa/COPYING.txt;md5=cd04fb087063 COMPATIBLE_MACHINE = "keystone" PACKAGE_ARCH = "${MACHINE_ARCH}" -PA_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/pa-lld.git" -PA_LLD_GIT_PROTOCOL = "git" -PA_LLD_GIT_BRANCH = "master" -PA_LLD_GIT_DESTSUFFIX = "git/ti/drv/pa" +inherit ti-pdk-fetch -# Below commit ID corresponding to "DEV.PA_LLD.03.00.02.08" -PA_LLD_SRCREV = "2cf268aac8afc957aa992af19f53dd1be56855ee" +TI_PDK_COMP = "ti.drv.pa" -BRANCH = "${PA_LLD_GIT_BRANCH}" -SRC_URI = "${PA_LLD_GIT_URI};destsuffix=${PA_LLD_GIT_DESTSUFFIX};protocol=${PA_LLD_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${PA_LLD_SRCREV}" +PE = "1" -PV = "03.00.02.08" INC_PR = "r0" -S = "${WORKDIR}/${PA_LLD_GIT_DESTSUFFIX}" DEVICELIST = "k2h k2k k2l k2e" DEVICELIST_k2hk = "k2h k2k" diff --git a/bsp/meta-ti/recipes-bsp/pcie-lld/pcie-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/pcie-lld/pcie-lld-rtos_git.bb index 8aee7e45..ccd9a44b 100644 --- a/bsp/meta-ti/recipes-bsp/pcie-lld/pcie-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/pcie-lld/pcie-lld-rtos_git.bb @@ -1,32 +1,22 @@ SUMMARY = "TI RTOS low lever driver for Peripheral Interconnect Express (PCIE)" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.pcie" + +PE = "1" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://pcie.h;beginline=1;endline=34;md5=566a784d78790a716d641764d5d60b74" +LIC_FILES_CHKSUM = "file://pcie.h;beginline=1;endline=34;md5=232c0b07bdf7ab934b23c09e6c5279b0" COMPATIBLE_MACHINE = "omap-a15|keystone|c66x|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -PCIE_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/pcie-lld.git" -PCIE_LLD_GIT_PROTOCOL = "git" -PCIE_LLD_GIT_BRANCH = "master" -PCIE_LLD_GIT_DESTSUFFIX = "git/ti/drv/pcie" - -# Below commit ID corresponds to "DEV.PCIE_LLD.02.03.00.03" -PCIE_LLD_SRCREV = "202a89929d8da0ac923978145b4cc44cfafc12d5" - -BRANCH = "${PCIE_LLD_GIT_BRANCH}" -SRC_URI = "${PCIE_LLD_GIT_URI};destsuffix=${PCIE_LLD_GIT_DESTSUFFIX};protocol=${PCIE_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${PCIE_LLD_SRCREV}" -PV = "02.03.00.03" -PR = "r0" +PR = "r1" DEPENDS_append_k3 = " udma-lld-rtos \ " -S = "${WORKDIR}/${PCIE_LLD_GIT_DESTSUFFIX}" export PDK_PCIE_ROOT_PATH ="${WORKDIR}/build" export DEST_ROOT="${S}" diff --git a/bsp/meta-ti/recipes-bsp/pktlib/pktlib.inc b/bsp/meta-ti/recipes-bsp/pktlib/pktlib.inc index f2afa318..af3f8bb1 100644 --- a/bsp/meta-ti/recipes-bsp/pktlib/pktlib.inc +++ b/bsp/meta-ti/recipes-bsp/pktlib/pktlib.inc @@ -10,15 +10,15 @@ PKTLIB_GIT_PROTOCOL = "git" PKTLIB_GIT_BRANCH = "master" PKTLIB_GIT_DESTSUFFIX = "git/ti/runtime/pktlib" -# Below commit ID corresponds to "DEV.PKTLIB.2.1.0.8A" -PKTLIB_SRCREV = "1fb44eb37ba0fcf94011204c9776360bfef5696c" +# Below commit ID corresponds to "DEV.PKTLIB.2.1.0.8B" +PKTLIB_SRCREV = "6d3758fda4c8c40fa9bd1194a9c713c9675b5a40" BRANCH = "${PKTLIB_GIT_BRANCH}" # Don't use DESTSUFFIX when cloning since repo contains ti/runtime/pktlib directory tree SRC_URI = "${PKTLIB_GIT_URI};protocol=${PKTLIB_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${PKTLIB_SRCREV}" -PV = "2.1.0.8A" +PV = "2.1.0.8B" INC_PR = "r0" S = "${WORKDIR}/${PKTLIB_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/pm-lld/pm-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/pm-lld/pm-lld-rtos_git.bb index 33ed5ffe..5db670e3 100644 --- a/bsp/meta-ti/recipes-bsp/pm-lld/pm-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/pm-lld/pm-lld-rtos_git.bb @@ -20,8 +20,8 @@ PM_LLD_GIT_BRANCH_k2g = "int_pm_am335x" PM_LLD_GIT_DESTSUFFIX = "git/ti/drv/pm" -# Below commit ID corresponds to "DEV.PM_LLD.01.08.00.21" -PM_LLD_SRCREV = "73d6a8536a420de7e7c40a4f3fd49e9e3b93ac6a" +# Below commit ID corresponds to "DEV.PM_LLD.01.08.00.23" +PM_LLD_SRCREV = "7c064b93a0ae648441991abb5c71b99d2c209eeb" # Below commit ID corresponds to "DEV.PM_LLD.01.04.00.05C" PM_LLD_SRCREV_ti33x = "dd1f8486e7738956631b7f4829c8238be2e49dd6" @@ -32,7 +32,7 @@ BRANCH = "${PM_LLD_GIT_BRANCH}" SRC_URI = "${PM_LLD_GIT_URI};destsuffix=${PM_LLD_GIT_DESTSUFFIX};protocol=${PM_LLD_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${PM_LLD_SRCREV}" -PV = "01.08.00.21" +PV = "01.08.00.23" PR = "r0" S = "${WORKDIR}/${PM_LLD_GIT_DESTSUFFIX}" @@ -63,4 +63,9 @@ do_compile_append() { tar -cf pm_lld.tar --exclude='*.tar' ./* } + +# Workaround: dra7xx build requires am57xx pm libraries for opencl-monitor +TI_PDK_LIMIT_SOCS_append_dra7xx = " am571x am572x am574x" +TI_PDK_LIMIT_BOARDS_append_dra7xx = " evmAM571x evmAM572x idkAM574x" + INSANE_SKIP_${PN} = "arch staticdev" diff --git a/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-km-support-general-toolchain.patch b/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-km-support-general-toolchain.patch new file mode 100644 index 00000000..4dc219cd --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-km-support-general-toolchain.patch @@ -0,0 +1,56 @@ +From dbdbd9309a58ee723fc827ef5fd45c28347cf61f Mon Sep 17 00:00:00 2001 +From: Eric Ruei <e-ruei1@ti.com> +Date: Tue, 7 May 2019 17:06:09 -0400 +Subject: [PATCH] km: support general toolchain + +This is a patch from IMG to support general toolchains such as +aarch64-oe-linux-gnu, aarch64-poky-linux-gnu, arm-none-linux-gnueabi +per IMG ticket 122059 + +Signed-off-by: Eric Ruei <e-ruei1@ti.com> +Signed-off-by: Denys Dmytriyenko <denys@ti.com> +--- + build/linux/config/compiler.mk | 12 +++++++++++- + .../build/linux/config/compilers/arm-linux-gnueabi.mk | 6 ++++++ + 2 files changed, 17 insertions(+), 1 deletion(-) + create mode 100644 build/linux/config/compilers/arm-linux-gnueabi.mk + +diff --git a/build/linux/config/compiler.mk b/build/linux/config/compiler.mk +index 82c9d44..dead2f9 100644 +--- a/build/linux/config/compiler.mk ++++ b/build/linux/config/compiler.mk +@@ -48,13 +48,14 @@ define calculate-compiler-preferred-target + ifeq ($(2),qcc) + $(1)_compiler_preferred_target := qcc + else +- $(1)_compiler_preferred_target := $$(subst --,-,$$(shell $(2) -dumpmachine)) ++ $(1)_compiler_preferred_target := $$(subst --,-,$$(subst unknown,,$$(shell $(2) -dumpmachine))) + ifeq ($$($(1)_compiler_preferred_target),) + $$(warning No output from '$(2) -dumpmachine') + $$(warning Check that the compiler is in your PATH and CROSS_COMPILE is) + $$(warning set correctly.) + $$(error Unable to run compiler '$(2)') + endif ++ $$(warning $(1) $(2)) + ifneq ($$(filter %-w64-mingw32,$$($(1)_compiler_preferred_target)),) + # Use the compiler target name. + else +@@ -64,6 +65,15 @@ define calculate-compiler-preferred-target + ifneq ($$(filter arm-linux-android,$$($(1)_compiler_preferred_target)),) + $(1)_compiler_preferred_target := arm-linux-androideabi + endif ++ ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),) ++ $(1)_compiler_preferred_target := aarch64-linux-gnu ++ endif ++ ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),) ++ $(1)_compiler_preferred_target := arm-linux-gnueabi ++ endif ++ ifneq ($$(filter arm-%-gnueabihf,$$($(1)_compiler_preferred_target)),) ++ $(1)_compiler_preferred_target := arm-linux-gnueabihf ++ endif + ifneq ($$(filter clang%,$(2)),) + ifeq ($(1),target) + ifeq (arm-linux-gnueabihf,$$(CROSS_TRIPLE)) +-- +2.7.4 + diff --git a/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.10.5371573.bb b/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.10.5371573.bb new file mode 100644 index 00000000..2f4b7ac5 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.10.5371573.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs" +HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver" +LICENSE = "MIT | GPLv2" +LIC_FILES_CHKSUM = "file://README;beginline=15;endline=20;md5=0403c7dea01a2b8232261e805325fac2" + +inherit module + +MACHINE_KERNEL_PR_append = "e" +PR = "${MACHINE_KERNEL_PR}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "j7-evm" + +DEPENDS = "virtual/kernel" + +PROVIDES = "virtual/gpudriver" + +BRANCH = "linuxws/thud/k4.19/${PV}" + +SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ + file://0001-km-support-general-toolchain.patch \ +" +S = "${WORKDIR}/git" + +SRCREV = "fe40a51f33987c59aca300f8a976a9a9c8112703" + +PVR_SOC = "j721e_linux" +PVR_BVNC = "22.104.208.318" +PVR_BUILD = "release" +PVR_WS = "wayland" + +EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${PVR_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${PVR_SOC} WINDOW_SYSTEM=${PVR_WS}' + +do_install() { + make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B}/binary_${PVR_SOC}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install +} diff --git a/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch b/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch new file mode 100644 index 00000000..071ce0ca --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch @@ -0,0 +1,34 @@ +From 755632b4f3a40996a12bc7816a9839af7112040a Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <denys@ti.com> +Date: Mon, 9 Sep 2019 17:05:48 -0400 +Subject: [PATCH] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf + suffix + +Signed-off-by: Denys Dmytriyenko <denys@ti.com> +--- + eurasia_km/eurasiacon/build/linux2/config/compiler.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk +index dead2f9..2ba3e5e 100644 +--- a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk ++++ b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk +@@ -68,12 +68,12 @@ define calculate-compiler-preferred-target + ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),) + $(1)_compiler_preferred_target := aarch64-linux-gnu + endif ++ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi,$$($(1)_compiler_preferred_target)),) ++ $(1)_compiler_preferred_target := arm-linux-gnueabihf ++ endif + ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),) + $(1)_compiler_preferred_target := arm-linux-gnueabi + endif +- ifneq ($$(filter arm-%-gnueabihf,$$($(1)_compiler_preferred_target)),) +- $(1)_compiler_preferred_target := arm-linux-gnueabihf +- endif + endif + endef + +-- +2.7.4 + diff --git a/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb index 2b1e1ee4..5c1a50de 100644 --- a/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +++ b/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb @@ -7,26 +7,24 @@ inherit module COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" -MACHINE_KERNEL_PR_append = "q" +MACHINE_KERNEL_PR_append = "s" PR = "${MACHINE_KERNEL_PR}" PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/kernel" -PROVIDES = "omapdrm-pvr" - -RPROVIDES_${PN} = "omapdrm-pvr" -RREPLACES_${PN} = "omapdrm-pvr" -RCONFLICTS_${PN} = "omapdrm-pvr" +PROVIDES = "virtual/gpudriver" BRANCH = "ti-img-sgx/${PV}/k4.19" -SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH} \ + file://0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch \ +" S = "${WORKDIR}/git" -SRCREV = "dbdbd9309a58ee723fc827ef5fd45c28347cf61f" +SRCREV = "4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d" TARGET_PRODUCT_omap-a15 = "jacinto6evm" TARGET_PRODUCT_ti33x = "ti335x" diff --git a/bsp/meta-ti/recipes-bsp/pru/pru-icss_git.bb b/bsp/meta-ti/recipes-bsp/pru/pru-icss_git.bb index a36bce05..88d28f37 100644 --- a/bsp/meta-ti/recipes-bsp/pru/pru-icss_git.bb +++ b/bsp/meta-ti/recipes-bsp/pru/pru-icss_git.bb @@ -2,15 +2,15 @@ DESCRIPTION = "Programmable Real-time Unit Software Package" HOMEPAGE = "http://processors.wiki.ti.com/index.php/PRU-ICSS" LICENSE = "BSD-3-Clause & GPL-2.0 & PD" -LIC_FILES_CHKSUM = "file://PRU-Package-v5.0-Manifest.html;md5=a86a37c8b6396ad0ad6ae752f1aa8fcc" +LIC_FILES_CHKSUM = "file://PRU-Package-v6.0-Manifest.html;md5=ea854230556f47609efdaedca174b44c" inherit update-alternatives BRANCH = "master" SRC_URI = "git://git.ti.com/pru-software-support-package/pru-software-support-package.git;protocol=git;branch=${BRANCH}" -SRCREV = "99b1bfd8ca8780fd2306c2c939f3fd477b2e5218" +SRCREV = "ff252a5e174f1b6aa42931744939f20d25d8e070" -PV = "5.4.0" +PV = "5.6.0" PR = "r1" require recipes-ti/includes/ti-paths.inc @@ -33,6 +33,7 @@ DEPENDS = "ti-cgt-pru-native" S = "${WORKDIR}/git" export PRU_CGT = "${TI_CGT_PRU_INSTALL_DIR}" +export PRU_SSP = "${S}" SUBDIRS = "examples pru_cape/pru_fw lib/src labs" @@ -41,6 +42,7 @@ PLATFORM_ti43x = "am437x" PLATFORM_omap-a15 = "am572x" PLATFORM_k2g = "k2g" PLATFORM_am65xx = "am65x" +PLATFORM_j7-evm = "j721e" do_compile() { for dir in ${SUBDIRS} @@ -50,9 +52,17 @@ do_compile() { } do_install() { + CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" install -d ${D}/lib/firmware/pru + install -d ${D}${includedir} + cp ${CP_ARGS} ${S}/include/* ${D}${includedir} + install -d ${D}${libdir} + install -m 0644 ${S}/lib/rpmsg_lib.lib ${D}${libdir} } +FILES_${PN}-staticdev = "${libdir}" +FILES_${PN}-dev = "${includedir}" + do_install_append_ti33x() { install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \ ${D}/lib/firmware/pru @@ -123,7 +133,31 @@ do_install_append_am65xx() { done } -FILES_${PN}-halt = "/lib/firmware/pru/PRU_Halt* /lib/firmware/pru/RTU_Halt*" +do_install_append_j7-evm() { + for i in 0 1 + do + install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU${i}/PRU_Halt_${i}.out \ + ${D}/lib/firmware/pru + install -m 644 ${S}/examples/${PLATFORM}/RTU_Halt/gen/RTU${i}/RTU_Halt_${i}.out \ + ${D}/lib/firmware/pru + install -m 644 ${S}/examples/${PLATFORM}/TX_PRU_Halt/gen/TX_PRU${i}/TX_PRU_Halt_${i}.out \ + ${D}/lib/firmware/pru + done + for i in 0 1 + do + for j in 0 1 + do + install -m 0644 ${S}/examples/j721e/PRU_RPMsg_Echo_Interrupt${j}/gen/icssg${i}/PRU_RPMsg_Echo_Interrupt${i}_${j}.out \ + ${D}/lib/firmware/pru + install -m 0644 ${S}/examples/j721e/RTU_RPMsg_Echo_Interrupt${j}/gen/icssg${i}/RTU_RPMsg_Echo_Interrupt${i}_${j}.out \ + ${D}/lib/firmware/pru + + done + done +} + + +FILES_${PN}-halt = "/lib/firmware/pru/PRU_Halt* /lib/firmware/pru/RTU_Halt* /lib/firmware/pru/TX_PRU_Halt*" FILES_${PN}-rpmsg-echo = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt* /lib/firmware/pru/RTU_RPMsg_Echo_Interrupt*" # Set up names for the firmwares @@ -132,6 +166,7 @@ PRU_ICSS_ALTERNATIVES_ti43x = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_ PRU_ICSS_ALTERNATIVES_omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw" PRU_ICSS_ALTERNATIVES_k2g = "k2g-pru0_0-fw k2g-pru0_1-fw k2g-pru1_0-fw k2g-pru1_1-fw" PRU_ICSS_ALTERNATIVES_am65xx = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw" +PRU_ICSS_ALTERNATIVES_j7-evm = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw" # Set up link names for the firmwares ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "/lib/firmware/am335x-pru0-fw" @@ -165,9 +200,25 @@ ALTERNATIVE_LINK_NAME[am65x-rtu1_1-fw] = "/lib/firmware/am65x-rtu1_1-fw" ALTERNATIVE_LINK_NAME[am65x-rtu2_0-fw] = "/lib/firmware/am65x-rtu2_0-fw" ALTERNATIVE_LINK_NAME[am65x-rtu2_1-fw] = "/lib/firmware/am65x-rtu2_1-fw" +ALTERNATIVE_LINK_NAME[j7-pru0_0-fw] = "/lib/firmware/j7-pru0_0-fw" +ALTERNATIVE_LINK_NAME[j7-pru0_1-fw] = "/lib/firmware/j7-pru0_1-fw" +ALTERNATIVE_LINK_NAME[j7-pru1_0-fw] = "/lib/firmware/j7-pru1_0-fw" +ALTERNATIVE_LINK_NAME[j7-pru1_1-fw] = "/lib/firmware/j7-pru1_1-fw" +ALTERNATIVE_LINK_NAME[j7-rtu0_0-fw] = "/lib/firmware/j7-rtu0_0-fw" +ALTERNATIVE_LINK_NAME[j7-rtu0_1-fw] = "/lib/firmware/j7-rtu0_1-fw" +ALTERNATIVE_LINK_NAME[j7-rtu1_0-fw] = "/lib/firmware/j7-rtu1_0-fw" +ALTERNATIVE_LINK_NAME[j7-rtu1_1-fw] = "/lib/firmware/j7-rtu1_1-fw" +ALTERNATIVE_LINK_NAME[j7-txpru0_0-fw] = "/lib/firmware/j7-txpru0_0-fw" +ALTERNATIVE_LINK_NAME[j7-txpru0_1-fw] = "/lib/firmware/j7-txpru0_1-fw" +ALTERNATIVE_LINK_NAME[j7-txpru1_0-fw] = "/lib/firmware/j7-txpru1_0-fw" +ALTERNATIVE_LINK_NAME[j7-txpru1_1-fw] = "/lib/firmware/j7-txpru1_1-fw" + # Create the pru-icss-halt firmware alternatives ALTERNATIVE_pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}" +# Only Halt firmware images are supported for the Tx_PRU cores +ALTERNATIVE_pru-icss-halt_append_j7-evm = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw" + ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "/lib/firmware/pru/PRU_Halt.out" ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "/lib/firmware/pru/PRU_Halt.out" @@ -199,6 +250,20 @@ ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_1-fw] = "/lib/firmware/pru/RTU_Halt_ ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out" ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out" +ALTERNATIVE_TARGET_pru-icss-halt[j7-pru0_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out" +ALTERNATIVE_TARGET_pru-icss-halt[j7-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out" +ALTERNATIVE_TARGET_pru-icss-halt[j7-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out" +ALTERNATIVE_TARGET_pru-icss-halt[j7-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out" +ALTERNATIVE_TARGET_pru-icss-halt[j7-rtu0_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out" +ALTERNATIVE_TARGET_pru-icss-halt[j7-rtu0_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out" +ALTERNATIVE_TARGET_pru-icss-halt[j7-rtu1_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out" +ALTERNATIVE_TARGET_pru-icss-halt[j7-rtu1_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out" +ALTERNATIVE_TARGET_pru-icss-halt[j7-txpru0_0-fw] = "/lib/firmware/pru/TX_PRU_Halt_0.out" +ALTERNATIVE_TARGET_pru-icss-halt[j7-txpru0_1-fw] = "/lib/firmware/pru/TX_PRU_Halt_1.out" +ALTERNATIVE_TARGET_pru-icss-halt[j7-txpru1_0-fw] = "/lib/firmware/pru/TX_PRU_Halt_0.out" +ALTERNATIVE_TARGET_pru-icss-halt[j7-txpru1_1-fw] = "/lib/firmware/pru/TX_PRU_Halt_1.out" + + ALTERNATIVE_PRIORITY_pru-icss-halt = "50" # Create the pru-icss-rpmsg-echo firmware alternatives @@ -235,6 +300,15 @@ ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu1_1-fw] = "/lib/firmware/pru/RTU ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu2_0-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt2_0.out" ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu2_1-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt2_1.out" +ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-pru0_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out" +ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-pru0_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out" +ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-pru1_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out" +ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-pru1_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out" +ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-rtu0_0-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt0_0.out" +ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-rtu0_1-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt0_1.out" +ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-rtu1_0-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt1_0.out" +ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-rtu1_1-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt1_1.out" + ALTERNATIVE_PRIORITY_pru-icss-rpmsg-echo = "100" ALLOW_EMPTY_${PN} = "1" diff --git a/bsp/meta-ti/recipes-bsp/pru/pru-pwm-fw_git.bb b/bsp/meta-ti/recipes-bsp/pru/pru-pwm-fw_git.bb new file mode 100644 index 00000000..a8c71034 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/pru/pru-pwm-fw_git.bb @@ -0,0 +1,39 @@ +SUMMARY = "Programmable Real-time Unit PWM Firmware" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://main.c;beginline=1;endline=32;md5=893d6a0cf1644338ea96642c0db97f59" + +require recipes-ti/includes/ti-paths.inc + +COMPATIBLE_MACHINE = "am65xx" +PACKAGE_ARCH = "${MACHINE_ARCH}" + + + +inherit ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.pruss.example.apps.icssg_pwm.firmware.src" + +PE = "1" + +DEPENDS = "ti-cgt-pru-native pru-icss common-csl-ip-rtos" + + +EXTRA_OEMAKE += " \ + PRU_CGT="${TI_CGT_PRU_INSTALL_DIR}" \ + PRU_SSP="${STAGING_DIR_TARGET}/usr" \ + PDK_INSTALL_DIR="${STAGING_DATADIR}/ti/ti-pdk-tree/packages" \ +" + +do_compile() { + oe_runmake +} + +do_install() { + install -d ${D}/lib/firmware/ti-pruss + install -m 0644 ${S}/gen/pwm.out ${D}/lib/firmware/ti-pruss/am65x-pru0-pwm-fw.elf +} + +FILES_${PN} = "/lib/firmware" + +INSANE_SKIP_${PN} = "arch" diff --git a/bsp/meta-ti/recipes-bsp/pru/pru-swuart-fw/0001-icss_uart-add-Makefile-for-building-firmware.patch b/bsp/meta-ti/recipes-bsp/pru/pru-swuart-fw/0001-icss_uart-add-Makefile-for-building-firmware.patch new file mode 100644 index 00000000..8414d945 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/pru/pru-swuart-fw/0001-icss_uart-add-Makefile-for-building-firmware.patch @@ -0,0 +1,145 @@ +From d37359e7b2bd26da4d04fc97a94967cf457558e9 Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <denys@ti.com> +Date: Tue, 6 Aug 2019 19:50:59 -0400 +Subject: [PATCH] icss_uart: add Makefile for building firmware + +Signed-off-by: Denys Dmytriyenko <denys@ti.com> +--- + firmware/icss_uart/src/Makefile | 125 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 125 insertions(+) + create mode 100644 firmware/icss_uart/src/Makefile + +diff --git a/firmware/icss_uart/src/Makefile b/firmware/icss_uart/src/Makefile +new file mode 100644 +index 0000000..4764622 +--- /dev/null ++++ b/firmware/icss_uart/src/Makefile +@@ -0,0 +1,125 @@ ++# PRU_CGT environment variable must point to the TI PRU code gen tools directory. E.g.: ++#(Desktop Linux) export PRU_CGT=/path/to/pru/code/gen/tools/ti-cgt-pru_2.x.y ++#(Windows) set PRU_CGT=C:/path/to/pru/code/gen/tools/ti-cgt-pru_2.x.y ++#(ARM Linux*) export PRU_CGT=/usr/share/ti/cgt-pru ++# ++# *ARM Linux also needs to create a symbolic link to the /usr/bin/ directory in ++# order to use the same Makefile ++#(ARM Linux) ln -s /usr/bin/ /usr/share/ti/cgt-pru/bin ++ ++ifndef PRU_CGT ++define ERROR_BODY ++ ++******************************************************************************* ++PRU_CGT environment variable is not set. Examples given: ++(Desktop Linux) export PRU_CGT=/path/to/pru/code/gen/tools/ti-cgt-pru_2.1.2 ++(Windows) set PRU_CGT=C:/path/to/pru/code/gen/tools/ti-cgt-pru_2.1.2 ++(ARM Linux*) export PRU_CGT=/usr/share/ti/cgt-pru ++ ++*ARM Linux also needs to create a symbolic link to the /usr/bin/ directory in ++order to use the same Makefile ++(ARM Linux) ln -s /usr/bin/ /usr/share/ti/cgt-pru/bin ++******************************************************************************* ++ ++endef ++$(error $(ERROR_BODY)) ++endif ++ ++# PRU_SSP environment variable must point to the PRU Software Support Package. E.g.: ++#(Desktop Linux) export PRU_SSP=/path/to/pru_software_support_package ++#(Windows) set PRU_SSP=C:/path/to/pru_software_support_package ++#(ARM Linux*) export PRU_SSP=/path/to/pru_software_support_package ++ ++ifndef PRU_SSP ++define ERROR_BODY ++ ++******************************************************************************* ++PRU_SSP environment variable must point to the PRU Software Support Package. E.g.: ++(Desktop Linux) export PRU_SSP=/path/to/pru_software_support_package ++(Windows) set PRU_SSP=C:/path/to/pru_software_support_package ++(ARM Linux*) export PRU_SSP=/path/to/pru_software_support_package ++PRU_CGT environment variable is not set. Examples given: ++******************************************************************************* ++ ++endef ++$(error $(ERROR_BODY)) ++endif ++ ++MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) ++CURRENT_DIR := $(notdir $(patsubst %/,%,$(dir $(MKFILE_PATH)))) ++PROJ_NAME=$(CURRENT_DIR) ++LINKER_COMMAND_FILE=./AM335x_PRU.cmd ++LIBS=--library=$(PRU_SSP)/lib/rpmsg_lib.lib ++INCLUDE=--include_path=$(PRU_SSP)/include --include_path=$(PRU_SSP)/include/am335x ++STACK_SIZE=0x100 ++HEAP_SIZE=0x100 ++GEN_DIR=gen ++ ++#Common compiler and linker flags (Defined in 'PRU Optimizing C/C++ Compiler User's Guide) ++CFLAGS=-v3 -o2 --display_error_number --endian=little --hardware_mac=on --asm_directory=$(GEN_DIR) --obj_directory=$(GEN_DIR) --pp_directory=$(GEN_DIR) -ppd -ppa -DICSS_REV2 ++#Linker flags (Defined in 'PRU Optimizing C/C++ Compiler User's Guide) ++LFLAGS=--reread_libs --warn_sections --stack_size=$(STACK_SIZE) --heap_size=$(HEAP_SIZE) ++ ++TARGET=$(GEN_DIR)/$(PROJ_NAME).out ++MAP=$(GEN_DIR)/$(PROJ_NAME).map ++OBJECTS=$(patsubst %.asm,$(GEN_DIR)/%.object,$(wildcard *.asm)) ++OBJECTS+=$(patsubst %.c,$(GEN_DIR)/%.object,$(wildcard *.c)) ++ ++ ++all: printStart $(TARGET) printEnd ++ ++printStart: ++ @echo '' ++ @echo '************************************************************' ++ @echo 'Building project: $(PROJ_NAME)' ++ ++printEnd: ++ @echo '' ++ @echo 'Output files can be found in the "$(GEN_DIR)" directory' ++ @echo '' ++ @echo 'Finished building project: $(PROJ_NAME)' ++ @echo '************************************************************' ++ @echo '' ++ ++# Invokes the linker (-z flag) to make the .out file ++$(TARGET): $(OBJECTS) $(LINKER_COMMAND_FILE) ++ @echo '' ++ @echo 'Building target: $@' ++ @echo 'Invoking: PRU Linker' ++ $(PRU_CGT)/bin/clpru $(CFLAGS) -z -i$(PRU_CGT)/lib -i$(PRU_CGT)/include $(LFLAGS) -o $(TARGET) $(OBJECTS) -m$(MAP) $(LINKER_COMMAND_FILE) --library=libc.a $(LIBS) ++ @echo 'Finished building target: $@' ++ ++# Invokes the compiler on all assembly files in the directory to create the object files ++$(GEN_DIR)/%.object: %.asm ++ @mkdir -p $(GEN_DIR) ++ @echo '' ++ @echo 'Building file: $<' ++ @echo 'Invoking: PRU Compiler' ++ $(PRU_CGT)/bin/clpru --include_path=$(PRU_CGT)/include $(INCLUDE) $(CFLAGS) -fe $@ $< ++ ++# Invokes the compiler on all c files in the directory to create the object files ++$(GEN_DIR)/%.object: %.c ++ @mkdir -p $(GEN_DIR) ++ @echo '' ++ @echo 'Building file: $<' ++ @echo 'Invoking: PRU Compiler' ++ $(PRU_CGT)/bin/clpru -k --include_path=$(PRU_CGT)/include $(INCLUDE) $(CFLAGS) -fe $@ $< ++ ++.PHONY: all clean ++ ++# Remove the $(GEN_DIR) directory ++clean: ++ @echo '' ++ @echo '************************************************************' ++ @echo 'Cleaning project: $(PROJ_NAME)' ++ @echo '' ++ @echo 'Removing files in the "$(GEN_DIR)" directory' ++ @rm -rf $(GEN_DIR) ++ @echo '' ++ @echo 'Finished cleaning project: $(PROJ_NAME)' ++ @echo '************************************************************' ++ @echo '' ++ ++# Includes the dependencies that the compiler creates (-ppd and -ppa flags) ++-include $(OBJECTS:%.object=%.pp) ++ +-- +2.7.4 + diff --git a/bsp/meta-ti/recipes-bsp/pru/pru-swuart-fw/0001-icss_uart-remove-dependency-on-PDK-CSL.patch b/bsp/meta-ti/recipes-bsp/pru/pru-swuart-fw/0001-icss_uart-remove-dependency-on-PDK-CSL.patch new file mode 100644 index 00000000..b565ba0e --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/pru/pru-swuart-fw/0001-icss_uart-remove-dependency-on-PDK-CSL.patch @@ -0,0 +1,54 @@ +From 1b853cfd6194d3855310f47d43cb8c9f498b6182 Mon Sep 17 00:00:00 2001 +From: Bin Liu <b-liu@ti.com> +Date: Wed, 27 Feb 2019 14:38:43 -0600 +Subject: [PATCH] icss_uart: remove dependency on PDK/CSL + +Signed-off-by: Bin Liu <b-liu@ti.com> +--- + firmware/icss_uart/src/icss_ctrl_regs.h | 32 ++++---------------------------- + 1 file changed, 4 insertions(+), 28 deletions(-) + +diff --git a/firmware/icss_uart/src/icss_ctrl_regs.h b/firmware/icss_uart/src/icss_ctrl_regs.h +index ce640f5..99ec90d 100644 +--- a/firmware/icss_uart/src/icss_ctrl_regs.h ++++ b/firmware/icss_uart/src/icss_ctrl_regs.h +@@ -39,32 +39,8 @@ + .if !$isdefed("__icss_ctrl_regs_h") + __icss_ctrl_regs_h .set 1 + +- .cdecls C,NOLIST +-%{ +-#include "cslr_icss.h" +-%} +- +- .if $defined("ICSS_REV1") +-ICSS_PRU_CTRL_CONTROL .set (CSL_ICSSM_PRU_CTRL_CONTROL) +-ICSS_PRU_CTRL_STATUS .set (CSL_ICSSM_PRU_CTRL_STATUS) +-ICSS_PRU_CTRL_WAKEUP_EN .set (CSL_ICSSM_PRU_CTRL_WAKEUP_EN) +-ICSS_PRU_CTRL_CYCLE .set (CSL_ICSSM_PRU_CTRL_CYCLE) +-ICSS_PRU_CTRL_STALL .set (CSL_ICSSM_PRU_CTRL_STALL) +-ICSS_PRU_CTRL_CTBIR0 .set (CSL_ICSSM_PRU_CTRL_CTBIR0) +-ICSS_PRU_CTRL_CTBIR1 .set (CSL_ICSSM_PRU_CTRL_CTBIR1) +-ICSS_PRU_CTRL_CTPPR0 .set (CSL_ICSSM_PRU_CTRL_CTPPR0) +-ICSS_PRU_CTRL_CTPPR1 .set (CSL_ICSSM_PRU_CTRL_CTPPR1) +- .endif ;ICSS_REV1 +- +- .if $defined("ICSS_REV2") +-ICSS_PRU_CTRL_CONTROL .set (CSL_ICSSPRUCTRL_CONTROL) +-ICSS_PRU_CTRL_STATUS .set (CSL_ICSSPRUCTRL_STATUS) +-ICSS_PRU_CTRL_WAKEUP_EN .set (CSL_ICSSPRUCTRL_WAKEUP_EN) +-ICSS_PRU_CTRL_CYCLE .set (CSL_ICSSPRUCTRL_CYCLE) +-ICSS_PRU_CTRL_STALL .set (CSL_ICSSPRUCTRL_STALL) +-ICSS_PRU_CTRL_CTBIR0 .set (CSL_ICSSPRUCTRL_CTBIR0) +-ICSS_PRU_CTRL_CTBIR1 .set (CSL_ICSSPRUCTRL_CTBIR1) +-ICSS_PRU_CTRL_CTPPR0 .set (CSL_ICSSPRUCTRL_CTPPR0) +-ICSS_PRU_CTRL_CTPPR1 .set (CSL_ICSSPRUCTRL_CTPPR1) +- .endif ;ICSS_REV2 ++ICSS_PRU_CTRL_CONTROL .set (0x0U) ++ICSS_PRU_CTRL_STATUS .set (0x4U) ++ICSS_PRU_CTRL_WAKEUP_EN .set (0x8U) ++ICSS_PRU_CTRL_CYCLE .set (0xcU) + .endif +-- +2.7.4 + diff --git a/bsp/meta-ti/recipes-bsp/pru/pru-swuart-fw_git.bb b/bsp/meta-ti/recipes-bsp/pru/pru-swuart-fw_git.bb new file mode 100644 index 00000000..1cb51f38 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/pru/pru-swuart-fw_git.bb @@ -0,0 +1,40 @@ +SUMMARY = "Programmable Real-time Unit Software UART Firmware" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://COPYING.txt;beginline=1;endline=31;md5=94b6a199da1caf777f6756cb70aca4a7" + +require recipes-ti/includes/ti-paths.inc + +COMPATIBLE_MACHINE = "ti33x" +PACKAGE_ARCH = "${MACHINE_ARCH}" + + +inherit ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.uart" + +PE = "1" + +SRC_URI_append = " \ + file://0001-icss_uart-add-Makefile-for-building-firmware.patch \ + file://0001-icss_uart-remove-dependency-on-PDK-CSL.patch \ +" + +DEPENDS = "ti-cgt-pru-native pru-icss" + + +export PRU_CGT = "${TI_CGT_PRU_INSTALL_DIR}" +export PRU_SSP = "${STAGING_DIR_TARGET}/usr" + +do_compile() { + oe_runmake -C firmware/icss_uart/src +} + +do_install() { + install -d ${D}/lib/firmware/ti-pruss + install -m 0644 ${S}/firmware/icss_uart/src/gen/src.out ${D}/lib/firmware/ti-pruss/pru_swuart-fw.elf +} + +FILES_${PN} = "/lib/firmware" + +INSANE_SKIP_${PN} = "arch" diff --git a/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb b/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb new file mode 100644 index 00000000..430e2a4e --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb @@ -0,0 +1,45 @@ +SUMMARY = "PRU Ethernet firmware for AM65x" + +require recipes-ti/includes/ti-paths.inc +require recipes-bsp/emac-lld/emac-lld.inc + +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://icss_dualmac/src/makefile;beginline=6;endline=53;md5=3f9129d208f240940749757214bdc191" + +PR = "r0" + +TI_PDK_COMP = "ti.drv.emac.firmware" + +B = "${S}/icss_dualmac" + +COMPATIBLE_MACHINE = "am65xx" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +DEPENDS = "ti-cgt-pru-native" + +EXTRA_OEMAKE += "CL_PRU_INSTALL_PATH="${TI_CGT_PRU_INSTALL_DIR}"" + +do_compile() { + oe_runmake -C src +} + +do_install() { + install -d ${D}${base_libdir}/firmware/ti-pruss + + install -m 0644 bin/rxl2_txl2_rgmii0/rxl2_txl2.out \ + ${D}${base_libdir}/firmware/ti-pruss/am65x-pru0-prueth-fw.elf + + install -m 0644 bin/rtu_test0/rtu_v2.out \ + ${D}${base_libdir}/firmware/ti-pruss/am65x-rtu0-prueth-fw.elf + + install -m 0644 bin/rxl2_txl2_rgmii1/rxl2_txl2.out \ + ${D}${base_libdir}/firmware/ti-pruss/am65x-pru1-prueth-fw.elf + + install -m 0644 bin/rtu_test1/rtu_v2.out \ + ${D}${base_libdir}/firmware/ti-pruss/am65x-rtu1-prueth-fw.elf +} + +FILES_${PN} = "${base_libdir}/firmware" + +INSANE_SKIP_${PN} = "arch" diff --git a/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-bin_git.bb b/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-bin_git.bb deleted file mode 100644 index 60dc0879..00000000 --- a/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-bin_git.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "PRU Ethernet firmware for AM65xx" - -LICENSE = "TI-TFL" -LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76" - -PV = "5.3.0.5" - -CLEANBROKEN = "1" - -COMPATIBLE_MACHINE = "am65xx-evm" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRCREV = "534ba03becfa9b39ccbd42b97e091abd94a207e7" -BRANCH ?= "ti-linux-firmware" - -SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}" - -S = "${WORKDIR}/git" - -TARGET = "am65x-pru0-prueth-fw.elf am65x-pru1-prueth-fw.elf am65x-rtu0-prueth-fw.elf am65x-rtu1-prueth-fw.elf" - -do_install() { - install -d ${D}${base_libdir}/firmware/ti-pruss - for f in ${TARGET}; do - install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f - done -} - -FILES_${PN} = "${base_libdir}/firmware" - -INSANE_SKIP_${PN} = "arch" diff --git a/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw_git.bb b/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw_git.bb index 573a428b..f7718ad2 100644 --- a/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw_git.bb +++ b/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw_git.bb @@ -4,32 +4,34 @@ require recipes-ti/includes/ti-paths.inc require recipes-bsp/icss-emac-lld/icss-emac-lld.inc LICENSE = "TI-TFL" -LIC_FILES_CHKSUM = "file://src/firmware_version.h;beginline=6;endline=53;md5=1f0a640a261059cdcbbcf01e6a739ff3" +LIC_FILES_CHKSUM = "file://icss_dualemac/src/firmware_version.h;beginline=6;endline=53;md5=1f0a640a261059cdcbbcf01e6a739ff3" -PV = "${PV_DUALEMAC_FW}" PR = "${INC_PR}.0" -S = "${WORKDIR}/${ICSS_EMAC_LLD_GIT_DESTSUFFIX}/firmware/icss_dualemac" +TI_PDK_COMP = "ti.drv.icss_emac.firmware" -COMPATIBLE_MACHINE = "am57xx-evm|am437x-evm|am335x-evm|k2g" +B = "${S}/icss_dualemac" + +COMPATIBLE_MACHINE = "am57xx-evm|am57xx-hs-evm|ti43x|ti33x|k2g" PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "ti-cgt-pru-native" PRU_VERSION = "" -PRU_VERSION_am335x-evm = "REV1" -PRU_VERSION_am437x-evm = "REV1" +PRU_VERSION_ti33x = "REV1" +PRU_VERSION_ti43x = "REV1" PRU_VERSION_am57xx-evm = "REV2" +PRU_VERSION_am57xx-hs-evm = "REV2" PRU_VERSION_k2g = "REV2" FW_PREFIX = "" -FW_PREFIX_am335x-evm = "am335x" -FW_PREFIX_am437x-evm = "am437x" +FW_PREFIX_ti33x = "am335x" +FW_PREFIX_ti43x = "am437x" FW_PREFIX_am57xx-evm = "am57xx" +FW_PREFIX_am57xx-hs-evm = "am57xx" FW_PREFIX_k2g = "k2g" - EXTRA_OEMAKE += "CL_PRU_INSTALL_PATH="${TI_CGT_PRU_INSTALL_DIR}" PRU_VERSION_LIST="${PRU_VERSION}"" do_install() { diff --git a/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld-apps_git.bb b/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld-apps_git.bb index 5867984b..48eab404 100644 --- a/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld-apps_git.bb +++ b/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld-apps_git.bb @@ -9,8 +9,6 @@ include pruss-lld.inc PR = "${INC_PR}.0" -S = "${WORKDIR}/${PRUSS_LLD_GIT_DESTSUFFIX}" - EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} PDK_PKG_PATH=${STAGING_DATADIR}/ti/ti-pdk-tree/packages PRUSS_SRC_DIR=${S}" diff --git a/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld-rtos_git.bb index b8db20ed..9ab09b64 100644 --- a/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld-rtos_git.bb @@ -6,8 +6,6 @@ require recipes-bsp/pruss-lld/pruss-lld.inc COMPATIBLE_MACHINE_append = "|k3" PR = "${INC_PR}.0" -S = "${WORKDIR}/${PRUSS_LLD_GIT_DESTSUFFIX}" - DEPENDS_append = " osal-rtos" DEPENDS_append_ti33x = " starterware-rtos" DEPENDS_append_ti43x = " starterware-rtos" diff --git a/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld-test_git.bb b/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld-test_git.bb index 93f19011..8007f652 100644 --- a/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld-test_git.bb +++ b/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld-test_git.bb @@ -6,8 +6,6 @@ include pruss-lld.inc PR = "${INC_PR}.2" -S = "${WORKDIR}/${PRUSS_LLD_GIT_DESTSUFFIX}" - EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} PRUSS_SRC_DIR=${S}" DEVICE_LIST ?= "${TI_PDK_LIMIT_SOCS}" diff --git a/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld.inc b/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld.inc index 2480adfd..793ba838 100644 --- a/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld.inc +++ b/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld.inc @@ -4,18 +4,11 @@ LIC_FILES_CHKSUM = "file://pruicss.h;beginline=1;endline=31;md5=315177aa03d58bcd COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g" PACKAGE_ARCH = "${MACHINE_ARCH}" -PRUSS_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/pruss-lld.git" -PRUSS_LLD_GIT_PROTOCOL = "git" -PRUSS_LLD_GIT_BRANCH = "master" -PRUSS_LLD_GIT_DESTSUFFIX = "git/ti/drv/pruss" +inherit ti-pdk-fetch -# Below commit ID corresponds to "DEV.PRUSS_LLD.01.00.00.13" -PRUSS_LLD_SRCREV = "21fee01370547a5a84076a50e66fe0d4f5dc51f2" +TI_PDK_COMP = "ti.drv.pruss" -BRANCH = "${PRUSS_LLD_GIT_BRANCH}" -SRC_URI = "${PRUSS_LLD_GIT_URI};destsuffix=${PRUSS_LLD_GIT_DESTSUFFIX};protocol=${PRUSS_LLD_GIT_PROTOCOL};branch=${BRANCH}" +PE = "1" -SRCREV = "${PRUSS_LLD_SRCREV}" -PV = "01.00.00.13" INC_PR = "r0" diff --git a/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld_git.bb b/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld_git.bb index 5b0a2576..f1e93cd7 100644 --- a/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld_git.bb @@ -6,8 +6,6 @@ include pruss-lld.inc PR = "${INC_PR}.2" -S = "${WORKDIR}/${PRUSS_LLD_GIT_DESTSUFFIX}" - EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}" do_compile () { diff --git a/bsp/meta-ti/recipes-bsp/prusw-fw/prusw-fw_git.bb b/bsp/meta-ti/recipes-bsp/prusw-fw/prusw-fw_git.bb new file mode 100644 index 00000000..2921fb1d --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/prusw-fw/prusw-fw_git.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "PRU Switch firmware for AM57xx" + +require recipes-ti/includes/ti-paths.inc +require recipes-bsp/icss-emac-lld/icss-emac-lld.inc + +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://icss_dualemac/src/firmware_version.h;beginline=6;endline=53;md5=1f0a640a261059cdcbbcf01e6a739ff3" + +PR = "${INC_PR}.0" + +TI_PDK_COMP = "ti.drv.icss_emac.firmware" + +B = "${S}/icss_switch" + +COMPATIBLE_MACHINE = "dra7xx" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +DEPENDS = "ti-cgt-pru-native" + +PRU_VERSION = "" +PRU_VERSION_dra7xx = "REV2" + +FW_PREFIX = "" +FW_PREFIX_dra7xx = "am57xx" + + +EXTRA_OEMAKE += "CL_PRU_INSTALL_PATH="${TI_CGT_PRU_INSTALL_DIR}" PRU_VERSION_LIST="${PRU_VERSION}"" + +do_install() { + install -d ${D}${base_libdir}/firmware/ti-pruss + install -m 0644 ./elf/${PRU_VERSION}/icss_stp_switch_PRU0.elf \ + ${D}${base_libdir}/firmware/ti-pruss/${FW_PREFIX}-pru0-prusw-fw.elf + install -m 0644 ./elf/${PRU_VERSION}/icss_stp_switch_PRU1.elf \ + ${D}${base_libdir}/firmware/ti-pruss/${FW_PREFIX}-pru1-prusw-fw.elf +} + +FILES_${PN} = "${base_libdir}/firmware" + +INSANE_SKIP_${PN} = "arch" diff --git a/bsp/meta-ti/recipes-bsp/qmss-lld/qmss-lld.inc b/bsp/meta-ti/recipes-bsp/qmss-lld/qmss-lld.inc index d579dfa1..5c9620f9 100644 --- a/bsp/meta-ti/recipes-bsp/qmss-lld/qmss-lld.inc +++ b/bsp/meta-ti/recipes-bsp/qmss-lld/qmss-lld.inc @@ -4,19 +4,12 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/qmss/COPYING.txt;md5=cd04fb0870 COMPATIBLE_MACHINE = "keystone" PACKAGE_ARCH = "${MACHINE_ARCH}" -QMSS_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/qmss-lld.git" -QMSS_LLD_GIT_PROTOCOL = "git" -QMSS_LLD_GIT_BRANCH = "master" -QMSS_LLD_GIT_DESTSUFFIX = "git/ti/drv/qmss" +inherit ti-pdk-fetch -# Below commit ID corresponding to "DEV.QMSS_LLD.02.01.00.16" -QMSS_LLD_SRCREV = "7934ae59f545b302ede96482e61a1f79ff3518ce" +TI_PDK_COMP = "ti.drv.qmss" -BRANCH ="${QMSS_LLD_GIT_BRANCH}" -SRC_URI = "${QMSS_LLD_GIT_URI};destsuffix=${QMSS_LLD_GIT_DESTSUFFIX};protocol=${QMSS_LLD_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${QMSS_LLD_SRCREV}" +PE = "1" -PV = "02.01.00.16" INC_PR = "r0" DEVICELIST = "k2h k2k k2l k2e" @@ -24,4 +17,3 @@ DEVICELIST_k2hk = "k2h k2k" DEVICELIST_k2l = "k2l" DEVICELIST_k2e = "k2e" -S = "${WORKDIR}/${QMSS_LLD_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/rm-lld/rm-lld.inc b/bsp/meta-ti/recipes-bsp/rm-lld/rm-lld.inc index 7b09c8e5..e6e61af0 100644 --- a/bsp/meta-ti/recipes-bsp/rm-lld/rm-lld.inc +++ b/bsp/meta-ti/recipes-bsp/rm-lld/rm-lld.inc @@ -2,22 +2,14 @@ DESCRIPTION = "TI Resource Manager Low Level Driver" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/rm/COPYING.txt;md5=dc61631b65360e6beb73b6c337800afc" -RM_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/rm-lld.git" -RM_LLD_GIT_PROTOCOL = "git" -RM_LLD_GIT_BRANCH = "master" -RM_LLD_GIT_DESTSUFFIX = "git/ti/drv/rm" +inherit ti-pdk-fetch -# Below commit ID corresponds to "DEV.RM_LLD.02.02.00.03A" -RM_LLD_SRCREV = "c90a9a8c7398e863571dc6af46d5b23389239ec5" +TI_PDK_COMP = "ti.drv.rm" -BRANCH = "${RM_LLD_GIT_BRANCH}" -SRC_URI = "${RM_LLD_GIT_URI};destsuffix=${RM_LLD_GIT_DESTSUFFIX};protocol=${RM_LLD_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${RM_LLD_SRCREV}" +PE = "1" -PV = "02.02.00.03A" INC_PR = "r0" COMPATIBLE_MACHINE = "keystone" BASEDIR = "${WORKDIR}/git" -S = "${BASEDIR}/ti/drv/rm" diff --git a/bsp/meta-ti/recipes-bsp/rwmem/rwmem_1.1.bb b/bsp/meta-ti/recipes-bsp/rwmem/rwmem_1.1.bb deleted file mode 100644 index 2848e1cd..00000000 --- a/bsp/meta-ti/recipes-bsp/rwmem/rwmem_1.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "A small tool to read/write memory" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRCREV = "54904b8873b265d8f1faf82617c2f04814c102c6" -SRC_URI = "git://github.com/tomba/rwmem.git" - -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}${bindir} - install -m 0755 rwmem ${D}${bindir} -} diff --git a/bsp/meta-ti/recipes-bsp/rwmem/rwmem_1.2.bb b/bsp/meta-ti/recipes-bsp/rwmem/rwmem_1.2.bb new file mode 100644 index 00000000..0545b0cc --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/rwmem/rwmem_1.2.bb @@ -0,0 +1,27 @@ +SUMMARY = "A small tool to read/write memory" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS += "python3" + +PV .= "+git${SRCPV}" + +SRCREV_rwmem = "cc296c5366a35a4c4271cfa3cc9831f6f34bfd9d" +SRCREV_inih = "4b10c654051a86556dfdb634c891b6c3224c4109" +SRCREV_pybind11 = "9a19306fbf30642ca331d0ec88e7da54a96860f9" + +SRCREV_FORMAT = "rwmem_inih_pybind11" + +SRC_URI = "git://github.com/tomba/rwmem.git;protocol=https;name=rwmem \ + git://github.com/benhoyt/inih.git;protocol=https;name=inih;nobranch=1;destsuffix=git/ext/inih \ + git://github.com/pybind/pybind11.git;protocol=https;name=pybind11;nobranch=1;destsuffix=git/ext/pybind11 \ + " + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +do_install() { + install -D -m 0755 ${B}/bin/rwmem ${D}${bindir}/rwmem + install -D -m 0644 ${B}/lib/librwmem.a ${D}${libdir}/librwmem.a +} diff --git a/bsp/meta-ti/recipes-bsp/sa-lld/sa-lld.inc b/bsp/meta-ti/recipes-bsp/sa-lld/sa-lld.inc index 0d8b0f94..4eaa0f80 100644 --- a/bsp/meta-ti/recipes-bsp/sa-lld/sa-lld.inc +++ b/bsp/meta-ti/recipes-bsp/sa-lld/sa-lld.inc @@ -8,14 +8,14 @@ SA_LLD_GIT_PROTOCOL = "git" SA_LLD_GIT_BRANCH = "master" SA_LLD_GIT_DESTSUFFIX = "git/ti/drv/sa" -# Below commit ID corresponding to "DEV.SA_LLD.04.00.00.02" -SA_LLD_SRCREV = "0fa21847bc633c66512352007b4a713073aae968" +# Below commit ID corresponding to "DEV.SA_LLD.04.00.00.03B" +SA_LLD_SRCREV = "ac85eea98ccb73fa00006afca8ae03536e933134" BRANCH = "${SA_LLD_GIT_BRANCH}" SRC_URI = "${SA_LLD_GIT_URI};destsuffix=${SA_LLD_GIT_DESTSUFFIX};protocol=${SA_LLD_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${SA_LLD_SRCREV}" -PV = "04.00.00.02" +PV = "04.00.00.03B" INC_PR = "r0" S = "${WORKDIR}/${SA_LLD_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/sciclient/sciclient-rtos_git.bb b/bsp/meta-ti/recipes-bsp/sciclient/sciclient-rtos_git.bb index e1455993..d14c4a12 100644 --- a/bsp/meta-ti/recipes-bsp/sciclient/sciclient-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/sciclient/sciclient-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI RTOS low level driver for SCICLIENT" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.sciclient" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://sciclient.h;beginline=1;endline=31;md5=7224b2eeca1444815f1737bfcdfa892a" @@ -8,37 +12,21 @@ LIC_FILES_CHKSUM = "file://sciclient.h;beginline=1;endline=31;md5=7224b2eeca1444 COMPATIBLE_MACHINE = "k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -SCICLIENT_GIT_URI = "git://git.ti.com/keystone-rtos/sciclient.git" -SCICLIENT_GIT_PROTOCOL = "git" -SCICLIENT_GIT_BRANCH = "master" - -# Below commit ID corresponds to "DEV.SCICLIENT.01.00.00.02B" -SCICLIENT_SRCREV = "3b88caad398d2eeca7acf4f02c24aaa993c6b545" - -BRANCH = "${SCICLIENT_GIT_BRANCH}" -SRC_URI = "${SCICLIENT_GIT_URI};protocol=${SCICLIENT_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${SCICLIENT_SRCREV}" -PV = "01.00.00.02B" PR = "r0" -DEPENDS_append = " osal-rtos common-csl-ip-rtos" +DEPENDS_append = " osal-rtos common-csl-ip-rtos openssl-native" # Build with make instead of XDC TI_PDK_XDCMAKE = "0" -SCICLIENT_PACKAGE_BASE = "${S}/../sciclient_base" +SCICLIENT_PACKAGE_BASE = "${WORKDIR}/sciclient_base" SCICLIENT_ROOTPATH = "${SCICLIENT_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv/sciclient" export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages" export PDK_SCICLIENT_ROOT_PATH = "${SCICLIENT_PACKAGE_BASE}/package/all/pdk_/packages" -#export PDK_SCICLIENT_ROOT_PATH ="${WORKDIR}/build" -#export DEST_ROOT="${S}" - -LIMSOCS_am65xx = "am65xx" -LIMBOARDS_am65xx = "am65xx_evm" -BOARD_PACKAGE_am65xx = "am65xx_evm" +# Sciclient for am65x supports mcu1_1 in addition to the default cores in TI_PDK_LIMIT_CORES +TI_PDK_LIMIT_CORES_append_am65xx = " mcu1_1" # HTML doc link params PDK_COMP_LINK_TEXT = "SCICLIENT" @@ -52,7 +40,7 @@ do_configure() { rm -f ${SCICLIENT_PACKAGE_BASE} # make the release package before building it - make package BOARD=${BOARD_PACKAGE} DEST_ROOT=${SCICLIENT_PACKAGE_BASE} PDK_SCICLIENT_COMP_PATH=${S} + make package BOARD="${TI_PDK_LIMIT_BOARDS}" DEST_ROOT=${SCICLIENT_PACKAGE_BASE} PDK_SCICLIENT_COMP_PATH=${S} # This is to ensure the make package completed successfully cat ${SCICLIENT_ROOTPATH}/makefile @@ -66,12 +54,47 @@ do_compile() { # make clean LIMIT_SOCS="${LIMSOCS}" LIMIT_BOARDS="${LIMBOARDS}" # Build am65xx libraries - make lib xdc_meta doxygen LIMIT_SOCS="${LIMSOCS}" LIMIT_BOARDS="${LIMBOARDS}" + make lib xdc_meta doxygen LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" LIMIT_CORES="${TI_PDK_LIMIT_CORES}" #archive tar -cf sciclient.tar --exclude='*.tar' ./* } + +do_compile_prepend_am65xx-hs-evm() { + + cd ${SCICLIENT_ROOTPATH} + + # Saving the GP firmware to a different GP name + cp ${CP_ARGS} ./soc/V0/sysfw.bin ./soc/V0/sysfw-gp.bin + + cd ${SCICLIENT_ROOTPATH}/tools + # Create the .bin file for HS + ${SCICLIENT_ROOTPATH}/tools/firmwareHeaderGen.sh am65x-hs ${PDK_INSTALL_DIR}/packages + cd - +} + +do_compile_prepend_am65xx-evm() { + + cd ${SCICLIENT_ROOTPATH}/tools + + # Create the .bin file for GP, PG1 + ${SCICLIENT_ROOTPATH}/tools/firmwareHeaderGen.sh am65x ${PDK_INSTALL_DIR}/packages + # Create the .bin file for GP, PG2 + ${SCICLIENT_ROOTPATH}/tools/firmwareHeaderGen.sh am65x_pg2 ${PDK_INSTALL_DIR}/packages + + cd - +} + + +do_compile_prepend_j7-evm() { + + cd ${SCICLIENT_ROOTPATH}/tools + # Create the .bin file for GP + ${SCICLIENT_ROOTPATH}/tools/firmwareHeaderGen.sh j721e ${PDK_INSTALL_DIR}/packages + cd - +} + do_install() { cd ${SCICLIENT_ROOTPATH} install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/sciclient @@ -83,3 +106,6 @@ FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages" INSANE_SKIP_${PN} = "arch ldflags file-rdeps" INSANE_SKIP_${PN}-dbg = "arch" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/bsp/meta-ti/recipes-bsp/serdes-diag/serdes-diag-rtos_git.bb b/bsp/meta-ti/recipes-bsp/serdes-diag/serdes-diag-rtos_git.bb index 6b6792e3..442c4cb1 100644 --- a/bsp/meta-ti/recipes-bsp/serdes-diag/serdes-diag-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/serdes-diag/serdes-diag-rtos_git.bb @@ -5,7 +5,7 @@ inherit ti-pdk LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://serdes_diag.h;beginline=1;endline=42;;md5=68e7ce6fdc0e9328fa7d0ec41c54420c" -COMPATIBLE_MACHINE = "keystone|c66x" +COMPATIBLE_MACHINE = "keystone|c66x|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" SERDES_DIAG_GIT_URI = "git://git.ti.com/keystone-rtos/serdes_diag.git" @@ -13,18 +13,22 @@ SERDES_DIAG_GIT_PROTOCOL = "git" SERDES_DIAG_GIT_BRANCH = "master" SERDES_DIAG_GIT_DESTSUFFIX = "git/ti/diag/serdes_diag" -# Below commit ID corresponds to "DEV.DIAG_SERDES_SB.01.00.00.11A" -SERDES_DIAG_SRCREV = "74db059c48ca5a903dab9cfbf665fd8693de8296" +# Below commit ID corresponds to "DEV.DIAG_SERDES_SB.01.00.00.13" +SERDES_DIAG_SRCREV = "6dd7cd2170efe3cb41cc424486ba55b8d5bba354" BRANCH = "${SERDES_DIAG_GIT_BRANCH}" SRC_URI = "${SERDES_DIAG_GIT_URI};destsuffix=${SERDES_DIAG_GIT_DESTSUFFIX};protocol=${SERDES_DIAG_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${SERDES_DIAG_SRCREV}" -PV = "01.00.00.11A" +PV = "01.00.00.13" PR = "r0" S = "${WORKDIR}/${SERDES_DIAG_GIT_DESTSUFFIX}" + +# Build with make instead of XDC for k3 +TI_PDK_XDCMAKE_k3 = "0" + # HTML doc link params PDK_COMP_LINK_TEXT = "SERDES Diagnostics" diff --git a/bsp/meta-ti/recipes-bsp/spi-lld/spi-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/spi-lld/spi-lld-rtos_git.bb index c33bc4b6..7d53d15c 100644 --- a/bsp/meta-ti/recipes-bsp/spi-lld/spi-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/spi-lld/spi-lld-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI RTOS low level driver for Serial Peripheral Interface (SPI)" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.spi" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://SPI.h;beginline=1;endline=31;md5=8580f9c5c0de8d5d13518cf18a0122b8" @@ -8,18 +12,6 @@ LIC_FILES_CHKSUM = "file://SPI.h;beginline=1;endline=31;md5=8580f9c5c0de8d5d1351 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|c66x|omapl1|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -SPI_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/spi-lld.git" -SPI_LLD_GIT_PROTOCOL = "git" -SPI_LLD_GIT_BRANCH = "master" - -# Below commit ID corresponds to "DEV.SPI_LLD.01.00.00.14A" -SPI_LLD_SRCREV = "f88180f7ee61670dc3addc3781507f04270a7eda" - -BRANCH = "${SPI_LLD_GIT_BRANCH}" -SRC_URI = "${SPI_LLD_GIT_URI};protocol=${SPI_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${SPI_LLD_SRCREV}" -PV = "01.00.00.14A" PR = "r0" DEPENDS_append = " osal-rtos \ diff --git a/bsp/meta-ti/recipes-bsp/srio-lld/srio-lld.inc b/bsp/meta-ti/recipes-bsp/srio-lld/srio-lld.inc index 2da8245e..efe379ff 100644 --- a/bsp/meta-ti/recipes-bsp/srio-lld/srio-lld.inc +++ b/bsp/meta-ti/recipes-bsp/srio-lld/srio-lld.inc @@ -3,24 +3,16 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/srio/srio_drv.h;beginline=1;end COMPATIBLE_MACHINE = "k2hk" -SRIO_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/srio-lld.git" -SRIO_LLD_GIT_PROTOCOL = "git" -SRIO_LLD_GIT_BRANCH = "master" -SRIO_LLD_GIT_DESTSUFFIX = "git/ti/drv/srio" +inherit ti-pdk-fetch -# commit ID corresponding to "DEV.SRIO_LLD.02.00.00.17" -SRIO_LLD_SRCREV = "444fe581426c04c9d57f9bce6763ebe43ce284f8" +TI_PDK_COMP = "ti.drv.srio" -BRANCH = "${SRIO_LLD_GIT_BRANCH}" -SRC_URI = "${SRIO_LLD_GIT_URI};destsuffix=${SRIO_LLD_GIT_DESTSUFFIX};protocol=${SRIO_LLD_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${SRIO_LLD_SRCREV}" +PE = "1" -PV = "02.00.00.17" INC_PR = "r0" DEVICELIST = "k2h k2k" BASEDIR = "${WORKDIR}/git" -S = "${BASEDIR}/ti/drv/srio" EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}" diff --git a/bsp/meta-ti/recipes-bsp/srio-lld/srio-lld_git.bb b/bsp/meta-ti/recipes-bsp/srio-lld/srio-lld_git.bb index 48e76337..3797bef6 100644 --- a/bsp/meta-ti/recipes-bsp/srio-lld/srio-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/srio-lld/srio-lld_git.bb @@ -17,4 +17,5 @@ do_compile () { do_install () { oe_runmake install INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} + chown -R root:root ${D} } diff --git a/bsp/meta-ti/recipes-bsp/starterware/starterware.inc b/bsp/meta-ti/recipes-bsp/starterware/starterware.inc index f77e5dde..ae098211 100644 --- a/bsp/meta-ti/recipes-bsp/starterware/starterware.inc +++ b/bsp/meta-ti/recipes-bsp/starterware/starterware.inc @@ -8,14 +8,14 @@ STARTERWARE_GIT_URI = "git://git.ti.com/keystone-rtos/starterware.git" STARTERWARE_GIT_PROTOCOL = "git" STARTERWARE_GIT_BRANCH = "master" -# Below commit ID corresponds to "DEV.STARTERWARE.PROCSDK.02.01.01.10" -STARTERWARE_SRCREV = "15b7839d4fe9bfb7188025c3710ea9d7c4118309" +# Below commit ID corresponds to "DEV.STARTERWARE.PROCSDK.02.01.01.12" +STARTERWARE_SRCREV = "7f418b7471ca11ba4c6d91b4a7eb992a1dd55d7d" BRANCH = "${STARTERWARE_GIT_BRANCH}" SRC_URI = "${STARTERWARE_GIT_URI};protocol=${STARTERWARE_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${STARTERWARE_SRCREV}" -PV = "02.01.01.10" +PV = "02.01.01.12" INC_PR = "r0" S = "${WORKDIR}/git" diff --git a/bsp/meta-ti/recipes-bsp/tcp3d-lld/tcp3d-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/tcp3d-lld/tcp3d-lld-rtos_git.bb index 8e62eea8..0f7c52bb 100644 --- a/bsp/meta-ti/recipes-bsp/tcp3d-lld/tcp3d-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/tcp3d-lld/tcp3d-lld-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI third generation Turbo Coprocessor (TCP3) low level driver" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.tcp3d" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://tcp3dver.h;beginline=1;endline=47;md5=3fe46c6320fb9ca4ac6692961402beb7" @@ -8,23 +12,8 @@ LIC_FILES_CHKSUM = "file://tcp3dver.h;beginline=1;endline=47;md5=3fe46c6320fb9ca COMPATIBLE_MACHINE = "k2hk|k2l|c66x" PACKAGE_ARCH = "${MACHINE_ARCH}" -TCP3D_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/tcp3d-lld.git" -TCP3D_LLD_GIT_PROTOCOL = "git" -TCP3D_LLD_GIT_BRANCH = "master" -TCP3D_LLD_GIT_DESTSUFFIX = "git/ti/drv/bcp" - -# Below commit ID corresponds to "DEV.TCP3D_LLD.02.01.00.06A" -TCP3D_LLD_SRCREV = "336cdfbbe999f1ec51cdb36915c335141c317d4d" - -BRANCH = "${TCP3D_LLD_GIT_BRANCH}" -SRC_URI = "${TCP3D_LLD_GIT_URI};destsuffix=${TCP3D_LLD_GIT_DESTSUFFIX};protocol=${TCP3D_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${TCP3D_LLD_SRCREV}" -PV = "02.01.00.06A" PR = "r0" -S = "${WORKDIR}/${TCP3D_LLD_GIT_DESTSUFFIX}" - DEPENDS_append = " edma3-lld-rtos" export EDMA3LLD_BIOS6_INSTALLDIR = "${EDMA3_LLD_INSTALL_DIR}" diff --git a/bsp/meta-ti/recipes-bsp/ti-display-sharing-fw/ti-display-sharing-fw_git.bb b/bsp/meta-ti/recipes-bsp/ti-display-sharing-fw/ti-display-sharing-fw_git.bb new file mode 100644 index 00000000..9115b6b4 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ti-display-sharing-fw/ti-display-sharing-fw_git.bb @@ -0,0 +1,48 @@ +SUMMARY = "TI Display Sharing Firmware" + +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76" + +PV = "06.01.00.00+git${SRCPV}" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit deploy +inherit update-alternatives + +PROTOCOL = "git" +BRANCH = "ti-linux-firmware" +SRCREV = "e7be1ab85266c47236330e2909997d20fc62e312" + +SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=${PROTOCOL};branch=${BRANCH}" + +S = "${WORKDIR}/git" + +TI_DISP_SHARE_FW_DIR = "${S}/ti-display-sharing/" +TI_DISP_SHARE_FW_FILENAME = "ti-display-sharing-j721e.bin" + +# make sure that lib/firmware, and all its contents are part of the package +FILES_${PN} += "${base_libdir}/firmware" + +do_install() { + install -d ${D}${base_libdir}/firmware + install -m 0755 ${TI_DISP_SHARE_FW_DIR}/${TI_DISP_SHARE_FW_FILENAME} ${D}${base_libdir}/firmware +} + +TARGET_MAIN_R5FSS0_1 = "j7-main-r5f0_1-fw" +ALTERNATIVE_${PN} = "j7-main-r5f0_1-fw" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}" +ALTERNATIVE_TARGET[j7-main-r5f0_1-fw] = "${base_libdir}/firmware/${TI_DISP_SHARE_FW_FILENAME}" +ALTERNATIVE_PRIORITY = "9" + +# This is used to prevent the build system to strip the executables +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" + +# This is used to prevent the build system to split the debug info in a separate file +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP +INSANE_SKIP_${PN} += "arch" + +# we don't want to configure and build the source code +do_compile[noexec] = "1" +do_configure[noexec] = "1" diff --git a/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/ti-img-encode-decode_1.0.0.bb b/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/ti-img-encode-decode_1.0.0.bb new file mode 100644 index 00000000..a1da9585 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/ti-img-encode-decode_1.0.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "Kernel drivers for the IMG VXE384 MP2 and D5520 encoder/decoder found in TI SoCs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://driver/common/dq.c;beginline=1;endline=16;md5=e015e28ff5e88576dab9fdf641e3dbfe" + +inherit module + +MACHINE_KERNEL_PR_append = "g" +PR = "${MACHINE_KERNEL_PR}" + +COMPATIBLE_MACHINE = "j7-evm" + +SRCREV = "0eba3678300f649e49f03d92d1b624cf0e008008" + +EXTRA_OEMAKE = "KPATH=${STAGING_KERNEL_DIR} KCONF=${STAGING_KERNEL_BUILDDIR}" +TARGET_CC_ARCH += "${LDFLAGS}" + +BRANCH = "master" +SRC_URI = "git://git.ti.com/jacinto7_multimedia/ti-img-encode-decode.git;protocol=git;branch=${BRANCH}" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake all -C ${S}/linux/decoder + oe_runmake all -C ${S}/linux/encoder +} + +do_install() { + install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra + install -m 644 ${S}/linux/decoder/vxd-dec.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra + install -m 644 ${S}/linux/encoder/vxe-enc.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra +} diff --git a/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb b/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb new file mode 100644 index 00000000..48a17537 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "Test applications for TI DEC (v4l2 decoder for IMG D5520)" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://main.c;beginline=1;endline=14;md5=f17e17d664f72942124e4fcf06c178ee" + +DEPENDS = "libdrm ffmpeg" + +inherit autotools pkgconfig + +PR = "r1" +SRCREV = "94a80c8c090dbfdc7fafd4e5bb78c2091e715af2" + +EXTRA_OEMAKE = "CC="${CC}"" +TARGET_CC_ARCH += "${LDFLAGS}" + +BRANCH = "master" +SRC_URI = "git://git.ti.com/jacinto7_multimedia/viddec-test-app.git;protocol=git;branch=${BRANCH}" + +S = "${WORKDIR}/git" diff --git a/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb b/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb new file mode 100644 index 00000000..3bb5d745 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "Test applications for TI ENC (v4l2 encoder for IMG VXE384)" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://main.c;beginline=1;endline=14;md5=3545dd5bdf513840937d38c10b866605" + +DEPENDS = "libdrm" + +inherit autotools pkgconfig + +PR = "r0" +SRCREV = "a5e7d820bea1be24f25a8369d4d4521c784f869a" + +EXTRA_OEMAKE = "CC="${CC}"" +TARGET_CC_ARCH += "${LDFLAGS}" + +BRANCH = "master" +SRC_URI = "git://git.ti.com/jacinto7_multimedia/videnc-test-app.git;protocol=git;branch=${BRANCH}" + +S = "${WORKDIR}/git" diff --git a/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb b/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb new file mode 100644 index 00000000..2812fa2c --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb @@ -0,0 +1,34 @@ +SUMMARY = "Video Decoding Firmware Packaging recipe" +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84ca7278930db001870686ad997d6bb1" + +BRANCH = "master" +SRCREV = "0acbf1d0a7c7eaca0ef14c1a30ce313ea82147e5" + +SRC_URI = "git://git.ti.com/jacinto7_multimedia/ti-img-encode-decode.git;protocol=git;branch=${BRANCH}" + +S = "${WORKDIR}/git" + +PV = "1.0-git${SRCPV}" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +VXD_FW_DIR = "${S}/decoder/firmware/" + +# make sure that lib/firmware, and all its contents are part of the package +FILES_${PN} += "${base_libdir}/firmware" + +do_install() { + install -d ${D}${base_libdir}/firmware + install -m 0755 ${VXD_FW_DIR}/pvdec_full_bin.fw ${D}${base_libdir}/firmware +} + +# This is used to prevent the build system to strip the executables +INHIBIT_PACKAGE_STRIP = "1" +# This is used to prevent the build system to split the debug info in a separate file +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP +INSANE_SKIP_${PN} += "arch" + +# we don't want to configure and build the source code +do_compile[noexec] = "1" +do_configure[noexec] = "1" diff --git a/bsp/meta-ti/recipes-bsp/ti-pdk-source/ti-pdk-source_git.bb b/bsp/meta-ti/recipes-bsp/ti-pdk-source/ti-pdk-source_git.bb new file mode 100644 index 00000000..f4b3da92 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ti-pdk-source/ti-pdk-source_git.bb @@ -0,0 +1,33 @@ +# Recipe to fetch/unpack sources used by ti-pdk-fetch recipes. +# +# Mimic gcc-source.inc from oe-core. + +# These shources will be unpacked to a "work-shared" directory. Then each +# "ti-pdk-fetch" recipe will hard-link only the sources it requires. + +deltask do_configure +deltask do_compile +deltask do_install +deltask do_populate_sysroot +deltask do_populate_lic + +RM_WORK_EXCLUDE += "${PN}" +EXCLUDE_FROM_WORLD = "1" + +inherit nopackages ti-pdk-fetch + +LICENSE = "BSD-3-Clause" + +PN = "${TI_PDK_SOURCE_PN}" +WORKDIR = "${TI_PDK_SOURCE_WORKDIR}" +SSTATE_SWSPEC = "sstate:ti-pdk::${PV}:${PR}::${SSTATE_VERSION}:" + +STAMP = "${STAMPS_DIR}/work-shared/ti-pdk-${PV}" +STAMPCLEAN = "${STAMPS_DIR}/work-shared/ti-pdk-${PV}*" + +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS = "" +PACKAGES = "" + +SRC_URI = "${TI_PDK_GIT_URI};branch=${TI_PDK_GIT_BRANCH};protocol=${TI_PDK_GIT_PROTOCOL}" +SRCREV = "${TI_PDK_SRCREV}" diff --git a/bsp/meta-ti/recipes-bsp/traceframework/traceframework.inc b/bsp/meta-ti/recipes-bsp/traceframework/traceframework.inc index 8eae7194..33b87d9c 100644 --- a/bsp/meta-ti/recipes-bsp/traceframework/traceframework.inc +++ b/bsp/meta-ti/recipes-bsp/traceframework/traceframework.inc @@ -9,14 +9,14 @@ TRACEFRAMEWORK_GIT_PROTOCOL = "git" TRACEFRAMEWORK_GIT_BRANCH = "master" TRACEFRAMEWORK_GIT_DESTSUFFIX = "git/ti/instrumentation/traceframework" -# Below commit ID corresponds to "DEV.TFWK-01.01.01.09" -TRACEFRAMEWORK_SRCREV = "47100a261788ffc55cc25d3b2d62f11434b31fc9" +# Below commit ID corresponds to "DEV.TFWK-01.01.01.09A" +TRACEFRAMEWORK_SRCREV = "b7aa8d91901d1aabe2e56fabc3233ed66bf08819" BRANCH = "${TRACEFRAMEWORK_GIT_BRANCH}" SRC_URI = "${TRACEFRAMEWORK_GIT_URI};destsuffix=${TRACEFRAMEWORK_GIT_DESTSUFFIX};protocol=${TRACEFRAMEWORK_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${TRACEFRAMEWORK_SRCREV}" -PV = "01.01.01.09" +PV = "01.01.01.09A" INC_PR = "r0" DEVICELIST = "k2k k2h k2e k2l" diff --git a/bsp/meta-ti/recipes-bsp/transport-rtos/bmet-eth-rtos_git.bb b/bsp/meta-ti/recipes-bsp/transport-rtos/bmet-eth-rtos_git.bb index 137476ed..f14161ff 100644 --- a/bsp/meta-ti/recipes-bsp/transport-rtos/bmet-eth-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/transport-rtos/bmet-eth-rtos_git.bb @@ -13,9 +13,7 @@ DEPENDS_append = " qmss-lld-rtos \ cppi-lld-rtos \ " -BMET_ETH_DESTSUFFIX = "git/bmet_eth" - -S = "${WORKDIR}/${BMET_ETH_DESTSUFFIX}" +TI_PDK_COMP = "ti.transport.bmet_eth" # HTML doc link params PDK_COMP_LINK_TEXT = "Baremetal Ethernet Transport" diff --git a/bsp/meta-ti/recipes-bsp/transport-rtos/nimu-icss-rtos_git.bb b/bsp/meta-ti/recipes-bsp/transport-rtos/nimu-icss-rtos_git.bb index 4750e046..7400adf8 100644 --- a/bsp/meta-ti/recipes-bsp/transport-rtos/nimu-icss-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/transport-rtos/nimu-icss-rtos_git.bb @@ -7,7 +7,7 @@ PR = "${INC_PR}.0" LIC_FILES_CHKSUM = "file://nimu_icssEth.h;beginline=1;endline=35;md5=3ea633a510be24d8a89d9d08b930994c" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|c66x|omapl1" +COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|c66x|omapl1|k3" DEPENDS_append = " ti-ndk \ pruss-lld-rtos \ @@ -17,13 +17,11 @@ DEPENDS_append_c665x-evm = " emac-lld-rtos" DEPENDS_append_c667x-evm = " pa-lld-rtos" DEPENDS_append_omapl1 = " emac-lld-rtos" -NIMU_ICSS_DESTSUFFIX = "git/ndk/nimu_icss" +TI_PDK_COMP = "ti.transport.ndk.nimu_icss" # Build with make instead of XDC TI_PDK_XDCMAKE = "0" -S = "${WORKDIR}/${NIMU_ICSS_DESTSUFFIX}" - export PDK_NIMU_ICSS_ROOT_PATH ="${WORKDIR}/build" export DEST_ROOT="${S}" diff --git a/bsp/meta-ti/recipes-bsp/transport-rtos/nimu-rtos_git.bb b/bsp/meta-ti/recipes-bsp/transport-rtos/nimu-rtos_git.bb index 1e3bc189..4389b1e8 100644 --- a/bsp/meta-ti/recipes-bsp/transport-rtos/nimu-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/transport-rtos/nimu-rtos_git.bb @@ -9,9 +9,7 @@ LIC_FILES_CHKSUM = "file://nimu_eth.h;beginline=1;endline=35;md5=ee9c662c39d4584 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|c66x|omapl1|k3" -NIMU_DESTSUFFIX = "git/ndk/nimu" - -S = "${WORKDIR}/${NIMU_DESTSUFFIX}" +TI_PDK_COMP = "ti.transport.ndk.nimu" DEPENDS_append = " ti-ndk osal-rtos" DEPENDS_append_ti33x = " starterware-rtos emac-lld-rtos" diff --git a/bsp/meta-ti/recipes-bsp/transport-rtos/timesync-rtos_git.bb b/bsp/meta-ti/recipes-bsp/transport-rtos/timesync-rtos_git.bb new file mode 100644 index 00000000..556c1288 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/transport-rtos/timesync-rtos_git.bb @@ -0,0 +1,31 @@ +SUMMARY = "RTOS driver for timesync driver" + +inherit ti-pdk +require recipes-bsp/transport-rtos/transport.inc + +PR = "${INC_PR}.0" + +LIC_FILES_CHKSUM = "file://timeSync_ver.h;beginline=23;endline=45;md5=4bd873035e47065aaa811e53622992e9" + +COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g" + +DEPENDS_append = " ti-ndk \ + osal-rtos \ + pruss-lld-rtos \ + icss-emac-lld-rtos \ + nimu-icss-rtos \ + edma3-lld-rtos \ +" + +TI_PDK_COMP = "ti.transport.timeSync" + +# Build with make instead of XDC +TI_PDK_XDCMAKE = "0" + +export PDK_TIMESYNC_ROOT_PATH ="${WORKDIR}/build" +export DEST_ROOT="${S}" + +export NDK_INSTALL_PATH = "${NDK_INSTALL_DIR}" +export EDMA3LLD_BIOS6_INSTALLDIR = "${EDMA3_LLD_INSTALL_DIR}" + +XDCPATH_append = ";${NDK_INSTALL_DIR}/packages" diff --git a/bsp/meta-ti/recipes-bsp/transport-rtos/transport.inc b/bsp/meta-ti/recipes-bsp/transport-rtos/transport.inc index 21a460e2..866d7a34 100644 --- a/bsp/meta-ti/recipes-bsp/transport-rtos/transport.inc +++ b/bsp/meta-ti/recipes-bsp/transport-rtos/transport.inc @@ -2,16 +2,10 @@ LICENSE = "BSD-3-Clause" PACKAGE_ARCH = "${MACHINE_ARCH}" -TRANSPORT_GIT_URI = "git://git.ti.com/keystone-rtos/transport.git" -TRANSPORT_GIT_PROTOCOL = "git" -TRANSPORT_GIT_BRANCH = "master" +inherit ti-pdk-fetch -# Below commit ID corresponds to "DEV.TRANSPORT.01.00.00.15A" -TRANSPORT_SRCREV = "808affb9c2ba050902fb04f5bda2e5af491941d5" +TI_PDK_COMP = "ti.transport" -BRANCH = "${TRANSPORT_GIT_BRANCH}" -SRC_URI = "${TRANSPORT_GIT_URI};protocol=${TRANSPORT_GIT_PROTOCOL};branch=${BRANCH}" +PE = "1" -SRCREV = "${TRANSPORT_SRCREV}" -PV = "01.00.00.15A" INC_PR = "r0" diff --git a/bsp/meta-ti/recipes-bsp/tsip-lld/tsip-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/tsip-lld/tsip-lld-rtos_git.bb index 0e90e6a4..bd8a6e37 100644 --- a/bsp/meta-ti/recipes-bsp/tsip-lld/tsip-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/tsip-lld/tsip-lld-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI RTOS low level driver for Telecom Serial Interface Port (TSIP)" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.tsip" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://tsip.h;beginline=1;endline=32;md5=dab2257b0b8a3678c26915f6eb49b71e" @@ -8,18 +12,6 @@ LIC_FILES_CHKSUM = "file://tsip.h;beginline=1;endline=32;md5=dab2257b0b8a3678c26 COMPATIBLE_MACHINE = "k2e|c667x-evm" PACKAGE_ARCH = "${MACHINE_ARCH}" -TSIP_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/tsip-lld.git" -TSIP_LLD_GIT_PROTOCOL = "git" -TSIP_LLD_GIT_BRANCH = "master" - -# Below commit ID corresponds to "DEV.TSIP_LLD.01.00.00.08" -TSIP_LLD_SRCREV = "f40c0153b711622e67ab4b36da5cf044f7bd9a8e" - -BRANCH = "${TSIP_LLD_GIT_BRANCH}" -SRC_URI = "${TSIP_LLD_GIT_URI};protocol=${TSIP_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${TSIP_LLD_SRCREV}" -PV = "01.00.00.08" PR = "r0" # HTML doc link params diff --git a/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2019.01.bb b/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2019.01.bb index 86d33dbc..472f5698 100644 --- a/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2019.01.bb +++ b/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2019.01.bb @@ -1,7 +1,7 @@ require u-boot-ti.inc -PR = "r13" +PR = "r32" -BRANCH = "ti-2019.01" +BRANCH = "ti-u-boot-2019.01" -SRCREV = "2654d29fd037730ebb154e9eda257acd7175b46b" +SRCREV = "350f3927b89bc06ce1c9ddb618280d298c418b94" diff --git a/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti.inc b/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti.inc index b66a7a6f..f1187e64 100644 --- a/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti.inc +++ b/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti.inc @@ -370,3 +370,5 @@ do_deploy_append_keystone () { fi fi } + +TOOLCHAIN = "gcc" diff --git a/bsp/meta-ti/recipes-bsp/uart-lld/uart-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/uart-lld/uart-lld-rtos_git.bb index b7c02a50..f293fdda 100644 --- a/bsp/meta-ti/recipes-bsp/uart-lld/uart-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/uart-lld/uart-lld-rtos_git.bb @@ -1,7 +1,11 @@ SUMMARY = "TI RTOS low level driver for UART" DESCRIPTION = "TI RTOS low level driver for Universal Asynchronous Receiver/Transmitter (UART) module " -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.uart" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;beginline=1;endline=31;md5=94b6a199da1caf777f6756cb70aca4a7" @@ -9,18 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;beginline=1;endline=31;md5=94b6a199da1caf COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c66x|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -UART_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/uart-lld.git" -UART_LLD_GIT_PROTOCOL = "git" -UART_LLD_GIT_BRANCH = "master" - -# Below commit ID corresponds to "DEV.UART_LLD.01.00.00.14" -UART_LLD_SRCREV = "3cba443fcd469f8f716bbff21c9b10f60086bcbb" - -BRANCH = "${UART_LLD_GIT_BRANCH}" -SRC_URI = "${UART_LLD_GIT_URI};protocol=${UART_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${UART_LLD_SRCREV}" -PV = "01.00.00.14" PR = "r0" DEPENDS_append = " edma3-lld-rtos \ diff --git a/bsp/meta-ti/recipes-bsp/udma-lld/udma-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/udma-lld/udma-lld-rtos_git.bb index 876b4db2..a82eb362 100644 --- a/bsp/meta-ti/recipes-bsp/udma-lld/udma-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/udma-lld/udma-lld-rtos_git.bb @@ -1,7 +1,11 @@ SUMMARY = "TI RTOS low level driver for UDMA" DESCRIPTION = "TI RTOS low level driver for Universal DMA module " -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.udma" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://udma.h;beginline=1;endline=31;md5=83d177cf3df55c16b27ae4102b6ade9a" @@ -9,19 +13,7 @@ LIC_FILES_CHKSUM = "file://udma.h;beginline=1;endline=31;md5=83d177cf3df55c16b27 COMPATIBLE_MACHINE = "k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -UDMA_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/udma-lld.git" -UDMA_LLD_GIT_PROTOCOL = "git" -UDMA_LLD_GIT_BRANCH = "master" - -# Below commit ID corresponds to "DEV.UDMA_LLD.01.00.00.02" -UDMA_LLD_SRCREV = "1577913ad89201a547ba4804ccb60693963499e8" - -BRANCH = "${UDMA_LLD_GIT_BRANCH}" -SRC_URI = "${UDMA_LLD_GIT_URI};protocol=${UDMA_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${UDMA_LLD_SRCREV}" -PV = "01.00.00.02" -PR = "r0" +PR = "r1" DEPENDS_append = " osal-rtos \ sciclient-rtos \ @@ -30,34 +22,33 @@ DEPENDS_append = " osal-rtos \ # Build with make instead of XDC TI_PDK_XDCMAKE = "0" -UDMA_PACKAGE_BASE = "${S}/../udma_base" +UDMA_PACKAGE_BASE = "${WORKDIR}/udma_base" UDMA_LLD_ROOTPATH = "${UDMA_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv/udma" export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages" export PDK_UDMA_ROOT_PATH = "${UDMA_PACKAGE_BASE}/package/all/pdk_/packages" -TI_PDK_LIMIT_BOARDS_k3 = "am65xx_evm" +TI_PDK_LIMIT_BOARDS_am65xx = "am65xx_evm" + # HTML doc link params PDK_COMP_LINK_TEXT = "UDMA LLD" do_configure() { - - # remove any previous package + # remove any previous package rm -rf ${UDMA_PACKAGE_BASE} cd ${S} # make the release package before building it - make package BOARD=${TI_PDK_LIMIT_BOARDS} DEST_ROOT=${UDMA_PACKAGE_BASE} PDK_UDMA_COMP_PATH=${S} + make package BOARD="${TI_PDK_LIMIT_BOARDS}" DEST_ROOT=${UDMA_PACKAGE_BASE} PDK_UDMA_COMP_PATH=${S} } do_compile() { - cd ${UDMA_LLD_ROOTPATH} - + # Build am65xx libraries - make clean lib xdc_meta doxygen LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" + make clean lib xdc_meta doxygen LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" LIMIT_CORES="${TI_PDK_LIMIT_CORES}" #archive tar -cf udma_lld.tar --exclude='*.tar' ./* diff --git a/bsp/meta-ti/recipes-bsp/usb-lld/usb-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/usb-lld/usb-lld-rtos_git.bb index e2b237ca..7aa0d1b9 100644 --- a/bsp/meta-ti/recipes-bsp/usb-lld/usb-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/usb-lld/usb-lld-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI RTOS USB low level driver" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.drv.usb" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://USBver.h;beginline=16;endline=46;md5=5394fa32763383d2c8e2aca5a1c67805" @@ -8,18 +12,6 @@ LIC_FILES_CHKSUM = "file://USBver.h;beginline=16;endline=46;md5=5394fa32763383d2 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -USB_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/usb.git" -USB_LLD_GIT_PROTOCOL = "git" -USB_LLD_GIT_BRANCH = "master" - -# Below commit ID corresponds to "DEV.USB_LLD.01.00.00.17" -USB_LLD_SRCREV = "d7670a7b2e9c659c2f674782c763e3e3bc22a74e" - -BRANCH = "${USB_LLD_GIT_BRANCH}" -SRC_URI = "${USB_LLD_GIT_URI};protocol=${USB_LLD_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${USB_LLD_SRCREV}" -PV = "01.00.00.17" PR = "r0" DEPENDS_append = " osal-rtos" diff --git a/bsp/meta-ti/recipes-bsp/utils-rtos/profiling-rtos_git.bb b/bsp/meta-ti/recipes-bsp/utils-rtos/profiling-rtos_git.bb index f578b7e5..9846804d 100644 --- a/bsp/meta-ti/recipes-bsp/utils-rtos/profiling-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/utils-rtos/profiling-rtos_git.bb @@ -1,6 +1,10 @@ SUMMARY = "TI RTOS profiling utilities" -inherit ti-pdk +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.utils.profiling" + +PE = "1" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://profilingver.h;beginline=1;endline=46;md5=974494ad60f33cfc0340e421c5a5a7a0" @@ -8,21 +12,9 @@ LIC_FILES_CHKSUM = "file://profilingver.h;beginline=1;endline=46;md5=974494ad60f COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|c66x|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -PROFILING_GIT_URI = "git://git.ti.com/keystone-rtos/utils.git" -PROFILING_GIT_PROTOCOL = "git" -PROFILING_GIT_BRANCH = "master" - -# Below commit ID corresponds to "DEV.UTILS.01.00.00.08" -PROFILING_SRCREV = "9c30f4df9ece2d5589d5f7e977d54acf1062185c" - -BRANCH = "${PROFILING_GIT_BRANCH}" -SRC_URI = "${PROFILING_GIT_URI};protocol=${PROFILING_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${PROFILING_SRCREV}" -PV = "01.00.00.08" PR = "r0" -S = "${WORKDIR}/git/profiling" # Build with make instead of XDC TI_PDK_XDCMAKE = "0" diff --git a/bsp/meta-ti/recipes-bsp/utils-rtos/trace-rtos_git.bb b/bsp/meta-ti/recipes-bsp/utils-rtos/trace-rtos_git.bb new file mode 100644 index 00000000..249ffc79 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/utils-rtos/trace-rtos_git.bb @@ -0,0 +1,28 @@ +SUMMARY = "TI RTOS Trace utility" + +DESCRIPTION = "This utility allows for tracing support in PDK drivers" + +inherit ti-pdk ti-pdk-fetch + +TI_PDK_COMP = "ti.utils.trace" + +PE = "1" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://tracever.h;beginline=19;endline=47;md5=983f531ecfc9fc8c4bc3af9333ab6696" + +COMPATIBLE_MACHINE = "k3" +PACKAGE_ARCH = "${MACHINE_ARCH}" + + +PR = "r0" + + +# Build with make instead of XDC +TI_PDK_XDCMAKE = "0" + +export PDK_TRACE_ROOT_PATH ="${WORKDIR}/build" +export DEST_ROOT="${S}" + +# HTML doc link params +PDK_COMP_LINK_TEXT = "Trace Utility" diff --git a/bsp/meta-ti/recipes-bsp/vps-lld/vps-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/vps-lld/vps-lld-rtos_git.bb index a06aae49..e2834a63 100644 --- a/bsp/meta-ti/recipes-bsp/vps-lld/vps-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/vps-lld/vps-lld-rtos_git.bb @@ -25,7 +25,9 @@ PR = "r0" S = "${WORKDIR}/${VPS_LLD_GIT_DESTSUFFIX}" -DEPENDS = " ti-sysbios \ +# Add to DEPENDS set in ti-pdk.bbclass +DEPENDS_append = " \ + ti-sysbios \ osal-rtos \ edma3-lld-rtos \ board-rtos \ @@ -39,6 +41,9 @@ export DEST_ROOT="${S}" # Build with make instead of XDC TI_PDK_XDCMAKE = "0" +# The makefile will push these on the XDCPATH +export EDMA3LLD_BIOS6_INSTALLDIR = "${EDMA3_LLD_INSTALL_DIR}" + do_compile_append() { # Delete archive created by XDC release command since it does not contain all content find -name "*.tar" -exec rm -f {} \; diff --git a/bsp/meta-ti/recipes-bsp/wdtimer/wdtimer-rtos_git.bb b/bsp/meta-ti/recipes-bsp/wdtimer/wdtimer-rtos_git.bb index b884bdc1..59ebf31f 100644 --- a/bsp/meta-ti/recipes-bsp/wdtimer/wdtimer-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/wdtimer/wdtimer-rtos_git.bb @@ -13,14 +13,14 @@ WATCHDOG_TIMER_GIT_PROTOCOL = "git" WATCHDOG_TIMER_GIT_BRANCH = "master" WATCHDOG_TIMER_GIT_DESTSUFFIX = "git/ti/instrumentation/wdtimer" -# Below commit ID corresponds to "DEV.WDTIMER.01.00.00.04" -WATCHDOG_TIMER_SRCREV = "e25220ea8cb1c1d4bd5f5fb4fba37407d5730ffb" +# Below commit ID corresponds to "DEV.WDTIMER.01.00.00.04A" +WATCHDOG_TIMER_SRCREV = "5c382014ed02fdf054beb1dd0263758eb17c34e2" BRANCH = "${WATCHDOG_TIMER_GIT_BRANCH}" SRC_URI = "${WATCHDOG_TIMER_GIT_URI};destsuffix=${WATCHDOG_TIMER_GIT_DESTSUFFIX};protocol=${WATCHDOG_TIMER_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${WATCHDOG_TIMER_SRCREV}" -PV = "01.00.00.04" +PV = "01.00.00.04A" PR = "r0" S = "${WORKDIR}/git/ti/instrumentation/wdtimer" diff --git a/bsp/meta-ti/recipes-connectivity/uim/uim_8.5.bb b/bsp/meta-ti/recipes-connectivity/uim/uim-sysfs_8.5.bb index 72e2166f..72e2166f 100644 --- a/bsp/meta-ti/recipes-connectivity/uim/uim_8.5.bb +++ b/bsp/meta-ti/recipes-connectivity/uim/uim-sysfs_8.5.bb diff --git a/bsp/meta-ti/recipes-devtools/ion/ion-tests/0001-CMakeLists.txt-disable-phys-addr-for-now.patch b/bsp/meta-ti/recipes-devtools/ion/ion-tests/0001-CMakeLists.txt-disable-phys-addr-for-now.patch new file mode 100644 index 00000000..7cf5895c --- /dev/null +++ b/bsp/meta-ti/recipes-devtools/ion/ion-tests/0001-CMakeLists.txt-disable-phys-addr-for-now.patch @@ -0,0 +1,34 @@ +From 85264fc72a261d20107a50ea2fad0258900a132b Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <denys@ti.com> +Date: Sat, 20 Apr 2019 16:54:03 +0000 +Subject: [PATCH] CMakeLists.txt: disable phys-addr for now + +Signed-off-by: Denys Dmytriyenko <denys@ti.com> +--- + CMakeLists.txt | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1d60003..eca6ba7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,16 +54,3 @@ target_link_libraries(ion-print-heaps + target_include_directories(ion-print-heaps PUBLIC ${LIBION_INCLUDE_DIRS}) + + install(TARGETS ion-print-heaps RUNTIME DESTINATION bin) +- +-# phys-addr +- +-add_executable(phys-addr +- src/phys-addr.c +-) +- +-target_link_libraries(phys-addr +- ${LIBION_LIBRARIES} +-) +-target_include_directories(phys-addr PUBLIC ${LIBION_INCLUDE_DIRS}) +- +-install(TARGETS phys-addr RUNTIME DESTINATION bin) +-- +2.17.1 + diff --git a/bsp/meta-ti/recipes-devtools/ion/ion-tests/0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch b/bsp/meta-ti/recipes-devtools/ion/ion-tests/0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch new file mode 100644 index 00000000..8915c642 --- /dev/null +++ b/bsp/meta-ti/recipes-devtools/ion/ion-tests/0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch @@ -0,0 +1,69 @@ +From f045cbf9aae0053e9e785e32b772e473aa892443 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 6 Oct 2019 16:08:36 -0700 +Subject: [PATCH] map_test: Replace PAGE_SIZE with local variable name + +PAGE_SIZE is already a define in libc implementations global namespace +e.g. in musl. Therefore its best to use a unique variable name to not +stamp on the global definition. + +Fixes +src/map_test.cpp:59:23: error: expected unqualified-id +unsigned long PAGE_SIZE = sysconf(_SC_PAGESIZE); +^ +/usr/include/limits.h:89:19: note: expanded from macro 'PAGE_SIZE' +^ +/usr/include/bits/limits.h:3:18: note: expanded from macro 'PAGESIZE' +^ + +Upstream-Status: Submitted [https://github.com/glneo/ion-tests/pull/1] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/map_test.cpp | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/map_test.cpp b/src/map_test.cpp +index a7ce2c9..7b5746d 100644 +--- a/src/map_test.cpp ++++ b/src/map_test.cpp +@@ -56,27 +56,27 @@ TEST_F(Map, MapOffset) + SCOPED_TRACE(::testing::Message() << "heap " << heapMask); + int map_fd = -1; + +- unsigned long PAGE_SIZE = sysconf(_SC_PAGESIZE); ++ unsigned long psize = sysconf(_SC_PAGESIZE); + +- ASSERT_EQ(0, ion_alloc(m_ionFd, PAGE_SIZE * 2, heapMask, 0, &map_fd)); ++ ASSERT_EQ(0, ion_alloc(m_ionFd, psize * 2, heapMask, 0, &map_fd)); + ASSERT_GE(map_fd, 0); + + unsigned char *ptr; +- ptr = (unsigned char *)mmap(NULL, PAGE_SIZE * 2, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, 0); ++ ptr = (unsigned char *)mmap(NULL, psize * 2, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, 0); + ASSERT_TRUE(ptr != NULL); + +- memset(ptr, 0, PAGE_SIZE); +- memset(ptr + PAGE_SIZE, 0xaa, PAGE_SIZE); ++ memset(ptr, 0, psize); ++ memset(ptr + psize, 0xaa, psize); + +- ASSERT_EQ(0, munmap(ptr, PAGE_SIZE * 2)); ++ ASSERT_EQ(0, munmap(ptr, psize * 2)); + +- ptr = (unsigned char *)mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, PAGE_SIZE); ++ ptr = (unsigned char *)mmap(NULL, psize, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, psize); + ASSERT_TRUE(ptr != NULL); + + ASSERT_EQ(ptr[0], 0xaa); +- ASSERT_EQ(ptr[PAGE_SIZE - 1], 0xaa); ++ ASSERT_EQ(ptr[psize - 1], 0xaa); + +- ASSERT_EQ(0, munmap(ptr, PAGE_SIZE)); ++ ASSERT_EQ(0, munmap(ptr, psize)); + + ASSERT_EQ(0, close(map_fd)); + } +-- +2.23.0 + diff --git a/bsp/meta-ti/recipes-devtools/ion/ion-tests_git.bb b/bsp/meta-ti/recipes-devtools/ion/ion-tests_git.bb new file mode 100644 index 00000000..52346f1c --- /dev/null +++ b/bsp/meta-ti/recipes-devtools/ion/ion-tests_git.bb @@ -0,0 +1,19 @@ +SUMMARY = "Test cases for ION" +HOMEPAGE = "https://github.com/glneo/ion-tests" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://src/ion_test.c;beginline=1;endline=15;md5=b225db900869a4cd31461606e55a3ec5" + +PV = "1.0" + +BRANCH = "master" +SRC_URI = "git://github.com/glneo/ion-tests.git;protocol=git;branch=${BRANCH} \ + file://0001-CMakeLists.txt-disable-phys-addr-for-now.patch \ + file://0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch \ +" +SRCREV = "70d730cebca29e6fd37b21d9beac82ae645f3900" + +DEPENDS = "libion gtest" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig diff --git a/bsp/meta-ti/recipes-devtools/ion/libion/0001-cmake-Use-GNUInstallDirs-module-to-detect-install-pa.patch b/bsp/meta-ti/recipes-devtools/ion/libion/0001-cmake-Use-GNUInstallDirs-module-to-detect-install-pa.patch new file mode 100644 index 00000000..bf63ed32 --- /dev/null +++ b/bsp/meta-ti/recipes-devtools/ion/libion/0001-cmake-Use-GNUInstallDirs-module-to-detect-install-pa.patch @@ -0,0 +1,48 @@ +From 51eece2c291e121f9ae67c9b812617b885e76a64 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Dec 2019 20:31:52 -0800 +Subject: [PATCH] cmake: Use GNUInstallDirs module to detect install paths + +This helps it to calculate directories as per platform instead of +hardcoding them, helps compile it for arches which use /lib64 and +/usr/lib64 for libpaths + +Upstream-Status: Submitted [https://github.com/glneo/libion/pull/2] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6e5928c..5b7c0de 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,8 @@ PROJECT(ion) + set(PROJECT_DESCRIPTION "ION Userspace Memory Allocator Library") + set(PROJECT_VERSION 1.0.0) + ++INCLUDE(GNUInstallDirs) ++ + add_library(ion + SHARED + src/libion.c +@@ -23,12 +25,12 @@ target_include_directories(ion + configure_file(libion.pc.in libion.pc @ONLY) + + install(TARGETS ion +- LIBRARY DESTINATION lib +- PUBLIC_HEADER DESTINATION include/ion) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ion) + + install(DIRECTORY include/kernel-headers/4.19/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.h") + + install(FILES ${CMAKE_BINARY_DIR}/libion.pc +- DESTINATION lib/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +-- +2.24.1 + diff --git a/bsp/meta-ti/recipes-devtools/ion/libion_git.bb b/bsp/meta-ti/recipes-devtools/ion/libion_git.bb new file mode 100644 index 00000000..4cf03afa --- /dev/null +++ b/bsp/meta-ti/recipes-devtools/ion/libion_git.bb @@ -0,0 +1,16 @@ +SUMMARY = "ION Userspace Memory Allocator Library" +HOMEPAGE = "https://github.com/glneo/libion" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +PV = "1.0.0" + +BRANCH = "master" +SRC_URI = "git://github.com/glneo/libion.git;protocol=git;branch=${BRANCH} \ + file://0001-cmake-Use-GNUInstallDirs-module-to-detect-install-pa.patch \ + " +SRCREV = "813bd63e2f2118e17cb1c5d38505a1e572a2381c" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig diff --git a/bsp/meta-ti/recipes-graphics/gbm/libgbm/0001-gbm.c-include-sys-sysmacros.h-for-minor-major-in-new.patch b/bsp/meta-ti/recipes-graphics/gbm/libgbm/0001-gbm.c-include-sys-sysmacros.h-for-minor-major-in-new.patch deleted file mode 100644 index 31134ab6..00000000 --- a/bsp/meta-ti/recipes-graphics/gbm/libgbm/0001-gbm.c-include-sys-sysmacros.h-for-minor-major-in-new.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ea5fc8da36886490d0ee40d475733cd98e38c2ec Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <denys@ti.com> -Date: Tue, 28 Aug 2018 18:35:55 -0400 -Subject: [PATCH] gbm.c: include <sys/sysmacros.h> for minor/major in new glibc - -glibc 2.28+ now requires this. -https://sourceware.org/bugzilla/show_bug.cgi?id=19239 - -Signed-off-by: Denys Dmytriyenko <denys@ti.com> ---- - gbm.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gbm.c b/gbm.c -index c046b1a..9356d7b 100644 ---- a/gbm.c -+++ b/gbm.c -@@ -35,6 +35,7 @@ - #include <stdint.h> - - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <sys/stat.h> - #include <unistd.h> - #include <errno.h> --- -2.7.4 - diff --git a/bsp/meta-ti/recipes-graphics/gbm/libgbm_10.0.0.bb b/bsp/meta-ti/recipes-graphics/gbm/libgbm_10.0.0.bb deleted file mode 100644 index 6d058b72..00000000 --- a/bsp/meta-ti/recipes-graphics/gbm/libgbm_10.0.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Userspace interface for the kernel GBM services" -HOMEPAGE = "http://git.ti.com/glsdk/libgbm.git" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://gbm.c;beginline=1;endline=26;md5=b871c7f2f477df29ee4c0ec437b187f7" - -DEPENDS = "libdrm udev" - -PROVIDES += "virtual/libgbm" - -inherit autotools pkgconfig - -BRANCH = "next" - -SRCREV = "96f37555c7e82a417b02051661377b10e6b3966e" - -SRC_URI = "git://git.ti.com/glsdk/libgbm.git;protocol=git;branch=${BRANCH} \ - file://0001-gbm.c-include-sys-sysmacros.h-for-minor-major-in-new.patch" - -S = "${WORKDIR}/git" - -COMPATIBLE_HOST ?= "null" -COMPATIBLE_HOST_ti-soc = "(.*)" diff --git a/bsp/meta-ti/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb b/bsp/meta-ti/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb index df1a99e9..e8c2f011 100644 --- a/bsp/meta-ti/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb +++ b/bsp/meta-ti/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-libs" LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://Manifest.html;md5=a9121e8936ace09820d23f7626daaca5" -PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "dra7xx" CLEANBROKEN = "1" @@ -24,9 +24,9 @@ python __anonymous() { raise bb.parse.SkipPackage("%s-%s ONLY supports hardfp mode for now" % (pkgn, pkgv)) } -TARGET_PRODUCT_omap-a15 = "jacinto6evm" +TARGET_PRODUCT = "jacinto6evm" -PR = "r2" +PR = "r3" S = "${WORKDIR}/git" @@ -38,6 +38,3 @@ do_install() { } INSANE_SKIP_${PN} += "ldflags" - -COMPATIBLE_HOST ?= "null" -COMPATIBLE_HOST_ti-soc = "(.*)" diff --git a/bsp/meta-ti/recipes-graphics/libgles/ti-img-rogue-umlibs_1.10.5371573.bb b/bsp/meta-ti/recipes-graphics/libgles/ti-img-rogue-umlibs_1.10.5371573.bb new file mode 100644 index 00000000..9cb863a5 --- /dev/null +++ b/bsp/meta-ti/recipes-graphics/libgles/ti-img-rogue-umlibs_1.10.5371573.bb @@ -0,0 +1,63 @@ +DESCRIPTION = "Userspace libraries for PowerVR Rogue GPU on TI SoCs" +HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs" +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "j7-evm" + +PR = "r5" + +BRANCH = "linuxws/thud/k4.19/${PV}" + +SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}" +SRCREV = "0721cdfc1fc86f40c93745159e3f1bcad5beda17" + +PVR_SOC ?= "j721e_linux" +PVR_BUILD ?= "release" +PVR_WS = "wayland" + +INITSCRIPT_NAME = "rc.pvr" +INITSCRIPT_PARAMS = "defaults 8" + +inherit update-rc.d + +PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm" + +DEPENDS += "libdrm wayland expat" +RDEPENDS_${PN} += "bash" +RDEPENDS_${PN} += "python-core" +RDEPENDS_${PN} += "ti-img-rogue-driver wayland expat" + +RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm" +RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" +RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" + +RREPLACES_${PN} = "libegl libgles1 liblges2 libgbm" +RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" +RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" + +RCONFLICTS_${PN} = "libegl libgles1 libgles2 libgbm" +RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" +RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" + +S = "${WORKDIR}/git" + +do_install () { + oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${PVR_SOC} BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} + chown -R root:root ${D} +} + +FILES_${PN} += " ${base_libdir}/firmware/" +FILES_${PN} += " ${datadir}/" + +PACKAGES =+ "${PN}-plugins" +FILES_${PN}-plugins = "${libdir}/libGLESv2.so ${libdir}/libGLESv1_CM.so ${libdir}/libEGL.so ${libdir}/dri/pvr_dri.so" +RDEPENDS_${PN} += "${PN}-plugins" + +ALLOW_EMPTY_${PN}-plugins = "1" + +INSANE_SKIP_${PN} += "ldflags arch already-stripped" +INSANE_SKIP_${PN}-plugins = "dev-so" + +CLEANBROKEN = "1" diff --git a/bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb index 7b4f2ec2..ecf3ffcc 100644 --- a/bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +++ b/bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb @@ -3,14 +3,15 @@ HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux" LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://TI-Linux-Graphics-DDK-UM-Manifest.doc;md5=b17390502bc89535c86cfbbae961a2a8" +PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" -PACKAGE_ARCH = "${MACHINE_ARCH}" +PR = "r34" BRANCH = "ti-img-sgx/thud/${PV}" SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git;branch=${BRANCH}" -SRCREV = "b0db45b7f74312afbff3e30c334e899e9c9d1338" +SRCREV = "2a2e5bb090ced870d73ed4edbc54793e952cc6d8" TARGET_PRODUCT_omap-a15 = "jacinto6evm" TARGET_PRODUCT_ti33x = "ti335x" @@ -22,23 +23,22 @@ INITSCRIPT_PARAMS = "defaults 8" inherit update-rc.d -PR = "r32" -PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 omap5-sgx-ddk-um-linux" +PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm" -DEPENDS += "libdrm udev libgbm wayland libffi" -RDEPENDS_${PN} += "libdrm libudev libgbm wayland libffi libdrm-omap" +DEPENDS += "libdrm udev wayland wayland-protocols libffi expat" +RDEPENDS_${PN} += "libdrm libdrm-omap udev wayland wayland-protocols libffi expat" -RPROVIDES_${PN} = "libegl libgles1 libgles2 omap5-sgx-ddk-um-linux" -RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev omap5-sgx-ddk-um-linux-dev" -RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg omap5-sgx-ddk-um-linux-dbg" +RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm" +RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" +RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" -RREPLACES_${PN} = "libegl libgles1 libgles2 omap5-sgx-ddk-um-linux" -RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev omap5-sgx-ddk-um-linux-dev" -RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg omap5-sgx-ddk-um-linux-dbg" +RREPLACES_${PN} = "libegl libgles1 libgles2 libgbm" +RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" +RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" -RCONFLICTS_${PN} = "libegl libgles1 libgles2 omap5-sgx-ddk-um-linux" -RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev omap5-sgx-ddk-um-linux-dev" -RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg omap5-sgx-ddk-um-linux-dbg" +RCONFLICTS_${PN} = "libegl libgles1 libgles2 libgbm" +RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" +RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" # The actual SONAME is libGLESv2.so.2, so need to explicitly specify RPROVIDES for .so.1 here RPROVIDES_${PN} += "libGLESv2.so.1" @@ -47,11 +47,9 @@ S = "${WORKDIR}/git" do_install () { oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} - mkdir -p ${D}${libdir}/gbm - ln -sf ../libpvrGBMWSEGL.so.${PV} ${D}${libdir}/gbm/gbm_pvr.so - ln -sf libGLESv2.so.${PV} ${D}${libdir}/libGLESv2.so.1 + ln -sf libGLESv2.so ${D}${libdir}/libGLESv2.so.1 - rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc + rm -rf ${D}${includedir}/GL chown -R root:root ${D} } @@ -62,14 +60,11 @@ FILES_${PN} += "${includedir}/*" FILES_${PN} += "${sysconfdir}/*" PACKAGES =+ "${PN}-plugins" -FILES_${PN}-plugins = "${libdir}/libsrv_init.so ${libdir}/libsrv_um.so ${libdir}/libglslcompiler.so ${libdir}/libPVRScopeServices.so ${libdir}/libGLESv2.so ${libdir}/libEGL.so ${libdir}/libGLES_CM.so ${libdir}/libpvrDRMWSEGL.so ${libdir}/libpvrGBMWSEGL.so ${libdir}/libpvrws_WAYLAND.so" +FILES_${PN}-plugins = "${libdir}/libsrv_init.so ${libdir}/libsrv_um.so ${libdir}/libglslcompiler.so ${libdir}/libPVRScopeServices.so ${libdir}/libGLESv2.so ${libdir}/libEGL.so ${libdir}/libGLESv1_CM.so ${libdir}/libGLES_CM.so ${libdir}/libGLESv1_PVR_MESA.so ${libdir}/libGLESv2_PVR_MESA.so" RDEPENDS_${PN} += "${PN}-plugins" ALLOW_EMPTY_${PN}-plugins = "1" -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_SYSROOT_STRIP = "1" - INSANE_SKIP_${PN} += "dev-so ldflags useless-rpaths" INSANE_SKIP_${PN}-plugins = "dev-so" INSANE_SKIP_${PN} += "already-stripped" diff --git a/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse-arch.inc b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse-arch.inc new file mode 100644 index 00000000..498b25ed --- /dev/null +++ b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse-arch.inc @@ -0,0 +1,22 @@ +# Set jailhouse architecture JH_ARCH variable +# +# return value must match one of architectures supported by jailhouse +# +valid_jh_archs = "x86 arm" + +def map_jh_arch(a, d): + import re + + valid_jh_archs = d.getVar('valid_jh_archs', True).split() + + if re.match('(i.86|athlon|x86.64)$', a): return 'x86' + elif re.match('armeb$', a): return 'arm' + elif re.match('aarch64$', a): return 'arm64' + elif re.match('aarch64_be$', a): return 'arm64' + elif a in valid_jh_archs: return a + else: + bb.error("cannot map '%s' to a jailhouse supported architecture" % a) + +export JH_ARCH = "${@map_jh_arch(d.getVar('TARGET_ARCH', True), d)}" + +COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" diff --git a/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb new file mode 100644 index 00000000..4186dc3a --- /dev/null +++ b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb @@ -0,0 +1,167 @@ +SUMMARY = "Linux-based partitioning hypervisor" +DESCRIPTION = "Jailhouse is a partitioning Hypervisor based on Linux. It is able to run bare-metal applications or (adapted) \ +operating systems besides Linux. For this purpose, it configures CPU and device virtualization features of the hardware \ +platform in a way that none of these domains, called 'cells' here, can interfere with each other in an unacceptable way." +HOMEPAGE = "https://github.com/siemens/jailhouse" +SECTION = "jailhouse" +LICENSE = "GPL-2.0 & BSD-2-Clause" + +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ +" + +PV = "0.10+git${SRCPV}" +SRCREV = "b3a68ac89d7ed955546eae91954b184ec1583ce3" +BRANCH = "ti-jailhouse-0.10" + +SRC_URI = " \ + git://git.ti.com/jailhouse/ti-jailhouse.git;protocol=git;branch=${BRANCH} \ +" + +DEPENDS = "virtual/kernel dtc-native python-mako-native python-mako make-native" +RDEPENDS_${PN} += "\ + python-curses\ + python-datetime\ + python-argparse\ + python-mmap\ +" + +S = "${WORKDIR}/git" + +require jailhouse-arch.inc +inherit module pythonnative bash-completion deploy setuptools + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(ti-soc)" + +JH_DATADIR ?= "${datadir}/jailhouse" +JH_EXEC_DIR ?= "${libexecdir}/jailhouse" +CELL_DIR ?= "${JH_DATADIR}/cells" +CELLCONF_DIR ?= "${JH_DATADIR}/configs" +INMATES_DIR ?= "${JH_DATADIR}/inmates" + +JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h" +JH_CONFIG_k3 ?= "${S}/ci/jailhouse-config-k3.h" + +JH_CELL_FILES ?= "*.cell" +JH_CELL_FILES_k3 ?= "k3-*.cell" + +JH_INMATE_DTB ?= "" +JH_INMATE_DTB_am65xx ?= "inmate-k3-am654-idk.dtb" +JH_INMATE_DTB_j7-evm ?= "inmate-k3-j721e-evm.dtb" + +JH_LINUX_DEMO_CELL ?= "" +JH_LINUX_DEMO_CELL_am65xx ?= "k3-am654-idk-linux-demo.cell" +JH_LINUX_DEMO_CELL_j7-evm ?= "k3-j721e-evm-linux-demo.cell" + +JH_SYSCONFIG_CELL ?= "" +JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell" +JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell" + +INITRAMFS_IMAGE ?= "" +JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}" + +JH_CMDLINE ?= "" +JH_CMDLINE_k3 ?= "console=ttyS1,115200n8" + +do_configure() { + if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; + then + cp ${STAGING_DIR_HOST}/${CELLCONF_DIR}/*.c ${S}/configs/ + fi + + cp -av ${JH_CONFIG} ${S}/include/jailhouse/config.h +} + +USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ + -DJAILHOUSE_VERSION=\\\"$JAILHOUSE_VERSION\\\" \ + -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \ + -I../driver' + +TOOLS_SRC_DIR = "${S}/tools" + +EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" KDIR=${STAGING_KERNEL_BUILDDIR}" + +do_compile() { + oe_runmake V=1 +} + +do_install() { + # Install pyjailhouse python modules needed by the tools + distutils_do_install + + # We want to install the python tools, but we do not want to use pip... + # At least with v0.10, we can work around this with + # 'PIP=":" PYTHON_PIP_USEABLE=yes' + oe_runmake PIP=: PYTHON_PIP_USEABLE=yes DESTDIR=${D} install + + install -d ${D}${CELL_DIR} + install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/ + + install -d ${D}${INMATES_DIR} + install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR} + + install -d ${D}/boot + if [ -n "${JH_RAMFS_IMAGE}" ] + then + if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ] + then + install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot + else + bberror "Could not find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!" + bberror "Please make sure that \"cpio\" is in IMAGE_FSTYPES." + fi + fi + + if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then + cd ${TOOLS_SRC_DIR} + + echo "#! /bin/sh" > ${D}${JH_DATADIR}/linux-demo.sh + echo "jailhouse enable ${CELL_DIR}/${JH_SYSCONFIG_CELL}" >> ${D}${JH_DATADIR}/linux-demo.sh + ./jailhouse-cell-linux -w ${D}${JH_DATADIR}/${JH_INMATE_DTB} \ + -a ${JH_ARCH} -c "${JH_CMDLINE}" \ + -d ../configs/${JH_ARCH}/dts/${JH_INMATE_DTB} \ + -i ${D}/boot/${JH_RAMFS_IMAGE}-${MACHINE}.cpio \ + ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \ + ${DEPLOY_DIR_IMAGE}/Image \ + | tr -cd '\11\12\15\40-\176' \ + >> ${D}${JH_DATADIR}/linux-demo.sh + + sed -i -e 's,^Modified device tree written.*,,g' ${D}${JH_DATADIR}/linux-demo.sh + sed -i -e 's,\${D},,g' ${D}${JH_DATADIR}/linux-demo.sh + sed -i -e 's, linux-loader.bin, ${JH_EXEC_DIR}/linux-loader.bin,g' ${D}${JH_DATADIR}/linux-demo.sh + sed -i -e 's,\${DEPLOY_DIR_IMAGE},/boot,g' ${D}${JH_DATADIR}/linux-demo.sh + sed -i -e '/^\s*$/d' ${D}${JH_DATADIR}/linux-demo.sh + chmod +x ${D}${JH_DATADIR}/linux-demo.sh + fi +} + +PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools" +FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /boot" +FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}" +FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*" + +RDEPENDS_${PN}-tools = "pyjailhouse python-mmap python-math python-argparse python-datetime python-curses python-compression" +RDEPENDS_pyjailhouse = "python-core python-ctypes python-fcntl python-shell" + +RRECOMMENDS_${PN} = "${PN}-tools" + +INSANE_SKIP_${PN} = "ldflags" + +KERNEL_MODULE_AUTOLOAD += "jailhouse" + +# Any extra cells/inmates from external recipes/packages +CELLS = "" + +python __anonymous () { + d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy') + ramfs = d.getVar('JH_RAMFS_IMAGE', True) + if ramfs: + d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete') + + # Setup DEPENDS and RDEPENDS to included cells + cells = d.getVar('CELLS', True) or "" + for cell in cells.split(): + d.appendVar('DEPENDS', ' ' + cell) + d.appendVar('RDEPENDS_${PN}', ' ' + cell) +} diff --git a/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb b/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb index b28868f5..96263875 100644 --- a/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb +++ b/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb @@ -160,6 +160,7 @@ RDEPENDS_${PN} += "bash \ ${PN}-net \ ${PN}-nsfs \ ${PN}-pstore \ + ${PN}-ptp \ ${PN}-ptrace \ ${PN}-seccomp \ ${PN}-sigaltstack \ diff --git a/bsp/meta-ti/recipes-kernel/linux/cmem.inc b/bsp/meta-ti/recipes-kernel/linux/cmem.inc index 5fd0b9d9..24760a9f 100644 --- a/bsp/meta-ti/recipes-kernel/linux/cmem.inc +++ b/bsp/meta-ti/recipes-kernel/linux/cmem.inc @@ -2,28 +2,33 @@ # # Use these for temporary overrides CMEM_MACHINE = "${MACHINE}" -CMEM_MACHINE_am57xx-evm = "am571x am572x am574x" -CMEM_MACHINE_am57xx-hs-evm = "am571x am572x am574x" -CMEM_MACHINE_dra7xx-evm = "dra71x dra72x dra74x" -CMEM_MACHINE_dra7xx-hs-evm = "dra71x dra72x dra74x" +CMEM_MACHINE_am57xx-evm = "am571x am572x am572idk am5729-beagleboneai am574x" +CMEM_MACHINE_am57xx-hs-evm = "am571x am572x am572idk am5729-beagleboneai am574x" +CMEM_MACHINE_dra7xx-evm = "dra71x dra72x dra74x dra76x" +CMEM_MACHINE_dra7xx-hs-evm = "dra71x dra72x dra74x dra76x" # Set cmem.dtsi per machine or machine variant CMEM_DTSI = "cmem.dtsi" CMEM_DTSI_am571x = "cmem-am571x.dtsi" +CMEM_DTSI_am572idk = "cmem-am572idk.dtsi" +CMEM_DTSI_am5729-beagleboneai = "cmem-am5729-beagleboneai.dtsi" CMEM_DTSI_am574x = "cmem-am574x.dtsi" CMEM_DTSI_dra71x = "cmem-dra71x.dtsi" CMEM_DTSI_dra72x = "cmem-dra72x.dtsi" +CMEM_DTSI_dra76x = "cmem-dra76x.dtsi" # Split device trees between variants CMEM_DEVICETREE = "${KERNEL_DEVICETREE}" CMEM_DEVICETREE_am571x = "am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb" -CMEM_DEVICETREE_am572x = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revc.dtb \ - am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb" +CMEM_DEVICETREE_am572x = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revc.dtb" +CMEM_DEVICETREE_am572idk = "am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb" +CMEM_DEVICETREE_am5729-beagleboneai = "am5729-beagleboneai.dtb" CMEM_DEVICETREE_am574x = "am574x-idk.dtb am574x-idk-lcd-osd101t2587.dtb" CMEM_DEVICETREE_dra71x = "dra71-evm.dtb" CMEM_DEVICETREE_dra72x = "dra72-evm.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb" CMEM_DEVICETREE_dra74x = "dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb" +CMEM_DEVICETREE_dra76x = "dra76-evm.dtb dra76-evm-tfp410.dtb" # Flag to enable CMEM injection RESERVE_CMEM ?= "0" diff --git a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi index 4228827e..8ca11c78 100644 --- a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi +++ b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi @@ -1,14 +1,14 @@ &pruss_soc_bus1 { - uio_pruss1_mdio { + uio_pruss1_mdio: uio_mdio@4b232400 { status = "okay"; compatible = "ti,davinci_mdio"; + reg = <0x4b232400 0x90>; #address-cells = <1>; #size-cells = <0>; clocks = <&dpll_gmac_h13x2_ck>; clock-names = "fck"; bus_freq = <1000000>; - reg = <0x32400 0x90>; reset-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>; reset-delay-us = <2>; /* PHY datasheet states 1uS min */ @@ -112,14 +112,14 @@ }; &pruss_soc_bus2 { - uio_pruss2_mdio { + uio_pruss2_mdio: uio_mdio@4b2b2400 { compatible = "ti,davinci_mdio"; + reg = <0x4b2b2400 0x90>; #address-cells = <1>; #size-cells = <0>; clocks = <&dpll_gmac_h13x2_ck>; clock-names = "fck"; bus_freq = <1000000>; - reg = <0x32400 0x90>; status = "okay"; reset-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; @@ -223,18 +223,6 @@ }; }; -&pruss1_eth { - status = "disabled"; -}; - -&pruss1_emac0 { - status = "disabled"; -}; - -&pruss1_emac1 { - status = "disabled"; -}; - &pruss2_emac0 { status = "disabled"; }; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi index 17b3f963..4cc57118 100644 --- a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi +++ b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi @@ -106,14 +106,14 @@ }; &pruss_soc_bus2 { - uio_pruss2_mdio: uio_pruss2_mdio { + uio_pruss2_mdio: uio_mdio@4b2b2400 { compatible = "ti,davinci_mdio"; + reg = <0x4b2b2400 0x90>; #address-cells = <1>; #size-cells = <0>; clocks = <&dpll_gmac_h13x2_ck>; clock-names = "fck"; bus_freq = <1000000>; - reg = <0x32400 0x90>; status = "disabled"; }; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi new file mode 100644 index 00000000..e0511d08 --- /dev/null +++ b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi @@ -0,0 +1,40 @@ +/ { + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + cmem_block_mem_0: cmem_block_mem@a0000000 { + reg = <0x0 0xa0000000 0x0 0x18000000>; + no-map; + status = "okay"; + }; + + cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { + reg = <0x0 0x40500000 0x0 0x100000>; + no-map; + status = "okay"; + }; + }; + + cmem { + compatible = "ti,cmem"; + #address-cells = <1>; + #size-cells = <0>; + + #pool-size-cells = <2>; + + status = "okay"; + + cmem_block_0: cmem_block@0 { + reg = <0>; + memory-region = <&cmem_block_mem_0>; + cmem-buf-pools = <1 0x0 0x18000000>; + }; + + cmem_block_1: cmem_block@1 { + reg = <1>; + memory-region = <&cmem_block_mem_1_ocmc3>; + }; + }; +}; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi new file mode 100644 index 00000000..6c39e22c --- /dev/null +++ b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi @@ -0,0 +1,40 @@ +/ { + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + cmem_block_mem_0: cmem_block_mem@a0000000 { + reg = <0x0 0xa0000000 0x0 0x20000000>; + no-map; + status = "okay"; + }; + + cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { + reg = <0x0 0x40500000 0x0 0x100000>; + no-map; + status = "okay"; + }; + }; + + cmem { + compatible = "ti,cmem"; + #address-cells = <1>; + #size-cells = <0>; + + #pool-size-cells = <2>; + + status = "okay"; + + cmem_block_0: cmem_block@0 { + reg = <0>; + memory-region = <&cmem_block_mem_0>; + cmem-buf-pools = <1 0x0 0x20000000>; + }; + + cmem_block_1: cmem_block@1 { + reg = <1>; + memory-region = <&cmem_block_mem_1_ocmc3>; + }; + }; +}; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi new file mode 100644 index 00000000..9d207db5 --- /dev/null +++ b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi @@ -0,0 +1,29 @@ +/ { + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + cmem_block_mem_0: cmem_block_mem@a0000000 { + reg = <0x0 0xa0000000 0x0 0x18000000>; + no-map; + status = "okay"; + }; + }; + + cmem { + compatible = "ti,cmem"; + #address-cells = <1>; + #size-cells = <0>; + + #pool-size-cells = <2>; + + status = "okay"; + + cmem_block_0: cmem_block@0 { + reg = <0>; + memory-region = <&cmem_block_mem_0>; + cmem-buf-pools = <1 0x0 0x18000000>; + }; + }; +}; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi index e4baca50..49894e0d 100644 --- a/bsp/meta-ti/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi +++ b/bsp/meta-ti/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi @@ -1,7 +1,7 @@ &pruss_soc_bus0 { - uio_pruss1_mdio: uio_mdio@32400 { + uio_pruss1_mdio: uio_mdio@20ab2400 { compatible = "ti,davinci_mdio"; - reg = <0x32400 0x90>; + reg = <0x20ab2400 0x90>; clocks = <&k2g_clks 0x0014 1>; clock-names = "fck"; #address-cells = <1>; @@ -95,9 +95,9 @@ }; &pruss_soc_bus1 { - uio_pruss2_mdio: uio_mdio@32400 { + uio_pruss2_mdio: uio_mdio@20af2400 { compatible = "ti,davinci_mdio"; - reg = <0x32400 0x90>; + reg = <0x20af2400 0x90>; clocks = <&k2g_clks 0x0015 1>; clock-names = "fck"; #address-cells = <1>; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi index 714b1d78..93a40ab5 100644 --- a/bsp/meta-ti/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi +++ b/bsp/meta-ti/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi @@ -1,7 +1,7 @@ &pruss_soc_bus { - uio_pruss_mdio: uio_pruss_mdio@32400 { + uio_pruss_mdio: uio_mdio@4a332400 { compatible = "ti,davinci_mdio"; - reg = <0x32400 0x90>; + reg = <0x4a332400 0x90>; clocks = <&dpll_core_m4_ck>; clock-names = "fck"; bus_freq = <1000000>; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi index 81c16e34..80993c4b 100644 --- a/bsp/meta-ti/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi +++ b/bsp/meta-ti/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi @@ -1,7 +1,7 @@ &pruss_soc_bus { - uio_pruss2_mdio: uio_mdio@32400 { + uio_pruss2_mdio: uio_mdio@54432400 { compatible = "ti,davinci_mdio"; - reg = <0x32400 0x90>; + reg = <0x54432400 0x90>; clocks = <&dpll_core_m4_ck>; clock-names = "fck"; bus_freq = <1000000>; diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb index 12532db6..5c56b286 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb @@ -6,5 +6,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.19:" BRANCH = "ti-rt-linux-4.19.y" -SRCREV = "b8935c3f161b90a15cec065066d710b216ae5c97" -PV = "4.19.38+git${SRCPV}" +SRCREV = "69c51d6d57c150155bea8dd032bd8ce7835cf234" +PV = "4.19.94+git${SRCPV}" diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.19.bb b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.19.bb index c7cf13b4..ab9653e1 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.19.bb +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.19.bb @@ -45,10 +45,14 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2l = " netcp-pa-fw" # Add run-time dependency for PRU Ethernet firmware to the rootfs RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-evm = " prueth-fw" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am437x-evm = " prueth-fw" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am335x-evm = " prueth-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-hs-evm = " prueth-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti43x = " prueth-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti33x = " prueth-fw" RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2g = " prueth-fw" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx-evm = " prueth-fw-bin" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx = " prueth-fw-am65x" + +# Add run-time dependency for Cadence MHDP firmware to the rootfs +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7-evm = " cadence-mhdp-fw" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" @@ -56,8 +60,8 @@ S = "${WORKDIR}/git" BRANCH = "ti-linux-4.19.y" -SRCREV = "c17c3766610f07dc0549e51694b4149b92f3ce97" -PV = "4.19.38+git${SRCPV}" +SRCREV = "5a23bc00e08d26bb83952953d909c95b42fab70c" +PV = "4.19.94+git${SRCPV}" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild MACHINE_KERNEL_PR_append = "a" @@ -69,3 +73,9 @@ SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ file://defconfig" FILES_${KERNEL_PACKAGE_NAME}-devicetree += "/${KERNEL_IMAGEDEST}/*.itb" + +# Special configuration for remoteproc/rpmsg IPC modules +module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" +module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus" +module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus" +KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc" diff --git a/bsp/meta-ti/recipes-ti/bios/ti-sysbios.inc b/bsp/meta-ti/recipes-ti/bios/ti-sysbios.inc index d2a551fc..087f2edd 100644 --- a/bsp/meta-ti/recipes-ti/bios/ti-sysbios.inc +++ b/bsp/meta-ti/recipes-ti/bios/ti-sysbios.inc @@ -10,8 +10,7 @@ require ../includes/ti-eula-unpack.inc S = "${WORKDIR}/bios_${PV}" SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios/${PV}/exports/bios_setuplinux_${PV}.bin;name=sysbiosbin" - -BINFILE="bios_setuplinux_${PV}.bin" +BINFILE="bios_${PV}.bin" TI_BIN_UNPK_CMDS="Y: q:workdir:Y" do_install() { diff --git a/bsp/meta-ti/recipes-ti/bios/ti-sysbios_6.75.02.00.bb b/bsp/meta-ti/recipes-ti/bios/ti-sysbios_6.76.03.01.bb index 553d43e1..8ebe2f3e 100644 --- a/bsp/meta-ti/recipes-ti/bios/ti-sysbios_6.75.02.00.bb +++ b/bsp/meta-ti/recipes-ti/bios/ti-sysbios_6.76.03.01.bb @@ -1,12 +1,12 @@ require recipes-ti/bios/ti-sysbios.inc -PV = "6_75_02_00" +PV = "6_76_03_01" PR = "r0" LIC_FILES_CHKSUM = "file://manifest_bios_${PV}.html;md5=5cf40699c51b26d36fc01647c0b27fb1" -SRC_URI[sysbiosbin.md5sum] = "8bca751d3054e74b9edb510a0d099095" -SRC_URI[sysbiosbin.sha256sum] = "c92cb72f86656b1e37454e238e9838f301eeeb4d711a0f4a84089ef80ccb6013" +SRC_URI[sysbiosbin.md5sum] = "647243209d66d5dd35503b0ec5a84ab9" +SRC_URI[sysbiosbin.sha256sum] = "b762b7f2343d26d367f952488e529046785128005158cc921c3baef08e97116a" TI_BIN_UNPK_CMDS = "" TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${WORKDIR}" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-cgt-arm-native_18.12.1.bb b/bsp/meta-ti/recipes-ti/devtools/ti-cgt-arm-native_18.12.1.bb deleted file mode 100644 index 7df9660c..00000000 --- a/bsp/meta-ti/recipes-ti/devtools/ti-cgt-arm-native_18.12.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ti-cgt-arm.inc - -LIC_FILES_CHKSUM = "file://ti-cgt-arm_${PV}.LTS/README.txt;md5=ab7a61241e90fcd144a756d88294cf30" - -BINFILE_MD5 = "af2378cf8d5d6f200ef3329f5a065529" -BINFILE_SHA256 = "d90ae2360cd5b22912715ae7898d99352da1b97fd655f9a55d0d19a2a46bab0e" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-cgt-arm.inc b/bsp/meta-ti/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb index d2d768ce..9e651819 100644 --- a/bsp/meta-ti/recipes-ti/devtools/ti-cgt-arm.inc +++ b/bsp/meta-ti/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb @@ -2,7 +2,8 @@ SUMMARY = "TI ARM Code Generation Tools" HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm" LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Hewlett-Packard & Patrick-Powell & AFL-3.0 & MIT & BSD-2-Clause & PD & BSD-4-Clause" -inherit native +LIC_FILES_CHKSUM = "file://ti-cgt-arm_${PV}.LTS/README.txt;md5=79631eb21b2e5b7190cd3ff1dfd41108" + require recipes-ti/includes/ti-unpack.inc require recipes-ti/includes/ti-staging.inc require recipes-ti/includes/ti-paths.inc @@ -17,13 +18,17 @@ BINFILE = "ti_cgt_tms470_${PV}.LTS_linux_installer_x86.bin" TI_BIN_UNPK_ARGS = "--prefix ${S}" TI_BIN_UNPK_CMDS = "" +# only x86_64 is supported +COMPATIBLE_HOST = "x86_64.*-linux" +COMPATIBLE_HOST_class-target = "null" + do_install() { install -d ${D}${M4_TOOLCHAIN_INSTALL_DIR_RECIPE} cp -r ${S}/ti-cgt-arm*/. ${D}${M4_TOOLCHAIN_INSTALL_DIR_RECIPE} } -SRC_URI[cgt_arm_installer.md5sum] = "${BINFILE_MD5}" -SRC_URI[cgt_arm_installer.sha256sum] = "${BINFILE_SHA256}" +SRC_URI[cgt_arm_installer.md5sum] = "e9e668332cf86c965b4da9d1d488426b" +SRC_URI[cgt_arm_installer.sha256sum] = "da976143128c619a278cb4214a4295c409d100f9e65ad2f4d0d1039db7cf98f4" BINFILE_NAME = "cgt_arm_installer" @@ -34,3 +39,5 @@ INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INSANE_SKIP_${PN} += "arch staticdev" + +BBCLASSEXTEND = "native nativesdk" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-cgt-pru_2.2.1.bb b/bsp/meta-ti/recipes-ti/devtools/ti-cgt-pru_2.3.2.bb index 8d3887e5..ed10e272 100644 --- a/bsp/meta-ti/recipes-ti/devtools/ti-cgt-pru_2.2.1.bb +++ b/bsp/meta-ti/recipes-ti/devtools/ti-cgt-pru_2.3.2.bb @@ -2,8 +2,8 @@ DESCRIPTION = "TI PRU Code Generation Tools" HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm" LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Hewlett-Packard & AFL-3.0 & MIT & BSD-2-Clause & PD" -LIC_FILES_CHKSUM = "file://ti-cgt-pru_${PV}/PRU_Code_Generation_Tools_2.2.x_manifest.html;md5=e84b4022808f66b075095cb896747758" -LIC_FILES_CHKSUM_class-target = "file://usr/share/doc/ti/cgt-pru/PRU_Code_Generation_Tools_2.2.x_manifest.html;md5=e84b4022808f66b075095cb896747758" +LIC_FILES_CHKSUM = "file://ti-cgt-pru_${PV}/PRU_Code_Generation_Tools_2.3.x_manifest.html;md5=e22f9d8240f7cca0c0aa5242d9ffa5bc" +LIC_FILES_CHKSUM_class-target = "file://usr/share/doc/ti/cgt-pru/PRU_Code_Generation_Tools_2.3.x_manifest.html;md5=e22f9d8240f7cca0c0aa5242d9ffa5bc" require recipes-ti/includes/ti-paths.inc require recipes-ti/includes/ti-unpack.inc @@ -18,11 +18,11 @@ BINFILE_NAME_class-target = "cgt-pru-arm" SRC_URI = "http://software-dl.ti.com/codegen/esd/cgt_public_sw/PRU/${PV}/${BINFILE};name=${BINFILE_NAME}" -SRC_URI[cgt-pru-x86.md5sum] = "749d75841eef7b465c7cb08beaa1d135" -SRC_URI[cgt-pru-x86.sha256sum] = "7dc37fd689d1d506bf410d2a00af658b93a58d4bc10ac32c2210129dab617377" +SRC_URI[cgt-pru-x86.md5sum] = "270a0ecca383f66cad3a0e2a738c6ab0" +SRC_URI[cgt-pru-x86.sha256sum] = "af1178a059d46d67d5672df053dd2fbebb0b89a513b17b8739dbe915b4a5d71a" -SRC_URI[cgt-pru-arm.md5sum] = "389eef56777e30e6dab337efca4af2bf" -SRC_URI[cgt-pru-arm.sha256sum] = "b47a032f67cb3a3e5bea8ee3ed1908038f42938dd08e2ff72fc64f7aae2c1ff8" +SRC_URI[cgt-pru-arm.md5sum] = "fbf10083af1b0e5d69b018126603bb58" +SRC_URI[cgt-pru-arm.sha256sum] = "75ac84775a5624ea7e4fad4efc1acb7e869c79160550d48ba780068a3dce879c" do_install() { install -d ${D}${TI_CGT_PRU_INSTALL_DIR_RECIPE} @@ -44,6 +44,6 @@ INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INSANE_SKIP_${PN} += "arch staticdev already-stripped" +INSANE_SKIP_${PN} += "arch staticdev already-stripped file-rdeps" BBCLASSEXTEND = "native nativesdk" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x-7-native_7.4.16.bb b/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb index 7bb4c75e..a67a2d8a 100644 --- a/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x-7-native_7.4.16.bb +++ b/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb @@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b6311962635a4f15630e36ec2d875eca" S = "${WORKDIR}/c6000_7.4.16" -inherit native require recipes-ti/includes/ti-paths.inc require recipes-ti/includes/ti-unpack.inc @@ -27,6 +26,10 @@ SRC_URI = "http://install.source.dir.local/${BINFILE};name=${BINFILE_NAME}" SRC_URI[cgt6x_7.4.16_x86_installer.md5sum] = "21ca55c5b1f6b2d8d4fb7570d5eb5513" SRC_URI[cgt6x_7.4.16_x86_installer.sha256sum] = "baa0d1ef20397383f99f45068a6d160963a01419d42fbbb851263b54c91df82f" +# only x86_64 is supported +COMPATIBLE_HOST = "x86_64.*-linux" +COMPATIBLE_HOST_class-target = "null" + do_install() { install -d ${D}/${TI_CGT6X_7_INSTALL_DIR_RECIPE} cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${WORKDIR}/c6000_7.4.16/. ${D}/${TI_CGT6X_7_INSTALL_DIR_RECIPE} @@ -34,8 +37,10 @@ do_install() { FILES_${PN} += "${TI_CGT6X_7_INSTALL_DIR_RECIPE}" -INSANE_SKIP_${PN} += "arch staticdev" +INSANE_SKIP_${PN} += "arch staticdev textrel" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +BBCLASSEXTEND = "native nativesdk" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-cgt7x_1.2.0.bb b/bsp/meta-ti/recipes-ti/devtools/ti-cgt7x_1.2.0.bb new file mode 100644 index 00000000..09178af8 --- /dev/null +++ b/bsp/meta-ti/recipes-ti/devtools/ti-cgt7x_1.2.0.bb @@ -0,0 +1,47 @@ +SUMMARY = "TI DSP Code Generation Tools" +DESCRIPTION = "Texas Instruments (TI) Code Generation Tools are custom \ +utilities targeted for TI embedded processors. This Digital Signal \ +Processor (DSP) suite contains tools needed to create and debug \ +applications for the C7000 DSP family. This includes tools such as: \ +compiler, linker, assembler, etc. This also includes C runtime \ +libraries and standard header files needed to produce a working DSP application." +HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm" +LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Patrick-Powell & AFL-3.0 & MIT & BSD-2-Clause & PD" + +LIC_FILES_CHKSUM = "file://ti-cgt-c7000_${PV}.STS/C7000_Code_Generation_Tools_1.x_manifest.html;md5=f1156d241d104c281bc64a6ec8eadc64" + +require recipes-ti/includes/ti-unpack.inc +require recipes-ti/includes/ti-paths.inc + +# only x86_64 is supported +COMPATIBLE_HOST = "x86_64.*-linux" +COMPATIBLE_HOST_class-target = "null" + +BINFILE = "ti_cgt_c7000_${PV}.STS_linux_installer_x86.bin" +BINFILE_NAME = "cgt7x_x86_installer" + +SRC_URI = "http://software-dl.ti.com/codegen/esd/cgt_public_sw/C7000/${PV}.STS/${BINFILE};name=${BINFILE_NAME}" + +TI_BIN_UNPK_ARGS = "--prefix ${S}" +TI_BIN_UNPK_CMDS = "" + +SRC_URI[cgt7x_x86_installer.md5sum] = "813840908f333dd2a31f92edec71c1fb" +SRC_URI[cgt7x_x86_installer.sha256sum] = "21379811a8857489f72ca8ec45a46eb086ced0bdbb58e78f73a86e63984ab2f5" + +S = "${WORKDIR}/c7000_${PV}" + +do_install() { + install -d ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE} + cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${WORKDIR}/c7000_${PV}/ti-cgt-c7000_${PV}.STS/. ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE} +} + + +FILES_${PN} += "${TI_CGT7X_INSTALL_DIR_RECIPE}" + +INSANE_SKIP_${PN} += "arch staticdev textrel" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +BBCLASSEXTEND = "native nativesdk" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-xdctools_3.51.01.18.bb b/bsp/meta-ti/recipes-ti/devtools/ti-xdctools_3.51.01.18.bb deleted file mode 100644 index 35258b4d..00000000 --- a/bsp/meta-ti/recipes-ti/devtools/ti-xdctools_3.51.01.18.bb +++ /dev/null @@ -1,9 +0,0 @@ -require recipes-ti/devtools/ti-xdctools-core.inc - -PV = "3_51_01_18" -PR = "r0" - -LIC_FILES_CHKSUM = "file://docs/license/xdc/shelf/package.html;beginline=1;endline=140;md5=7d8508a640d8e76fe372141df01c351f" - -SRC_URI[xdczip.md5sum] = "54b80b603471623c1dbb0cfeb75b0fe2" -SRC_URI[xdczip.sha256sum] = "9bbbf433f0970bcb0cbf938615afe4d54420ecc56bc6e872f1a004338a8f19d5" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb b/bsp/meta-ti/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb new file mode 100644 index 00000000..74817835 --- /dev/null +++ b/bsp/meta-ti/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb @@ -0,0 +1,9 @@ +require recipes-ti/devtools/ti-xdctools-core.inc + +PV = "3_55_02_22" +PR = "r0" + +LIC_FILES_CHKSUM = "file://docs/license/xdc/shelf/package.html;beginline=1;endline=140;md5=2e742b9757bc9ce0241aadba9f627ab8" + +SRC_URI[xdczip.md5sum] = "bb9154d677ce4724a5eac73817b23a0f" +SRC_URI[xdczip.sha256sum] = "bf90dfbbe298458c736d81d5631db25b335e79146923a4a50fab217e02723e7b" diff --git a/bsp/meta-ti/recipes-ti/dsplib/dsplib.inc b/bsp/meta-ti/recipes-ti/dsplib/dsplib.inc index 1dfbcd24..111d83cb 100644 --- a/bsp/meta-ti/recipes-ti/dsplib/dsplib.inc +++ b/bsp/meta-ti/recipes-ti/dsplib/dsplib.inc @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" require ../includes/ti-paths.inc -PV = "3_4_0_3" +PV = "3_4_0_4" PR = "r2" DEPENDS = "ti-cgt6x-native \ @@ -19,7 +19,7 @@ S = "${WORKDIR}/git" DSPLIB_GIT_BRANCH = "master" DSPLIB_GIT_PROTOCOL = "git" DSPLIB_GIT_URI = "git://git.ti.com/ep-processor-libraries/dsplib.git" -DSPLIB_SRCREV = "2cd21a04913648d040bd63234183cc6f81f5286a" +DSPLIB_SRCREV = "0390b171042c602e07669fd28a371cc319b90161" SRC_URI = "${DSPLIB_GIT_URI};protocol=${DSPLIB_GIT_PROTOCOL};branch=${DSPLIB_GIT_BRANCH}" SRCREV = "${DSPLIB_SRCREV}" diff --git a/bsp/meta-ti/recipes-ti/includes/ti-paths.inc b/bsp/meta-ti/recipes-ti/includes/ti-paths.inc index 250074b4..52a93cf5 100644 --- a/bsp/meta-ti/recipes-ti/includes/ti-paths.inc +++ b/bsp/meta-ti/recipes-ti/includes/ti-paths.inc @@ -60,6 +60,8 @@ export MPM_INSTALL_DIR_RECIPE = "${installdir}/ti-mpm-tree" export TI_CGT6X_7_INSTALL_DIR_RECIPE = "${installdir}/cgt6x-7" export GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE = "${installdir}/gcc-linaro-baremetal" export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE = "${installdir}/gcc-linaro-baremetal-aarch64" +export TI_CGT7X_INSTALL_DIR_RECIPE = "${installdir}/cgt-c7x" + # This is where the tools will end up in sysroot export BIOS_INSTALL_DIR = "${STAGING_DIR_TARGET}${BIOS_INSTALL_DIR_RECIPE}" @@ -113,6 +115,7 @@ export MPM_INSTALL_DIR = "${STAGING_DIR_TARGET}${MPM_INSTALL_DIR_RECIPE}" export TI_CGT6X_7_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT6X_7_INSTALL_DIR_RECIPE}" export GCC_LINARO_BAREMETAL_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE}" export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE}" +export TI_CGT7X_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT7X_INSTALL_DIR_RECIPE}" DSPSUFFIX_omapl137 = "x674" diff --git a/bsp/meta-ti/recipes-ti/includes/ti-unpack.inc b/bsp/meta-ti/recipes-ti/includes/ti-unpack.inc index dbc49491..828f3d5a 100644 --- a/bsp/meta-ti/recipes-ti/includes/ti-unpack.inc +++ b/bsp/meta-ti/recipes-ti/includes/ti-unpack.inc @@ -20,11 +20,8 @@ python ti_bin_do_unpack() { import os # InstallJammer requires 32bit version of glibc - lib32path = '/lib' - if os.path.exists('/lib64') and (os.path.islink('/lib64') or os.path.islink('/lib') or os.path.exists('/lib32')): - lib32path = '/lib32' - if not os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('%s/i386-linux-gnu/libc.so.6' % lib32path): - bb.warn("TI installer requires 32bit glibc libraries for proper operation\nrun 'yum install glibc.i686' on Fedora or 'apt-get install libc6:i386' on Ubuntu/Debian") + if not os.path.exists('/lib/ld-linux.so.2'): + bb.fatal("TI installer requires 32bit glibc libraries for proper operation\nrun 'yum install glibc.i686' on Fedora or 'apt-get install libc6:i386' on Ubuntu/Debian") localdata = bb.data.createCopy(d) bb.data.update_data(localdata) diff --git a/bsp/meta-ti/recipes-ti/ipc/ipc-transport-srio_git.bb b/bsp/meta-ti/recipes-ti/ipc/ipc-transport-srio_git.bb index f0586d8b..ca7f7b6c 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ipc-transport-srio_git.bb +++ b/bsp/meta-ti/recipes-ti/ipc/ipc-transport-srio_git.bb @@ -13,4 +13,5 @@ do_compile () { do_install () { oe_runmake install INSTALL_INC_BASE_DIR=${D}${includedir} \ INSTALL_LIB_BASE_DIR=${D}${libdir} + chown -R root:root ${D} } diff --git a/bsp/meta-ti/recipes-ti/ipc/ipc-transport.inc b/bsp/meta-ti/recipes-ti/ipc/ipc-transport.inc index 25c49e72..0c1edef1 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ipc-transport.inc +++ b/bsp/meta-ti/recipes-ti/ipc/ipc-transport.inc @@ -4,12 +4,12 @@ IPC_TRANSPORT_GIT_URI = "git://git.ti.com/keystone-linux/ipc-transport.git" IPC_TRANSPORT_GIT_PROTOCOL = "git" IPC_TRANSPORT_GIT_BRANCH = "master" -# Below commit ID corresponds to "DEV.IPC-TRANSPORT.02.00.00.02" -IPC_TRANSPORT_SRCREV = "8cb22733115f7c1ee1e1cf3f7d704158080f383c" +# Below commit ID corresponds to "DEV.IPC-TRANSPORT.02.00.00.02A" +IPC_TRANSPORT_SRCREV = "f75e2e29b9b1b63443a0c82493e41dd2f771c6f5" BRANCH = "${IPC_TRANSPORT_GIT_BRANCH}" SRC_URI = "${IPC_TRANSPORT_GIT_URI};protocol=${IPC_TRANSPORT_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${IPC_TRANSPORT_SRCREV}" -PV = "02.00.00.02" +PV = "02.00.00.02A" INC_PR = "r0" diff --git a/bsp/meta-ti/recipes-ti/ipc/ti-ipc-common.inc b/bsp/meta-ti/recipes-ti/ipc/ti-ipc-common.inc index 036e46d8..86a0fd0c 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ti-ipc-common.inc +++ b/bsp/meta-ti/recipes-ti/ipc/ti-ipc-common.inc @@ -1,4 +1,4 @@ -PV = "3.50.03.05" +PV = "3.50.04.08" INC_PR = "r0" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/bsp/meta-ti/recipes-ti/ipc/ti-ipc-rtos.inc b/bsp/meta-ti/recipes-ti/ipc/ti-ipc-rtos.inc index dcd6309f..4d0d449c 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ti-ipc-rtos.inc +++ b/bsp/meta-ti/recipes-ti/ipc/ti-ipc-rtos.inc @@ -24,10 +24,10 @@ protocol=${TI_IPC_METADATA_GIT_PROTOCOL};\ branch=${TI_IPC_METADATA_GIT_BRANCH};\ name=${TI_IPC_METADATA_NAME}" -# Corresponds to tag: 3.50.03.05 -TI_IPC_METADATA_SRCREV = "3936c41d021c6d56c25f4bb07b647314a6589a57" -# Corresponds to tag: 3.50.03.05 -TI_IPC_EXAMPLES_SRCREV = "55a8341c60a91c0ba2d79b7e4b805e2e39b3060f" +# Corresponds to tag: 3.50.04.08 +TI_IPC_METADATA_SRCREV = "48788ea79190c4995df4c802e8aa4e17f332943d" +# Corresponds to tag: 3.50.04.08 +TI_IPC_EXAMPLES_SRCREV = "4707fcbbe0d136e781c4a7ffdc072be407c34358" SRCREV_FORMAT = "default" SRCREV_ipc-metadata = "${TI_IPC_METADATA_SRCREV}" @@ -39,7 +39,7 @@ S_ipc-metadata = "${WORKDIR}/git/ipc-metadata" RELEASE_TYPE = "GA" RELEASE_SUFFIX = "" -PR = "${INC_PR}.r0" +PR = "${INC_PR}.r2" DEPENDS_append_keystone = " ti-cgt6x-native \ gcc-arm-none-eabi-native \ @@ -84,12 +84,13 @@ IPC_TARGETS_am65xx = "\ ti.targets.arm.elf.R5F="${M4_TOOLCHAIN_INSTALL_DIR}" \ " +PARALLEL_XDC = "${@oe.utils.parallel_make_argument(d, '--jobs=%d')}" EXTRA_OEMAKE = "\ PLATFORM=${PLATFORM} \ XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \ BIOS_INSTALL_DIR="${SYSBIOS_INSTALL_DIR}" \ ${IPC_TARGETS} \ - JOBS="--jobs=${BB_NUMBER_THREADS}" \ + ${PARALLEL_XDC} \ JAVA_TOOL_OPTIONS=-Xss2560k \ " EXTRA_OEMAKE_append_am65xx = " PDK_INSTALL_DIR=${PDK_INSTALL_DIR}" diff --git a/bsp/meta-ti/recipes-ti/ipc/ti-ipc.inc b/bsp/meta-ti/recipes-ti/ipc/ti-ipc.inc index 482fdcc2..d1eaad2a 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ti-ipc.inc +++ b/bsp/meta-ti/recipes-ti/ipc/ti-ipc.inc @@ -8,8 +8,8 @@ TI_IPC_GIT_URI = "git://git.ti.com/ipc/ipcdev.git" TI_IPC_GIT_PROTOCOL = "git" TI_IPC_GIT_BRANCH = "3.50" -#Corresponds to 3.50.03.05 -TI_IPC_SRCREV = "7007b8adff409fd8c90757c9adafd264a3ff15e3" +#Corresponds to 3.50.04.08 +TI_IPC_SRCREV = "1d53b856338b86d1979fe09345c0b382913a848a" BRANCH = "${TI_IPC_GIT_BRANCH}" SRC_URI = "${TI_IPC_GIT_URI};protocol=${TI_IPC_GIT_PROTOCOL};branch=${BRANCH};name=ipcdev" diff --git a/bsp/meta-ti/recipes-ti/mathlib/mathlib.inc b/bsp/meta-ti/recipes-ti/mathlib/mathlib.inc index b0cd62ec..cfc5409f 100644 --- a/bsp/meta-ti/recipes-ti/mathlib/mathlib.inc +++ b/bsp/meta-ti/recipes-ti/mathlib/mathlib.inc @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" require ../includes/ti-paths.inc -PV = "3_1_2_3" +PV = "3_1_2_4" PR = "r2" DEPENDS = "ti-cgt6x-native \ @@ -19,7 +19,7 @@ S = "${WORKDIR}/git" MATHLIB_GIT_BRANCH = "master" MATHLIB_GIT_PROTOCOL = "git" MATHLIB_GIT_URI = "git://git.ti.com/ep-processor-libraries/mathlib.git" -MATHLIB_SRCREV = "faedd650c47becb48b2d179242c8310327ef9853" +MATHLIB_SRCREV = "eadcc9547faf69789661b004bb0b5ef53bb69951" SRC_URI = "${MATHLIB_GIT_URI};protocol=${MATHLIB_GIT_PROTOCOL};branch=${MATHLIB_GIT_BRANCH}" SRCREV = "${MATHLIB_SRCREV}" diff --git a/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr.inc b/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr.inc index 998e5507..40a20af9 100644 --- a/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr.inc +++ b/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr.inc @@ -8,10 +8,10 @@ MULTIPROCMGR_GIT_URI = "git://git.ti.com/keystone-linux/multi-proc-manager.git" MULTIPROCMGR_GIT_PROTOCOL = "git" MULTIPROCMGR_GIT_BRANCH = "master" -# The following commits correspond to DEV.MPM-3.00.04.00 -MULTIPROCMGR_SRCREV = "21579a066b469ff4620e7cff12803ae152880bb5" +# The following commits correspond to DEV.MPM-3.00.05.00 +MULTIPROCMGR_SRCREV = "f7fb3b7c21b3f6dd8b4adeef5df5be1824b9be73" -PV = "3.0.4.0" +PV = "3.0.5.0" INC_PR = "r0" BRANCH = "${MULTIPROCMGR_GIT_BRANCH}" diff --git a/bsp/meta-ti/recipes-ti/ndk/ti-ndk_3.60.00.13.bb b/bsp/meta-ti/recipes-ti/ndk/ti-ndk_3.60.00.13.bb deleted file mode 100644 index 700ad7d3..00000000 --- a/bsp/meta-ti/recipes-ti/ndk/ti-ndk_3.60.00.13.bb +++ /dev/null @@ -1,16 +0,0 @@ -require ti-ndk.inc - -PV = "3_60_00_13" -PR = "r0" - -LIC_FILES_CHKSUM = "file://manifest_ndk_${PV}.html;md5=6d1d16547344a4418e565586fa45b458" - -SRC_URI[ndkzip.md5sum] = "cc1bbe67b46bd02c4a423814360a4e00" -SRC_URI[ndkzip.sha256sum] = "86407d4b423419e020b38a44d1a61705fdec0ae0d5e35eb07b99fcfe5ceee7dd" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INHIBIT_SYSROOT_STRIP = "1" - -COMPATIBLE_HOST ?= "null" -COMPATIBLE_HOST_ti-soc = "(.*)" diff --git a/bsp/meta-ti/recipes-ti/ndk/ti-ndk_3.61.01.01.bb b/bsp/meta-ti/recipes-ti/ndk/ti-ndk_3.61.01.01.bb new file mode 100644 index 00000000..f120f2fe --- /dev/null +++ b/bsp/meta-ti/recipes-ti/ndk/ti-ndk_3.61.01.01.bb @@ -0,0 +1,16 @@ +require ti-ndk.inc + +PV = "3_61_01_01" +PR = "r0" + +LIC_FILES_CHKSUM = "file://manifest_ndk_${PV}.html;md5=871c716abcf52bac5a7c23154eaba3b6" + +SRC_URI[ndkzip.md5sum] = "87f0494c9faee344fe93ae68e71ca189" +SRC_URI[ndkzip.sha256sum] = "3bfca50367432603ebc1d53d9185302bb4fa4558ac766696f086dc7a5a2ccd29" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_SYSROOT_STRIP = "1" + +COMPATIBLE_HOST ?= "null" +COMPATIBLE_HOST_ti-soc = "(.*)" diff --git a/bsp/meta-ti/recipes-ti/ns/ti-ns_2.60.00.07.bb b/bsp/meta-ti/recipes-ti/ns/ti-ns_2.60.01.06.bb index a5da7f9e..d86fcd5f 100644 --- a/bsp/meta-ti/recipes-ti/ns/ti-ns_2.60.00.07.bb +++ b/bsp/meta-ti/recipes-ti/ns/ti-ns_2.60.01.06.bb @@ -1,13 +1,13 @@ require ti-ns.inc -PV = "2_60_00_07" +PV = "2_60_01_06" PR = "r0" SRC_URI = "http://software-dl.ti.com/targetcontent/ns/${PV}/exports/ns_${PV}.zip;name=nszip" LIC_FILES_CHKSUM = "file://manifest_ns_${PV}.html;md5=e15dc261b0ef14c6fbabba24abcde4f0" -SRC_URI[nszip.md5sum] = "7ad9f9fc79b4718bfa9b0042cb28d06f" -SRC_URI[nszip.sha256sum] = "8d2901e49ee72dde2e88370981e931c656e89efc7e0d5e3f775dde7d720e2b19" +SRC_URI[nszip.md5sum] = "b78d86423e9c4d148be5fba5903cc2c7" +SRC_URI[nszip.sha256sum] = "f66b2fda6ab02585020e67d84897305209f3e141847581a214ccf123c3f15f00" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/bsp/meta-ti/recipes-ti/swtools/swtools_git.bb b/bsp/meta-ti/recipes-ti/swtools/swtools_git.bb index 796909f1..497c0e0d 100644 --- a/bsp/meta-ti/recipes-ti/swtools/swtools_git.bb +++ b/bsp/meta-ti/recipes-ti/swtools/swtools_git.bb @@ -11,13 +11,13 @@ DEPENDS = "ti-cgt6x-native \ ti-xdctools-native" PV = "5_0_8" -PR = "r2" +PR = "r3" S = "${WORKDIR}/git" SWTOOLS_GIT_BRANCH = "master" SWTOOLS_GIT_PROTOCOL = "git" SWTOOLS_GIT_URI = "git://git.ti.com/ep-processor-libraries/swtools.git" -SWTOOLS_SRCREV = "d0c1022954b489d5f3d8d2f5c81d8c6a392f4af4" +SWTOOLS_SRCREV = "7d1c85e686b1466cd2d535fc9cac5baf1aae24a4" SRC_URI = "${SWTOOLS_GIT_URI};protocol=${SWTOOLS_GIT_PROTOCOL};branch=${SWTOOLS_GIT_BRANCH}" SRCREV = "${SWTOOLS_SRCREV}" @@ -41,7 +41,7 @@ do_compile() { do_install() { CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" install -d ${D}${SWTOOLS_INSTALL_DIR_RECIPE} - cp -pPrf ${S}/* ${D}${SWTOOLS_INSTALL_DIR_RECIPE} + cp ${CP_ARGS} ${S}/* ${D}${SWTOOLS_INSTALL_DIR_RECIPE} } FILES_${PN}-dev += "${SWTOOLS_INSTALL_DIR_RECIPE}" diff --git a/bsp/meta-ti/recipes-ti/ti-pdk-build/ti-pdk-build-rtos_git.bb b/bsp/meta-ti/recipes-ti/ti-pdk-build/ti-pdk-build-rtos_git.bb index b71e7cf7..96648815 100644 --- a/bsp/meta-ti/recipes-ti/ti-pdk-build/ti-pdk-build-rtos_git.bb +++ b/bsp/meta-ti/recipes-ti/ti-pdk-build/ti-pdk-build-rtos_git.bb @@ -4,28 +4,17 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;beginline=1;endline=31;md5=92ab6f5e10f150 require recipes-ti/includes/ti-paths.inc -PV = "01.00.00.12B" PR = "r0" -PDK_BUILD_GIT_URI = "git://git.ti.com/keystone-rtos/processor-pdk-build.git" -PDK_BUILD_GIT_PROTOCOL = "git" -PDK_BUILD_GIT_BRANCH = "master" +inherit ti-pdk-fetch -# Below Commit ID corresponds to "DEV.PDK_BUILD.01.00.00.12B" -PDK_BUILD_SRCREV = "40e09c24dc988ff79f0e4757201d6b87fb84af56" +TI_PDK_COMP = "ti.build" -BRANCH = "${PDK_BUILD_GIT_BRANCH}" -SRC_URI = "\ - ${PDK_BUILD_GIT_URI};protocol=${PDK_BUILD_GIT_PROTOCOL};branch=${BRANCH} \ - " - -SRCREV = "${PDK_BUILD_SRCREV}" +PE = "1" COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c66x|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/git/" - PARALLEL_MAKE = "" CLEANBROKEN = "1" diff --git a/bsp/meta-ti/recipes-ti/udma/udma_git.bb b/bsp/meta-ti/recipes-ti/udma/udma_git.bb index 0374d37f..c905fa58 100644 --- a/bsp/meta-ti/recipes-ti/udma/udma_git.bb +++ b/bsp/meta-ti/recipes-ti/udma/udma_git.bb @@ -10,11 +10,13 @@ S = "${WORKDIR}/git" # Commit corresponds to UDMA.01.00.00.00 SRCREV = "53d09fb0bc98c41c5eb43623097e363c497d6fd8" +PV = "01.00.00.00" + PACKAGES =+ "${PN}-test" FILES_${PN}-test = "${bindir}/udma_test" -do_install_append() { +do_install() { install -d ${D}${bindir}/ install -d ${D}${libdir}/ install -d ${D}${includedir}/ @@ -26,3 +28,5 @@ do_install_append() { ln -sf libudma.so.1.0.0 libudma.so install -c -m 755 ${S}/include/* ${D}${includedir}/ } + +INSANE_SKIP_${PN} += "textrel" |