linux-nrsw: Merge patch directly in sources

id:413750

layers/meta-netmodule-legacy-bsp/recipes-kernel/linux/linux-nrsw/0001-compile-fix.patch

@@ -1,22 +0,0 @@
-diff --git a/arch/arm/boot/dts/am335x-nbhw16-prod2.dts b/arch/arm/boot/dts/am335x-nbhw16-prod2.dts
-index 1871d78bca89..b4830a8ef61c 100755
---- a/arch/arm/boot/dts/am335x-nbhw16-prod2.dts
-+++ b/arch/arm/boot/dts/am335x-nbhw16-prod2.dts
-@@ -73,7 +73,7 @@ netbox_dio: netbox_dio {
- 	wlan_bt_clock: wlan_bt_clock {
- 		compatible = "pwm-clock";
- 		#clock-cells = <0>;
--		pwms = <&ecap2 0 30518 0>;
-+		pwms = <&ecap_2 0 30518 0>;
- 	};
- 
- 	wlan_bt_oscillator: wlan_bt_oscillator {
-@@ -93,7 +93,7 @@ &reset_button {
- &epwmss2 {
- 	status = "okay";
- 
--	ecap2: ecap@48304100 {
-+	ecap_2: ecap@48304100 {
- 		status = "okay";
- 		pinctrl-names = "default";
- 		pinctrl-0 = <&ecap2_pins>;

layers/meta-netmodule-legacy-bsp/recipes-kernel/linux/linux-nrsw_%.bb

@@ -24,7 +24,6 @@ config_fragments = "${@' '.join(['conf/' + f for f in "\
 
 SRC_URI = "git://git.netmodule.intranet/NRSW/nmlinux-kernel.git;protocol=ssh;user=gitea;branch=nmlinux-kernel-upgrade\
            ${@' '.join(['file://' + f for f in " ${headers_to_copy} ${config_fragments} verify_config_merge_log.py ".split()])} \
-           file://0001-compile-fix.patch \
            "
 
 SRCREV ?= "${AUTOREV}"