On 4/5/23 1:58 PM, Denys Dmytriyenko wrote:
On Wed, Apr 05, 2023 at 01:47:11PM -0500, Andrew Davis via 
lists.yoctoproject.org wrote:
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 <[email protected]>
---
  .../recipes-kernel/linux/linux-ti-mainline/defconfig       | 1 -
  .../linux/linux-ti-mainline/dra7xx/defconfig               | 1 -
  .../recipes-kernel/linux/linux-ti-mainline/k3/defconfig    | 1 -
  .../linux/linux-ti-mainline/omapl138/defconfig             | 1 -
  .../recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig | 1 -
  .../recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig | 1 -
  meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb  | 7 +++++--
  7 files changed, 5 insertions(+), 8 deletions(-)
  delete mode 100644 
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig
  delete mode 100644 
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig
  delete mode 100644 
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig
  delete mode 100644 
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig
  delete mode 100644 
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig
  delete mode 100644 
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig

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 @@
-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 @@
-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 @@
-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 @@
-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 @@
-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 @@
-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..3f4b560d 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
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
  inherit kernel
DEFCONFIG_BUILDER = "${S}/ti-upstream-tools/config/defconfig_builder.sh"

Then this ^^^ variable is also not needed any more.


ACK, will remove in v2

Semms like you are pretty much abandoning the old ti-upstream-tools concept,
which was supplying TI-specific defconfig fragments+script and DTB/DTBOs on
top of mainline kernel. In that case mainline and next recipes will be the
same, except for SRC_URI tree and SRCREV?


Basically yes. For now I keep the ti-upstream-tools in the "mainline" builds
just for adding some DTBOs used in testing, I have a patch that removes it
completely, I'll add that patch for v2.

Andrew


-require recipes-kernel/linux/setup-defconfig.inc
  require recipes-kernel/linux/kernel-rdepends.inc
  require recipes-kernel/linux/ti-kernel.inc
@@ -33,12 +32,16 @@ KERNEL_GIT_PROTOCOL = "https"
  SRC_URI += " \
      
${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux \
      
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
 \
-    file://defconfig \
  "
SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95"
  SRCREV_FORMAT = "linux"
+DEFCONFIG_NAME = "multi_v7_defconfig"
+DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig"
+DEFCONFIG_NAME:k3 = "defconfig"
+KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}"
+
  kernel_do_compile:append() {
        oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" 
${KERNEL_EXTRA_ARGS}
        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}
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16343): 
https://lists.yoctoproject.org/g/meta-ti/message/16343
Mute This Topic: https://lists.yoctoproject.org/mt/98089310/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to