mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: [PATCH] fixup! mvebu: create bbu handler for kwb images and use it on cubox
Date: Tue, 12 Jun 2018 07:42:14 +0200	[thread overview]
Message-ID: <20180612054214.23261-1-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20180611203822.dpc6qtgvydg66veg@pengutronix.de>

---
 arch/arm/mach-mvebu/Makefile           | 2 +-
 arch/arm/mach-mvebu/include/mach/bbu.h | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index cc2b926438e4..6079403b83dd 100644
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -1,8 +1,8 @@
 obj-pbl-y			+= common.o
-obj-y				+= kwb_bbu.o
 obj-$(CONFIG_ARCH_ARMADA_370)	+= armada-370-xp.o
 obj-$(CONFIG_ARCH_ARMADA_XP)	+= armada-370-xp.o
 obj-$(CONFIG_ARCH_ARMADA_38X)	+= armada-370-xp.o
 obj-$(CONFIG_ARCH_DOVE)		+= dove.o
 obj-$(CONFIG_ARCH_KIRKWOOD)	+= kirkwood.o
+obj-$(CONFIG_BAREBOX_UPDATE)	+= kwb_bbu.o
 obj-$(CONFIG_BOOTM)		+= kwbootimage.o
diff --git a/arch/arm/mach-mvebu/include/mach/bbu.h b/arch/arm/mach-mvebu/include/mach/bbu.h
index f1021e52ce9f..a06db2b1442e 100644
--- a/arch/arm/mach-mvebu/include/mach/bbu.h
+++ b/arch/arm/mach-mvebu/include/mach/bbu.h
@@ -1,3 +1,12 @@
+#ifdef CONFIG_BAREBOX_UPDATE
 int mvebu_bbu_flash_register_handler(const char *name,
 				     char *devicefile, int version,
 				     bool isdefault);
+#else
+int mvebu_bbu_flash_register_handler(const char *name,
+                                     char *devicefile, int version,
+                                     bool isdefault)
+{
+	return -ENOSYS;
+}
+#endif
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2018-06-12  5:42 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-08  8:42 [PATCH] " Uwe Kleine-König
2018-06-11  6:43 ` Sascha Hauer
2018-06-11  6:49   ` Uwe Kleine-König
2018-06-11  6:58   ` Sascha Hauer
2018-06-11 20:38 ` Sascha Hauer
2018-06-12  5:42   ` Uwe Kleine-König [this message]
2018-06-13  8:28     ` [PATCH] fixup! " Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180612054214.23261-1-u.kleine-koenig@pengutronix.de \
    --to=u.kleine-koenig@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox