[U-Boot] [PATCH 1/2] cmd_nand: Remove duplicate include

[U-Boot] [PATCH 1/2] cmd_nand: Remove duplicate include

[Peter Tyser]

Also remove vague, unnecessary comment

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
---
 common/cmd_nand.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 158a55f..404ef9c 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -9,14 +9,6 @@
  */
 
 #include <common.h>
-
-
-/*
- *
- * New NAND support
- *
- */
-#include <common.h>
 #include <linux/mtd/mtd.h>
 
 #if defined(CONFIG_CMD_NAND)
-- 
1.6.2.1

[U-Boot] [PATCH 2/2] cmd_nand: Move conditional compilation to Makefile

[Peter Tyser]

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
---
 common/Makefile   |    2 +-
 common/cmd_nand.c |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/common/Makefile b/common/Makefile
index 35af8ae..ec025ed 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -120,7 +120,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 404ef9c..075a8af 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -10,9 +10,6 @@
 
 #include <common.h>
 #include <linux/mtd/mtd.h>
-
-#if defined(CONFIG_CMD_NAND)
-
 #include <command.h>
 #include <watchdog.h>
 #include <malloc.h>
@@ -678,4 +675,3 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot,
 	"boot from NAND device",
 	"[partition] | [[[loadAddr] dev] offset]"
 );
-#endif
-- 
1.6.2.1

[U-Boot] [PATCH 2/2] cmd_nand: Move conditional compilation to Makefile

[vimal singh]

Could you please add some description?

-vimal

On Thu, Oct 15, 2009 at 9:18 PM, Peter Tyser <ptyser@xes-inc.com> wrote:
> Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
> ---
> ?common/Makefile ? | ? ?2 +-
> ?common/cmd_nand.c | ? ?4 ----
> ?2 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/common/Makefile b/common/Makefile
> index 35af8ae..ec025ed 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -120,7 +120,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 404ef9c..075a8af 100644
> --- a/common/cmd_nand.c
> +++ b/common/cmd_nand.c
> @@ -10,9 +10,6 @@
>
> ?#include <common.h>
> ?#include <linux/mtd/mtd.h>
> -
> -#if defined(CONFIG_CMD_NAND)
> -
> ?#include <command.h>
> ?#include <watchdog.h>
> ?#include <malloc.h>
> @@ -678,4 +675,3 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot,
> ? ? ? ?"boot from NAND device",
> ? ? ? ?"[partition] | [[[loadAddr] dev] offset]"
> ?);
> -#endif
> --
> 1.6.2.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>



-- 
Regards,
Vimal Singh

[U-Boot] [PATCH 2/2] cmd_nand: Move conditional compilation to Makefile

[Peter Tyser]

Hi Vimal,

On Fri, 2009-10-16 at 17:03 +0530, vimal singh wrote:
> Could you please add some description?

I personally think the patch title has plenty of description.  The
change is trivial, and similar changes (with similar
titles/descriptions) have been accepted many times in the past.

Best,
Peter

[U-Boot] [PATCH 1/2] cmd_nand: Remove duplicate include

[Scott Wood]

On Thu, Oct 15, 2009 at 10:48:17AM -0500, Peter Tyser wrote:
> Also remove vague, unnecessary comment
> 
> Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

Applied both patches to u-boot-nand-flash/next

-Scott