|
|
@@ -0,0 +1,47 @@
|
|
|
+From 4bd66fd5b69eda41b4320fd6f8db50a7b7fa7bf7 Mon Sep 17 00:00:00 2001
|
|
|
+Message-ID: <4bd66fd5b69eda41b4320fd6f8db50a7b7fa7bf7.1690828424.git.daniel@makrotopia.org>
|
|
|
+From: Daniel Golle <[email protected]>
|
|
|
+Date: Mon, 31 Jul 2023 19:25:04 +0100
|
|
|
+Subject: [PATCH] ram: mediatek: include <linux/sizes.h> for SZ_* macros
|
|
|
+To: Ryder Lee <[email protected]>,
|
|
|
+ Weijie Gao <[email protected]>,
|
|
|
+ Chunfeng Yun <[email protected]>,
|
|
|
+ GSS_MTK_Uboot_upstream <[email protected]>,
|
|
|
+ [email protected]
|
|
|
+
|
|
|
+Something between U-Boot 2023.04 and 2023.07.02 resulted in no longer
|
|
|
+implicitely including <linux/sizes.h> in the DDR3 RAM driver for the
|
|
|
+MT7929 SoC. The result is a build failure:
|
|
|
+drivers/ram/mediatek/ddr3-mt7629.c: In function 'mtk_ddr3_get_info':
|
|
|
+drivers/ram/mediatek/ddr3-mt7629.c:734:30: error: 'SZ_128M' undeclared (first use in this function)
|
|
|
+ 734 | info->size = SZ_128M;
|
|
|
+ | ^~~~~~~
|
|
|
+drivers/ram/mediatek/ddr3-mt7629.c:734:30: note: each undeclared identifier is reported only once for each function it appears in
|
|
|
+drivers/ram/mediatek/ddr3-mt7629.c:737:30: error: 'SZ_256M' undeclared (first use in this function)
|
|
|
+ 737 | info->size = SZ_256M;
|
|
|
+ | ^~~~~~~
|
|
|
+drivers/ram/mediatek/ddr3-mt7629.c:740:30: error: 'SZ_512M' undeclared (first use in this function)
|
|
|
+ 740 | info->size = SZ_512M;
|
|
|
+ | ^~~~~~~
|
|
|
+drivers/ram/mediatek/ddr3-mt7629.c:743:30: error: 'SZ_1G' undeclared (first use in this function)
|
|
|
+ 743 | info->size = SZ_1G;
|
|
|
+ | ^~~~~
|
|
|
+
|
|
|
+Include <linux/sizes.h> so SZ_* is defined.
|
|
|
+
|
|
|
+Reported-by: Tianling Shen <[email protected]>
|
|
|
+Signed-off-by: Daniel Golle <[email protected]>
|
|
|
+---
|
|
|
+ drivers/ram/mediatek/ddr3-mt7629.c | 1 +
|
|
|
+ 1 file changed, 1 insertion(+)
|
|
|
+
|
|
|
+--- a/drivers/ram/mediatek/ddr3-mt7629.c
|
|
|
++++ b/drivers/ram/mediatek/ddr3-mt7629.c
|
|
|
+@@ -14,6 +14,7 @@
|
|
|
+ #include <asm/io.h>
|
|
|
+ #include <linux/bitops.h>
|
|
|
+ #include <linux/delay.h>
|
|
|
++#include <linux/sizes.h>
|
|
|
+
|
|
|
+ /* EMI */
|
|
|
+ #define EMI_CONA 0x000
|