From 614d7a954dfbdeaa55500e0ba223b6899a1c7eda Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sun, 09 Oct 2022 14:04:22 +0800
Subject: [PATCH] update hardknott to add overlays support in /boot

---
 yocto/meta-igkboard/hardknott/recipes-kernel/linux/files/linux-imx-lf-5.10.52-2.1.0.patch |   62 ++++++++++++++++++-------------
 1 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/yocto/meta-igkboard/hardknott/recipes-kernel/linux/files/linux-imx-lf-5.10.52-2.1.0.patch b/yocto/meta-igkboard/hardknott/recipes-kernel/linux/files/linux-imx-lf-5.10.52-2.1.0.patch
index 0e14b5c..8037445 100644
--- a/yocto/meta-igkboard/hardknott/recipes-kernel/linux/files/linux-imx-lf-5.10.52-2.1.0.patch
+++ b/yocto/meta-igkboard/hardknott/recipes-kernel/linux/files/linux-imx-lf-5.10.52-2.1.0.patch
@@ -1,6 +1,6 @@
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/igkboard.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/igkboard.dts
 --- linux-imx/arch/arm/boot/dts/igkboard.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/igkboard.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/igkboard.dts	2022-10-09 13:19:22.622732242 +0800
 @@ -0,0 +1,608 @@
 +/*
 + * Device Tree Source for LingYun IGKBoard(IoT Gateway Kit Board)
@@ -612,7 +612,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/Makefile linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/Makefile
 --- linux-imx/arch/arm/boot/dts/Makefile	2021-09-08 18:41:11.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/Makefile	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/Makefile	2022-10-09 13:19:22.622732242 +0800
 @@ -1490,3 +1490,6 @@
  	aspeed-bmc-opp-zaius.dtb \
  	aspeed-bmc-portwell-neptune.dtb \
@@ -622,7 +622,7 @@
 +subdir-$(CONFIG_SOC_IMX6UL) += overlays
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/cam.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/cam.dts
 --- linux-imx/arch/arm/boot/dts/overlays/cam.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/cam.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/cam.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,24 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -650,7 +650,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/can1.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can1.dts
 --- linux-imx/arch/arm/boot/dts/overlays/can1.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can1.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can1.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,28 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -682,7 +682,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/can2.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can2.dts
 --- linux-imx/arch/arm/boot/dts/overlays/can2.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can2.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can2.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,28 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -714,7 +714,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/i2c1.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/i2c1.dts
 --- linux-imx/arch/arm/boot/dts/overlays/i2c1.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/i2c1.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/i2c1.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,28 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -746,7 +746,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/lcd.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/lcd.dts
 --- linux-imx/arch/arm/boot/dts/overlays/lcd.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/lcd.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/lcd.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,89 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -839,7 +839,7 @@
 +};
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/Makefile linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/Makefile
 --- linux-imx/arch/arm/boot/dts/overlays/Makefile	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/Makefile	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/Makefile	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,20 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -863,7 +863,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/nbiot-4g.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/nbiot-4g.dts
 --- linux-imx/arch/arm/boot/dts/overlays/nbiot-4g.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/nbiot-4g.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/nbiot-4g.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,34 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -901,7 +901,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/pwm7.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm7.dts
 --- linux-imx/arch/arm/boot/dts/overlays/pwm7.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm7.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm7.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,28 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -933,7 +933,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/pwm8.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm8.dts
 --- linux-imx/arch/arm/boot/dts/overlays/pwm8.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm8.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm8.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,28 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -965,7 +965,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/spi1.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/spi1.dts
 --- linux-imx/arch/arm/boot/dts/overlays/spi1.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/spi1.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/spi1.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -1008,7 +1008,7 @@
 +};
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart2.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart2.dts
 --- linux-imx/arch/arm/boot/dts/overlays/uart2.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart2.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart2.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,26 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -1038,7 +1038,7 @@
 +};
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart3.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart3.dts
 --- linux-imx/arch/arm/boot/dts/overlays/uart3.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart3.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart3.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -1069,7 +1069,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart4.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart4.dts
 --- linux-imx/arch/arm/boot/dts/overlays/uart4.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart4.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart4.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -1100,7 +1100,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart7.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart7.dts
 --- linux-imx/arch/arm/boot/dts/overlays/uart7.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart7.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart7.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -1131,7 +1131,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/w1.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/w1.dts
 --- linux-imx/arch/arm/boot/dts/overlays/w1.dts	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/w1.dts	2022-07-20 19:47:14.215487408 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/w1.dts	2022-10-09 13:19:22.626732206 +0800
 @@ -0,0 +1,31 @@
 +/*
 + * Copyright (C) 2022 LingYun IoT System Studio
@@ -1166,7 +1166,7 @@
 +
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/configs/igkboard_defconfig linux-imx-lf-5.10.52-2.1.0/arch/arm/configs/igkboard_defconfig
 --- linux-imx/arch/arm/configs/igkboard_defconfig	1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/configs/igkboard_defconfig	2022-07-24 10:47:11.013928964 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/configs/igkboard_defconfig	2022-10-09 13:20:51.349955648 +0800
 @@ -0,0 +1,726 @@
 +CONFIG_KERNEL_LZO=y
 +CONFIG_SYSVIPC=y
@@ -1896,7 +1896,7 @@
 +# CONFIG_FTRACE is not set
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/drivers/bluetooth/btrtl.c linux-imx-lf-5.10.52-2.1.0/drivers/bluetooth/btrtl.c
 --- linux-imx/drivers/bluetooth/btrtl.c	2021-09-08 18:41:11.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/drivers/bluetooth/btrtl.c	2022-07-24 10:55:55.972627066 +0800
++++ linux-imx-lf-5.10.52-2.1.0/drivers/bluetooth/btrtl.c	2022-10-09 13:19:22.626732206 +0800
 @@ -136,12 +136,12 @@
  	  .fw_name  = "rtl_bt/rtl8761a_fw.bin",
  	  .cfg_name = "rtl_bt/rtl8761a_config" },
@@ -1915,7 +1915,7 @@
  	{ .match_flags = IC_MATCH_FL_LMPSUBV | IC_MATCH_FL_HCIREV |
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/drivers/bluetooth/btusb.c linux-imx-lf-5.10.52-2.1.0/drivers/bluetooth/btusb.c
 --- linux-imx/drivers/bluetooth/btusb.c	2021-09-08 18:41:11.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/drivers/bluetooth/btusb.c	2022-07-24 10:55:27.392918113 +0800
++++ linux-imx-lf-5.10.52-2.1.0/drivers/bluetooth/btusb.c	2022-10-09 13:19:22.626732206 +0800
 @@ -419,6 +419,9 @@
  	{ USB_DEVICE(0x0bda, 0xb009), .driver_info = BTUSB_REALTEK },
  	{ USB_DEVICE(0x2ff8, 0xb011), .driver_info = BTUSB_REALTEK },
@@ -1928,7 +1928,7 @@
  	{ USB_DEVICE(0x13d3, 0x3414), .driver_info = BTUSB_REALTEK },
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/drivers/video/backlight/pwm_bl.c linux-imx-lf-5.10.52-2.1.0/drivers/video/backlight/pwm_bl.c
 --- linux-imx/drivers/video/backlight/pwm_bl.c	2021-09-08 18:41:11.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/drivers/video/backlight/pwm_bl.c	2022-07-20 19:47:14.219487363 +0800
++++ linux-imx-lf-5.10.52-2.1.0/drivers/video/backlight/pwm_bl.c	2022-10-09 13:19:22.626732206 +0800
 @@ -558,6 +558,7 @@
  	if (!state.period && (data->pwm_period_ns > 0))
  		state.period = data->pwm_period_ns;
@@ -1939,18 +1939,28 @@
  		dev_err(&pdev->dev, "failed to apply initial PWM state: %d\n",
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/Makefile linux-imx-lf-5.10.52-2.1.0/Makefile
 --- linux-imx/Makefile	2021-09-08 18:41:11.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/Makefile	2022-07-24 10:36:33.204084146 +0800
++++ linux-imx-lf-5.10.52-2.1.0/Makefile	2022-10-09 13:20:41.118045212 +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 ?= arm-linux-gnueabihf-
 
  # Architecture as present in compile.h
  UTS_MACHINE 	:= $(ARCH)
-@@ -1833,6 +1834,7 @@
+@@ -1353,6 +1354,9 @@
+ %.dtb: include/config/kernel.release scripts_dtc
+ 	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
+
++%.dtbo: include/config/kernel.release scripts_dtc
++	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
++
+ PHONY += dtbs dtbs_install dtbs_check
+ dtbs: include/config/kernel.release scripts_dtc
+ 	$(Q)$(MAKE) $(build)=$(dtstree)
+@@ -1833,6 +1837,7 @@
  		\( -name '*.[aios]' -o -name '*.ko' -o -name '.*.cmd' \
  		-o -name '*.ko.*' \
  		-o -name '*.dtb' -o -name '*.dtb.S' -o -name '*.dt.yaml' \
@@ -1960,7 +1970,7 @@
  		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/scripts/Makefile.lib linux-imx-lf-5.10.52-2.1.0/scripts/Makefile.lib
 --- linux-imx/scripts/Makefile.lib	2021-09-08 18:41:11.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/scripts/Makefile.lib	2022-07-20 19:47:14.223487317 +0800
++++ linux-imx-lf-5.10.52-2.1.0/scripts/Makefile.lib	2022-10-09 13:19:22.630732171 +0800
 @@ -325,6 +325,16 @@
  $(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE
  	$(call if_changed_dep,dtc)
@@ -1980,7 +1990,7 @@
  # DT_TMP_SCHEMA may be overridden from Documentation/devicetree/bindings/Makefile
 diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/sound/soc/fsl/fsl_sai.c linux-imx-lf-5.10.52-2.1.0/sound/soc/fsl/fsl_sai.c
 --- linux-imx/sound/soc/fsl/fsl_sai.c	2021-09-08 18:41:11.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/sound/soc/fsl/fsl_sai.c	2022-07-20 19:47:14.227487272 +0800
++++ linux-imx-lf-5.10.52-2.1.0/sound/soc/fsl/fsl_sai.c	2022-10-09 13:19:22.630732171 +0800
 @@ -1349,7 +1349,7 @@
  		sai->bus_clk = NULL;
  	}

--
Gitblit v1.9.1