Patchwork efikamx: match machine descriptions with legacy

login
register
mail settings
Submitter Hector Oron
Date Feb. 20, 2012, 11:09 p.m.
Message ID <1329779368-27878-1-git-send-email-hector.oron@gmail.com>
Download mbox | patch
Permalink /patch/142209/
State New
Headers show

Comments

Hector Oron - Feb. 20, 2012, 11:09 p.m.
Rename machine descriptions to match legacy descriptions distributed by
  manufacturer BSP. This way distributions can do clean upgrades from
  userspace scripts which check for these values to differentiate platforms
  with single kernel binaries.

Signed-off-by: Hector Oron <hector.oron@gmail.com>
Acked-by: Matt Sealey <matt@genesi-usa.com>
---
 arch/arm/mach-mx5/board-mx51_efikamx.c |    3 +--
 arch/arm/mach-mx5/board-mx51_efikasb.c |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
Amit Kucheria - Feb. 23, 2012, 2:04 p.m.
On Tue, Feb 21, 2012 at 1:09 AM, Hector Oron <hector.oron@gmail.com> wrote:
>  Rename machine descriptions to match legacy descriptions distributed by
>  manufacturer BSP. This way distributions can do clean upgrades from
>  userspace scripts which check for these values to differentiate platforms
>  with single kernel binaries.
>
> Signed-off-by: Hector Oron <hector.oron@gmail.com>
> Acked-by: Matt Sealey <matt@genesi-usa.com>

This is likely to break flash-kernel used in debian/ubuntu/linaro I
suspect. Can you fix that too?

Otherwise,
Acked-by: Amit Kucheria <amit.kucheria@linaro.org>

> ---
>  arch/arm/mach-mx5/board-mx51_efikamx.c |    3 +--
>  arch/arm/mach-mx5/board-mx51_efikasb.c |    2 +-
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c
> index 3a5ed2d..fbfccc7 100644
> --- a/arch/arm/mach-mx5/board-mx51_efikamx.c
> +++ b/arch/arm/mach-mx5/board-mx51_efikamx.c
> @@ -283,8 +283,7 @@ static struct sys_timer mx51_efikamx_timer = {
>        .init = mx51_efikamx_timer_init,
>  };
>
> -MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
> -       /* Maintainer: Amit Kucheria <amit.kucheria@linaro.org> */
> +MACHINE_START(MX51_EFIKAMX, "Genesi Efika MX (Smarttop)")
>        .atag_offset = 0x100,
>        .map_io = mx51_map_io,
>        .init_early = imx51_init_early,
> diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c
> index 4baf05c..dedbca5 100644
> --- a/arch/arm/mach-mx5/board-mx51_efikasb.c
> +++ b/arch/arm/mach-mx5/board-mx51_efikasb.c
> @@ -483,7 +483,7 @@ static struct sys_timer mx51_efikasb_timer = {
>        .init   = mx51_efikasb_timer_init,
>  };
>
> -MACHINE_START(MX51_EFIKASB, "Genesi Efika Smartbook")
> +MACHINE_START(MX51_EFIKASB, "Genesi Efika MX (Smartbook)")
>        .atag_offset = 0x100,
>        .map_io = mx51_map_io,
>        .init_early = imx51_init_early,
> --
> 1.7.9
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hector Oron - Feb. 23, 2012, 4:49 p.m.
Hello,

2012/2/23 Amit Kucheria <amit.kucheria@linaro.org>:
> On Tue, Feb 21, 2012 at 1:09 AM, Hector Oron <hector.oron@gmail.com> wrote:

>>  Rename machine descriptions to match legacy descriptions distributed by
>>  manufacturer BSP. This way distributions can do clean upgrades from
>>  userspace scripts which check for these values to differentiate platforms
>>  with single kernel binaries.
>>
>> Signed-off-by: Hector Oron <hector.oron@gmail.com>
>> Acked-by: Matt Sealey <matt@genesi-usa.com>

> This is likely to break flash-kernel used in debian/ubuntu/linaro I
> suspect. Can you fix that too?

Surely, I can and I will do.

> Otherwise,
> Acked-by: Amit Kucheria <amit.kucheria@linaro.org>

Thanks

>> ---
>>  arch/arm/mach-mx5/board-mx51_efikamx.c |    3 +--
>>  arch/arm/mach-mx5/board-mx51_efikasb.c |    2 +-
>>  2 files changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c
>> index 3a5ed2d..fbfccc7 100644
>> --- a/arch/arm/mach-mx5/board-mx51_efikamx.c
>> +++ b/arch/arm/mach-mx5/board-mx51_efikamx.c
>> @@ -283,8 +283,7 @@ static struct sys_timer mx51_efikamx_timer = {
>>        .init = mx51_efikamx_timer_init,
>>  };
>>
>> -MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
>> -       /* Maintainer: Amit Kucheria <amit.kucheria@linaro.org> */
>> +MACHINE_START(MX51_EFIKAMX, "Genesi Efika MX (Smarttop)")
>>        .atag_offset = 0x100,
>>        .map_io = mx51_map_io,
>>        .init_early = imx51_init_early,
>> diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c
>> index 4baf05c..dedbca5 100644
>> --- a/arch/arm/mach-mx5/board-mx51_efikasb.c
>> +++ b/arch/arm/mach-mx5/board-mx51_efikasb.c
>> @@ -483,7 +483,7 @@ static struct sys_timer mx51_efikasb_timer = {
>>        .init   = mx51_efikasb_timer_init,
>>  };
>>
>> -MACHINE_START(MX51_EFIKASB, "Genesi Efika Smartbook")
>> +MACHINE_START(MX51_EFIKASB, "Genesi Efika MX (Smartbook)")
>>        .atag_offset = 0x100,
>>        .map_io = mx51_map_io,
>>        .init_early = imx51_init_early,
>> --
>> 1.7.9
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Matt Sealey - March 1, 2012, 4:41 p.m.
On Thu, Feb 23, 2012 at 10:49 AM, Hector Oron <hector.oron@gmail.com> wrote:
> Hello,
>
> 2012/2/23 Amit Kucheria <amit.kucheria@linaro.org>:
>> On Tue, Feb 21, 2012 at 1:09 AM, Hector Oron <hector.oron@gmail.com> wrote:
>
>>>  Rename machine descriptions to match legacy descriptions distributed by
>>>  manufacturer BSP. This way distributions can do clean upgrades from
>>>  userspace scripts which check for these values to differentiate platforms
>>>  with single kernel binaries.
>>>
>>> Signed-off-by: Hector Oron <hector.oron@gmail.com>
>>> Acked-by: Matt Sealey <matt@genesi-usa.com>
>
>> This is likely to break flash-kernel used in debian/ubuntu/linaro I
>> suspect. Can you fix that too?
>
> Surely, I can and I will do.
>
>> Otherwise,
>> Acked-by: Amit Kucheria <amit.kucheria@linaro.org>

Thanks, Amit.

The patch is predicated on two things. Firstly that it unifies
behavior and the board identification across both BSP kernels and
mainline kernels, which is not up for argument on which is more
"correct" (vendor defines this, it is not a random freeform string of
the pusher's choosing, more importantly it is something at least 2
userspace tools use as input to seek board type and therefore is under
some restriction to change).

Secondly, upstream flash-kernel never worked on Debian or Ubuntu
anyway (patches sent upstream were needlessly rewritten to the point
that they actually simply did not work to produce a bootable kernel
image set, and pushed to Debian therefore breaking any chance of
Debian or Ubuntu supporting the board) and Linaro don't support the
EfikaMX with their MX5 kernels.

So this breaks nobody currently, but we actually want to get this
stuff done right upstream.
Hector Oron - March 11, 2012, 12:33 p.m.
Hello,

2012/2/21 Hector Oron <hector.oron@gmail.com>:
>  Rename machine descriptions to match legacy descriptions distributed by
>  manufacturer BSP. This way distributions can do clean upgrades from
>  userspace scripts which check for these values to differentiate platforms
>  with single kernel binaries.
>
> Signed-off-by: Hector Oron <hector.oron@gmail.com>
> Acked-by: Matt Sealey <matt@genesi-usa.com>
> ---
>  arch/arm/mach-mx5/board-mx51_efikamx.c |    3 +--
>  arch/arm/mach-mx5/board-mx51_efikasb.c |    2 +-
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c
> index 3a5ed2d..fbfccc7 100644
> --- a/arch/arm/mach-mx5/board-mx51_efikamx.c
> +++ b/arch/arm/mach-mx5/board-mx51_efikamx.c
> @@ -283,8 +283,7 @@ static struct sys_timer mx51_efikamx_timer = {
>        .init = mx51_efikamx_timer_init,
>  };
>
> -MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
> -       /* Maintainer: Amit Kucheria <amit.kucheria@linaro.org> */
> +MACHINE_START(MX51_EFIKAMX, "Genesi Efika MX (Smarttop)")
>        .atag_offset = 0x100,
>        .map_io = mx51_map_io,
>        .init_early = imx51_init_early,
> diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c
> index 4baf05c..dedbca5 100644
> --- a/arch/arm/mach-mx5/board-mx51_efikasb.c
> +++ b/arch/arm/mach-mx5/board-mx51_efikasb.c
> @@ -483,7 +483,7 @@ static struct sys_timer mx51_efikasb_timer = {
>        .init   = mx51_efikasb_timer_init,
>  };
>
> -MACHINE_START(MX51_EFIKASB, "Genesi Efika Smartbook")
> +MACHINE_START(MX51_EFIKASB, "Genesi Efika MX (Smartbook)")
>        .atag_offset = 0x100,
>        .map_io = mx51_map_io,
>        .init_early = imx51_init_early,
> --
> 1.7.9
>

Ping!
I dont see the patch being applied. Is there any problem with it?

Cheers,
Hector Oron - March 13, 2012, 6:05 p.m.
Sending as I forgot to CC Sascha

2012/3/11 Hector Oron <hector.oron@gmail.com>:
> Hello,
>
> 2012/2/21 Hector Oron <hector.oron@gmail.com>:
>>  Rename machine descriptions to match legacy descriptions distributed by
>>  manufacturer BSP. This way distributions can do clean upgrades from
>>  userspace scripts which check for these values to differentiate platforms
>>  with single kernel binaries.
>>
>> Signed-off-by: Hector Oron <hector.oron@gmail.com>
>> Acked-by: Matt Sealey <matt@genesi-usa.com>
>> ---
>>  arch/arm/mach-mx5/board-mx51_efikamx.c |    3 +--
>>  arch/arm/mach-mx5/board-mx51_efikasb.c |    2 +-
>>  2 files changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c
>> index 3a5ed2d..fbfccc7 100644
>> --- a/arch/arm/mach-mx5/board-mx51_efikamx.c
>> +++ b/arch/arm/mach-mx5/board-mx51_efikamx.c
>> @@ -283,8 +283,7 @@ static struct sys_timer mx51_efikamx_timer = {
>>        .init = mx51_efikamx_timer_init,
>>  };
>>
>> -MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
>> -       /* Maintainer: Amit Kucheria <amit.kucheria@linaro.org> */
>> +MACHINE_START(MX51_EFIKAMX, "Genesi Efika MX (Smarttop)")
>>        .atag_offset = 0x100,
>>        .map_io = mx51_map_io,
>>        .init_early = imx51_init_early,
>> diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c
>> index 4baf05c..dedbca5 100644
>> --- a/arch/arm/mach-mx5/board-mx51_efikasb.c
>> +++ b/arch/arm/mach-mx5/board-mx51_efikasb.c
>> @@ -483,7 +483,7 @@ static struct sys_timer mx51_efikasb_timer = {
>>        .init   = mx51_efikasb_timer_init,
>>  };
>>
>> -MACHINE_START(MX51_EFIKASB, "Genesi Efika Smartbook")
>> +MACHINE_START(MX51_EFIKASB, "Genesi Efika MX (Smartbook)")
>>        .atag_offset = 0x100,
>>        .map_io = mx51_map_io,
>>        .init_early = imx51_init_early,
>> --
>> 1.7.9
>>
>
> Ping!
> I dont see the patch being applied. Is there any problem with it?
>
> Cheers,
> --
>  Héctor Orón  -.. . -... .. .- -.   -.. . ...- . .-.. --- .--. . .-.
Sascha Hauer - April 2, 2012, 9:21 a.m.
On Tue, Feb 21, 2012 at 12:09:28AM +0100, Hector Oron wrote:
>   Rename machine descriptions to match legacy descriptions distributed by
>   manufacturer BSP. This way distributions can do clean upgrades from
>   userspace scripts which check for these values to differentiate platforms
>   with single kernel binaries.
> 
> Signed-off-by: Hector Oron <hector.oron@gmail.com>
> Acked-by: Matt Sealey <matt@genesi-usa.com>

Applied, thanks

Sascha

> ---
>  arch/arm/mach-mx5/board-mx51_efikamx.c |    3 +--
>  arch/arm/mach-mx5/board-mx51_efikasb.c |    2 +-
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c
> index 3a5ed2d..fbfccc7 100644
> --- a/arch/arm/mach-mx5/board-mx51_efikamx.c
> +++ b/arch/arm/mach-mx5/board-mx51_efikamx.c
> @@ -283,8 +283,7 @@ static struct sys_timer mx51_efikamx_timer = {
>  	.init = mx51_efikamx_timer_init,
>  };
>  
> -MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
> -	/* Maintainer: Amit Kucheria <amit.kucheria@linaro.org> */
> +MACHINE_START(MX51_EFIKAMX, "Genesi Efika MX (Smarttop)")
>  	.atag_offset = 0x100,
>  	.map_io = mx51_map_io,
>  	.init_early = imx51_init_early,
> diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c
> index 4baf05c..dedbca5 100644
> --- a/arch/arm/mach-mx5/board-mx51_efikasb.c
> +++ b/arch/arm/mach-mx5/board-mx51_efikasb.c
> @@ -483,7 +483,7 @@ static struct sys_timer mx51_efikasb_timer = {
>  	.init	= mx51_efikasb_timer_init,
>  };
>  
> -MACHINE_START(MX51_EFIKASB, "Genesi Efika Smartbook")
> +MACHINE_START(MX51_EFIKASB, "Genesi Efika MX (Smartbook)")
>  	.atag_offset = 0x100,
>  	.map_io = mx51_map_io,
>  	.init_early = imx51_init_early,
> -- 
> 1.7.9
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

Patch

diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c
index 3a5ed2d..fbfccc7 100644
--- a/arch/arm/mach-mx5/board-mx51_efikamx.c
+++ b/arch/arm/mach-mx5/board-mx51_efikamx.c
@@ -283,8 +283,7 @@  static struct sys_timer mx51_efikamx_timer = {
 	.init = mx51_efikamx_timer_init,
 };
 
-MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
-	/* Maintainer: Amit Kucheria <amit.kucheria@linaro.org> */
+MACHINE_START(MX51_EFIKAMX, "Genesi Efika MX (Smarttop)")
 	.atag_offset = 0x100,
 	.map_io = mx51_map_io,
 	.init_early = imx51_init_early,
diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c
index 4baf05c..dedbca5 100644
--- a/arch/arm/mach-mx5/board-mx51_efikasb.c
+++ b/arch/arm/mach-mx5/board-mx51_efikasb.c
@@ -483,7 +483,7 @@  static struct sys_timer mx51_efikasb_timer = {
 	.init	= mx51_efikasb_timer_init,
 };
 
-MACHINE_START(MX51_EFIKASB, "Genesi Efika Smartbook")
+MACHINE_START(MX51_EFIKASB, "Genesi Efika MX (Smartbook)")
 	.atag_offset = 0x100,
 	.map_io = mx51_map_io,
 	.init_early = imx51_init_early,