diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 9ed6c61ab747ad17fa569326dc2971cc6c5949a7..17bd18031dc6822e102085b8f30dc2f5539d7c0f 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -406,7 +406,6 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_SYS_NAND_BASE		(CONFIG_SYS_NAND_ADDR + CONFIG_SYS_NAND_CS)
 #define CONFIG_SYS_NAND_SELECT_DEVICE	1 /* nand driver supports mutipl. chips */
-#define CONFIG_SYS_NAND_QUIET_TEST	1
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	230400	/* speed to run kgdb serial port */
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 281d614de18294c009f29926e4a4e40742ecb411..e5fb474afce805435a57afbf8ff112dc7de99d5e 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -147,7 +147,6 @@
 /*
  * Board NAND Info.
  */
-#define CONFIG_SYS_NAND_QUIET_TEST
 #define CONFIG_NAND_OMAP_GPMC
 #define CONFIG_SYS_NAND_ADDR		NAND_BASE	/* physical address */
 							/* to access nand */
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 69332b647da1d45eef947b278c612e2bb1f01463..f3d1f4352e42b976e5a2d4dc10651a3a08cecf90 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -154,7 +154,6 @@
 /*
  * Board NAND Info.
  */
-#define CONFIG_SYS_NAND_QUIET_TEST
 #define CONFIG_NAND_OMAP_GPMC
 #define CONFIG_SYS_NAND_ADDR		NAND_BASE	/* physical address */
 							/* to access nand */
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index f309b2e83b7103c511dd41c68d4dd5507684bade..bf986f86cb6ce9efa5f2e9f0f45d4483e95d3534 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -121,7 +121,6 @@
 /*
  * Board NAND Info.
  */
-#define CONFIG_SYS_NAND_QUIET_TEST	1
 #define CONFIG_NAND_OMAP_GPMC
 #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of NAND */
 							/* devices */
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 713df3cf80d9b7e7c40e946f087d4cf9274d8233..3f777b6aebc445166df3dd525f99f0a4d65d84bf 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -70,7 +70,6 @@
 /*
  * Board NAND Info.
  */
-#define CONFIG_SYS_NAND_QUIET_TEST	1
 #define CONFIG_NAND_OMAP_GPMC
 #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of NAND */
 							/* devices */
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 8bd36340e7b32e7ab6705c3b5547e9603014b166..ecd56158597f60f3f8f3fe2eae4e2b692f129c76 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -105,7 +105,6 @@
  * Board NAND Info.
  */
 #define CONFIG_SYS_NAND_BASE            NAND_BASE
-#define CONFIG_SYS_NAND_QUIET_TEST
 #define CONFIG_NAND_OMAP_GPMC
 #define CONFIG_SYS_NAND_ADDR		NAND_BASE	/* physical address */
 							/* to access nand */
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 53ff61d10c1f3d655508a4b7ff0f7c1c844e234a..3b1e5d7ff8e5ca0e93bfc37ef6127261f223194f 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -88,7 +88,6 @@
 #endif /* CONFIG_NAND */
 
 /* Board NAND Info. */
-#define CONFIG_SYS_NAND_QUIET_TEST
 #define CONFIG_SYS_NAND_ADDR		NAND_BASE	/* physical address */
 							/* to access nand */
 /* Environment information */
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index fb1bf66d0243bc7edf842b90bc70d70b28d6aa87..edae831f22fb2d1897939bdea1de2514c6e39750 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -97,7 +97,6 @@
 #define CONFIG_NAND_FSMC
 #define CONFIG_SYS_MAX_NAND_DEVICE		1
 #define CONFIG_SYS_NAND_ONFI_DETECTION
-#define CONFIG_SYS_NAND_QUIET_TEST
 
 /*
  * Command support defines
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 408895f3329a2b28445fff7e484f6ed9eb2b84b3..bd1c07c3ebb2bd7999bf81d509c285b97f55f2a8 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -126,7 +126,6 @@
 /*
  * Board NAND Info.
  */
-#define CONFIG_SYS_NAND_QUIET_TEST
 #define CONFIG_NAND_OMAP_GPMC
 #define CONFIG_SYS_NAND_ADDR		NAND_BASE	/* physical address */
 							/* to access nand */
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 669aa53c9138e90216db3456f2360a72067e946a..b5d1126d5978868564475fd1594cfe47ab1386b7 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -138,7 +138,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_NAND_ACTL_CLE 	(1 << 15)	/* C_LA15 */
 #define CONFIG_SYS_NAND_ACTL_NCE	0		/* NCE not controlled by ADDR */
 #define CONFIG_SYS_NAND_ACTL_DELAY	25
-#define CONFIG_SYS_NAND_QUIET_TEST
 #define CONFIG_JFFS2_NAND
 
 /*
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 58ace2cf48717b3710a96c77676cf5c2f192635e..0d2423499d993a203cfcbe12ed2b76ea77f419e6 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -131,7 +131,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_SYS_NAND_BASE_LIST	{CONFIG_SYS_NAND_BASE, \
 					 CONFIG_SYS_NAND_BASE2}
 #define CONFIG_SYS_MAX_NAND_DEVICE	2
-#define CONFIG_SYS_NAND_QUIET_TEST	/* 2nd NAND flash not always populated */
 #define CONFIG_NAND_FSL_ELBC
 
 /*
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 765aaadf105c2e2c4b0ac014e1bdc41d84705e6f..f30d1996c01b87c2b3f01ea7625941904629dac7 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -122,7 +122,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_SYS_NAND_BASE_LIST	{CONFIG_SYS_NAND_BASE, \
 					 CONFIG_SYS_NAND_BASE2}
 #define CONFIG_SYS_MAX_NAND_DEVICE	2
-#define CONFIG_SYS_NAND_QUIET_TEST	/* 2nd NAND flash not always populated */
 #define CONFIG_NAND_FSL_ELBC
 
 /*