Browse Source

[BUILD] conditionally compile common/cmd_*.c in common/Makefile

Modify common/Makefile to conditionally compile the cmd_*.c files based
on the board config.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Grant Likely 17 years ago
parent
commit
4a43719a77

+ 45 - 37
common/Makefile

@@ -33,53 +33,61 @@ COBJS-y += altera.o
 COBJS-y += bedbug.o
 COBJS-y += bedbug.o
 COBJS-y += circbuf.o
 COBJS-y += circbuf.o
 COBJS-y += cmd_autoscript.o
 COBJS-y += cmd_autoscript.o
-COBJS-y += cmd_bdinfo.o
-COBJS-y += cmd_bedbug.o
-COBJS-y += cmd_bmp.o
+COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o
+COBJS-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o
+COBJS-$(CONFIG_CMD_BMP) += cmd_bmp.o
 COBJS-y += cmd_boot.o
 COBJS-y += cmd_boot.o
 COBJS-y += cmd_bootm.o
 COBJS-y += cmd_bootm.o
-COBJS-y += cmd_cache.o
-COBJS-y += cmd_console.o
-COBJS-y += cmd_date.o
-COBJS-y += cmd_dcr.o
-COBJS-y += cmd_diag.o
-COBJS-y += cmd_display.o
-COBJS-y += cmd_doc.o
-COBJS-y += cmd_dtt.o
+COBJS-$(CONFIG_CMD_CACHE) += cmd_cache.o
+COBJS-$(CONFIG_CMD_CONSOLE) += cmd_console.o
+COBJS-$(CONFIG_CMD_DATE) += cmd_date.o
+ifdef CONFIG_4xx
+COBJS-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o
+endif
+ifdef CONFIG_POST
+COBJS-$(CONFIG_CMD_DIAG) += cmd_diag.o
+endif
+COBJS-$(CONFIG_CMD_DISPLAY) += cmd_display.o
+COBJS-$(CONFIG_CMD_DOC) += cmd_doc.o
+COBJS-$(CONFIG_CMD_DTT) += cmd_dtt.o
 COBJS-y += cmd_eeprom.o
 COBJS-y += cmd_eeprom.o
-COBJS-y += cmd_elf.o
-COBJS-y += cmd_ext2.o
-COBJS-y += cmd_fat.o
+COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o
+COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
+COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o
 COBJS-y += cmd_fdc.o
 COBJS-y += cmd_fdc.o
-COBJS-y += cmd_fdt.o
-COBJS-y += cmd_fdos.o
-COBJS-y += cmd_flash.o
-COBJS-y += cmd_fpga.o
-COBJS-y += cmd_i2c.o
-COBJS-y += cmd_ide.o
-COBJS-y += cmd_immap.o
-COBJS-y += cmd_itest.o
-COBJS-y += cmd_jffs2.o
+COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o
+COBJS-$(CONFIG_CMD_FDOS) += cmd_fdos.o
+COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o
+ifdef CONFIG_FPGA
+COBJS-$(CONFIG_CMD_FPGA) += cmd_fpga.o
+endif
+COBJS-$(CONFIG_CMD_I2C) += cmd_i2c.o
+COBJS-$(CONFIG_CMD_IDE) += cmd_ide.o
+COBJS-$(CONFIG_CMD_IMMAP) += cmd_immap.o
+COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o
+COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o
 COBJS-y += cmd_load.o
 COBJS-y += cmd_load.o
-COBJS-y += cmd_log.o
+COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
 COBJS-y += cmd_mem.o
 COBJS-y += cmd_mem.o
-COBJS-y += cmd_mii.o
-COBJS-y += cmd_misc.o
-COBJS-y += cmd_mmc.o
+COBJS-$(CONFIG_CMD_MII) += cmd_mii.o
+COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o
+COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
 COBJS-y += cmd_nand.o
 COBJS-y += cmd_nand.o
-COBJS-y += cmd_net.o
+COBJS-$(CONFIG_CMD_NET) += cmd_net.o
 COBJS-y += cmd_nvedit.o
 COBJS-y += cmd_nvedit.o
 COBJS-y += cmd_onenand.o
 COBJS-y += cmd_onenand.o
-COBJS-y += cmd_pci.o
+ifdef CONFIG_PCI
+COBJS-$(CONFIG_CMD_PCI) += cmd_pci.o
+endif
 COBJS-y += cmd_pcmcia.o
 COBJS-y += cmd_pcmcia.o
-COBJS-y += cmd_portio.o
-COBJS-y += cmd_reginfo.o
-COBJS-y += cmd_reiser.o
+COBJS-$(CONFIG_CMD_PORTIO) += cmd_portio.o
+COBJS-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o
+COBJS-$(CONFIG_CMD_REISER) += cmd_reiser.o
 COBJS-y += cmd_sata.o
 COBJS-y += cmd_sata.o
-COBJS-y += cmd_scsi.o
-COBJS-y += cmd_spi.o
-COBJS-y += cmd_universe.o
-COBJS-y += cmd_usb.o
+COBJS-$(CONFIG_CMD_SCSI) += cmd_scsi.o
+COBJS-$(CONFIG_CMD_SPI) += cmd_spi.o
+COBJS-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o
+COBJS-$(CONFIG_CMD_USB) += cmd_usb.o
 COBJS-y += cmd_vfd.o
 COBJS-y += cmd_vfd.o
 COBJS-y += command.o
 COBJS-y += command.o
 COBJS-y += console.o
 COBJS-y += console.o
@@ -123,7 +131,7 @@ COBJS-y += xilinx.o
 COBJS-y += crc16.o
 COBJS-y += crc16.o
 COBJS-y += xyzModem.o
 COBJS-y += xyzModem.o
 COBJS-y += cmd_mac.o
 COBJS-y += cmd_mac.o
-COBJS-y += cmd_mfsl.o
+COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o
 
 
 COBJS	:= $(COBJS-y)
 COBJS	:= $(COBJS-y)
 SRCS	:= $(AOBJS:.o=.S) $(COBJS:.o=.c)
 SRCS	:= $(AOBJS:.o=.S) $(COBJS:.o=.c)

+ 0 - 2
common/cmd_bdinfo.c

@@ -30,7 +30,6 @@
 
 
 DECLARE_GLOBAL_DATA_PTR;
 DECLARE_GLOBAL_DATA_PTR;
 
 
-#if defined(CONFIG_CMD_BDI)
 static void print_num(const char *, ulong);
 static void print_num(const char *, ulong);
 
 
 #ifndef CONFIG_ARM	/* PowerPC and other */
 #ifndef CONFIG_ARM	/* PowerPC and other */
@@ -350,4 +349,3 @@ U_BOOT_CMD(
 	"bdinfo  - print Board Info structure\n",
 	"bdinfo  - print Board Info structure\n",
 	NULL
 	NULL
 );
 );
-#endif

+ 0 - 3
common/cmd_bedbug.c

@@ -13,8 +13,6 @@
 
 
 DECLARE_GLOBAL_DATA_PTR;
 DECLARE_GLOBAL_DATA_PTR;
 
 
-#if defined(CONFIG_CMD_BEDBUG)
-
 #ifndef MAX
 #ifndef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 #endif
@@ -413,7 +411,6 @@ int do_bedbug_rdump (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD (rdump, 1, 1, do_bedbug_rdump,
 U_BOOT_CMD (rdump, 1, 1, do_bedbug_rdump,
 	    "rdump   - Show registers.\n", " - Show registers.\n");
 	    "rdump   - Show registers.\n", " - Show registers.\n");
 /* ====================================================================== */
 /* ====================================================================== */
-#endif
 
 
 
 
 /*
 /*

+ 0 - 4
common/cmd_bmp.c

@@ -31,8 +31,6 @@
 #include <asm/byteorder.h>
 #include <asm/byteorder.h>
 #include <malloc.h>
 #include <malloc.h>
 
 
-#if defined(CONFIG_CMD_BMP)
-
 static int bmp_info (ulong addr);
 static int bmp_info (ulong addr);
 static int bmp_display (ulong addr, int x, int y);
 static int bmp_display (ulong addr, int x, int y);
 
 
@@ -187,5 +185,3 @@ static int bmp_display(ulong addr, int x, int y)
 # error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO
 # error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO
 #endif
 #endif
 }
 }
-
-#endif /* defined(CONFIG_CMD_BMP) */

+ 0 - 4
common/cmd_console.c

@@ -28,8 +28,6 @@
 #include <command.h>
 #include <command.h>
 #include <devices.h>
 #include <devices.h>
 
 
-#if defined(CONFIG_CMD_CONSOLE)
-
 extern void _do_coninfo (void);
 extern void _do_coninfo (void);
 int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
 int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
 {
 {
@@ -67,5 +65,3 @@ U_BOOT_CMD(
 	"coninfo - print console devices and information\n",
 	"coninfo - print console devices and information\n",
 	""
 	""
 );
 );
-
-#endif

+ 0 - 4
common/cmd_date.c

@@ -31,8 +31,6 @@
 
 
 DECLARE_GLOBAL_DATA_PTR;
 DECLARE_GLOBAL_DATA_PTR;
 
 
-#if defined(CONFIG_CMD_DATE)
-
 const char *weekdays[] = {
 const char *weekdays[] = {
 	"Sun", "Mon", "Tues", "Wednes", "Thurs", "Fri", "Satur",
 	"Sun", "Mon", "Tues", "Wednes", "Thurs", "Fri", "Satur",
 };
 };
@@ -210,5 +208,3 @@ U_BOOT_CMD(
 	"  - with numeric argument: set the system date & time\n"
 	"  - with numeric argument: set the system date & time\n"
 	"  - with 'reset' argument: reset the RTC\n"
 	"  - with 'reset' argument: reset the RTC\n"
 );
 );
-
-#endif

+ 0 - 4
common/cmd_dcr.c

@@ -29,8 +29,6 @@
 #include <config.h>
 #include <config.h>
 #include <command.h>
 #include <command.h>
 
 
-#if defined(CONFIG_4xx) && defined(CONFIG_CMD_SETGETDCR)
-
 unsigned long get_dcr (unsigned short);
 unsigned long get_dcr (unsigned short);
 unsigned long set_dcr (unsigned short, unsigned long);
 unsigned long set_dcr (unsigned short, unsigned long);
 
 
@@ -245,5 +243,3 @@ U_BOOT_CMD(
 	"setidcr - Set a register value via indirect DCR addressing\n",
 	"setidcr - Set a register value via indirect DCR addressing\n",
 	"adr_dcrn[.dat_dcrn] offset value - write offset to adr_dcrn, write value to dat_dcrn.\n"
 	"adr_dcrn[.dat_dcrn] offset value - write offset to adr_dcrn, write value to dat_dcrn.\n"
 );
 );
-
-#endif

+ 0 - 4
common/cmd_diag.c

@@ -28,8 +28,6 @@
 #include <command.h>
 #include <command.h>
 #include <post.h>
 #include <post.h>
 
 
-#if defined(CONFIG_CMD_DIAG) && defined(CONFIG_POST)
-
 int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
 {
 	unsigned int i;
 	unsigned int i;
@@ -76,5 +74,3 @@ U_BOOT_CMD(
 	"diag run [test1 [test2]]\n"
 	"diag run [test1 [test2]]\n"
 	"         - run specified tests\n"
 	"         - run specified tests\n"
 );
 );
-
-#endif

+ 0 - 4
common/cmd_display.c

@@ -24,8 +24,6 @@
 #include <common.h>
 #include <common.h>
 #include <command.h>
 #include <command.h>
 
 
-#if defined(CONFIG_CMD_DISPLAY)
-
 #undef DEBUG_DISP
 #undef DEBUG_DISP
 
 
 #define DISP_SIZE	8
 #define DISP_SIZE	8
@@ -78,5 +76,3 @@ U_BOOT_CMD(
 	"    - with <string> argument: display <string> on dot matrix display\n"
 	"    - with <string> argument: display <string> on dot matrix display\n"
 	"    - without arguments: clear dot matrix display\n"
 	"    - without arguments: clear dot matrix display\n"
 );
 );
-
-#endif

+ 0 - 5
common/cmd_doc.c

@@ -11,9 +11,6 @@
 #include <command.h>
 #include <command.h>
 #include <malloc.h>
 #include <malloc.h>
 #include <asm/io.h>
 #include <asm/io.h>
-
-#if defined(CONFIG_CMD_DOC)
-
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/doc2000.h>
 #include <linux/mtd/doc2000.h>
 
 
@@ -1607,5 +1604,3 @@ void doc_probe(unsigned long physadr)
 		puts ("No DiskOnChip found\n");
 		puts ("No DiskOnChip found\n");
 	}
 	}
 }
 }
-
-#endif

+ 0 - 4
common/cmd_dtt.c

@@ -25,8 +25,6 @@
 #include <config.h>
 #include <config.h>
 #include <command.h>
 #include <command.h>
 
 
-#if defined(CONFIG_CMD_DTT)
-
 #include <dtt.h>
 #include <dtt.h>
 #include <i2c.h>
 #include <i2c.h>
 
 
@@ -60,5 +58,3 @@ U_BOOT_CMD(
 	  "dtt     - Digital Thermometer and Thermostat\n",
 	  "dtt     - Digital Thermometer and Thermostat\n",
 	  "        - Read temperature from digital thermometer and thermostat.\n"
 	  "        - Read temperature from digital thermometer and thermostat.\n"
 );
 );
-
-#endif

+ 0 - 4
common/cmd_elf.c

@@ -23,8 +23,6 @@
 DECLARE_GLOBAL_DATA_PTR;
 DECLARE_GLOBAL_DATA_PTR;
 #endif
 #endif
 
 
-#if defined(CONFIG_CMD_ELF)
-
 #ifndef MAX
 #ifndef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 #endif
@@ -323,5 +321,3 @@ U_BOOT_CMD(
 	"bootvx  - Boot vxWorks from an ELF image\n",
 	"bootvx  - Boot vxWorks from an ELF image\n",
 	" [address] - load address of vxWorks ELF image.\n"
 	" [address] - load address of vxWorks ELF image.\n"
 );
 );
-
-#endif

+ 0 - 4
common/cmd_ext2.c

@@ -34,8 +34,6 @@
  */
  */
 #include <common.h>
 #include <common.h>
 #include <part.h>
 #include <part.h>
-
-#if defined(CONFIG_CMD_EXT2)
 #include <config.h>
 #include <config.h>
 #include <command.h>
 #include <command.h>
 #include <image.h>
 #include <image.h>
@@ -259,5 +257,3 @@ U_BOOT_CMD(
 	"    - load binary file 'filename' from 'dev' on 'interface'\n"
 	"    - load binary file 'filename' from 'dev' on 'interface'\n"
 	"      to address 'addr' from ext2 filesystem\n"
 	"      to address 'addr' from ext2 filesystem\n"
 );
 );
-
-#endif

+ 0 - 7
common/cmd_fat.c

@@ -30,11 +30,6 @@
 #include <net.h>
 #include <net.h>
 #include <ata.h>
 #include <ata.h>
 #include <part.h>
 #include <part.h>
-
-#if defined(CONFIG_CMD_FAT)
-
-#undef	DEBUG
-
 #include <fat.h>
 #include <fat.h>
 
 
 
 
@@ -323,5 +318,3 @@ void hexdump (int cnt, unsigned char *data)
 	}
 	}
 }
 }
 #endif	/* NOT_IMPLEMENTED_YET */
 #endif	/* NOT_IMPLEMENTED_YET */
-
-#endif

+ 0 - 4
common/cmd_fdos.c

@@ -31,8 +31,6 @@
 #include <command.h>
 #include <command.h>
 #include <fdc.h>
 #include <fdc.h>
 
 
-#if defined(CONFIG_CMD_FDOS)
-
 /*-----------------------------------------------------------------------------
 /*-----------------------------------------------------------------------------
  * do_fdosboot --
  * do_fdosboot --
  *-----------------------------------------------------------------------------
  *-----------------------------------------------------------------------------
@@ -153,5 +151,3 @@ U_BOOT_CMD(
 	"fdosls  - list files in a directory\n",
 	"fdosls  - list files in a directory\n",
 	"[directory]\n"
 	"[directory]\n"
 );
 );
-
-#endif

+ 0 - 5
common/cmd_fdt.c

@@ -28,9 +28,6 @@
 #include <command.h>
 #include <command.h>
 #include <linux/ctype.h>
 #include <linux/ctype.h>
 #include <linux/types.h>
 #include <linux/types.h>
-
-#ifdef CONFIG_OF_LIBFDT
-
 #include <asm/global_data.h>
 #include <asm/global_data.h>
 #include <fdt.h>
 #include <fdt.h>
 #include <libfdt.h>
 #include <libfdt.h>
@@ -692,5 +689,3 @@ U_BOOT_CMD(
 	"          fdt print /cpus \"#address-cells\"\n"
 	"          fdt print /cpus \"#address-cells\"\n"
 	"          fdt set   /cpus \"#address-cells\" \"[00 00 00 01]\"\n"
 	"          fdt set   /cpus \"#address-cells\" \"[00 00 00 01]\"\n"
 );
 );
-
-#endif /* CONFIG_OF_LIBFDT */

+ 0 - 4
common/cmd_flash.c

@@ -31,8 +31,6 @@
 #include <dataflash.h>
 #include <dataflash.h>
 #endif
 #endif
 
 
-#if defined(CONFIG_CMD_FLASH)
-
 #if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
 #if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
 #include <jffs2/jffs2.h>
 #include <jffs2/jffs2.h>
 
 
@@ -731,5 +729,3 @@ U_BOOT_CMD(
 #undef	TMP_ERASE
 #undef	TMP_ERASE
 #undef	TMP_PROT_ON
 #undef	TMP_PROT_ON
 #undef	TMP_PROT_OFF
 #undef	TMP_PROT_OFF
-
-#endif

+ 0 - 3
common/cmd_fpga.c

@@ -43,8 +43,6 @@
 #define PRINTF(fmt,args...)
 #define PRINTF(fmt,args...)
 #endif
 #endif
 
 
-#if defined (CONFIG_FPGA) && defined(CONFIG_CMD_FPGA)
-
 /* Local functions */
 /* Local functions */
 static void fpga_usage (cmd_tbl_t * cmdtp);
 static void fpga_usage (cmd_tbl_t * cmdtp);
 static int fpga_get_op (char *opstr);
 static int fpga_get_op (char *opstr);
@@ -321,4 +319,3 @@ U_BOOT_CMD (fpga, 6, 1, do_fpga,
 	    "\tloadb\tLoad device from bitstream buffer (Xilinx devices only)\n"
 	    "\tloadb\tLoad device from bitstream buffer (Xilinx devices only)\n"
 	    "\tloadmk\tLoad device generated with mkimage\n"
 	    "\tloadmk\tLoad device generated with mkimage\n"
 	    "\tdump\tLoad device to memory buffer\n");
 	    "\tdump\tLoad device to memory buffer\n");
-#endif

+ 0 - 5
common/cmd_i2c.c

@@ -86,9 +86,6 @@
 #include <i2c.h>
 #include <i2c.h>
 #include <asm/byteorder.h>
 #include <asm/byteorder.h>
 
 
-#if defined(CONFIG_CMD_I2C)
-
-
 /* Display values from last command.
 /* Display values from last command.
  * Memory modify remembered values are different from display memory.
  * Memory modify remembered values are different from display memory.
  */
  */
@@ -1024,5 +1021,3 @@ U_BOOT_CMD(
 	"      (valid chip values 50..57)\n"
 	"      (valid chip values 50..57)\n"
 );
 );
 #endif
 #endif
-
-#endif

+ 0 - 4
common/cmd_ide.c

@@ -68,8 +68,6 @@ DECLARE_GLOBAL_DATA_PTR;
 # define SYNC		/* nothing */
 # define SYNC		/* nothing */
 #endif
 #endif
 
 
-#if defined(CONFIG_CMD_IDE)
-
 #ifdef CONFIG_IDE_8xx_DIRECT
 #ifdef CONFIG_IDE_8xx_DIRECT
 /* Timings for IDE Interface
 /* Timings for IDE Interface
  *
  *
@@ -2081,5 +2079,3 @@ U_BOOT_CMD(
 	"diskboot- boot from IDE device\n",
 	"diskboot- boot from IDE device\n",
 	"loadAddr dev:part\n"
 	"loadAddr dev:part\n"
 );
 );
-
-#endif

+ 1 - 4
common/cmd_immap.c

@@ -28,8 +28,7 @@
 #include <common.h>
 #include <common.h>
 #include <command.h>
 #include <command.h>
 
 
-#if defined(CONFIG_CMD_IMMAP) && \
-    (defined(CONFIG_8xx) || defined(CONFIG_8260))
+#if defined(CONFIG_8xx) || defined(CONFIG_8260)
 
 
 #if defined(CONFIG_8xx)
 #if defined(CONFIG_8xx)
 #include <asm/8xx_immap.h>
 #include <asm/8xx_immap.h>
@@ -41,9 +40,7 @@
 #include <asm/iopin_8260.h>
 #include <asm/iopin_8260.h>
 #endif
 #endif
 
 
-#if defined(CONFIG_8xx) || defined(CONFIG_8260)
 DECLARE_GLOBAL_DATA_PTR;
 DECLARE_GLOBAL_DATA_PTR;
-#endif
 
 
 static void
 static void
 unimplemented ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 unimplemented ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])

+ 0 - 3
common/cmd_itest.c

@@ -32,8 +32,6 @@
 #include <config.h>
 #include <config.h>
 #include <command.h>
 #include <command.h>
 
 
-#if defined(CONFIG_CMD_ITEST)
-
 #define EQ	0
 #define EQ	0
 #define NE	1
 #define NE	1
 #define LT	2
 #define LT	2
@@ -197,4 +195,3 @@ U_BOOT_CMD(
 	"itest\t- return true/false on integer compare\n",
 	"itest\t- return true/false on integer compare\n",
 	"[.b, .w, .l, .s] [*]value1 <op> [*]value2\n"
 	"[.b, .w, .l, .s] [*]value1 <op> [*]value2\n"
 );
 );
-#endif

+ 0 - 5
common/cmd_jffs2.c

@@ -93,9 +93,6 @@
 #include <jffs2/jffs2.h>
 #include <jffs2/jffs2.h>
 #include <linux/list.h>
 #include <linux/list.h>
 #include <linux/ctype.h>
 #include <linux/ctype.h>
-
-#if defined(CONFIG_CMD_JFFS2)
-
 #include <cramfs/cramfs_fs.h>
 #include <cramfs/cramfs_fs.h>
 
 
 #if defined(CONFIG_CMD_NAND)
 #if defined(CONFIG_CMD_NAND)
@@ -2191,5 +2188,3 @@ U_BOOT_CMD(
 #endif /* #ifdef CONFIG_JFFS2_CMDLINE */
 #endif /* #ifdef CONFIG_JFFS2_CMDLINE */
 
 
 /***************************************************/
 /***************************************************/
-
-#endif

+ 0 - 4
common/cmd_log.c

@@ -48,8 +48,6 @@
 
 
 DECLARE_GLOBAL_DATA_PTR;
 DECLARE_GLOBAL_DATA_PTR;
 
 
-#if defined(CONFIG_LOGBUFFER)
-
 /* Local prototypes */
 /* Local prototypes */
 static void logbuff_putc (const char c);
 static void logbuff_putc (const char c);
 static void logbuff_puts (const char *s);
 static void logbuff_puts (const char *s);
@@ -287,5 +285,3 @@ static int logbuff_printk(const char *line)
 	}
 	}
 	return i;
 	return i;
 }
 }
-
-#endif /* (CONFIG_LOGBUFFER) */

+ 0 - 4
common/cmd_mfsl.c

@@ -29,8 +29,6 @@
 #include <common.h>
 #include <common.h>
 #include <config.h>
 #include <config.h>
 #include <command.h>
 #include <command.h>
-
-#if defined(CONFIG_CMD_MFSL)
 #include <asm/asm.h>
 #include <asm/asm.h>
 
 
 int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
@@ -413,5 +411,3 @@ U_BOOT_CMD (rspr, 3, 1, do_rspr,
 		" 1 - MSR - Machine status register\n"
 		" 1 - MSR - Machine status register\n"
 		" 3 - EAR - Exception address register\n"
 		" 3 - EAR - Exception address register\n"
 		" 5 - ESR - Exception status register\n");
 		" 5 - ESR - Exception status register\n");
-
-#endif

+ 0 - 4
common/cmd_mii.c

@@ -27,8 +27,6 @@
 
 
 #include <common.h>
 #include <common.h>
 #include <command.h>
 #include <command.h>
-
-#if defined(CONFIG_CMD_MII)
 #include <miiphy.h>
 #include <miiphy.h>
 
 
 #ifdef CONFIG_TERSE_MII
 #ifdef CONFIG_TERSE_MII
@@ -598,5 +596,3 @@ U_BOOT_CMD(
 );
 );
 
 
 #endif /* CONFIG_TERSE_MII */
 #endif /* CONFIG_TERSE_MII */
-
-#endif

+ 0 - 4
common/cmd_misc.c

@@ -27,8 +27,6 @@
 #include <common.h>
 #include <common.h>
 #include <command.h>
 #include <command.h>
 
 
-#if defined(CONFIG_CMD_MISC)
-
 int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 {
 	ulong start = get_timer(0);
 	ulong start = get_timer(0);
@@ -68,5 +66,3 @@ U_BOOT_CMD(
 	"N\n"
 	"N\n"
 	"    - delay execution for N seconds (N is _decimal_ !!!)\n"
 	"    - delay execution for N seconds (N is _decimal_ !!!)\n"
 );
 );
-
-#endif

+ 0 - 5
common/cmd_mmc.c

@@ -23,9 +23,6 @@
 
 
 #include <common.h>
 #include <common.h>
 #include <command.h>
 #include <command.h>
-
-#if defined(CONFIG_CMD_MMC)
-
 #include <mmc.h>
 #include <mmc.h>
 
 
 int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -42,5 +39,3 @@ U_BOOT_CMD(
 	"mmcinit - init mmc card\n",
 	"mmcinit - init mmc card\n",
 	NULL
 	NULL
 );
 );
-
-#endif

+ 0 - 4
common/cmd_net.c

@@ -28,8 +28,6 @@
 #include <command.h>
 #include <command.h>
 #include <net.h>
 #include <net.h>
 
 
-#if defined(CONFIG_CMD_NET)
-
 extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
 extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
 
 
 static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]);
 static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]);
@@ -343,5 +341,3 @@ U_BOOT_CMD(
 	"[NTP server IP]\n"
 	"[NTP server IP]\n"
 );
 );
 #endif
 #endif
-
-#endif

+ 0 - 9
common/cmd_pci.c

@@ -30,16 +30,11 @@
  */
  */
 
 
 #include <common.h>
 #include <common.h>
-
-#ifdef CONFIG_PCI
-
 #include <command.h>
 #include <command.h>
 #include <asm/processor.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <pci.h>
 
 
-#if defined(CONFIG_CMD_PCI)
-
 extern int cmd_get_data_size(char* arg, int default_size);
 extern int cmd_get_data_size(char* arg, int default_size);
 
 
 unsigned char	ShortPCIListing = 1;
 unsigned char	ShortPCIListing = 1;
@@ -564,7 +559,3 @@ U_BOOT_CMD(
 	"pci write[.b, .w, .l] b.d.f address value\n"
 	"pci write[.b, .w, .l] b.d.f address value\n"
 	"    - write to CFG address\n"
 	"    - write to CFG address\n"
 );
 );
-
-#endif
-
-#endif /* CONFIG_PCI */

+ 0 - 4
common/cmd_portio.c

@@ -30,8 +30,6 @@
 #include <common.h>
 #include <common.h>
 #include <command.h>
 #include <command.h>
 
 
-#if defined(CONFIG_CMD_PORTIO)
-
 extern int cmd_get_data_size (char *arg, int default_size);
 extern int cmd_get_data_size (char *arg, int default_size);
 
 
 /* Display values from last command.
 /* Display values from last command.
@@ -165,5 +163,3 @@ U_BOOT_CMD(
 	"[.b, .w, .l] port\n"
 	"[.b, .w, .l] port\n"
 	"    - read datum from IO port\n"
 	"    - read datum from IO port\n"
 );
 );
-
-#endif

+ 0 - 5
common/cmd_reginfo.c

@@ -33,8 +33,6 @@
 #include <mpc5xxx.h>
 #include <mpc5xxx.h>
 #endif
 #endif
 
 
-#if defined(CONFIG_CMD_REGINFO)
-
 int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 {
 #if defined(CONFIG_8xx)
 #if defined(CONFIG_8xx)
@@ -335,9 +333,6 @@ int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return 0;
 	return 0;
 }
 }
 
 
-#endif
-
-
  /**************************************************/
  /**************************************************/
 
 
 #if ( defined(CONFIG_8xx)   || defined(CONFIG_405GP) || \
 #if ( defined(CONFIG_8xx)   || defined(CONFIG_405GP) || \

+ 0 - 4
common/cmd_reiser.c

@@ -27,8 +27,6 @@
  * Reiserfs support
  * Reiserfs support
  */
  */
 #include <common.h>
 #include <common.h>
-
-#if defined(CONFIG_CMD_REISER)
 #include <config.h>
 #include <config.h>
 #include <command.h>
 #include <command.h>
 #include <image.h>
 #include <image.h>
@@ -239,5 +237,3 @@ U_BOOT_CMD(
 	"    - load binary file 'filename' from 'dev' on 'interface'\n"
 	"    - load binary file 'filename' from 'dev' on 'interface'\n"
 	"      to address 'addr' from dos filesystem\n"
 	"      to address 'addr' from dos filesystem\n"
 );
 );
-
-#endif

+ 0 - 4
common/cmd_scsi.c

@@ -34,8 +34,6 @@
 #include <image.h>
 #include <image.h>
 #include <pci.h>
 #include <pci.h>
 
 
-#if defined(CONFIG_CMD_SCSI)
-
 #ifdef CONFIG_SCSI_SYM53C8XX
 #ifdef CONFIG_SCSI_SYM53C8XX
 #define SCSI_VEND_ID	0x1000
 #define SCSI_VEND_ID	0x1000
 #ifndef CONFIG_SCSI_DEV_ID
 #ifndef CONFIG_SCSI_DEV_ID
@@ -611,5 +609,3 @@ U_BOOT_CMD(
 	"scsiboot- boot from SCSI device\n",
 	"scsiboot- boot from SCSI device\n",
 	"loadAddr dev:part\n"
 	"loadAddr dev:part\n"
 );
 );
-
-#endif

+ 0 - 4
common/cmd_spi.c

@@ -29,8 +29,6 @@
 #include <command.h>
 #include <command.h>
 #include <spi.h>
 #include <spi.h>
 
 
-#if defined(CONFIG_CMD_SPI)
-
 /*-----------------------------------------------------------------------
 /*-----------------------------------------------------------------------
  * Definitions
  * Definitions
  */
  */
@@ -139,5 +137,3 @@ U_BOOT_CMD(
 	"<bit_len> - Number of bits to send (base 10)\n"
 	"<bit_len> - Number of bits to send (base 10)\n"
 	"<dout>    - Hexadecimal string that gets sent\n"
 	"<dout>    - Hexadecimal string that gets sent\n"
 );
 );
-
-#endif

+ 0 - 4
common/cmd_universe.c

@@ -28,8 +28,6 @@
 
 
 #include <universe.h>
 #include <universe.h>
 
 
-#if defined(CONFIG_CMD_UNIVERSE)
-
 #define PCI_VENDOR PCI_VENDOR_ID_TUNDRA
 #define PCI_VENDOR PCI_VENDOR_ID_TUNDRA
 #define PCI_DEVICE PCI_DEVICE_ID_TUNDRA_CA91C042
 #define PCI_DEVICE PCI_DEVICE_ID_TUNDRA_CA91C042
 
 
@@ -386,5 +384,3 @@ U_BOOT_CMD(
 	"                                      02 -> D16 Data Width\n"
 	"                                      02 -> D16 Data Width\n"
 	"                                      03 -> D32 Data Width\n"
 	"                                      03 -> D32 Data Width\n"
 );
 );
-
-#endif

+ 0 - 10
common/cmd_usb.c

@@ -29,9 +29,6 @@
 #include <command.h>
 #include <command.h>
 #include <asm/byteorder.h>
 #include <asm/byteorder.h>
 #include <part.h>
 #include <part.h>
-
-#if defined(CONFIG_CMD_USB)
-
 #include <usb.h>
 #include <usb.h>
 
 
 #ifdef CONFIG_USB_STORAGE
 #ifdef CONFIG_USB_STORAGE
@@ -608,12 +605,6 @@ int do_usb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return 1;
 	return 1;
 }
 }
 
 
-
-#endif
-
-
-#if defined(CONFIG_CMD_USB)
-
 #ifdef CONFIG_USB_STORAGE
 #ifdef CONFIG_USB_STORAGE
 U_BOOT_CMD(
 U_BOOT_CMD(
 	usb,	5,	1,	do_usb,
 	usb,	5,	1,	do_usb,
@@ -645,4 +636,3 @@ U_BOOT_CMD(
 	"usb  info [dev] - show available USB devices\n"
 	"usb  info [dev] - show available USB devices\n"
 );
 );
 #endif
 #endif
-#endif

+ 0 - 1
include/configs/sbc2410x.h

@@ -103,7 +103,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_REGINFO
 
 
 
 
 #define CONFIG_BOOTDELAY	3
 #define CONFIG_BOOTDELAY	3

+ 0 - 1
include/configs/smdk2410.h

@@ -88,7 +88,6 @@
 #include <config_cmd_default.h>
 #include <config_cmd_default.h>
 
 
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_ELF