Patchwork [U-Boot] OMAP: Tweak omap-common/Makefile since reset.S -> reset.c

login
register
mail settings
Submitter Robert P. J. Day
Date Nov. 15, 2012, 11:21 a.m.
Message ID <alpine.DEB.2.02.1211150618380.10217@oneiric>
Download mbox | patch
Permalink /patch/199252/
State Awaiting Upstream
Delegated to: Tom Rini
Headers show

Comments

Robert P. J. Day - Nov. 15, 2012, 11:21 a.m.
Git commit d417d1db5f9092d125ddea882ced77eaa5f3d236 replaced the
omap-common file reset.S with reset.c, but the Makefile was not
adjusted for that.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---

  Compile and run-tested on a BeagleBoard xM (rev C), seems to work
fine.
Tom Rini - Dec. 10, 2012, 8:16 p.m.
On Thu, Nov 15, 2012 at 01:21:18AM -0000, Robert P. J. Day wrote:

> Git commit d417d1db5f9092d125ddea882ced77eaa5f3d236 replaced the
> omap-common file reset.S with reset.c, but the Makefile was not
> adjusted for that.
> 
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

Applied to u-boot-ti/master, thanks!

Patch

diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index 1f2fa02..0efc80d 100644
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -25,9 +25,8 @@  include $(TOPDIR)/config.mk

 LIB	= $(obj)libomap-common.o

-SOBJS	:= reset.o
-
-COBJS	:= timer.o
+COBJS	:= reset.o
+COBJS	+= timer.o
 COBJS	+= utils.o

 ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)