Fix some missing commands, cleanup header files

(autoscript, bmp, bsp, fat, mmc, nand, portio, ...)

CHANGELOG

 ======================================================================
-Changes since U-Boot 0.4.0:
+Changes for U-Boot 0.4.1:
 ======================================================================
 
+* Fix some missing commands, cleanup header files
+  (autoscript, bmp, bsp, fat, mmc, nand, portio, ...)
+
 * Rewrite command lookup and help command (fix problems with bubble
   sort when sorting command name list). Minor cleanup here and there.
 

board/evb64260/eth.c

@@ -22,7 +22,6 @@ Skeleton NIC driver for Etherboot
 
 #include <common.h>
 #include <malloc.h>
-#include <cmd_bsp.h>
 #include <galileo/gt64260R.h>
 #include <galileo/core.h>
 #include <asm/cache.h>

board/exbitgen/u-boot.lds

@@ -119,6 +119,10 @@ SECTIONS
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

board/hymod/bsp.c

@@ -27,7 +27,6 @@
 #include <command.h>
 #include <net.h>
 #include <asm/iopin_8260.h>
-#include <cmd_bsp.h>
 
 /*-----------------------------------------------------------------------
  * Board Special Commands: FPGA load/store, EEPROM erase

board/siemens/pcu_e/pcu_e.c

@@ -26,7 +26,6 @@
 #include <commproc.h>
 #include <i2c.h>
 #include <command.h>
-#include <cmd_bsp.h>
 
 /* ------------------------------------------------------------------------- */
 

board/sl8245/Makefile

@@ -28,7 +28,7 @@ LIB	= lib$(BOARD).a
 OBJS 	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 

board/sl8245/u-boot.lds

@@ -102,6 +102,10 @@ SECTIONS
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

board/w7o/cmd_vpd.c

@@ -27,7 +27,6 @@
 #if (CONFIG_COMMANDS & CFG_CMD_BSP)
 
 #include "vpd.h"
-#include "cmd_bsp.h"
 
 /* ======================================================================
  * Interpreter command to retrieve board specific Vital Product Data, "VPD"

common/cmd_autoscript.c

@@ -47,7 +47,6 @@
 #include <hush.h>
 #endif
 
-#define AUTOSCRIPT_MAGIC	0x09011962
 #if defined(CONFIG_AUTOSCRIPT) || \
 	 (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT )
 

common/cmd_bmp.c

@@ -73,6 +73,13 @@ int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	}
 }
 
+cmd_tbl_t U_BOOT_CMD(BMP) = MK_CMD_ENTRY(
+	"bmp",	3,	1,	do_bmp,
+	"bmp     - manipulate BMP image data\n",
+	"info <imageAddr>    - display image info\n"
+	"bmp display <imageAddr> - display image\n"
+);
+
 /*
  * Subroutine:  bmp_info
  *

common/cmd_boot.c

@@ -26,7 +26,6 @@
  */
 #include <common.h>
 #include <command.h>
-#include <cmd_autoscript.h>
 #include <net.h>
 #include <syscall.h>
 

common/cmd_fat.c

@@ -26,7 +26,6 @@
  */
 #include <common.h>
 #include <command.h>
-#include <cmd_autoscript.h>
 #include <s_record.h>
 #include <net.h>
 #include <ata.h>
@@ -63,6 +62,14 @@ int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return size;
 }
 
+cmd_tbl_t U_BOOT_CMD(FATLOAD) = MK_CMD_ENTRY(
+	"fatload",	4,	0,	do_fat_fsload,
+	"fatload - load binary file from a dos filesystem\n",
+	"[ off ] [ filename ]\n"
+	"    - load binary file from dos filesystem\n"
+	"      with offset 'off'\n"
+);
+
 int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	char *filename = "/";
@@ -76,6 +83,13 @@ int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return (ret);
 }
 
+cmd_tbl_t U_BOOT_CMD(FATLS) = MK_CMD_ENTRY(
+	"fatls",	2,	1,	do_fat_ls,
+	"fatls   - list files in a directory (default /)\n",
+	"[ directory ]\n"
+	"    - list files in a directory\n"
+);
+
 int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	int ret;
@@ -87,6 +101,13 @@ int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return (ret);
 }
 
+cmd_tbl_t U_BOOT_CMD(FATINFO) = MK_CMD_ENTRY(
+	"fatinfo",	1,	1,	do_fat_fsinfo,
+	"fatinfo - print information about filesystem\n",
+	"\n"
+	"    - print information about filesystem\n"
+);
+
 #ifdef NOT_IMPLEMENTED_YET
 /* find first device whose first partition is a DOS filesystem */
 int find_fat_partition (void)

common/cmd_fpga.c

@@ -27,7 +27,6 @@
  */
 #include <common.h>
 #include <command.h>
-#include <cmd_bsp.h>
 #if (CONFIG_COMMANDS & CFG_CMD_NET)
 #include <net.h>
 #endif

common/cmd_ide.c

@@ -39,7 +39,6 @@
 #endif
 #include <ide.h>
 #include <ata.h>
-#include <cmd_disk.h>
 #ifdef CONFIG_STATUS_LED
 # include <status_led.h>
 #endif

common/cmd_load.c

@@ -26,7 +26,6 @@
  */
 #include <common.h>
 #include <command.h>
-#include <cmd_autoscript.h>
 #include <s_record.h>
 #include <net.h>
 #include <syscall.h>

common/cmd_mmc.c

@@ -37,4 +37,10 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return 0;
 }
 
+cmd_tbl_t U_BOOT_CMD(MMCINIT) = MK_CMD_ENTRY(
+	"mmcinit",	1,	0,	do_mmc,
+	"mmcinit - init mmc card\n",
+	NULL
+);
+
 #endif	/* CFG_CMD_MMC */

common/cmd_nand.c

@@ -247,6 +247,21 @@ int do_nand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
     }
 }
 
+cmd_tbl_t U_BOOT_CMD(NAND) = MK_CMD_ENTRY(
+	"nand",	5,	1,	do_nand,
+	"nand    - NAND sub-system\n",
+	"info  - show available NAND devices\n"
+	"nand device [dev] - show or set current device\n"
+	"nand read[.jffs2]  addr off size\n"
+	"nand write[.jffs2] addr off size - read/write `size' bytes starting\n"
+	"    at offset `off' to/from memory address `addr'\n"
+	"nand erase [clean] [off size] - erase `size' bytes from\n"
+	"    offset `off' (entire device if not specified)\n"
+	"nand bad - show bad blocks\n"
+	"nand read.oob addr off size - read out-of-band data\n"
+	"nand write.oob addr off size - read out-of-band data\n"
+);
+
 int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	char *boot_device = NULL;
@@ -348,6 +363,12 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return rcode;
 }
 
+cmd_tbl_t U_BOOT_CMD(NBOOT) = MK_CMD_ENTRY(
+	"nboot",	4,	1,	do_nandboot,
+	"nboot   - boot from NAND device\n",
+	"loadAddr dev\n"
+);
+
 /* returns 0 if block containing pos is OK:
  *		valid erase block and
  *		not marked bad, or no bad mark position is specified

common/cmd_net.c

@@ -26,7 +26,6 @@
  */
 #include <common.h>
 #include <command.h>
-#include <cmd_autoscript.h>
 #include <net.h>
 
 #if (CONFIG_COMMANDS & CFG_CMD_NET)

common/cmd_portio.c

@@ -29,7 +29,6 @@
 
 #include <common.h>
 #include <command.h>
-#include <cmd_portio.h>
 
 #if (CONFIG_COMMANDS & CFG_CMD_PORTIO)
 
@@ -96,6 +95,12 @@ int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 	return 0;
 }
 
+cmd_tbl_t U_BOOT_CMD(PORTIO_OUT) = MK_CMD_ENTRY(
+	"out",	3,	1,	do_portio_out,
+	"out     - write datum to IO port\n",
+	"[.b, .w, .l] port value\n    - output to IO port\n"
+);
+
 int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
 	uint addr = in_last_addr;
@@ -154,4 +159,11 @@ int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 	return 0;
 }
 
+cmd_tbl_t U_BOOT_CMD(PORTIO_IN) = MK_CMD_ENTRY(
+	"in",	2,	1,	do_portio_in,
+	"in      - read data from an IO port\n",
+	"[.b, .w, .l] port\n"
+	"    - read datum from IO port\n"
+);
+
 #endif	/* CFG_CMD_PORTIO */

common/cmd_scsi.c

@@ -33,7 +33,6 @@
 #include <asm/processor.h>
 #include <scsi.h>
 #include <image.h>
-#include <cmd_disk.h>
 #include <pci.h>