[PATCH v2] microblaze: Fix Makefile to delete build generated files

[PATCH v2] microblaze: Fix Makefile to delete build generated files

[Arun Bhanu]

'make clean' does not to delete the following build generated file:
	arch/microblaze/boot/linux.bin.ub

'make mrproper' does not to delete the following build generated files:
	arch/microblaze/boot/simpleImage.*

Fix the Makefile to delete these build generated files.

See [1] for a discussion on why simpleImage.* files are deleted with 'make
mrproper' and not with 'make clean'.
	[1] http://lkml.org/lkml/2010/3/12/96

Signed-off-by: Arun Bhanu <arun@bhanu.net>
---
 arch/microblaze/Makefile      |    2 ++
 arch/microblaze/boot/Makefile |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index d2d6cfc..36926b9 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -93,3 +93,5 @@ define archhelp
   echo '  name of a dts file from the arch/microblaze/boot/dts/ directory'
   echo '  (minus the .dts extension).'
 endef
+
+MRPROPER_FILES += $(boot)/simpleImage.*
diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile
index 902cf98..a1fc324 100644
--- a/arch/microblaze/boot/Makefile
+++ b/arch/microblaze/boot/Makefile
@@ -64,4 +64,4 @@ $(obj)/%.dtb: $(dtstree)/%.dts FORCE
 
 clean-kernel += linux.bin linux.bin.gz simpleImage.*
 
-clean-files += *.dtb simpleImage.*.unstrip
+clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub
-- 
1.6.2.5

Re: [PATCH v2] microblaze: Fix Makefile to delete build generated files

[Michal Simek]

Arun Bhanu wrote:
> 'make clean' does not to delete the following build generated file:
> 	arch/microblaze/boot/linux.bin.ub
> 
> 'make mrproper' does not to delete the following build generated files:
> 	arch/microblaze/boot/simpleImage.*
> 
> Fix the Makefile to delete these build generated files.
> 
> See [1] for a discussion on why simpleImage.* files are deleted with 'make
> mrproper' and not with 'make clean'.
> 	[1] http://lkml.org/lkml/2010/3/12/96
> 
> Signed-off-by: Arun Bhanu <arun@bhanu.net>
> ---
>  arch/microblaze/Makefile      |    2 ++
>  arch/microblaze/boot/Makefile |    2 +-
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
> index d2d6cfc..36926b9 100644
> --- a/arch/microblaze/Makefile
> +++ b/arch/microblaze/Makefile
> @@ -93,3 +93,5 @@ define archhelp
>    echo '  name of a dts file from the arch/microblaze/boot/dts/ directory'
>    echo '  (minus the .dts extension).'
>  endef
> +
> +MRPROPER_FILES += $(boot)/simpleImage.*

I personally don't like that this line is in main arch Makefile but I 
saw that other archs have it too. Will be better to have it only in boot 
folder but I don't know if is possible to do that.
Sam: What do you think?


> diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile
> index 902cf98..a1fc324 100644
> --- a/arch/microblaze/boot/Makefile
> +++ b/arch/microblaze/boot/Makefile
> @@ -64,4 +64,4 @@ $(obj)/%.dtb: $(dtstree)/%.dts FORCE
>  
>  clean-kernel += linux.bin linux.bin.gz simpleImage.*
>  
> -clean-files += *.dtb simpleImage.*.unstrip
> +clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub

Could you please take a look at clean-kernel option too?
I think we can simple remove it. It should be any ancient code from powerpc.

Thanks,
Michal




-- 
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian

Re: [PATCH v2] microblaze: Fix Makefile to delete build generated files

[Arun Bhanu]

Adding Cc: Michal Marek <mmarek@suse.cz> who is the Kbuild maintainer.

* Michal Simek (monstr@monstr.eu) wrote:
> Arun Bhanu wrote:
>> 'make clean' does not to delete the following build generated file:
>> 	arch/microblaze/boot/linux.bin.ub
>>
>> 'make mrproper' does not to delete the following build generated files:
>> 	arch/microblaze/boot/simpleImage.*
>>
>> Fix the Makefile to delete these build generated files.
>>
>> See [1] for a discussion on why simpleImage.* files are deleted with 'make
>> mrproper' and not with 'make clean'.
>> 	[1] http://lkml.org/lkml/2010/3/12/96
>>
>> Signed-off-by: Arun Bhanu <arun@bhanu.net>
>> ---
>>  arch/microblaze/Makefile      |    2 ++
>>  arch/microblaze/boot/Makefile |    2 +-
>>  2 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
>> index d2d6cfc..36926b9 100644
>> --- a/arch/microblaze/Makefile
>> +++ b/arch/microblaze/Makefile
>> @@ -93,3 +93,5 @@ define archhelp
>>    echo '  name of a dts file from the arch/microblaze/boot/dts/ directory'
>>    echo '  (minus the .dts extension).'
>>  endef
>> +
>> +MRPROPER_FILES += $(boot)/simpleImage.*
>
> I personally don't like that this line is in main arch Makefile but I  
> saw that other archs have it too. Will be better to have it only in boot  
> folder but I don't know if is possible to do that.
> Sam: What do you think?

>From my limited understanding of Kbuild, it only includes the top
level Makefile of each architecture. In our case
arch/microblaze/Makefile. If we define MRPROPER_FILES variable in
arch/microblaze/boot/Makefile Kbuild will not evaluate it.

>
>
>> diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile
>> index 902cf98..a1fc324 100644
>> --- a/arch/microblaze/boot/Makefile
>> +++ b/arch/microblaze/boot/Makefile
>> @@ -64,4 +64,4 @@ $(obj)/%.dtb: $(dtstree)/%.dts FORCE
>>   clean-kernel += linux.bin linux.bin.gz simpleImage.*
>>  -clean-files += *.dtb simpleImage.*.unstrip
>> +clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub
>
> Could you please take a look at clean-kernel option too?
> I think we can simple remove it. It should be any ancient code from powerpc.

Yeah, I think we can safely remove the "clean-kernel" variable as it is
not used by Kbuild infrastructure.

>
> Thanks,
> Michal
>
>
>
>
> -- 
> Michal Simek, Ing. (M.Eng)
> w: www.monstr.eu p: +42-0-721842854
> Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
> Microblaze U-BOOT custodian
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

-Arun

Re: [PATCH v2] microblaze: Fix Makefile to delete build generated files

[Michal Marek]

On 16.3.2010 11:53, Arun Bhanu wrote:
> Adding Cc: Michal Marek <mmarek@suse.cz> who is the Kbuild maintainer.
>> I personally don't like that this line is in main arch Makefile but I  
>> saw that other archs have it too. Will be better to have it only in boot  
>> folder but I don't know if is possible to do that.
>> Sam: What do you think?
> 
> From my limited understanding of Kbuild, it only includes the top
> level Makefile of each architecture. In our case
> arch/microblaze/Makefile. If we define MRPROPER_FILES variable in
> arch/microblaze/boot/Makefile Kbuild will not evaluate it.

Correct, make mrproper is not a recursive target, so it won't read
ordinary kbuild files like arch/microblaze/boot/Makefile.

Michal

Re: [PATCH v2] microblaze: Fix Makefile to delete build generated files

[Michal Simek]

Arun Bhanu wrote:
> Adding Cc: Michal Marek <mmarek@suse.cz> who is the Kbuild maintainer.
> 
> * Michal Simek (monstr@monstr.eu) wrote:
>> Arun Bhanu wrote:
>>> 'make clean' does not to delete the following build generated file:
>>> 	arch/microblaze/boot/linux.bin.ub
>>>
>>> 'make mrproper' does not to delete the following build generated files:
>>> 	arch/microblaze/boot/simpleImage.*
>>>
>>> Fix the Makefile to delete these build generated files.
>>>
>>> See [1] for a discussion on why simpleImage.* files are deleted with 'make
>>> mrproper' and not with 'make clean'.
>>> 	[1] http://lkml.org/lkml/2010/3/12/96
>>>
>>> Signed-off-by: Arun Bhanu <arun@bhanu.net>
>>> ---
>>>  arch/microblaze/Makefile      |    2 ++
>>>  arch/microblaze/boot/Makefile |    2 +-
>>>  2 files changed, 3 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
>>> index d2d6cfc..36926b9 100644
>>> --- a/arch/microblaze/Makefile
>>> +++ b/arch/microblaze/Makefile
>>> @@ -93,3 +93,5 @@ define archhelp
>>>    echo '  name of a dts file from the arch/microblaze/boot/dts/ directory'
>>>    echo '  (minus the .dts extension).'
>>>  endef
>>> +
>>> +MRPROPER_FILES += $(boot)/simpleImage.*
>> I personally don't like that this line is in main arch Makefile but I  
>> saw that other archs have it too. Will be better to have it only in boot  
>> folder but I don't know if is possible to do that.
>> Sam: What do you think?
> 
> From my limited understanding of Kbuild, it only includes the top
> level Makefile of each architecture. In our case
> arch/microblaze/Makefile. If we define MRPROPER_FILES variable in
> arch/microblaze/boot/Makefile Kbuild will not evaluate it.

yes, it won't I checked it. It was just idea that will be good to have 
it in correct location but I am ok with it.


> 
>>
>>> diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile
>>> index 902cf98..a1fc324 100644
>>> --- a/arch/microblaze/boot/Makefile
>>> +++ b/arch/microblaze/boot/Makefile
>>> @@ -64,4 +64,4 @@ $(obj)/%.dtb: $(dtstree)/%.dts FORCE
>>>   clean-kernel += linux.bin linux.bin.gz simpleImage.*
>>>  -clean-files += *.dtb simpleImage.*.unstrip
>>> +clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub
>> Could you please take a look at clean-kernel option too?
>> I think we can simple remove it. It should be any ancient code from powerpc.
> 
> Yeah, I think we can safely remove the "clean-kernel" variable as it is
> not used by Kbuild infrastructure.

ok. I will wait if someone post any other comment and I will do this 
change and incorporate it to your patch.

Michal

> 
>> Thanks,
>> Michal
>>
>>
>>
>>
>> -- 
>> Michal Simek, Ing. (M.Eng)
>> w: www.monstr.eu p: +42-0-721842854
>> Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
>> Microblaze U-BOOT custodian
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/
> 
> -Arun


-- 
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian