Skip to contentSkip to conversation

linux-ti-staging: extract common rdepends, pass defconfig_builder.sh via variable

PATCH New Denys Dmytriyenko 1 participant 3 messages Oct 12, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 linux-ti-staging: extract common rdepends, pass defconfig_builder.sh via variable

From: Denys Dmytriyenko <[email protected]>

---
 recipes-kernel/linux/kernel-rdepends.inc     | 40 +++++++++++++++++++++++++
 recipes-kernel/linux/linux-ti-staging_5.4.bb | 45 ++--------------------------
 recipes-kernel/linux/setup-defconfig.inc     |  2 +-
 3 files changed, 44 insertions(+), 43 deletions(-)
 create mode 100644 recipes-kernel/linux/kernel-rdepends.inc
recipes-kernel/linux/kernel-rdepends.inc new file +40 -0
new file mode 100644
index 0000000..56dfe4b
@@ -0,0 +1,40 @@
+# Pull in the devicetree files into the rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
+
+# Add run-time dependency for PM firmware to the rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti33x = " amx3-cm3"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti43x = " amx3-cm3"
+
+# Add run-time dependency for VPE VPDMA firmware to the rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_dra7xx = " vpdma-fw"
+
+# Add run-time dependency for Goodix firmware to the rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_dra7xx = " goodix-fw"
+
+# Install boot-monitor skern file into /boot dir of rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_keystone = " boot-monitor"
+
+# Install ti-sci-fw into /boot dir of rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2g = " ti-sci-fw"
+
+# Add run-time dependency for SerDes firmware to the rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_keystone = " serdes-fw"
+
+# Add run-time dependency for QMSS PDSP firmware to the rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_keystone = " qmss-pdsp-fw"
+
+# Add run-time dependency for NETCP PA firmware to the rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2hk = " netcp-pa-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2e = " netcp-pa-fw"
+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 prusw-fw pruhsr-fw pruprp-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-hs-evm = " prueth-fw prusw-fw pruhsr-fw pruprp-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti43x = " prueth-fw pruhsr-fw pruprp-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti33x = " prueth-fw pruhsr-fw pruprp-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx = " prueth-fw-am65x"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx-evm = " prueth-fw-am65x-sr2"
+
+# Add run-time dependency for Cadence MHDP firmware to the rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7 = " cadence-mhdp-fw"
recipes-kernel/linux/linux-ti-staging_5.4.bb +3 -42

62 lines not on this page · raw message

recipes-kernel/linux/setup-defconfig.inc +1 -1
index dcf2ada..850a1dd 100644
@@ -28,7 +28,7 @@ do_configure() {
     config=`cat ${B}/.config | grep use-tisdk-config | cut -d= -f2`
     if [ -n "$config" ]
     then
-        ${S}/ti_config_fragments/defconfig_builder.sh -w ${S} -t $config
+        ${DEFCONFIG_BUILDER} -w ${S} -t $config
         oe_runmake -C ${S} O=${B} "$config"_defconfig
     else
         # First, check if pointing to a combined config with config fragments
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/3 linux-ti-mainline: add mainline 5.9 using ti-upstream-tools

From: Denys Dmytriyenko <[email protected]>

---
 .../defconfig                                      |  0
 .../dra7xx/defconfig                               |  0
 .../k2g/defconfig                                  |  0
 .../k3/defconfig                                   |  0
 .../keystone/defconfig                             |  0
 .../omapl138/defconfig                             |  0
 .../ti33x/defconfig                                |  0
 .../ti43x/defconfig                                |  0
 ...-ti-staging_5.4.bb => linux-ti-mainline_git.bb} | 71 +++++++++++++++-------
 9 files changed, 49 insertions(+), 22 deletions(-)
 copy recipes-kernel/linux/{linux-ti-staging-5.4 => linux-ti-mainline}/defconfig (100%)
 copy recipes-kernel/linux/{linux-ti-staging-5.4 => linux-ti-mainline}/dra7xx/defconfig (100%)
 copy recipes-kernel/linux/{linux-ti-staging-5.4 => linux-ti-mainline}/k2g/defconfig (100%)
 copy recipes-kernel/linux/{linux-ti-staging-5.4 => linux-ti-mainline}/k3/defconfig (100%)
 copy recipes-kernel/linux/{linux-ti-staging-5.4 => linux-ti-mainline}/keystone/defconfig (100%)
 copy recipes-kernel/linux/{linux-ti-staging-5.4 => linux-ti-mainline}/omapl138/defconfig (100%)
 copy recipes-kernel/linux/{linux-ti-staging-5.4 => linux-ti-mainline}/ti33x/defconfig (100%)
 copy recipes-kernel/linux/{linux-ti-staging-5.4 => linux-ti-mainline}/ti43x/defconfig (100%)
 copy recipes-kernel/linux/{linux-ti-staging_5.4.bb => linux-ti-mainline_git.bb} (20%)
recipes-kernel/linux/linux-ti-mainline/defconfig renamed from recipes-kernel/linux/linux-ti-staging-5.4/defconfig +0 -0
similarity index 100%
copy from recipes-kernel/linux/linux-ti-staging-5.4/defconfig
copy to recipes-kernel/linux/linux-ti-mainline/defconfig
recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig renamed from recipes-kernel/linux/linux-ti-staging-5.4/dra7xx/defconfig +0 -0
similarity index 100%
copy from recipes-kernel/linux/linux-ti-staging-5.4/dra7xx/defconfig
copy to recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig
recipes-kernel/linux/linux-ti-mainline/k2g/defconfig renamed from recipes-kernel/linux/linux-ti-staging-5.4/k2g/defconfig +0 -0
similarity index 100%
copy from recipes-kernel/linux/linux-ti-staging-5.4/k2g/defconfig
copy to recipes-kernel/linux/linux-ti-mainline/k2g/defconfig
recipes-kernel/linux/linux-ti-mainline/k3/defconfig renamed from recipes-kernel/linux/linux-ti-staging-5.4/k3/defconfig +0 -0
similarity index 100%
copy from recipes-kernel/linux/linux-ti-staging-5.4/k3/defconfig
copy to recipes-kernel/linux/linux-ti-mainline/k3/defconfig
recipes-kernel/linux/linux-ti-mainline/keystone/defconfig renamed from recipes-kernel/linux/linux-ti-staging-5.4/keystone/defconfig +0 -0
similarity index 100%
copy from recipes-kernel/linux/linux-ti-staging-5.4/keystone/defconfig
copy to recipes-kernel/linux/linux-ti-mainline/keystone/defconfig
recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig renamed from recipes-kernel/linux/linux-ti-staging-5.4/omapl138/defconfig +0 -0
similarity index 100%
copy from recipes-kernel/linux/linux-ti-staging-5.4/omapl138/defconfig
copy to recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig
recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig renamed from recipes-kernel/linux/linux-ti-staging-5.4/ti33x/defconfig +0 -0
similarity index 100%
copy from recipes-kernel/linux/linux-ti-staging-5.4/ti33x/defconfig
copy to recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig
recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig renamed from recipes-kernel/linux/linux-ti-staging-5.4/ti43x/defconfig +0 -0
similarity index 100%
copy from recipes-kernel/linux/linux-ti-staging-5.4/ti43x/defconfig
copy to recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig
recipes-kernel/linux/linux-ti-mainline_git.bb renamed from recipes-kernel/linux/linux-ti-staging_5.4.bb +49 -22

92 lines not on this page · raw message

Signature · 1 line
2.7.4
#2 lore raw

PATCH 3/3 u-boot-ti-mainline: add mainline 2020.10

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

Update md5 README checksum for u-boot. No actual licensing changes.

Change is with u-boot commit
35bd70c5107f0 ("Convert CONFIG_SPLASH_SCREEN et al to Kconfig")

---
 .../{u-boot-ti-staging_2020.01.bb => u-boot-ti-mainline_git.bb}  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
 copy recipes-bsp/u-boot/{u-boot-ti-staging_2020.01.bb => u-boot-ti-mainline_git.bb} (9%)
recipes-bsp/u-boot/u-boot-ti-mainline_git.bb renamed from recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb +6 -3
similarity index 9%
copy from recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb
copy to recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
index 5b09cb5..ee0b176 100644
@@ -1,7 +1,10 @@
 require u-boot-ti.inc
 
-PR = "r18"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
-BRANCH = "ti-u-boot-2020.01"
+PR = "r0"
 
-SRCREV = "eea73800730b3d9125f5c12a629db2f88e566b71"
+PV = "2020.10"
+UBOOT_GIT_URI = "git://gitlab.denx.de/u-boot/u-boot.git"
+UBOOT_GIT_PROTOCOL = "http"
+SRCREV = "050acee119b3757fee3bd128f55d720fdd9bb890"
Signature · 1 line
2.7.4