[PATCH] ARM: add back in KS8695 based SnapGear board entries

[PATCH] ARM: add back in KS8695 based SnapGear board entries

[gerg at snapgear.com]

From: Greg Ungerer <gerg@uclinux.org>

Board support code for the SnapGear boards based on the Micrel KS8695 SoC
will soon appear in mainline kernel. The board IDs had been removed from
the mach-types file, so add them back in.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
 arch/arm/tools/mach-types |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 2997e56..69a3e81 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -96,6 +96,7 @@ lpd7a400		MACH_LPD7A400		LPD7A400		389
 lpd7a404		MACH_LPD7A404		LPD7A404		390
 csb337			MACH_CSB337		CSB337			399
 mainstone		MACH_MAINSTONE		MAINSTONE		406
+lite300			MACH_LITE300		LITE300			408
 xcep			MACH_XCEP		XCEP			413
 arcom_vulcan		MACH_ARCOM_VULCAN	ARCOM_VULCAN		414
 nomadik			MACH_NOMADIK		NOMADIK			420
@@ -162,6 +163,7 @@ pnx4008			MACH_PNX4008		PNX4008			782
 cpuat91			MACH_CPUAT91		CPUAT91			787
 iq81340sc		MACH_IQ81340SC		IQ81340SC		799
 iq81340mc		MACH_IQ81340MC		IQ81340MC		801
+se4200			MACH_SE4200		SE4200			809
 micro9			MACH_MICRO9		MICRO9			811
 micro9l			MACH_MICRO9L		MICRO9L			812
 omap_palmte		MACH_OMAP_PALMTE	OMAP_PALMTE		817
@@ -270,6 +272,7 @@ dns323			MACH_DNS323		DNS323			1542
 omap3_beagle		MACH_OMAP3_BEAGLE	OMAP3_BEAGLE		1546
 nokia_n810		MACH_NOKIA_N810		NOKIA_N810		1548
 pcm038			MACH_PCM038		PCM038			1551
+sg310			MACH_SG310		SG310			1564
 ts209			MACH_TS209		TS209			1565
 at91cap9adk		MACH_AT91CAP9ADK	AT91CAP9ADK		1566
 mx31moboard		MACH_MX31MOBOARD	MX31MOBOARD		1574
-- 
1.7.0.4

[PATCH] ARM: add back in KS8695 based SnapGear board entries

[Russell King - ARM Linux]

On Mon, Sep 10, 2012 at 01:30:15PM +1000, gerg at snapgear.com wrote:
> From: Greg Ungerer <gerg@uclinux.org>
> 
> Board support code for the SnapGear boards based on the Micrel KS8695 SoC
> will soon appear in mainline kernel. The board IDs had been removed from
> the mach-types file, so add them back in.

Nak.  You must add platform support for these numbers _along_ _side_
adding them back to mach-types, otherwise my scripts will simply delete
them again.  These entries have been aged out due to lack of merging of
the platforms.

[PATCH] ARM: add back in KS8695 based SnapGear board entries

[Greg Ungerer]

On 09/10/2012 06:42 PM, Russell King - ARM Linux wrote:
> On Mon, Sep 10, 2012 at 01:30:15PM +1000, gerg at snapgear.com wrote:
>> From: Greg Ungerer <gerg@uclinux.org>
>>
>> Board support code for the SnapGear boards based on the Micrel KS8695 SoC
>> will soon appear in mainline kernel. The board IDs had been removed from
>> the mach-types file, so add them back in.
>
> Nak.  You must add platform support for these numbers _along_ _side_
> adding them back to mach-types, otherwise my scripts will simply delete
> them again.  These entries have been aged out due to lack of merging of
> the platforms.

So if I combine this with:

 
http://lists.infradead.org/pipermail/linux-arm-kernel/2012-September/118237.html

and submit as a single patch (through the arm-soc tree) will that cause
your scripts any problems?

Regards
Greg


------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg at snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close,                            FAX:         +61 7 3891 3630
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

[PATCH] ARM: add back in KS8695 based SnapGear board entries

[Olof Johansson]

Hi,

On Mon, Sep 10, 2012 at 1:42 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Mon, Sep 10, 2012 at 01:30:15PM +1000, gerg at snapgear.com wrote:
>> From: Greg Ungerer <gerg@uclinux.org>
>>
>> Board support code for the SnapGear boards based on the Micrel KS8695 SoC
>> will soon appear in mainline kernel. The board IDs had been removed from
>> the mach-types file, so add them back in.
>
> Nak.  You must add platform support for these numbers _along_ _side_
> adding them back to mach-types, otherwise my scripts will simply delete
> them again.  These entries have been aged out due to lack of merging of
> the platforms.

Greg has submitted the new platforms for arm-soc but building of them
will be broken until this update goes in.

I guess we have the option of picking up the platform patch but not
enabling it in the ks8695 defconfig until it's buildable (or enable it
and have build breakage, which isn't awesome). Or, if you're OK with
it (and give us an acked-by) we can include the mach-types patch in
the same branch where the platform support gets merged.

Russell, do you have a preference?


-Olof

[PATCH] ARM: add back in KS8695 based SnapGear board entries

[Greg Ungerer]

Ping...

On 13/09/12 16:52, Olof Johansson wrote:
> Hi,
>
> On Mon, Sep 10, 2012 at 1:42 AM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
>> On Mon, Sep 10, 2012 at 01:30:15PM +1000, gerg at snapgear.com wrote:
>>> From: Greg Ungerer <gerg@uclinux.org>
>>>
>>> Board support code for the SnapGear boards based on the Micrel KS8695 SoC
>>> will soon appear in mainline kernel. The board IDs had been removed from
>>> the mach-types file, so add them back in.
>>
>> Nak.  You must add platform support for these numbers _along_ _side_
>> adding them back to mach-types, otherwise my scripts will simply delete
>> them again.  These entries have been aged out due to lack of merging of
>> the platforms.
>
> Greg has submitted the new platforms for arm-soc but building of them
> will be broken until this update goes in.
>
> I guess we have the option of picking up the platform patch but not
> enabling it in the ks8695 defconfig until it's buildable (or enable it
> and have build breakage, which isn't awesome). Or, if you're OK with
> it (and give us an acked-by) we can include the mach-types patch in
> the same branch where the platform support gets merged.
>
> Russell, do you have a preference?
>
>
> -Olof
>
  
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg at snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com