diff options
author | Andrew Davis <afd@ti.com> | 2023-04-11 16:52:38 -0500 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-04-14 14:27:19 -0500 |
commit | 4a80f678c0ef2df648aa84848178f4fd44472067 (patch) | |
tree | f88f91ead98ba376bc026f66dd1f5826416340e2 /meta-ti-bsp/recipes-kernel | |
parent | a84da012ac0ff2d759a2ed7ba6ee7c8cf733db3c (diff) | |
download | meta-ti-4a80f678c0ef2df648aa84848178f4fd44472067.tar.gz |
linux-ti-mainline: Use upstream configs with upstream kernel
Mainline should test the mainline kernel as it is, not with out-of-tree
changes like to the default configuration that one would get when using
a stock distro. Use only upstream configuration.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp/recipes-kernel')
7 files changed, 5 insertions, 9 deletions
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig deleted file mode 100644 index d083d182..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | use-tisdk-config=ti_sdk_omap2_release | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig deleted file mode 100644 index dcb53bab..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | use-tisdk-config=ti_sdk_dra7x_release | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig deleted file mode 100644 index b9bc6137..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | use-tisdk-config=ti_sdk_arm64_release | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig deleted file mode 100644 index b3467853..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | use-tisdk-config=ti_sdk_omapl138_release | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig deleted file mode 100644 index 88f80fa9..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | use-tisdk-config=ti_sdk_am3x_release | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig deleted file mode 100644 index 4b9daaf9..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | use-tisdk-config=ti_sdk_am4x_release | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb index be278d73..7d948a85 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | |||
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | |||
5 | 5 | ||
6 | inherit kernel | 6 | inherit kernel |
7 | 7 | ||
8 | DEFCONFIG_BUILDER = "${S}/ti-upstream-tools/config/defconfig_builder.sh" | ||
9 | require recipes-kernel/linux/setup-defconfig.inc | ||
10 | require recipes-kernel/linux/kernel-rdepends.inc | 8 | require recipes-kernel/linux/kernel-rdepends.inc |
11 | require recipes-kernel/linux/ti-kernel.inc | 9 | require recipes-kernel/linux/ti-kernel.inc |
12 | 10 | ||
@@ -33,12 +31,16 @@ KERNEL_GIT_PROTOCOL = "https" | |||
33 | SRC_URI += " \ | 31 | SRC_URI += " \ |
34 | ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux \ | 32 | ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux \ |
35 | git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=git/ti-upstream-tools \ | 33 | git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=git/ti-upstream-tools \ |
36 | file://defconfig \ | ||
37 | " | 34 | " |
38 | 35 | ||
39 | SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95" | 36 | SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95" |
40 | SRCREV_FORMAT = "linux" | 37 | SRCREV_FORMAT = "linux" |
41 | 38 | ||
39 | DEFCONFIG_NAME = "multi_v7_defconfig" | ||
40 | DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig" | ||
41 | DEFCONFIG_NAME:k3 = "defconfig" | ||
42 | KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}" | ||
43 | |||
42 | kernel_do_compile:append() { | 44 | kernel_do_compile:append() { |
43 | oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} | 45 | oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} |
44 | oe_runmake -C ${S}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} | 46 | oe_runmake -C ${S}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} |