>-----Original Message----- >From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@lists.denx.de] >On Behalf Of Stephen Warren >Sent: Wednesday, February 27, 2013 6:28 AM >To: Tom Warren >Cc: u-boot@lists.denx.de; Stephen Warren >Subject: [U-Boot] [PATCH 3/3] ARM: mx6: use common CPU errata config >options > >From: Stephen Warren <swar...@nvidia.com> > >Now that U-Boot has common CONFIG_ options to work around some ARM >CPU errata, enable the relevant options on MX6, and remove the custom >lowlevel_init.S, since it's just duplicated code now. > >Signed-off-by: Stephen Warren <swar...@nvidia.com> >--- > arch/arm/cpu/armv7/Makefile | 2 +- > arch/arm/cpu/armv7/mx6/Makefile | 1 - > arch/arm/cpu/armv7/mx6/lowlevel_init.S | 35 -------------------------------- > arch/arm/cpu/armv7/mx6/soc.c | 4 ++++ > include/configs/mx6_common.h | 23 +++++++++++++++++++++ > include/configs/mx6qarm2.h | 3 +++ > include/configs/mx6qsabre_common.h | 3 +++ > include/configs/mx6qsabrelite.h | 3 +++ > 8 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 >arch/arm/cpu/armv7/mx6/lowlevel_init.S > create mode 100644 include/configs/mx6_common.h
Acked-by: Jason Liu <r64...@freescale.com> > >diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile >index ee8c2b3..4668b3c 100644 >--- a/arch/arm/cpu/armv7/Makefile >+++ b/arch/arm/cpu/armv7/Makefile >@@ -32,7 +32,7 @@ COBJS += cache_v7.o > COBJS += cpu.o > COBJS += syslib.o > >-ifneq >($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_T >EGRA),) >+ifneq >+($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_ >TEGRA)$(C >+ONFIG_MX6),) > SOBJS += lowlevel_init.o > endif > >diff --git a/arch/arm/cpu/armv7/mx6/Makefile >b/arch/arm/cpu/armv7/mx6/Makefile index cbce411..4f9ca68 100644 >--- a/arch/arm/cpu/armv7/mx6/Makefile >+++ b/arch/arm/cpu/armv7/mx6/Makefile >@@ -28,7 +28,6 @@ include $(TOPDIR)/config.mk > LIB = $(obj)lib$(SOC).o > > COBJS = soc.o clock.o >-SOBJS = lowlevel_init.o > > SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) > OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) >diff --git a/arch/arm/cpu/armv7/mx6/lowlevel_init.S >b/arch/arm/cpu/armv7/mx6/lowlevel_init.S >deleted file mode 100644 >index 7b60ca7..0000000 [..] >-- >1.7.10.4 > >_______________________________________________ >U-Boot mailing list >U-Boot@lists.denx.de >http://lists.denx.de/mailman/listinfo/u-boot _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
