6 files changed, 1 insertions, 77 deletions
diff --git a/pkg/u-boot/patch/0004-Avoid-pointer-arithmetic-on-void.patch b/pkg/u-boot/patch/0002-Avoid-pointer-arithmetic-on-void.patch
index 65b8f60f..65b8f60f 100644
--- a/pkg/u-boot/patch/0004-Avoid-pointer-arithmetic-on-void.patch
+++ b/pkg/u-boot/patch/0002-Avoid-pointer-arithmetic-on-void.patch
diff --git a/pkg/u-boot/patch/0002-Use-__typeof__-instead-of-typeof.patch b/pkg/u-boot/patch/0002-Use-__typeof__-instead-of-typeof.patch
deleted file mode 100644
index db0ba15c..00000000
--- a/pkg/u-boot/patch/0002-Use-__typeof__-instead-of-typeof.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 62f25c7293254bcb465c6c85bda61bff4630b8c8 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 1 May 2021 00:57:30 -0700
-Subject: [PATCH] Use __typeof__ instead of typeof
-
-The compiler may not define typeof in strict C mode to prevent
-namespace polution.
----
- tools/imagetool.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/imagetool.h b/tools/imagetool.h
-index 2801ea9e9f..bbdf82877b 100644
---- a/tools/imagetool.h
-+++ b/tools/imagetool.h
-@@ -26,7 +26,7 @@
- #define ARRAY_SIZE(x)		(sizeof(x) / sizeof((x)[0]))
- 
- #define __ALIGN_MASK(x, mask)	(((x) + (mask)) & ~(mask))
--#define ALIGN(x, a)		__ALIGN_MASK((x), (typeof(x))(a) - 1)
-+#define ALIGN(x, a)		__ALIGN_MASK((x), (__typeof__(x))(a) - 1)
- 
- #define IH_ARCH_DEFAULT		IH_ARCH_INVALID
- 
--- 
-2.31.1
-
diff --git a/pkg/u-boot/patch/0003-Avoid-empty-initializer-lists.patch b/pkg/u-boot/patch/0003-Avoid-empty-initializer-lists.patch
deleted file mode 100644
index 0fdc2445..00000000
--- a/pkg/u-boot/patch/0003-Avoid-empty-initializer-lists.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e5643a0cc9d661643541d6c965ac0ea59a77db75 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 1 May 2021 01:01:49 -0700
-Subject: [PATCH] Avoid empty initializer lists
-
-These are not allowed in ISO C.
----
- common/image.c   | 2 +-
- tools/kwbimage.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/common/image.c b/common/image.c
-index 51854aae5d..1610c9c5c0 100644
---- a/common/image.c
-+++ b/common/image.c
-@@ -216,7 +216,7 @@ static const struct comp_magic_map image_comp[] = {
- 	{	IH_COMP_GZIP,	"gzip",		{0x1f, 0x8b},},
- 	{	IH_COMP_LZMA,	"lzma",		{0x5d, 0x00},},
- 	{	IH_COMP_LZO,	"lzo",		{0x89, 0x4c},},
--	{	IH_COMP_NONE,	"none",		{},	},
-+	{	IH_COMP_NONE,	"none",		{0},	},
- };
- 
- static const struct table_info table_info[IH_COUNT] = {
-diff --git a/tools/kwbimage.c b/tools/kwbimage.c
-index 02fd0c949f..11b174a026 100644
---- a/tools/kwbimage.c
-+++ b/tools/kwbimage.c
-@@ -70,7 +70,7 @@ struct boot_mode boot_modes[] = {
- 	{ 0x9C, "pex"  },
- 	{ 0x69, "uart" },
- 	{ 0xAE, "sdio" },
--	{},
-+	{ 0 },
- };
- 
- struct nand_ecc_mode {
-@@ -83,7 +83,7 @@ struct nand_ecc_mode nand_ecc_modes[] = {
- 	{ 0x01, "hamming" },
- 	{ 0x02, "rs" },
- 	{ 0x03, "disabled" },
--	{},
-+	{ 0 },
- };
- 
- /* Used to identify an undefined execution or destination address */
--- 
-2.31.1
-
diff --git a/pkg/u-boot/patch/0005-Remove-use-of-statement-expressions.patch b/pkg/u-boot/patch/0003-Remove-use-of-statement-expressions.patch
index 4a4f097f..4a4f097f 100644
--- a/pkg/u-boot/patch/0005-Remove-use-of-statement-expressions.patch
+++ b/pkg/u-boot/patch/0003-Remove-use-of-statement-expressions.patch
diff --git a/pkg/u-boot/patch/0006-Use-__bswap32-instead-of-__builtin_bswap32.patch b/pkg/u-boot/patch/0004-Use-__bswap32-instead-of-__builtin_bswap32.patch
index 1c693b68..1c693b68 100644
--- a/pkg/u-boot/patch/0006-Use-__bswap32-instead-of-__builtin_bswap32.patch
+++ b/pkg/u-boot/patch/0004-Use-__bswap32-instead-of-__builtin_bswap32.patch
diff --git a/pkg/u-boot/ver b/pkg/u-boot/ver
index 0c331267..80d54778 100644
--- a/pkg/u-boot/ver
+++ b/pkg/u-boot/ver
@@ -1 +1 @@
-2021.04 r1
+2021.04 r2