Skip to contentSkip to conversation

cmd_nand: Remove duplicate include

PATCH New Peter Tyser 3 participants 5 messages Oct 15, 2009 – Oct 19, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 cmd_nand: Remove duplicate include

Also remove vague, unnecessary comment

---
 common/cmd_nand.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
common/cmd_nand.c +0 -8
index 158a55f..404ef9c 100644
@@ -9,14 +9,6 @@
  */
 
 #include <common.h>
-
-
-/*
- *
- * New NAND support
- *
- */
-#include <common.h>
 #include <linux/mtd/mtd.h>
 
 #if defined(CONFIG_CMD_NAND)
Signature · 1 line
1.6.2.1
#1 lore raw

PATCH 2/2 cmd_nand: Move conditional compilation to Makefile

---
 common/Makefile   |    2 +-
 common/cmd_nand.c |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)
common/Makefile +1 -1
index 35af8ae..ec025ed 100644
@@ -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
common/cmd_nand.c +0 -4
index 404ef9c..075a8af 100644
@@ -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
Signature · 1 line
1.6.2.1
#2 lore raw

PATCH 2/2 cmd_nand: Move conditional compilation to Makefile

Could you please add some description?

-vimal

Quoted 46 lines · Peter Tyser

---
?common/Makefile ? | ? ?2 +-
?common/cmd_nand.c | ? ?4 ----
?2 files changed, 1 insertions(+), 5 deletions(-)

common/Makefile +0 -0
index 35af8ae..ec025ed 100644
@@ -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

common/Makefile +1 -1
-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

common/cmd_nand.c +0 -0
index 404ef9c..075a8af 100644
@@ -10,9 +10,6 @@
 

?#include <common.h>
?#include <linux/mtd/mtd.h>

common/cmd_nand.c +0 -3
-
-#if defined(CONFIG_CMD_NAND)
-

?#include <command.h>
?#include <watchdog.h>
?#include <malloc.h>

common/cmd_nand.c +0 -0
@@ -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

Signature · 2 lines
Regards,
Vimal Singh
#3 lore raw

PATCH 2/2 cmd_nand: Move conditional compilation to Makefile

Hi Vimal,

Quoted 1 line · vimal singh

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