* [PATCH 1/2] powerpc/boot/dts: Install dts from the right directory
@ 2011-01-09 0:24 Ben Hutchings
2011-01-09 0:25 ` [PATCH 2/2] powerpc/boot/Makefile: Use $(src) and $(obj) as per makefiles.txt Ben Hutchings
2011-01-11 19:05 ` [PATCH 1/2] powerpc/boot/dts: Install dts from the right directory Gerhard Pircher
0 siblings, 2 replies; 3+ messages in thread
From: Ben Hutchings @ 2011-01-09 0:24 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras; +Cc: linuxppc-dev
The dts-installed variable is initialised using a wildcard path that
will be expanded relative to the build directory. Use the existing
variable dtstree to generate an absolute wildcard path that will work
when building in a separate directory.
Reported-by: Gerhard Pircher <gerhard_pircher@gmx.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Tested-by: Gerhard Pircher <gerhard_pircher@gmx.net> [against 2.6.32]
---
arch/powerpc/boot/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 96deec6..8917816 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -368,7 +368,7 @@ INSTALL :=3D install
extra-installed :=3D $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%, =
$(extra-y))
hostprogs-installed :=3D $(patsubst %, $(DESTDIR)$(WRAPPER_BINDIR)/%, $(ho=
stprogs-y))
wrapper-installed :=3D $(DESTDIR)$(WRAPPER_BINDIR)/wrapper
-dts-installed :=3D $(patsubst $(obj)/dts/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%=
, $(wildcard $(obj)/dts/*.dts))
+dts-installed :=3D $(patsubst $(dtstree)/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%=
, $(wildcard $(dtstree)/*.dts))
=20
all-installed :=3D $(extra-installed) $(hostprogs-installed) $(wrapper-in=
stalled) $(dts-installed)
=20
--=20
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] powerpc/boot/Makefile: Use $(src) and $(obj) as per makefiles.txt
2011-01-09 0:24 [PATCH 1/2] powerpc/boot/dts: Install dts from the right directory Ben Hutchings
@ 2011-01-09 0:25 ` Ben Hutchings
2011-01-11 19:05 ` [PATCH 1/2] powerpc/boot/dts: Install dts from the right directory Gerhard Pircher
1 sibling, 0 replies; 3+ messages in thread
From: Ben Hutchings @ 2011-01-09 0:25 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras; +Cc: linuxppc-dev
$(src) and $(obj) are normally the same, but are supposed to be used
for paths under $(srctree) and $(objtree) respectively.
Also use $(dtstree) and $(wrapper) as appropriate.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
This is totally untested, so please review carefully!
Ben.
arch/powerpc/boot/Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 8917816..bd7abba 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -33,7 +33,7 @@ ifeq ($(call cc-option-yn, -fstack-protector),y)
BOOTCFLAGS +=3D -fno-stack-protector
endif
=20
-BOOTCFLAGS +=3D -I$(obj) -I$(srctree)/$(obj)
+BOOTCFLAGS +=3D -I$(obj) -I$(srctree)/$(src)
=20
DTC_FLAGS ?=3D -p 1024
=20
@@ -399,10 +399,10 @@ $(extra-installed) : $(DESTDIR)$(WRAPPER_OBJDIR)/% : =
$(obj)/% | $(DESTDIR)$(WRAP
$(hostprogs-installed) : $(DESTDIR)$(WRAPPER_BINDIR)/% : $(obj)/% | $(DES=
TDIR)$(WRAPPER_BINDIR)
$(call cmd,install_exe)
=20
-$(dts-installed) : $(DESTDIR)$(WRAPPER_DTSDIR)/% : $(srctree)/$(obj)/dts/%=
| $(DESTDIR)$(WRAPPER_DTSDIR)
+$(dts-installed) : $(DESTDIR)$(WRAPPER_DTSDIR)/% : $(dtstree)/% | $(DESTDI=
R)$(WRAPPER_DTSDIR)
$(call cmd,install_dts)
=20
-$(wrapper-installed): $(DESTDIR)$(WRAPPER_BINDIR) $(srctree)/$(obj)/wrappe=
r | $(DESTDIR)$(WRAPPER_BINDIR)
+$(wrapper-installed): $(DESTDIR)$(WRAPPER_BINDIR) $(wrapper) | $(DESTDIR)$=
(WRAPPER_BINDIR)
$(call cmd,install_wrapper)
=20
$(obj)/bootwrapper_install: $(all-installed)
--=20
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] powerpc/boot/dts: Install dts from the right directory
2011-01-09 0:24 [PATCH 1/2] powerpc/boot/dts: Install dts from the right directory Ben Hutchings
2011-01-09 0:25 ` [PATCH 2/2] powerpc/boot/Makefile: Use $(src) and $(obj) as per makefiles.txt Ben Hutchings
@ 2011-01-11 19:05 ` Gerhard Pircher
1 sibling, 0 replies; 3+ messages in thread
From: Gerhard Pircher @ 2011-01-11 19:05 UTC (permalink / raw)
To: Ben Hutchings, paulus, benh; +Cc: linuxppc-dev
-------- Original-Nachricht --------
> Datum: Sun, 09 Jan 2011 00:24:01 +0000
> Von: Ben Hutchings <ben@decadent.org.uk>
> An: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>
> CC: Gerhard Pircher <gerhard_pircher@gmx.net>, linuxppc-dev@lists.ozlabs.org
> Betreff: [PATCH 1/2] powerpc/boot/dts: Install dts from the right directory
> The dts-installed variable is initialised using a wildcard path that
> will be expanded relative to the build directory. Use the existing
> variable dtstree to generate an absolute wildcard path that will work
> when building in a separate directory.
Wouldn't this patch be a good candidate for the stable kernel series?
> Reported-by: Gerhard Pircher <gerhard_pircher@gmx.net>
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> Tested-by: Gerhard Pircher <gerhard_pircher@gmx.net> [against 2.6.32]
> ---
> arch/powerpc/boot/Makefile | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
> index 96deec6..8917816 100644
> --- a/arch/powerpc/boot/Makefile
> +++ b/arch/powerpc/boot/Makefile
> @@ -368,7 +368,7 @@ INSTALL := install
> extra-installed := $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%,
> $(extra-y))
> hostprogs-installed := $(patsubst %, $(DESTDIR)$(WRAPPER_BINDIR)/%,
> $(hostprogs-y))
> wrapper-installed := $(DESTDIR)$(WRAPPER_BINDIR)/wrapper
> -dts-installed := $(patsubst $(obj)/dts/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%,
> $(wildcard $(obj)/dts/*.dts))
> +dts-installed := $(patsubst $(dtstree)/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%,
> $(wildcard $(dtstree)/*.dts))
>
> all-installed := $(extra-installed) $(hostprogs-installed)
> $(wrapper-installed) $(dts-installed)
>
> --
> 1.7.2.3
Gerhard
--
NEU: FreePhone - kostenlos mobil telefonieren und surfen!
Jetzt informieren: http://www.gmx.net/de/go/freephone
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-11 19:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-09 0:24 [PATCH 1/2] powerpc/boot/dts: Install dts from the right directory Ben Hutchings
2011-01-09 0:25 ` [PATCH 2/2] powerpc/boot/Makefile: Use $(src) and $(obj) as per makefiles.txt Ben Hutchings
2011-01-11 19:05 ` [PATCH 1/2] powerpc/boot/dts: Install dts from the right directory Gerhard Pircher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.