From 913a20efa2bf37aacf354809750e4441cdf120f0 Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Thu, 16 Dec 2021 17:26:45 +0800 Subject: [PATCH] update patch file from imx6lll to igkboard --- bsp/kernel/patch/linux-imx-igkboard.patch | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bsp/kernel/patch/linux-imx-imx6ull.patch b/bsp/kernel/patch/linux-imx-igkboard.patch similarity index 95% rename from bsp/kernel/patch/linux-imx-imx6ull.patch rename to bsp/kernel/patch/linux-imx-igkboard.patch index 9af0ab5..4c52bd6 100644 --- a/bsp/kernel/patch/linux-imx-imx6ull.patch +++ b/bsp/kernel/patch/linux-imx-igkboard.patch @@ -1,6 +1,6 @@ -diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi linux-imx-igkboard/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi --- linux-imx/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi 2021-09-08 18:41:11.000000000 +0800 -+++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi 2021-12-13 15:47:27.308336693 +0800 ++++ linux-imx-igkboard/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi 2021-12-16 17:14:58.289255549 +0800 @@ -31,7 +31,41 @@ brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <6>; @@ -423,9 +423,9 @@ >; }; -diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/imx6ul.dtsi linux-imx-imx6ull/arch/arm/boot/dts/imx6ul.dtsi +diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/imx6ul.dtsi linux-imx-igkboard/arch/arm/boot/dts/imx6ul.dtsi --- linux-imx/arch/arm/boot/dts/imx6ul.dtsi 2021-09-08 18:41:11.000000000 +0800 -+++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul.dtsi 2021-12-13 15:47:27.312336750 +0800 ++++ linux-imx-igkboard/arch/arm/boot/dts/imx6ul.dtsi 2021-12-16 17:14:58.537264795 +0800 @@ -727,6 +727,7 @@ offset = <0x34>; interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>, @@ -447,9 +447,9 @@ gpt2: timer@20e8000 { compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt"; reg = <0x020e8000 0x4000>; -diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/configs/imx6ull_defconfig linux-imx-imx6ull/arch/arm/configs/imx6ull_defconfig ---- linux-imx/arch/arm/configs/imx6ull_defconfig 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-imx6ull/arch/arm/configs/imx6ull_defconfig 2021-12-16 12:58:54.243346404 +0800 +diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/configs/igkboard_defconfig linux-imx-igkboard/arch/arm/configs/igkboard_defconfig +--- linux-imx/arch/arm/configs/igkboard_defconfig 1970-01-01 08:00:00.000000000 +0800 ++++ linux-imx-igkboard/arch/arm/configs/igkboard_defconfig 2021-12-16 17:24:27.802364072 +0800 @@ -0,0 +1,572 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y @@ -1023,22 +1023,22 @@ +# CONFIG_SCHED_DEBUG is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_FTRACE is not set -diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/Makefile linux-imx-imx6ull/Makefile +diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/Makefile linux-imx-igkboard/Makefile --- linux-imx/Makefile 2021-09-08 18:41:11.000000000 +0800 -+++ linux-imx-imx6ull/Makefile 2021-12-16 12:58:31.871555092 +0800 ++++ linux-imx-igkboard/Makefile 2021-12-16 17:23:39.849150267 +0800 @@ -367,7 +367,8 @@ # Alternatively CROSS_COMPILE can be set in the environment. # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile -ARCH ?= $(SUBARCH) +ARCH ?= arm -+CROSS_COMPILE=/opt/buildroot/cortexA7/bin/arm-linux- ++CROSS_COMPILE?=/opt/buildroot/cortexA7/bin/arm-linux- # Architecture as present in compile.h UTS_MACHINE := $(ARCH) -diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/sound/soc/fsl/fsl_mqs.c linux-imx-imx6ull/sound/soc/fsl/fsl_mqs.c +diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/sound/soc/fsl/fsl_mqs.c linux-imx-igkboard/sound/soc/fsl/fsl_mqs.c --- linux-imx/sound/soc/fsl/fsl_mqs.c 2021-09-08 18:41:11.000000000 +0800 -+++ linux-imx-imx6ull/sound/soc/fsl/fsl_mqs.c 2021-12-13 15:47:27.352337331 +0800 ++++ linux-imx-igkboard/sound/soc/fsl/fsl_mqs.c 2021-12-16 17:14:58.537264795 +0800 @@ -247,6 +247,8 @@ &fsl_mqs_dai, 1); if (ret) @@ -1048,9 +1048,9 @@ return 0; err_free_gpr_np: -diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/sound/soc/fsl/fsl_sai.c linux-imx-imx6ull/sound/soc/fsl/fsl_sai.c +diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/sound/soc/fsl/fsl_sai.c linux-imx-igkboard/sound/soc/fsl/fsl_sai.c --- linux-imx/sound/soc/fsl/fsl_sai.c 2021-09-08 18:41:11.000000000 +0800 -+++ linux-imx-imx6ull/sound/soc/fsl/fsl_sai.c 2021-12-13 15:47:27.352337331 +0800 ++++ linux-imx-igkboard/sound/soc/fsl/fsl_sai.c 2021-12-16 17:14:58.537264795 +0800 @@ -1349,7 +1349,7 @@ sai->bus_clk = NULL; } -- Gitblit v1.9.1