| Message ID | 1432403949-11604-1-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
Hi Simon, On Sat, May 23, 2015 at 12:59 PM, Simon Glass <sjg@chromium.org> wrote: > A conflict between the PMIC and unit test work means that the sandbox test > device tree file is no-longer built. Fix this. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- Acked-by: Joe Hershberger <joe.hershberger@ni.com> Thanks, -Joe
On 25 May 2015 at 11:00, Joe Hershberger <joe.hershberger@gmail.com> wrote: > Hi Simon, > > On Sat, May 23, 2015 at 12:59 PM, Simon Glass <sjg@chromium.org> wrote: >> A conflict between the PMIC and unit test work means that the sandbox test >> device tree file is no-longer built. Fix this. >> >> Signed-off-by: Simon Glass <sjg@chromium.org> >> --- > > Acked-by: Joe Hershberger <joe.hershberger@ni.com> > > Thanks, > -Joe Applied to u-boot-dm.
diff --git a/arch/sandbox/dts/Makefile b/arch/sandbox/dts/Makefile index 562a078..517b555 100644 --- a/arch/sandbox/dts/Makefile +++ b/arch/sandbox/dts/Makefile @@ -1,5 +1,5 @@ dtb-$(CONFIG_SANDBOX) += sandbox.dtb -dtb-$(CONFIG_DM_TEST) += test.dtb +dtb-$(CONFIG_UT_DM) += test.dtb targets += $(dtb-y)
A conflict between the PMIC and unit test work means that the sandbox test device tree file is no-longer built. Fix this. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/sandbox/dts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)