diff options
author | Yogesh Siraswar <yogeshs@ti.com> | 2021-05-21 04:51:08 -0500 |
---|---|---|
committer | Yogesh Siraswar <yogeshs@ti.com> | 2021-05-26 12:17:22 -0500 |
commit | 99cf543ee385677589edc6bd132068c5a710803f (patch) | |
tree | c3b1a585e083f40557a9666fac9c970bfe909c39 | |
parent | 0a7997966f160ffa8b889fa1864355058c3a11e5 (diff) | |
download | meta-ti-99cf543ee385677589edc6bd132068c5a710803f.tar.gz |
linux-ti-staging: Add extra dtc flags to support dtb overlays
Added KERNEL_DTB_OVERLAY_SUPPORT to common ti-soc include. This fixes the issue
where the dtbs are build without symbols causing issue with overlays.
Please note this increases the size of the dtb for all platform
derived from ti-soc. So for custom boards disable it from local.conf to
reduce size.
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
-rw-r--r-- | conf/machine/include/ti-soc.inc | 1 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-ti-mainline_git.bb | 6 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-ti-staging_5.10.bb | 6 | ||||
-rw-r--r-- | recipes-kernel/linux/ti-kernel.inc | 9 |
4 files changed, 18 insertions, 4 deletions
diff --git a/conf/machine/include/ti-soc.inc b/conf/machine/include/ti-soc.inc index 227d8972..2792d2a0 100644 --- a/conf/machine/include/ti-soc.inc +++ b/conf/machine/include/ti-soc.inc | |||
@@ -1,4 +1,5 @@ | |||
1 | # This is a generic TI SOC family. It is a superset of all other SOCs | 1 | # This is a generic TI SOC family. It is a superset of all other SOCs |
2 | # and platforms defined in meta-ti to allow BSP-level overrides. | 2 | # and platforms defined in meta-ti to allow BSP-level overrides. |
3 | SOC_FAMILY = "ti-soc" | 3 | SOC_FAMILY = "ti-soc" |
4 | KERNEL_DTB_OVERLAY_SUPPORT ?= "1" | ||
4 | require conf/machine/include/soc-family.inc | 5 | require conf/machine/include/soc-family.inc |
diff --git a/recipes-kernel/linux/linux-ti-mainline_git.bb b/recipes-kernel/linux/linux-ti-mainline_git.bb index fc16485d..6770adca 100644 --- a/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/recipes-kernel/linux/linux-ti-mainline_git.bb | |||
@@ -8,10 +8,12 @@ inherit kernel | |||
8 | DEFCONFIG_BUILDER = "${WORKDIR}/ti-upstream-tools/config/defconfig_builder.sh" | 8 | DEFCONFIG_BUILDER = "${WORKDIR}/ti-upstream-tools/config/defconfig_builder.sh" |
9 | require recipes-kernel/linux/setup-defconfig.inc | 9 | require recipes-kernel/linux/setup-defconfig.inc |
10 | require recipes-kernel/linux/kernel-rdepends.inc | 10 | require recipes-kernel/linux/kernel-rdepends.inc |
11 | require recipes-kernel/linux/ti-kernel.inc | ||
11 | 12 | ||
12 | DEPENDS += "gmp-native" | 13 | DEPENDS += "gmp-native" |
13 | 14 | ||
14 | KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" | 15 | KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ |
16 | ${EXTRA_DTC_ARGS}" | ||
15 | 17 | ||
16 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
17 | 19 | ||
@@ -23,7 +25,7 @@ SRCREV = "9f4ad9e425a1d3b6a34617b8ea226d56a119a717" | |||
23 | PV = "5.12+git${SRCPV}" | 25 | PV = "5.12+git${SRCPV}" |
24 | 26 | ||
25 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild | 27 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild |
26 | MACHINE_KERNEL_PR_append = "a" | 28 | MACHINE_KERNEL_PR_append = "b" |
27 | PR = "${MACHINE_KERNEL_PR}" | 29 | PR = "${MACHINE_KERNEL_PR}" |
28 | 30 | ||
29 | KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" | 31 | KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" |
diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb b/recipes-kernel/linux/linux-ti-staging_5.10.bb index 4ec19af7..0a134f93 100644 --- a/recipes-kernel/linux/linux-ti-staging_5.10.bb +++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb | |||
@@ -11,11 +11,13 @@ require recipes-kernel/linux/cmem.inc | |||
11 | require recipes-kernel/linux/ti-uio.inc | 11 | require recipes-kernel/linux/ti-uio.inc |
12 | require recipes-kernel/linux/bundle-devicetree.inc | 12 | require recipes-kernel/linux/bundle-devicetree.inc |
13 | require recipes-kernel/linux/kernel-rdepends.inc | 13 | require recipes-kernel/linux/kernel-rdepends.inc |
14 | require recipes-kernel/linux/ti-kernel.inc | ||
14 | 15 | ||
15 | # Look in the generic major.minor directory for files | 16 | # Look in the generic major.minor directory for files |
16 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.10:" | 17 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.10:" |
17 | 18 | ||
18 | KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" | 19 | KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ |
20 | ${EXTRA_DTC_ARGS}" | ||
19 | 21 | ||
20 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
21 | 23 | ||
@@ -25,7 +27,7 @@ SRCREV = "d85aee3e19aa7403bd157d2ae30917e736096a7f" | |||
25 | PV = "5.10.30+git${SRCPV}" | 27 | PV = "5.10.30+git${SRCPV}" |
26 | 28 | ||
27 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild | 29 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild |
28 | MACHINE_KERNEL_PR_append = "a" | 30 | MACHINE_KERNEL_PR_append = "b" |
29 | PR = "${MACHINE_KERNEL_PR}" | 31 | PR = "${MACHINE_KERNEL_PR}" |
30 | 32 | ||
31 | KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" | 33 | KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" |
diff --git a/recipes-kernel/linux/ti-kernel.inc b/recipes-kernel/linux/ti-kernel.inc new file mode 100644 index 00000000..a7eb476e --- /dev/null +++ b/recipes-kernel/linux/ti-kernel.inc | |||
@@ -0,0 +1,9 @@ | |||
1 | # Add DTC FLAGS -@ when KERNEL_DTB_OVERLAY_SUPPORT is enabled | ||
2 | |||
3 | def get_extra_dtc_args(d): | ||
4 | if d.getVar('KERNEL_DTB_OVERLAY_SUPPORT') == "1": | ||
5 | return "DTC_FLAGS=-@" | ||
6 | else: | ||
7 | return "" | ||
8 | |||
9 | EXTRA_DTC_ARGS += "${@get_extra_dtc_args(d)}" | ||