This thread has been locked.

If you have a related question, please click the "Ask a related question" button in the top right corner. The newly created question will be automatically linked to this question.

TDA2PXEVM: git am ../linux-kernel-addon/earlyboot-kernel-patches/* failed

Part Number: TDA2PXEVM

Hi,

I want to apply the earlyboot-kernel-patches for kernel.But it apply failed.My vision SDK version is 3.07.

Here's the apply log.

git am ../linux-kernel-addon/earlyboot-kernel-patches/*
应用:dra7xx: Kernel Optimizations for early-use-case enablement
error: 打补丁失败:ti_config_fragments/auto.cfg:50
error: ti_config_fragments/auto.cfg:补丁未应用
打补丁失败于 0001 dra7xx: Kernel Optimizations for early-use-case enablement
失败的补丁文件副本位于:.git/rebase-apply/patch
当您解决这一问题,执行 "git am --continue"。
如果您想要跳过这一补丁,则执行 "git am --skip"。
若要复原至原始分支并停止补丁操作,执行 "git am --abort"。

Could you give some help?

Regards

Ll

  • Hi Ll,

    can you make sure you have checkout the right branch as described in chapter "2.4.2.1.1 Clone kernel" of VisionSDK_Linux_UserGuide.pdf.

    You may need to run 'git am --abort' before you can checkout the branch.

    (also it could be useful if you change your local setting to English so we can read the error messages)

    Regards,

    Yordan

  • Hi Yordan,

    I describe my steps below.

    1.Checkout the right branch,I use a new branch name early_boot to distinguish origin branch.

    lyp@lyp-desktop:~/hd2/tda2/sdk_3.07/ti_components/os_tools/linux/kernel/omap$ git checkout -b early_boot tags/REL_VISION_SDK_03_07_00_00
    Switched to a new branch 'early_boot'
    lyp@lyp-desktop:~/hd2/tda2/sdk_3.07/ti_components/os_tools/linux/kernel/omap$ git log commit 0af2ab56214366ea1b8c1ea6ca0dae726dba083a Author: Shravan Karthik <shravan.karthik@ti.com> Date: Tue Jun 4 18:47:56 2019 +0530 ti_config_fragments: Add CONFIG_BLK_DEV_NVME to default config Cascade radar board has a NVME SSD card mounted on the board. Add NVME driver support by default in the kernel config Signed-off-by: Shravan Karthik <shravan.karthik@ti.com> commit 9e4a96e876ff8cfffe8694f38f27635dfbc18f3f Author: Shravan Karthik <shravan.karthik@ti.com> Date: Tue Jun 4 18:45:32 2019 +0530 arm: dts: Change board name for cascade radar DTB Signed-off-by: Shravan Karthik <shravan.karthik@ti.com> commit 12d7cbeff8522722c1981d49b8e07d81fdd887ce Author: Vignesh R <vigneshr@ti.com> Date: Wed Nov 22 14:33:41 2017 +0530 pci: dwc: pci-dra7xx: Improve MSI IRQ handling We need to ensure that there are no pending MSI IRQ vector set (i.e PCIE_MSI_INTR0_STATUS reads 0 at least once) before exiting dra7xx_pcie_msi_irq_handler(). Else, the dra7xx PCIe wrapper will not register new MSI IRQs even though PCIE_MSI_INTR0_STATUS shows IRQs are pending. Therefore, keep calling dra7xx_pcie_msi_irq_handler() until it returns IRQ_NONE, which suggests that PCIE_MSI_INTR0_STATUS is 0.
    lyp@lyp-desktop:~/hd2/tda2/sdk_3.07/ti_components/os_tools/linux/kernel/omap$ git branch * early_boot infoadas-on-psdkla3.03 kernel_dev

    2.Try to apply the patch,it still apply failed.

    lyp@lyp-desktop:~/hd2/tda2/sdk_3.07/ti_components/os_tools/linux/kernel/omap$ git am ../linux-kernel-addon/earlyboot-kernel-patches/*
    Applying: dra7xx: Kernel Optimizations for early-use-case enablement
    error: patch failed: ti_config_fragments/auto.cfg:50
    error: ti_config_fragments/auto.cfg: patch does not apply
    Patch failed at 0001 dra7xx: Kernel Optimizations for early-use-case enablement
    The copy of the patch that failed is found in: .git/rebase-apply/patch
    When you have resolved this problem, run "git am --continue".
    If you prefer to skip this patch, run "git am --skip" instead.
    To restore the original branch and stop patching, run "git am --abort".
    

    Regards,

    LI

  • Hi,

    Can you apply patch 1 by 1 and tell us which patch is giving the error and share the output of gist status and git diff when you get the error.

    Regards,

    Anuj

  • Hi LI,

    We haven't heard back from you, I'm assuming you were able to resolve your issue.
    If not, just post a reply below (or create a new thread if the thread has locked due to time-out).

    Regards,
    Yordan