Hi Mathtjjs,
-----Original Message----- From: Mattijs Korpershoek mkorpershoek@baylibre.com Sent: Thursday, November 2, 2023 6:15 PM To: Jaehoon Chung jh80.chung@samsung.com Cc: lukma@denx.de; u-boot@lists.denx.de Subject: Re: [PATCH] dfu: add CONFIG_DFU_NAME_MAX_SIZE configuration
Hi Jaehoon,
On mar., oct. 31, 2023 at 15:50, Mattijs Korpershoek mkorpershoek@baylibre.com wrote:
Hi,
On Mon, 20 Jun 2022 20:13:54 +0900, Jaehoon Chung wrote:
Add CONFIG_DFU_NAME_MAX_SIZE to change the proper size. If name is longer than default size, it can do wrong behavior during updating image. So it need to change the proper maximum size.
This patch is proviced the solution to change value with configuration.
[...]
Thanks, Applied to https://protect2.fireeye.com/v1/url?k=195a8ba3-78d19e99-195b00ec-74fe4860008...
e609da47a4bcadff&q=1&e=b6fd9ce6-85b6-46a3-81aa-8aa89d16a9ed&u=https%3A%2F%2Fsource.denx.de%2Fu- boot%2Fcustodians%2Fu-boot-dfu (u-boot-dfu-next)
[1/1] dfu: add CONFIG_DFU_NAME_MAX_SIZE configuration https://protect2.fireeye.com/v1/url?k=b04b2ae8-d1c03fd2-b04aa1a7-74fe4860008...
d8ec8502221dcca0&q=1&e=b6fd9ce6-85b6-46a3-81aa-8aa89d16a9ed&u=https%3A%2F%2Fsource.denx.de%2Fu- boot%2Fcustodians%2Fu-boot-dfu%2F-%2Fcommit%2Fde9b2e10f10996050a10998a0836abe2f9e425e3
This patch breaks CI for both arm32 and arm64 platforms:
a4f5d2c73833c4d5&q=1&e=b6fd9ce6-85b6-46a3-81aa-8aa89d16a9ed&u=https%3A%2F%2Fsource.denx.de%2Fu- boot%2Fcustodians%2Fu-boot-dfu%2F-%2Fjobs%2F725163
f6dc3d75fe9b283a&q=1&e=b6fd9ce6-85b6-46a3-81aa-8aa89d16a9ed&u=https%3A%2F%2Fsource.denx.de%2Fu- boot%2Fcustodians%2Fu-boot-dfu%2F-%2Fjobs%2F725164
I couldn't access the above CI URL.
It breaks because multiple boards which include dfu.h without having CONFIG_DFU being set.
Tom attempted to fix this with: https://protect2.fireeye.com/v1/url?k=452a9007-24a1853d-452b1b48-74fe4860008... a88f870953497071&q=1&e=b6fd9ce6-85b6-46a3-81aa- 8aa89d16a9ed&u=https%3A%2F%2Fpatchwork.ozlabs.org%2Fproject%2Fuboot%2Flist%2F%3Fseries%3D369275
But that had some different issues, see: https://protect2.fireeye.com/v1/url?k=f1c007bd-904b1287-f1c18cf2-74fe4860008... a305de1bab5bdff1&q=1&e=b6fd9ce6-85b6-46a3-81aa- 8aa89d16a9ed&u=https%3A%2F%2Flibera.irclog.whitequark.org%2Fu-boot%2F2023-10-31%2335154532;
I've fixed it up with the following diff:
diff --git a/include/dfu.h b/include/dfu.h index 4573f753c565..2c3ffa3f9297 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -99,7 +99,12 @@ struct virt_internal_data { int dev_num; };
+#if defined(CONFIG_DFU_NAME_MAX_SIZE) #define DFU_NAME_SIZE CONFIG_DFU_NAME_MAX_SIZE +#else +#define DFU_NAME_SIZE 32 +#endif #ifndef DFU_DEFAULT_POLL_TIMEOUT #define DFU_DEFAULT_POLL_TIMEOUT 0 #endif
If you have a better idea to fix this, can you please let me know?
After checking this, let you inform.
Otherwise, I will squash this to keep CI green.
Thank you
-- Mattijs