All of lore.kernel.org
 help / color / mirror / Atom feed
From: Robert P. J. Day <rpjday@crashcourse.ca>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] Move preprocessor test for cmd_nand.c to Makefile
Date: Thu, 19 Nov 2009 11:08:17 -0500 (EST)	[thread overview]
Message-ID: <alpine.LFD.2.00.0911191105530.9676@localhost> (raw)


Move the CONFIG_CMD_NAND preprocessor test out of common/cmd_nand.c
and into the Makefile for consistency with other commands.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---

  AFAICT, this doesn't affect any functionality, right?

diff --git a/common/Makefile b/common/Makefile
index 3781738..b8c596c 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -116,7 +116,7 @@ COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o
 COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
 COBJS-$(CONFIG_MP) += cmd_mp.o
 COBJS-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o
-COBJS-y += cmd_nand.o
+COBJS-$(CONFIG_CMD_NAND) += cmd_nand.o
 COBJS-$(CONFIG_CMD_NET) += cmd_net.o
 COBJS-$(CONFIG_CMD_ONENAND) += cmd_onenand.o
 COBJS-$(CONFIG_CMD_OTP) += cmd_otp.o
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 158a55f..1b17159 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -19,8 +19,6 @@
 #include <common.h>
 #include <linux/mtd/mtd.h>

-#if defined(CONFIG_CMD_NAND)
-
 #include <command.h>
 #include <watchdog.h>
 #include <malloc.h>
@@ -686,4 +684,3 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot,
 	"boot from NAND device",
 	"[partition] | [[[loadAddr] dev] offset]"
 );
-#endif

========================================================================
Robert P. J. Day                               Waterloo, Ontario, CANADA

            Linux Consulting, Training and Kernel Pedantry.

Web page:                                          http://crashcourse.ca
Twitter:                                       http://twitter.com/rpjday
========================================================================

             reply	other threads:[~2009-11-19 16:08 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-19 16:08 Robert P. J. Day [this message]
2009-11-19 16:15 ` [U-Boot] [PATCH] Move preprocessor test for cmd_nand.c to Makefile Peter Tyser
2009-11-19 18:34   ` Scott Wood

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=alpine.LFD.2.00.0911191105530.9676@localhost \
    --to=rpjday@crashcourse.ca \
    --cc=u-boot@lists.denx.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 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.