From: Daniel Golle <daniel@makrotopia.org>
Date: Sun, 17 Jul 2022 20:41:31 +0000 (+0100)
Subject: uboot-mediatek: reorder patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=603aaceb4288555e8e9ad6a559288ce1b2e1131d;p=openwrt%2Fstaging%2Frobimarko.git

uboot-mediatek: reorder patches

Rename/reorder patches to avoid duplicate usage of 300-* prefix.
No functional changes.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch b/package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch
deleted file mode 100644
index 43270a7a72..0000000000
--- a/package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/board/mediatek/mt7622/mt7622_rfb.c
-+++ b/board/mediatek/mt7622/mt7622_rfb.c
-@@ -6,9 +6,16 @@
- 
- #include <common.h>
- #include <config.h>
-+#include <dm.h>
-+#include <button.h>
- #include <env.h>
- #include <init.h>
- #include <asm/global_data.h>
-+#include <linux/delay.h>
-+
-+#ifndef CONFIG_RESET_BUTTON_LABEL
-+#define CONFIG_RESET_BUTTON_LABEL "reset"
-+#endif
- 
- DECLARE_GLOBAL_DATA_PTR;
- 
-@@ -20,7 +27,19 @@ int board_init(void)
- 
- int board_late_init(void)
- {
--	gd->env_valid = 1; //to load environment variable from persistent store
-+	struct udevice *dev;
-+
-+	if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) {
-+		puts("reset button found\n");
-+#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
-+		mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY);
-+#endif
-+		if (button_get_state(dev) == BUTTON_ON) {
-+			puts("button pushed, resetting environment\n");
-+			gd->env_valid = ENV_INVALID;
-+		}
-+	}
-+
- 	env_relocate();
- 	return 0;
- }
---- a/arch/arm/mach-mediatek/Kconfig
-+++ b/arch/arm/mach-mediatek/Kconfig
-@@ -115,4 +115,8 @@ config MTK_BROM_HEADER_INFO
- 	default "media=emmc" if TARGET_MT8516 || TARGET_MT8365 || TARGET_MT8183
- 	default "lk=1" if TARGET_MT7623
- 
-+config RESET_BUTTON_LABEL
-+	string "Button to trigger factory reset"
-+	default "reset"
-+
- endif
diff --git a/package/boot/uboot-mediatek/patches/301-mt7622-generic-reset-button-ignore-env.patch b/package/boot/uboot-mediatek/patches/301-mt7622-generic-reset-button-ignore-env.patch
new file mode 100644
index 0000000000..43270a7a72
--- /dev/null
+++ b/package/boot/uboot-mediatek/patches/301-mt7622-generic-reset-button-ignore-env.patch
@@ -0,0 +1,51 @@
+--- a/board/mediatek/mt7622/mt7622_rfb.c
++++ b/board/mediatek/mt7622/mt7622_rfb.c
+@@ -6,9 +6,16 @@
+ 
+ #include <common.h>
+ #include <config.h>
++#include <dm.h>
++#include <button.h>
+ #include <env.h>
+ #include <init.h>
+ #include <asm/global_data.h>
++#include <linux/delay.h>
++
++#ifndef CONFIG_RESET_BUTTON_LABEL
++#define CONFIG_RESET_BUTTON_LABEL "reset"
++#endif
+ 
+ DECLARE_GLOBAL_DATA_PTR;
+ 
+@@ -20,7 +27,19 @@ int board_init(void)
+ 
+ int board_late_init(void)
+ {
+-	gd->env_valid = 1; //to load environment variable from persistent store
++	struct udevice *dev;
++
++	if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) {
++		puts("reset button found\n");
++#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
++		mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY);
++#endif
++		if (button_get_state(dev) == BUTTON_ON) {
++			puts("button pushed, resetting environment\n");
++			gd->env_valid = ENV_INVALID;
++		}
++	}
++
+ 	env_relocate();
+ 	return 0;
+ }
+--- a/arch/arm/mach-mediatek/Kconfig
++++ b/arch/arm/mach-mediatek/Kconfig
+@@ -115,4 +115,8 @@ config MTK_BROM_HEADER_INFO
+ 	default "media=emmc" if TARGET_MT8516 || TARGET_MT8365 || TARGET_MT8183
+ 	default "lk=1" if TARGET_MT7623
+ 
++config RESET_BUTTON_LABEL
++	string "Button to trigger factory reset"
++	default "reset"
++
+ endif
diff --git a/package/boot/uboot-mediatek/patches/301-mt7623-generic-reset-button-ignore-env.patch b/package/boot/uboot-mediatek/patches/301-mt7623-generic-reset-button-ignore-env.patch
deleted file mode 100644
index e144f42c47..0000000000
--- a/package/boot/uboot-mediatek/patches/301-mt7623-generic-reset-button-ignore-env.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/board/mediatek/mt7623/mt7623_rfb.c
-+++ b/board/mediatek/mt7623/mt7623_rfb.c
-@@ -4,8 +4,17 @@
-  */
- 
- #include <common.h>
-+#include <dm.h>
-+#include <button.h>
-+#include <env.h>
-+#include <init.h>
- #include <mmc.h>
- #include <asm/global_data.h>
-+#include <linux/delay.h>
-+
-+#ifndef CONFIG_RESET_BUTTON_LABEL
-+#define CONFIG_RESET_BUTTON_LABEL "reset"
-+#endif
- 
- DECLARE_GLOBAL_DATA_PTR;
- 
-@@ -41,3 +50,22 @@ int mmc_get_env_dev(void)
- 	return mmc_get_boot_dev();
- }
- #endif
-+
-+int board_late_init(void)
-+{
-+	struct udevice *dev;
-+
-+	if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) {
-+		puts("reset button found\n");
-+#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
-+		mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY);
-+#endif
-+		if (button_get_state(dev) == BUTTON_ON) {
-+			puts("button pushed, resetting environment\n");
-+			gd->env_valid = ENV_INVALID;
-+		}
-+	}
-+
-+	env_relocate();
-+	return 0;
-+}
diff --git a/package/boot/uboot-mediatek/patches/302-mt7623-generic-reset-button-ignore-env.patch b/package/boot/uboot-mediatek/patches/302-mt7623-generic-reset-button-ignore-env.patch
new file mode 100644
index 0000000000..e144f42c47
--- /dev/null
+++ b/package/boot/uboot-mediatek/patches/302-mt7623-generic-reset-button-ignore-env.patch
@@ -0,0 +1,43 @@
+--- a/board/mediatek/mt7623/mt7623_rfb.c
++++ b/board/mediatek/mt7623/mt7623_rfb.c
+@@ -4,8 +4,17 @@
+  */
+ 
+ #include <common.h>
++#include <dm.h>
++#include <button.h>
++#include <env.h>
++#include <init.h>
+ #include <mmc.h>
+ #include <asm/global_data.h>
++#include <linux/delay.h>
++
++#ifndef CONFIG_RESET_BUTTON_LABEL
++#define CONFIG_RESET_BUTTON_LABEL "reset"
++#endif
+ 
+ DECLARE_GLOBAL_DATA_PTR;
+ 
+@@ -41,3 +50,22 @@ int mmc_get_env_dev(void)
+ 	return mmc_get_boot_dev();
+ }
+ #endif
++
++int board_late_init(void)
++{
++	struct udevice *dev;
++
++	if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) {
++		puts("reset button found\n");
++#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
++		mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY);
++#endif
++		if (button_get_state(dev) == BUTTON_ON) {
++			puts("button pushed, resetting environment\n");
++			gd->env_valid = ENV_INVALID;
++		}
++	}
++
++	env_relocate();
++	return 0;
++}