diff mbox series

rmobile: avoid deprecated srec_cat flags

Message ID 20230418182007.1127953-1-ralph.siemsen@linaro.org
State Superseded
Delegated to: Marek Vasut
Headers show
Series rmobile: avoid deprecated srec_cat flags | expand

Commit Message

Ralph Siemsen April 18, 2023, 6:20 p.m. UTC 
The -l-e-constant flag has been deprecated since 2012. [1]
Use the recommended replacement instead.

[1] https://sourceforge.net/p/srecord/code/ci/1.59.D009/

Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
---
 arch/arm/mach-rmobile/Makefile | 48 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

Comments

Marek Vasut April 18, 2023, 7:36 p.m. UTC | #1 
On 4/18/23 20:20, Ralph Siemsen wrote:
> The -l-e-constant flag has been deprecated since 2012. [1]
> Use the recommended replacement instead.
> 
> [1] https://sourceforge.net/p/srecord/code/ci/1.59.D009/
> 
> Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>

I'm afraid this needs some backward compatibility sreccat version check 
. Similar to GCC compiler flags presence check. To avoid breaking legacy 
users.
Ralph Siemsen April 19, 2023, 4:30 p.m. UTC | #2 
On Tue, Apr 18, 2023 at 3:36 PM Marek Vasut <marek.vasut@mailbox.org> wrote:
> I'm afraid this needs some backward compatibility sreccat version check
> . Similar to GCC compiler flags presence check. To avoid breaking legacy
> users.

I'll revisit this after the rz/n1 work, which is more important.

Also I noticed that srec_cat is being called even when it is not
installed, which of course causes the build to fail. This is curious
since the makefile checks for srec_cat prior to using it.

Ralph
Marek Vasut April 19, 2023, 6:45 p.m. UTC | #3 
On 4/19/23 18:30, Ralph Siemsen wrote:
> On Tue, Apr 18, 2023 at 3:36 PM Marek Vasut <marek.vasut@mailbox.org> wrote:
>> I'm afraid this needs some backward compatibility sreccat version check
>> . Similar to GCC compiler flags presence check. To avoid breaking legacy
>> users.
> 
> I'll revisit this after the rz/n1 work, which is more important.
> 
> Also I noticed that srec_cat is being called even when it is not
> installed, which of course causes the build to fail. This is curious
> since the makefile checks for srec_cat prior to using it.

I have this one on my ToDo too. Basically what I am pondering about is 
whether we can get rid of SREC_CAT and replace it somehow with binman. 
The keyword here is "somehow" right now ... for I have no idea how yet.
diff mbox series

Patch

diff --git a/arch/arm/mach-rmobile/Makefile b/arch/arm/mach-rmobile/Makefile
index 5b86221bc2..84ee70fb6e 100644
--- a/arch/arm/mach-rmobile/Makefile
+++ b/arch/arm/mach-rmobile/Makefile
@@ -52,34 +52,34 @@  quiet_cmd_srec_cat = SRECCAT $@
       cmd_srec_cat = srec_cat -output $@ -M 8 $< -M 8 \
 			-offset -0x13fd0 \
 			-Output_Block_Size 16 \
-			-generate 0xe6300400 0xe6300404 -l-e-constant 0x0 4 \
-			-generate 0xe630048c 0xe6300490 -l-e-constant 0x0 4 \
-			-generate 0xe63005d4 0xe63005d8 -l-e-constant 0xe6304000 4 \
-			-generate 0xe63006e4 0xe63006e8 -l-e-constant $2 4 \
-			-generate 0xe6301154 0xe6301158 -l-e-constant 0xe6304000 4 \
-			-generate 0xe6301264 0xe6301268 -l-e-constant $2 4 \
-			-generate 0xe6304000 0xe6304004 -l-e-constant 0xd2bcc000 4 \
-			-generate 0xe6304004 0xe6304008 -l-e-constant 0xb26c0400 4 \
-			-generate 0xe6304008 0xe630400c -l-e-constant 0xb2720001 4 \
-			-generate 0xe630400c 0xe6304010 -l-e-constant 0xb27c0421 4 \
-			-generate 0xe6304010 0xe6304014 -l-e-constant 0xb2710402 4 \
-			-generate 0xe6304014 0xe6304018 -l-e-constant 0xaa0203e0 4 \
-			-generate 0xe6304018 0xe630401c -l-e-constant 0xd28e0003 4 \
-			-generate 0xe630401c 0xe6304020 -l-e-constant 0xa8c11424 4 \
-			-generate 0xe6304020 0xe6304024 -l-e-constant 0xa8811444 4 \
-			-generate 0xe6304024 0xe6304028 -l-e-constant 0xf1004063 4 \
-			-generate 0xe6304028 0xe630402c -l-e-constant 0x54ffffaa 4 \
-			-generate 0xe630402c 0xe6304030 -l-e-constant 0xd61f0000 4
+			-generate 0xe6300400 0xe6300404 -constant-l-e 0x0 4 \
+			-generate 0xe630048c 0xe6300490 -constant-l-e 0x0 4 \
+			-generate 0xe63005d4 0xe63005d8 -constant-l-e 0xe6304000 4 \
+			-generate 0xe63006e4 0xe63006e8 -constant-l-e $2 4 \
+			-generate 0xe6301154 0xe6301158 -constant-l-e 0xe6304000 4 \
+			-generate 0xe6301264 0xe6301268 -constant-l-e $2 4 \
+			-generate 0xe6304000 0xe6304004 -constant-l-e 0xd2bcc000 4 \
+			-generate 0xe6304004 0xe6304008 -constant-l-e 0xb26c0400 4 \
+			-generate 0xe6304008 0xe630400c -constant-l-e 0xb2720001 4 \
+			-generate 0xe630400c 0xe6304010 -constant-l-e 0xb27c0421 4 \
+			-generate 0xe6304010 0xe6304014 -constant-l-e 0xb2710402 4 \
+			-generate 0xe6304014 0xe6304018 -constant-l-e 0xaa0203e0 4 \
+			-generate 0xe6304018 0xe630401c -constant-l-e 0xd28e0003 4 \
+			-generate 0xe630401c 0xe6304020 -constant-l-e 0xa8c11424 4 \
+			-generate 0xe6304020 0xe6304024 -constant-l-e 0xa8811444 4 \
+			-generate 0xe6304024 0xe6304028 -constant-l-e 0xf1004063 4 \
+			-generate 0xe6304028 0xe630402c -constant-l-e 0x54ffffaa 4 \
+			-generate 0xe630402c 0xe6304030 -constant-l-e 0xd61f0000 4
 else
 quiet_cmd_srec_cat = SRECCAT $@
       cmd_srec_cat = srec_cat -output $@ -M 8 $< -M 8 \
 			-Output_Block_Size 16 \
-			-generate 0xe6300400 0xe6300404 -l-e-constant 0x0 4 \
-			-generate 0xe630048c 0xe6300490 -l-e-constant 0x0 4 \
-			-generate 0xe63005d4 0xe63005d8 -l-e-constant $(CONFIG_SPL_TEXT_BASE) 4 \
-			-generate 0xe63006e4 0xe63006e8 -l-e-constant $2 4 \
-			-generate 0xe6301154 0xe6301158 -l-e-constant $(CONFIG_SPL_TEXT_BASE) 4 \
-			-generate 0xe6301264 0xe6301268 -l-e-constant $2 4
+			-generate 0xe6300400 0xe6300404 -constant-l-e 0x0 4 \
+			-generate 0xe630048c 0xe6300490 -constant-l-e 0x0 4 \
+			-generate 0xe63005d4 0xe63005d8 -constant-l-e $(CONFIG_SPL_TEXT_BASE) 4 \
+			-generate 0xe63006e4 0xe63006e8 -constant-l-e $2 4 \
+			-generate 0xe6301154 0xe6301158 -constant-l-e $(CONFIG_SPL_TEXT_BASE) 4 \
+			-generate 0xe6301264 0xe6301268 -constant-l-e $2 4
 endif
 
 spl/u-boot-spl.scif: spl/u-boot-spl.srec spl/u-boot-spl.bin