[PATCH] mach-k3: common_fdt: Fix Label Issue

[Daniel Schultz]

On 4/7/25 10:26, Neha Malcom Francis wrote:
> Hi Udit
>
> On 07/04/25 13:51, Kumar, Udit wrote:
>> Hi Daniel.
>>
>> Thanks for patch
>>
>> On 4/7/2025 11:37 AM, Daniel Schultz wrote:
>>> Labels are not allowed before declarations. Add a semicolon after the
>>> label to introduce an empty statement. This will fix following error:
>>>
>>> arch/arm/mach-k3/common_fdt.c: In function 'fdt_fixup_reserved':
>>> arch/arm/mach-k3/common_fdt.c:156:2: error: a label can only be part
>>> of a statement and a declaration is not a statement
>>>     156 |  struct fdt_memory carveout = {
>>>         |  ^~~~~~
>>> make[1]: *** [scripts/Makefile.build:256:
>>> arch/arm/mach-k3/common_fdt.o] Error 1
>>> make: *** [Makefile:1919: arch/arm/mach-k3] Error 2
>> Is there some specific compiler option you are using, Sorry but I don't
>> see this error .
>>
>> i just build sha id e458e103d4f5fb7aaf13e744c65916ab3ba4a18d of next
>>
> I had run into the same issue when I was using v10.1 of the Arm GNU
> toolchain, moving to v14.2, I no longer see it.

I'm currently using "aarch64-linux-gnu-gcc (Ubuntu 
9.4.0-1ubuntu1~20.04.2) 9.4.0" with just make.

>
>>> Fixes: 096aa229a9e ("mach-k3: common_fdt: create a reserved memory node")
>>>
>>> Signed-off-by: Daniel Schultz <d.schultz at phytec.de>
>>> ---
>>>
>>> I'm open to other suggestions! This is just the easiest way to fix this
>>> compile error. BTW, master is fine since 096aa229a9e is only on next.
>>>
>>>    arch/arm/mach-k3/common_fdt.c | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm/mach-k3/common_fdt.c
>>> b/arch/arm/mach-k3/common_fdt.c
>>> index 361b0c0b31b..7178918a12c 100644
>>> --- a/arch/arm/mach-k3/common_fdt.c
>>> +++ b/arch/arm/mach-k3/common_fdt.c
>>> @@ -152,7 +152,7 @@ int fdt_fixup_reserved(void *blob, const char *name,
>>>            }
>>>        }
>>>    -add_carveout:
>>> +add_carveout: ;
>>>        struct fdt_memory carveout = {
>>>            .start = new_address,
>>>            .end = new_address + new_size - 1,
>> My suggestion will be to move this struct at start of function.
>>
>> and change only size here
>>
>> carveout.end = new_address + new_size - 1;

sounds good.

- Daniel

>>
>>