* [U-Boot] [PATCH 1/3 v2] PXA: Fix off-the-tree build problems
@ 2010-08-08 13:55 Marek Vasut
2010-08-08 13:55 ` [U-Boot] [PATCH 2/3] PXA: Fix missing includes Marek Vasut
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Marek Vasut @ 2010-08-08 13:55 UTC (permalink / raw)
To: u-boot
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
V2:
Add missing $(obj) before .depend in the following line:
rm -f $(LIB) core *.bak $(obj).depend
board/colibri_pxa270/Makefile | 20 ++++++++++++--------
board/vpac270/Makefile | 20 ++++++++++++--------
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/board/colibri_pxa270/Makefile b/board/colibri_pxa270/Makefile
index 44d73cc..ae570e1 100644
--- a/board/colibri_pxa270/Makefile
+++ b/board/colibri_pxa270/Makefile
@@ -21,25 +21,29 @@
include $(TOPDIR)/config.mk
-LIB = lib$(BOARD).a
+LIB = $(obj)lib$(BOARD).a
-OBJS := colibri_pxa270.o
+COBJS := colibri_pxa270.o
SOBJS := lowlevel_init.o
-$(LIB): $(OBJS) $(SOBJS)
- $(AR) crv $@ $(OBJS) $(SOBJS)
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB): $(obj).depend $(OBJS) $(SOBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
clean:
rm -f $(SOBJS) $(OBJS)
distclean: clean
- rm -f $(LIB) core *.bak .depend
+ rm -f $(LIB) core *.bak $(obj).depend
#########################################################################
-.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
- $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
--include .depend
+sinclude $(obj).depend
#########################################################################
diff --git a/board/vpac270/Makefile b/board/vpac270/Makefile
index 0f3eacd..c6f4c7c 100644
--- a/board/vpac270/Makefile
+++ b/board/vpac270/Makefile
@@ -24,25 +24,29 @@
include $(TOPDIR)/config.mk
-LIB = lib$(BOARD).a
+LIB = $(obj)lib$(BOARD).a
-OBJS := vpac270.o
+COBJS := vpac270.o
SOBJS := lowlevel_init.o
-$(LIB): $(OBJS) $(SOBJS)
- $(AR) crv $@ $(OBJS) $(SOBJS)
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB): $(obj).depend $(OBJS) $(SOBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
clean:
rm -f $(SOBJS) $(OBJS)
distclean: clean
- rm -f $(LIB) core *.bak .depend
+ rm -f $(LIB) core *.bak $(obj).depend
#########################################################################
-.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
- $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
--include .depend
+sinclude $(obj).depend
#########################################################################
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [U-Boot] [PATCH 2/3] PXA: Fix missing includes
2010-08-08 13:55 [U-Boot] [PATCH 1/3 v2] PXA: Fix off-the-tree build problems Marek Vasut
@ 2010-08-08 13:55 ` Marek Vasut
2010-08-08 23:15 ` Wolfgang Denk
2010-08-08 13:55 ` [U-Boot] [PATCH 3/3] PXA: Declare __io for vpac270 IDE Marek Vasut
2010-08-08 23:14 ` [U-Boot] [PATCH 1/3 v2] PXA: Fix off-the-tree build problems Wolfgang Denk
2 siblings, 1 reply; 7+ messages in thread
From: Marek Vasut @ 2010-08-08 13:55 UTC (permalink / raw)
To: u-boot
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
board/colibri_pxa270/colibri_pxa270.c | 1 +
board/vpac270/vpac270.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/board/colibri_pxa270/colibri_pxa270.c b/board/colibri_pxa270/colibri_pxa270.c
index d3822f0..84ec38e 100644
--- a/board/colibri_pxa270/colibri_pxa270.c
+++ b/board/colibri_pxa270/colibri_pxa270.c
@@ -21,6 +21,7 @@
#include <common.h>
#include <asm/arch/hardware.h>
+#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/vpac270/vpac270.c b/board/vpac270/vpac270.c
index 48e93ab..18e47e2 100644
--- a/board/vpac270/vpac270.c
+++ b/board/vpac270/vpac270.c
@@ -30,6 +30,7 @@
#include <common.h>
#include <asm/arch/hardware.h>
+#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR;
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/3] PXA: Fix missing includes
2010-08-08 13:55 ` [U-Boot] [PATCH 2/3] PXA: Fix missing includes Marek Vasut
@ 2010-08-08 23:15 ` Wolfgang Denk
0 siblings, 0 replies; 7+ messages in thread
From: Wolfgang Denk @ 2010-08-08 23:15 UTC (permalink / raw)
To: u-boot
Dear Marek Vasut,
In message <1281275752-6466-2-git-send-email-marek.vasut@gmail.com> you wrote:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
> board/colibri_pxa270/colibri_pxa270.c | 1 +
> board/vpac270/vpac270.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I believe you find life such a problem because you think there are
the good people and the bad people. You're wrong, of course. There
are, always and only, the bad people, but some of them are on oppo-
site sides. - Terry Pratchett, _Guards! Guards!_
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 3/3] PXA: Declare __io for vpac270 IDE
2010-08-08 13:55 [U-Boot] [PATCH 1/3 v2] PXA: Fix off-the-tree build problems Marek Vasut
2010-08-08 13:55 ` [U-Boot] [PATCH 2/3] PXA: Fix missing includes Marek Vasut
@ 2010-08-08 13:55 ` Marek Vasut
2010-08-08 23:15 ` Wolfgang Denk
2010-08-08 23:14 ` [U-Boot] [PATCH 1/3 v2] PXA: Fix off-the-tree build problems Wolfgang Denk
2 siblings, 1 reply; 7+ messages in thread
From: Marek Vasut @ 2010-08-08 13:55 UTC (permalink / raw)
To: u-boot
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
include/configs/vpac270.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index 6d02995..d3e22d9 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -228,6 +228,8 @@
#undef CONFIG_IDE_LED
#undef CONFIG_IDE_RESET
+#define __io
+
#define CONFIG_SYS_IDE_MAXBUS 1
#define CONFIG_SYS_IDE_MAXDEVICE 1
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 3/3] PXA: Declare __io for vpac270 IDE
2010-08-08 13:55 ` [U-Boot] [PATCH 3/3] PXA: Declare __io for vpac270 IDE Marek Vasut
@ 2010-08-08 23:15 ` Wolfgang Denk
0 siblings, 0 replies; 7+ messages in thread
From: Wolfgang Denk @ 2010-08-08 23:15 UTC (permalink / raw)
To: u-boot
Dear Marek Vasut,
In message <1281275752-6466-3-git-send-email-marek.vasut@gmail.com> you wrote:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
> include/configs/vpac270.h | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It is dangerous to be sincere unless you are also stupid.
- George Bernard Shaw
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 1/3 v2] PXA: Fix off-the-tree build problems
2010-08-08 13:55 [U-Boot] [PATCH 1/3 v2] PXA: Fix off-the-tree build problems Marek Vasut
2010-08-08 13:55 ` [U-Boot] [PATCH 2/3] PXA: Fix missing includes Marek Vasut
2010-08-08 13:55 ` [U-Boot] [PATCH 3/3] PXA: Declare __io for vpac270 IDE Marek Vasut
@ 2010-08-08 23:14 ` Wolfgang Denk
2 siblings, 0 replies; 7+ messages in thread
From: Wolfgang Denk @ 2010-08-08 23:14 UTC (permalink / raw)
To: u-boot
Dear Marek Vasut,
In message <1281275752-6466-1-git-send-email-marek.vasut@gmail.com> you wrote:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
> V2:
> Add missing $(obj) before .depend in the following line:
> rm -f $(LIB) core *.bak $(obj).depend
>
> board/colibri_pxa270/Makefile | 20 ++++++++++++--------
> board/vpac270/Makefile | 20 ++++++++++++--------
> 2 files changed, 24 insertions(+), 16 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
All these theories, diverse as they are, have two things in common:
they explain the observed facts, and they are completeley and utterly
wrong. - Terry Pratchett, _The Light Fantastic_
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 1/3] PXA: Fix off-the-tree build problems
@ 2010-08-08 0:39 Marek Vasut
2010-08-08 0:39 ` [U-Boot] [PATCH 3/3] PXA: Declare __io for vpac270 IDE Marek Vasut
0 siblings, 1 reply; 7+ messages in thread
From: Marek Vasut @ 2010-08-08 0:39 UTC (permalink / raw)
To: u-boot
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
board/colibri_pxa270/Makefile | 18 +++++++++++-------
board/vpac270/Makefile | 18 +++++++++++-------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/board/colibri_pxa270/Makefile b/board/colibri_pxa270/Makefile
index 44d73cc..59575ca 100644
--- a/board/colibri_pxa270/Makefile
+++ b/board/colibri_pxa270/Makefile
@@ -21,13 +21,17 @@
include $(TOPDIR)/config.mk
-LIB = lib$(BOARD).a
+LIB = $(obj)lib$(BOARD).a
-OBJS := colibri_pxa270.o
+COBJS := colibri_pxa270.o
SOBJS := lowlevel_init.o
-$(LIB): $(OBJS) $(SOBJS)
- $(AR) crv $@ $(OBJS) $(SOBJS)
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB): $(obj).depend $(OBJS) $(SOBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
clean:
rm -f $(SOBJS) $(OBJS)
@@ -37,9 +41,9 @@ distclean: clean
#########################################################################
-.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
- $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
--include .depend
+sinclude $(obj).depend
#########################################################################
diff --git a/board/vpac270/Makefile b/board/vpac270/Makefile
index 0f3eacd..92fc3a0 100644
--- a/board/vpac270/Makefile
+++ b/board/vpac270/Makefile
@@ -24,13 +24,17 @@
include $(TOPDIR)/config.mk
-LIB = lib$(BOARD).a
+LIB = $(obj)lib$(BOARD).a
-OBJS := vpac270.o
+COBJS := vpac270.o
SOBJS := lowlevel_init.o
-$(LIB): $(OBJS) $(SOBJS)
- $(AR) crv $@ $(OBJS) $(SOBJS)
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB): $(obj).depend $(OBJS) $(SOBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
clean:
rm -f $(SOBJS) $(OBJS)
@@ -40,9 +44,9 @@ distclean: clean
#########################################################################
-.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
- $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
--include .depend
+sinclude $(obj).depend
#########################################################################
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-08-08 23:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-08 13:55 [U-Boot] [PATCH 1/3 v2] PXA: Fix off-the-tree build problems Marek Vasut
2010-08-08 13:55 ` [U-Boot] [PATCH 2/3] PXA: Fix missing includes Marek Vasut
2010-08-08 23:15 ` Wolfgang Denk
2010-08-08 13:55 ` [U-Boot] [PATCH 3/3] PXA: Declare __io for vpac270 IDE Marek Vasut
2010-08-08 23:15 ` Wolfgang Denk
2010-08-08 23:14 ` [U-Boot] [PATCH 1/3 v2] PXA: Fix off-the-tree build problems Wolfgang Denk
-- strict thread matches above, loose matches on Subject: below --
2010-08-08 0:39 [U-Boot] [PATCH 1/3] " Marek Vasut
2010-08-08 0:39 ` [U-Boot] [PATCH 3/3] PXA: Declare __io for vpac270 IDE Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox