diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/cmd_autoscript.h | 34 | ||||
| -rw-r--r-- | include/cmd_bmp.h | 44 | ||||
| -rw-r--r-- | include/cmd_bsp.h | 29 | ||||
| -rw-r--r-- | include/cmd_disk.h | 58 | ||||
| -rw-r--r-- | include/cmd_fat.h | 61 | ||||
| -rw-r--r-- | include/cmd_mmc.h | 41 | ||||
| -rw-r--r-- | include/cmd_nand.h | 58 | ||||
| -rw-r--r-- | include/cmd_portio.h | 52 | ||||
| -rw-r--r-- | include/common.h | 5 | ||||
| -rw-r--r-- | include/configs/lwmon.h | 2 | ||||
| -rw-r--r-- | include/part.h | 31 |
11 files changed, 27 insertions, 388 deletions
diff --git a/include/cmd_autoscript.h b/include/cmd_autoscript.h deleted file mode 100644 index ca5fdb555..000000000 --- a/include/cmd_autoscript.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * (C) Copyright 2001 - * Kyle Harris, kharris@nexus-tech.net - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef _CMD_AUTOSCRIPT_H_ -#define _CMD_AUTOSCRIPT_H_ - -#define AUTOSCRIPT_MAGIC 0x09011962 - -#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) - -int autoscript (ulong addr); -#endif - -#endif /* _CMD_AUTOSCRIPT_H_ */ diff --git a/include/cmd_bmp.h b/include/cmd_bmp.h deleted file mode 100644 index 2b66617a6..000000000 --- a/include/cmd_bmp.h +++ /dev/null @@ -1,44 +0,0 @@ -/* (C) Copyright 2002 - * Detlev Zundel, DENX Software Engineering, dzu@denx.de. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -/* - * Bitmap display support - */ -#ifndef _CMD_BMP_H -#define _CMD_BMP_H - -#include <common.h> -#include <command.h> - - -#if (CONFIG_COMMANDS & CFG_CMD_BMP) - -#define CMD_TBL_BMP MK_CMD_TBL_ENTRY( \ - "bmp", 3, 3, 1, do_bmp, \ - "bmp - manipulate BMP image data\n", \ - "info <imageAddr> - display image info\n" \ - "bmp display <imageAddr> - display image\n" \ -), -int do_bmp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); - -#else -#define CMD_TBL_BMP -#endif - -#endif /* _CMD_BMP_H */ diff --git a/include/cmd_bsp.h b/include/cmd_bsp.h deleted file mode 100644 index 417d32fb6..000000000 --- a/include/cmd_bsp.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * (C) Copyright 2001, 2002 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef _CMD_BSP_H_ -#define _CMD_BSP_H_ - -/* do not edit this file */ - -#endif /* _CMD_BSP_H_ */ diff --git a/include/cmd_disk.h b/include/cmd_disk.h deleted file mode 100644 index 6e2e0cb1a..000000000 --- a/include/cmd_disk.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -/* - * Harddisk support - */ -#ifndef _CMD_DISK_H -#define _CMD_DISK_H - -#include <common.h> -#include <command.h> - -/* - * Type string for U-Boot bootable partitions - */ -#define BOOT_PART_TYPE "U-Boot" /* primary boot partition type */ -#define BOOT_PART_COMP "PPCBoot" /* PPCBoot compatibility type */ - -#if 0 - -typedef struct disk_partition { - ulong start; /* # of first block in partition */ - ulong size; /* number of blocks in partition */ - ulong blksz; /* block size in bytes */ - uchar name[32]; /* partition name */ - uchar type[32]; /* string type description */ -} disk_partition_t; - -int get_partition_info (block_dev_desc_t * dev_desc, int part, disk_partition_t *info); -#ifdef CONFIG_MAC_PARTITION -int get_partition_info_mac (block_dev_desc_t * dev_desc, int part, disk_partition_t *info); -#endif -#ifdef CONFIG_DOS_PARTITION -int get_partition_info_dos (block_dev_desc_t * dev_desc, int part, disk_partition_t *info); -#endif -#endif /* 0 */ - -#endif /* _CMD_DISK_H */ diff --git a/include/cmd_fat.h b/include/cmd_fat.h deleted file mode 100644 index 12245bd41..000000000 --- a/include/cmd_fat.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * (C) Copyright 2002 - * Richard Jones, rjones@nexus-tech.net - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -/* - * FAT support - */ -#ifndef _CMD_FAT_H -#define _CMD_FAT_H - -#if (CONFIG_COMMANDS & CFG_CMD_FAT) - -int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -int do_fat_dump (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); - -#define CMD_TBL_FAT MK_CMD_TBL_ENTRY( \ - "fatload", 5, 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" \ -), \ - MK_CMD_TBL_ENTRY( \ - "fatinfo", 5, 1, 1, do_fat_fsinfo, \ - "fatinfo - print information about filesystem\n", \ - "\n" \ - " - print information about filesystem\n" \ -), \ - MK_CMD_TBL_ENTRY( \ - "fatls", 2, 2, 1, do_fat_ls, \ - "fatls - list files in a directory (default /)\n", \ - "[ directory ]\n" \ - " - list files in a directory.\n" \ -), - -#else -#define CMD_TBL_FAT -#endif /* CFG_CMD_FAT */ - -#endif /* _CMD_FAT_H */ diff --git a/include/cmd_mmc.h b/include/cmd_mmc.h deleted file mode 100644 index ff5a176fe..000000000 --- a/include/cmd_mmc.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef _CMD_MMC_H_ -#define _CMD_MMC_H_ - -#include <command.h> - -#if (CONFIG_COMMANDS & CFG_CMD_MMC) - -#define CMD_TBL_MMC MK_CMD_TBL_ENTRY( \ - "mmcinit", 4, 1, 0, do_mmc, \ - "mmcinit - init mmc card\n", \ -), -#else - -#define CMD_TBL_MMC - -#endif - -int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); - -#endif /* _CMD_MMC_H_ */ diff --git a/include/cmd_nand.h b/include/cmd_nand.h deleted file mode 100644 index ce7ee84c5..000000000 --- a/include/cmd_nand.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -/* - * NAND support - */ -#ifndef _CMD_NAND_H -#define _CMD_NAND_H - -#include <common.h> -#include <command.h> - - -#if (CONFIG_COMMANDS & CFG_CMD_NAND) -#define CMD_TBL_NAND MK_CMD_TBL_ENTRY( \ - "nand", 3, 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" \ -), - -#define CMD_TBL_NANDBOOT MK_CMD_TBL_ENTRY( \ - "nboot", 4, 4, 1, do_nandboot, \ - "nboot - boot from NAND device\n", \ - "loadAddr dev\n" \ -), - -int do_nand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); - -#else -#define CMD_TBL_NAND -#define CMD_TBL_NANDBOOT -#endif - -#endif /* _CMD_NAND_H */ diff --git a/include/cmd_portio.h b/include/cmd_portio.h deleted file mode 100644 index 6897ab6d5..000000000 --- a/include/cmd_portio.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * (C) Copyright 2003 - * Marc Singer, elf@buici.com - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -/* - * Memory Functions - */ -#ifndef _CMD_PORTIO_H -#define _CMD_PORTIO_H - -#if (CONFIG_COMMANDS & CFG_CMD_PORTIO) - -#define CMD_TBL_PORTIO_OUT MK_CMD_TBL_ENTRY( \ - "out", 3, 3, 1, do_portio_out, \ - "out - write datum to IO port\n", \ - "[.b, .w, .l] port value\n - output to IO port\n" \ -), -#define CMD_TBL_PORTIO_IN MK_CMD_TBL_ENTRY( \ - "in", 2, 2, 1, do_portio_in, \ - "in - read data from an IO port\n", \ - "[.b, .w, .l] port\n" \ - " - read datum from IO port\n" \ -), - -int do_portio_out (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -int do_portio_in (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); - -#else -#define CMD_TBL_PORTIO_OUT -#define CMD_TBL_PORTIO_IN -#endif /* CFG_CMD_PORTIO */ - -#endif /* _CMD_PORTIO_H */ diff --git a/include/common.h b/include/common.h index 0bb43533c..8a98de3f2 100644 --- a/include/common.h +++ b/include/common.h @@ -147,8 +147,11 @@ extern ulong monitor_flash_len; /* common/flash.c */ void flash_perror (int); +/* common/cmd_autoscript.c */ +int autoscript (ulong addr); + /* common/cmd_bootm.c */ -void print_image_hdr (image_header_t *hdr); +void print_image_hdr (image_header_t *hdr); extern ulong load_addr; /* Default Load Address */ diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index 2989d42a9..34923f1db 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -152,6 +152,7 @@ #ifdef CONFIG_8xx_CONS_SCC2 /* Can't use ethernet, then */ #define CONFIG_COMMANDS ( (CONFIG_CMD_DFL & ~CFG_CMD_NET) | \ + CFG_CMD_ASKENV | \ CFG_CMD_DATE | \ CFG_CMD_I2C | \ CFG_CMD_EEPROM | \ @@ -161,6 +162,7 @@ CFG_CMD_POST_DIAG ) #else #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ + CFG_CMD_ASKENV | \ CFG_CMD_DHCP | \ CFG_CMD_DATE | \ CFG_CMD_I2C | \ diff --git a/include/part.h b/include/part.h index 35afa28d3..2f5a01dea 100644 --- a/include/part.h +++ b/include/part.h @@ -37,15 +37,20 @@ typedef struct block_dev_desc { unsigned char product[20];/* IDE Serial no, SCSI product */ unsigned char revision[8];/* firmware revision */ unsigned char removable; /* removable device */ - unsigned long (*block_read)(int dev,unsigned long start,unsigned long blkcnt, unsigned long *buffer); + unsigned long (*block_read)(int dev, + unsigned long start, + unsigned long blkcnt, + unsigned long *buffer); }block_dev_desc_t; + /* Interface types: */ -#define IF_TYPE_UNKNOWN 0 -#define IF_TYPE_IDE 1 +#define IF_TYPE_UNKNOWN 0 +#define IF_TYPE_IDE 1 #define IF_TYPE_SCSI 2 #define IF_TYPE_ATAPI 3 -#define IF_TYPE_USB 4 -#define IF_TYPE_DOC 5 +#define IF_TYPE_USB 4 +#define IF_TYPE_DOC 5 + /* Part types */ #define PART_TYPE_UNKNOWN 0x00 #define PART_TYPE_MAC 0x01 @@ -53,12 +58,18 @@ typedef struct block_dev_desc { #define PART_TYPE_ISO 0x03 #define PART_TYPE_AMIGA 0x04 +/* + * Type string for U-Boot bootable partitions + */ +#define BOOT_PART_TYPE "U-Boot" /* primary boot partition type */ +#define BOOT_PART_COMP "PPCBoot" /* PPCBoot compatibility type */ + /* device types */ -#define DEV_TYPE_UNKNOWN 0xff /* not connected */ -#define DEV_TYPE_HARDDISK 0x00 /* harddisk */ -#define DEV_TYPE_TAPE 0x01 /* Tape */ -#define DEV_TYPE_CDROM 0x05 /* CD-ROM */ -#define DEV_TYPE_OPDISK 0x07 /* optical disk */ +#define DEV_TYPE_UNKNOWN 0xff /* not connected */ +#define DEV_TYPE_HARDDISK 0x00 /* harddisk */ +#define DEV_TYPE_TAPE 0x01 /* Tape */ +#define DEV_TYPE_CDROM 0x05 /* CD-ROM */ +#define DEV_TYPE_OPDISK 0x07 /* optical disk */ typedef struct disk_partition { ulong start; /* # of first block in partition */ |