| Message ID | 54d0cd1c.JZPcRllcuDW7d5v+%tsahee@annapurnalabs.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/03/15 05:29, Tsahee Zidenberg wrote: > diff --git a/arch/arm/Makefile b/arch/arm/Makefile > index c1785ee..bcc4113 100644 > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@ -143,6 +143,7 @@ textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 > > # Machine directory name. This list is sorted alphanumerically > # by CONFIG_* macro name. > +machine-$(CONFIG_ARCH_ALPINE) += alpine > machine-$(CONFIG_ARCH_AT91) += at91 > machine-$(CONFIG_ARCH_AXXIA) += axxia > machine-$(CONFIG_ARCH_BCM) += bcm > diff --git a/arch/arm/mach-alpine/Kconfig b/arch/arm/mach-alpine/Kconfig > new file mode 100644 > index 0000000..4548f32 > --- /dev/null > +++ b/arch/arm/mach-alpine/Kconfig > @@ -0,0 +1,8 @@ > +config ARCH_ALPINE > + bool "Annapurna Labs Alpine platform" if ARCH_MULTI_V7 s/ */\t/ > + select ARM_AMBA > + select ARM_GIC > + select GENERIC_IRQ_CHIP > + select HAVE_ARM_ARCH_TIMER > + help > + This enables support for the Annapurna Labs Alpine V1 boards. > diff --git a/arch/arm/mach-alpine/Makefile b/arch/arm/mach-alpine/Makefile > new file mode 100644 > index 0000000..8ba9e99 > --- /dev/null > +++ b/arch/arm/mach-alpine/Makefile > @@ -0,0 +1,5 @@ > +# > +# Makefile for the linux kernel. > +# Remove comment because this isn't the Makefile for the linux kernel? > + > +obj-y += alpine_machine.o > diff --git a/arch/arm/mach-alpine/alpine_machine.c b/arch/arm/mach-alpine/alpine_machine.c > new file mode 100644 > index 0000000..cf77053 > --- /dev/null > +++ b/arch/arm/mach-alpine/alpine_machine.c > @@ -0,0 +1,28 @@ > +/* > + * Machine declaration for Alpine platforms. > + * > + * Copyright (C) 2015 Annapurna Labs Ltd. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + */ > + > +#include <linux/of_platform.h> > + > +#include <asm/mach/arch.h> > + > +static const char *al_match[] __initconst = { static const char * const al_match[] ... > + "al,alpine", > + NULL, > +}; > + > +DT_MACHINE_START(AL_DT, "Annapurna Labs Alpine") > + .dt_compat = al_match, > +MACHINE_END Technically we don't even need this file because the default machine descriptor for DT based platforms will work the same.
On Tuesday 03 February 2015 10:52:31 Stephen Boyd wrote: > > > + "al,alpine", > > + NULL, > > +}; > > + > > +DT_MACHINE_START(AL_DT, "Annapurna Labs Alpine") > > + .dt_compat = al_match, > > +MACHINE_END > > Technically we don't even need this file because the default machine > descriptor for DT based platforms will work the same. I currently still prefer to have them, primarily for documenting what we support, but also to have a nice string in /proc/cpuinfo. Arnd
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f5dd6e9..c74441b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -842,6 +842,8 @@ config ARCH_VIRT # source "arch/arm/mach-mvebu/Kconfig" +source "arch/arm/mach-alpine/Kconfig" + source "arch/arm/mach-asm9260/Kconfig" source "arch/arm/mach-at91/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index c1785ee..bcc4113 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -143,6 +143,7 @@ textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. +machine-$(CONFIG_ARCH_ALPINE) += alpine machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_AXXIA) += axxia machine-$(CONFIG_ARCH_BCM) += bcm diff --git a/arch/arm/mach-alpine/Kconfig b/arch/arm/mach-alpine/Kconfig new file mode 100644 index 0000000..4548f32 --- /dev/null +++ b/arch/arm/mach-alpine/Kconfig @@ -0,0 +1,8 @@ +config ARCH_ALPINE + bool "Annapurna Labs Alpine platform" if ARCH_MULTI_V7 + select ARM_AMBA + select ARM_GIC + select GENERIC_IRQ_CHIP + select HAVE_ARM_ARCH_TIMER + help + This enables support for the Annapurna Labs Alpine V1 boards. diff --git a/arch/arm/mach-alpine/Makefile b/arch/arm/mach-alpine/Makefile new file mode 100644 index 0000000..8ba9e99 --- /dev/null +++ b/arch/arm/mach-alpine/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the linux kernel. +# + +obj-y += alpine_machine.o diff --git a/arch/arm/mach-alpine/alpine_machine.c b/arch/arm/mach-alpine/alpine_machine.c new file mode 100644 index 0000000..cf77053 --- /dev/null +++ b/arch/arm/mach-alpine/alpine_machine.c @@ -0,0 +1,28 @@ +/* + * Machine declaration for Alpine platforms. + * + * Copyright (C) 2015 Annapurna Labs Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/of_platform.h> + +#include <asm/mach/arch.h> + +static const char *al_match[] __initconst = { + "al,alpine", + NULL, +}; + +DT_MACHINE_START(AL_DT, "Annapurna Labs Alpine") + .dt_compat = al_match, +MACHINE_END