[U-Boot] [PATCH 1/3 v2] PXA: Fix off-the-tree build problems
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
#########################################################################
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;
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
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
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
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
participants (2)
-
Marek Vasut -
Wolfgang Denk