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/bootloader/build.sh | 4 ++--
bsp/bootloader/patch/uboot-imx-igkboard.patch | 24 ++++++++++++------------
bsp/kernel/patch/linux-imx-igkboard.patch | 28 ++++++++++++++--------------
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/bsp/bootloader/build.sh b/bsp/bootloader/build.sh
index c6f2481..422d4df 100755
--- a/bsp/bootloader/build.sh
+++ b/bsp/bootloader/build.sh
@@ -22,7 +22,7 @@
PATCH_FILE=${PRJ_PATH}/patch/${UBOOT_SRC}-${BOARD}.patch
-CONF_FILE=.cfg-${BOARD}
+CONF_FILE=configs/${BOARD}_defconfig
JOBS=`cat /proc/cpuinfo | grep processor | wc -l`
@@ -114,7 +114,7 @@
msg_banner "Clean ${UBOOT_SRC} source code"
cd ${UBOOT_SRC}
make savedefconfig
- mv defconfig configs/${BOARD}_defconfig
+ mv defconfig ${CONF_FILE}
make distclean
cd -
diff --git a/bsp/bootloader/patch/uboot-imx-imx6ull.patch b/bsp/bootloader/patch/uboot-imx-igkboard.patch
similarity index 92%
rename from bsp/bootloader/patch/uboot-imx-imx6ull.patch
rename to bsp/bootloader/patch/uboot-imx-igkboard.patch
index d5d8d3e..f1bb514 100644
--- a/bsp/bootloader/patch/uboot-imx-imx6ull.patch
+++ b/bsp/bootloader/patch/uboot-imx-igkboard.patch
@@ -1,6 +1,6 @@
-diff -Nuar uboot-imx/arch/arm/dts/imx6ul-14x14-evk.dtsi uboot-imx-imx6ull/arch/arm/dts/imx6ul-14x14-evk.dtsi
+diff -Nuar uboot-imx/arch/arm/dts/imx6ul-14x14-evk.dtsi uboot-imx-igkboard/arch/arm/dts/imx6ul-14x14-evk.dtsi
--- uboot-imx/arch/arm/dts/imx6ul-14x14-evk.dtsi 2021-09-06 16:48:23.000000000 +0800
-+++ uboot-imx-imx6ull/arch/arm/dts/imx6ul-14x14-evk.dtsi 2021-12-16 12:53:06.050125641 +0800
++++ uboot-imx-igkboard/arch/arm/dts/imx6ul-14x14-evk.dtsi 2021-12-16 17:12:11.714490021 +0800
@@ -21,7 +21,6 @@
regulator-name = "VSD_3V3";
regulator-min-microvolt = <3300000>;
@@ -115,9 +115,9 @@
>;
};
-diff -Nuar uboot-imx/configs/imx6ull_defconfig uboot-imx-imx6ull/configs/imx6ull_defconfig
---- uboot-imx/configs/imx6ull_defconfig 1970-01-01 08:00:00.000000000 +0800
-+++ uboot-imx-imx6ull/configs/imx6ull_defconfig 2021-12-16 13:00:10.426612499 +0800
+diff -Nuar uboot-imx/configs/igkboard_defconfig uboot-imx-igkboard/configs/igkboard_defconfig
+--- uboot-imx/configs/igkboard_defconfig 1970-01-01 08:00:00.000000000 +0800
++++ uboot-imx-igkboard/configs/igkboard_defconfig 2021-12-16 17:25:11.551447847 +0800
@@ -0,0 +1,96 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
@@ -215,9 +215,9 @@
+CONFIG_SYS_WHITE_ON_BLACK=y
+CONFIG_SPLASH_SCREEN=y
+CONFIG_SPLASH_SCREEN_ALIGN=y
-diff -Nuar uboot-imx/drivers/net/phy/phy.c uboot-imx-imx6ull/drivers/net/phy/phy.c
+diff -Nuar uboot-imx/drivers/net/phy/phy.c uboot-imx-igkboard/drivers/net/phy/phy.c
--- uboot-imx/drivers/net/phy/phy.c 2021-09-06 16:48:23.000000000 +0800
-+++ uboot-imx-imx6ull/drivers/net/phy/phy.c 2021-12-16 12:53:06.054125616 +0800
++++ uboot-imx-igkboard/drivers/net/phy/phy.c 2021-12-16 17:12:11.714490021 +0800
@@ -182,6 +182,9 @@
{
int result;
@@ -228,9 +228,9 @@
if (phydev->autoneg != AUTONEG_ENABLE)
return genphy_setup_forced(phydev);
-diff -Nuar uboot-imx/include/configs/mx6ullevk.h uboot-imx-imx6ull/include/configs/mx6ullevk.h
+diff -Nuar uboot-imx/include/configs/mx6ullevk.h uboot-imx-igkboard/include/configs/mx6ullevk.h
--- uboot-imx/include/configs/mx6ullevk.h 2021-09-06 16:48:23.000000000 +0800
-+++ uboot-imx-imx6ull/include/configs/mx6ullevk.h 2021-12-16 12:53:06.054125616 +0800
++++ uboot-imx-igkboard/include/configs/mx6ullevk.h 2021-12-16 17:12:11.714490021 +0800
@@ -100,124 +100,39 @@
#else
@@ -387,15 +387,15 @@
#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_IOMUX_LPSR
-diff -Nuar uboot-imx/Makefile uboot-imx-imx6ull/Makefile
+diff -Nuar uboot-imx/Makefile uboot-imx-igkboard/Makefile
--- uboot-imx/Makefile 2021-09-06 16:48:23.000000000 +0800
-+++ uboot-imx-imx6ull/Makefile 2021-12-16 12:53:06.058125591 +0800
++++ uboot-imx-igkboard/Makefile 2021-12-16 17:23:36.221057260 +0800
@@ -263,6 +263,9 @@
CROSS_COMPILE ?=
endif
+ARCH=arm
-+CROSS_COMPILE=/opt/buildroot/cortexA7/bin/arm-linux-
++CROSS_COMPILE?=/opt/buildroot/cortexA7/bin/arm-linux-
+
KCONFIG_CONFIG ?= .config
export KCONFIG_CONFIG
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