Message ID | 20130124201709.GB1036@beefymiracle.amer.corp.natinst.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
> -----Original Message----- > From: Josh Cartwright [mailto:josh.cartwright@ni.com] > Sent: Thursday, January 24, 2013 9:17 PM > To: arm@kernel.org; Rob Herring > Cc: linux-arm-kernel@lists.infradead.org; Michal Simek > Subject: Re: [PATCH 2/2] ARM: multi_v7_defconfig: add ARCH_ZYNQ > > On Thu, Jan 24, 2013 at 01:33:25PM -0600, Josh Cartwright wrote: > > Cc: Michal Simek <michal.simek@ni.com> > > Ugh, my fingers typed '@ni.com' out of habit. Corrected patch below (and > correct Cc added). Acked-by: Michal Simek <michal.simek@xilinx.com> M
On Fri, Jan 25, 2013 at 03:08:06PM +0000, Michal Simek wrote: > > > > -----Original Message----- > > From: Josh Cartwright [mailto:josh.cartwright@ni.com] > > Sent: Thursday, January 24, 2013 9:17 PM > > To: arm@kernel.org; Rob Herring > > Cc: linux-arm-kernel@lists.infradead.org; Michal Simek > > Subject: Re: [PATCH 2/2] ARM: multi_v7_defconfig: add ARCH_ZYNQ > > > > On Thu, Jan 24, 2013 at 01:33:25PM -0600, Josh Cartwright wrote: > > > Cc: Michal Simek <michal.simek@ni.com> > > > > Ugh, my fingers typed '@ni.com' out of habit. Corrected patch below (and > > correct Cc added). > > Acked-by: Michal Simek <michal.simek@xilinx.com> Applied, thanks. -Olof
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 6862e76..e31d442 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SUNXI=y # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set +CONFIG_ARCH_ZYNQ=y CONFIG_ARM_ERRATA_754322=y CONFIG_SMP=y CONFIG_ARM_ARCH_TIMER=y