Bitbake was successful after i erased and re-installed oe-core. However the patch is not working. I tried both ways described.
FIRST METHOD. I changed the recipie /layers/meta-toradex-nxp/recipeies-kernel/linux/linux-toradex_4.9-1.0.x.bb by modifying the follwing two variables:
SRCREV = "731e809d3e4a14e49756bd4158b98c69e39a8459"
SRCBRANCH = "toradex_4.9-1.0.x-imx-next"
I didnt know where to get the git hash for all the patches together, so I used the git hash I obtained by moving up the commit tree from the patch until i got to the head. I rebuilt the image without any errors but the patch did not fix the problem of powering up correctly after standby.
SECOND METHOD. I downloaded the patch and created a file called fix_powerup.patch. The patch file is as follows:
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index 551ecd0..75a09e0 100644
@@ -198,6 +198,7 @@ unsigned int imx_gpc_is_mf_mix_off(void)
static void imx_gpc_mf_mix_off(void)
for (i = 0; i < IMR_NUM; i++)
@@ -208,6 +209,7 @@ static void imx_gpc_mf_mix_off(void)
pr_info("Turn off M/F mix!\n");
/* turn off mega/fast mix */
writel_relaxed(0x1, gpc_base + GPC_PGC_MF_PDN);
void imx_gpc_set_arm_power_up_timing(u32 sw2iso, u32 sw)
I placed this file in the directory:
Using the original linux-toradex_4.9-1.0.x.bb receipie, I added an extra line to SRC_URI
" file://fix_powerup.patch " after adding a " \ to the end of the previous line.
When i try to build the image i get the follwing error.
ERROR: linux-toradex-4.9-1.0.x+gitAUTOINC+07d40f6ffc-r0 do_patch: Command Error: 'quilt --quiltrc /home/lachlan/toradex/oe-core/build/tmp-glibc/work/colibri_imx6ull-angstrom-linux-gnueabi/linux-toradex/4.9-1.0.x+gitAUTOINC+07d40f6ffc-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output:
Applying patch fix_powerup.patch
patching file arch/arm/mach-imx/gpc.c
Hunk #1 FAILED at 198.
Hunk #2 FAILED at 208.
2 out of 2 hunks FAILED -- rejects in file arch/arm/mach-imx/gpc.c
Patch fix_powerup.patch can be reverse-applied
ERROR: linux-toradex-4.9-1.0.x+gitAUTOINC+07d40f6ffc-r0 do_patch: Function failed: patch_do_patch
ERROR: Logfile of failure stored in: /home/lachlan/toradex/oe-core/build/tmp-glibc/work/colibri_imx6ull-angstrom-linux-gnueabi/linux-toradex/4.9-1.0.x+gitAUTOINC+07d40f6ffc-r0/temp/log.do_patch.2883
ERROR: Task (/home/lachlan/toradex/oe-core/build/../layers/meta-toradex-nxp/recipes-kernel/linux/linux-toradex_4.9-1.0.x.bb:do_patch) failed with exit code '1'
If I look at the source in
I see that the contenets already include the #if 0 and #endif that the patch is trying to add. But the power-up problem still occurs.
Any advice on how to successfully apply the patch with both methods would be appreciated, especially the second method because there is another patch i would like to apply to the image.