From 8bde7f776c77b343aca29b8c7b58464d915ac245 Mon Sep 17 00:00:00 2001 From: wdenk Date: Fri, 27 Jun 2003 21:31:46 +0000 Subject: * Code cleanup: - remove trailing white space, trailing empty lines, C++ comments, etc. - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c) * Patches by Kenneth Johansson, 25 Jun 2003: - major rework of command structure (work done mostly by Michal Cendrowski and Joakim Kristiansen) --- doc/README-i386 | 24 ++++----- doc/README.EVB-64260-750CX | 1 - doc/README.IPHASE4539 | 2 +- doc/README.JFFS2 | 8 +-- doc/README.Modem | 1 - doc/README.OXC | 1 - doc/README.Purple | 1 - doc/README.RPXClassic | 2 - doc/README.RPXlite | 10 ---- doc/README.Sandpoint8240 | 19 +++---- doc/README.TQM8260 | 2 +- doc/README.autoboot | 121 ++++++++++++++++++++++----------------------- doc/README.bedbug | 1 - doc/README.cmi | 28 +++++------ doc/README.ebony | 6 +-- doc/README.fads | 1 - doc/README.mpc5xx | 10 ++-- doc/README.nand | 9 ++-- doc/README.ppc440 | 6 +-- 19 files changed, 113 insertions(+), 140 deletions(-) (limited to 'doc') diff --git a/doc/README-i386 b/doc/README-i386 index 862f3f7a3a..02b753cbd7 100644 --- a/doc/README-i386 +++ b/doc/README-i386 @@ -4,23 +4,23 @@ work was sponsored by my emplyer, Omicron Ceti AB. http://www.omicron.se It is currently capable of booting a linux bzImage from flash on the AMD SC520 CDP platform. -It was originally based on PPCBoot taken from the CVS October 28 2002. +It was originally based on PPCBoot taken from the CVS October 28 2002. To compile: 1) Unpack the source tree, either from the complete tarball or from the virgin snapshot + the patch - + 2) Configure the source $ make sc520_cdp_comfig $ make - + To use this code on the CDP: 1) Make a suitable kernel, I used 2.4.19 with the mtd-support updated from the MTD CVS and a patch to allow root=/dev/mtdblock1 which I - included at the end of this file. + included at the end of this file. The following options in the MTD section might be useful: - + CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_START=38100000 CONFIG_MTD_PHYSMAP_LEN=7a0000 @@ -29,9 +29,9 @@ To use this code on the CDP: 2) Program it in to the CDP flashbank with remon u-boot.bin should be programmed att offset 0x7e000 and the kernel at - offset 0. If you want to use a jffs2 root file system (not included here), + offset 0. If you want to use a jffs2 root file system (not included here), it should be programmed to offset 0x100000. - + remon> z remon> yi remon> ns u-boot.bin 7e0000 @@ -39,22 +39,21 @@ To use this code on the CDP: remon> ns image.jffs2 100000 3) Connect a terminal to the 25pin serial port at 9600bps, and start the CDP. - + remon> z remon> g 4) U-Boot should output some message and a prompt on the terminal, to start the kernel issue the following command: - + BOOT> bootm - + 5) The kernel should boot, and mount the root filesystem if present. We hope you find this stuff useful Daniel Engström, Omicron Ceti AB, daniel@omicron.se - --- linux-2.4.19-orig/init/do_mounts.c Sat Aug 3 02:39:46 2002 +++ linux-2.4.19/init/do_mounts.c Mon Sep 23 16:21:33 2002 @@ -224,6 +224,14 @@ @@ -71,4 +70,5 @@ Daniel Engstr + { "mtdblock7", 0x1f07 }, { NULL, 0 } }; - + +------------------- diff --git a/doc/README.EVB-64260-750CX b/doc/README.EVB-64260-750CX index 481feffb42..5ea38eaea3 100644 --- a/doc/README.EVB-64260-750CX +++ b/doc/README.EVB-64260-750CX @@ -5,4 +5,3 @@ supported except the following differences: * It has a single PCI male connector instead of the 4 PCI female connectors on the BP. It also gets power trough the PCI connector. * It has only a single DIMM slot instead of the 2 slots in the BP. - diff --git a/doc/README.IPHASE4539 b/doc/README.IPHASE4539 index 9302ff5ce4..defad3009f 100644 --- a/doc/README.IPHASE4539 +++ b/doc/README.IPHASE4539 @@ -89,7 +89,7 @@ saveenv - save environment variables to persistent storage setenv - set environment variables sleep - delay execution for some time tftpboot- boot image via network using TFTP protocol - and env variables ipaddr and serverip + and env variables ipaddr and serverip version - print monitor version ? - alias for 'help' => diff --git a/doc/README.JFFS2 b/doc/README.JFFS2 index 3243895150..f854984558 100644 --- a/doc/README.JFFS2 +++ b/doc/README.JFFS2 @@ -68,9 +68,9 @@ jffs2_part_info(int part_num) TODO. - Add a new command so it's actually possible to change + Add a new command so it's actually possible to change partition. - Remove the assumption that JFFS can dereference a pointer - into the disk. The current code do not work with memory holes - or hardware with a sliding window (PCMCIA). + Remove the assumption that JFFS can dereference a pointer + into the disk. The current code do not work with memory holes + or hardware with a sliding window (PCMCIA). diff --git a/doc/README.Modem b/doc/README.Modem index a3ba7b78bf..1613c11cad 100644 --- a/doc/README.Modem +++ b/doc/README.Modem @@ -70,4 +70,3 @@ SMDK board, and this setting should be stored in modem NVRAM. For the Rockwell OEM modem this can to be done with the following command: AT&D0&W - diff --git a/doc/README.OXC b/doc/README.OXC index e7bb76f399..c5db5f8859 100644 --- a/doc/README.OXC +++ b/doc/README.OXC @@ -22,4 +22,3 @@ CONFIG_SHOW_BOOT_PROGRESS When this option is on, U-Boot switches the Active LED off before booting an image and switches it on if booting failed due to some reasons. - diff --git a/doc/README.Purple b/doc/README.Purple index f811b67daa..0098e26c1d 100644 --- a/doc/README.Purple +++ b/doc/README.Purple @@ -71,7 +71,6 @@ Installation Instructions: Power on. U-Boot should come up. - Implementation Notes: --------------------- diff --git a/doc/README.RPXClassic b/doc/README.RPXClassic index 5caa2bc60e..5344cc64c5 100644 --- a/doc/README.RPXClassic +++ b/doc/README.RPXClassic @@ -17,5 +17,3 @@ NVRAM : 512 kb from 0xfa000000 - Mac address is read from EEPROM - ethernet on SCC1 or fast ethernet on FEC are running (depending on the configuration flag CONFIG_FEC_ENET) - - diff --git a/doc/README.RPXlite b/doc/README.RPXlite index 25bf80b2a8..c8ccc41eb0 100644 --- a/doc/README.RPXlite +++ b/doc/README.RPXlite @@ -126,13 +126,6 @@ ############################################################### - - - - - - - ############################################################### # Misc Information ############################################################### @@ -755,7 +748,6 @@ reg_config.txt: PIT = PIT count /* Read only */ - /*------------------------------------------------------------------- */ /*------------------------------------------------------------------- */ /* CLOCKS */ @@ -825,7 +817,6 @@ reg_config.txt: JTRS = JTAG reset - /*------------------------------------------------------------------- */ /*------------------------------------------------------------------- */ /* DMA */ @@ -884,4 +875,3 @@ reg_config.txt: AD = 0 DONE = 0 OB = 0 - diff --git a/doc/README.Sandpoint8240 b/doc/README.Sandpoint8240 index 5cb79b32d6..b506c01ce1 100644 --- a/doc/README.Sandpoint8240 +++ b/doc/README.Sandpoint8240 @@ -20,7 +20,6 @@ SW3.1: OFF SW3.2: on SW3.3: OFF SW3.4: OFF SW3.5: on SW3.6: OFF SW3.7: OFF SW3.8: on - The followind detailed description of installation and initial steps with U-Boot and QNX was provided by Jim Sandoz : @@ -38,19 +37,18 @@ http://e-www.motorola.com/collateral/SPX3UM.pdf http://e-www.motorola.com/collateral/UNITYX4CONFIG.pdf - Connection Diagram: - =========== + =========== === ===== |----- | | | <---------------> | | | | | |PC | rs232 | BDI |=============[] | | | | |2000 | BDM probe | | | | | <---------------> | | |----- | === ethernet ===== | | - | | - =========== - Sandpoint X3 with - Unity 8240 proc + | | + =========== + Sandpoint X3 with + Unity 8240 proc PART 1) @@ -354,9 +352,9 @@ TFTP from server 145.17.242.46; our IP address is 145.17.228.42; sending through Filename 'sandpoint-simple.elf'. Load address: 0x800000 Loading: ################################################################# - ################################################################# - ################################################################# - ######################## + ################################################################# + ################################################################# + ######################## done Bytes transferred = 1120284 (11181c hex) ==> @@ -394,4 +392,3 @@ password for anonymous, simply press the Enter key. cvs -d:pserver:anonymous@cvs.u-boot.sourceforge.net:/cvsroot/u-boot login cvs -z6 -d:pserver:anonymous@cvs.u-boot.sourceforge.net:/cvsroot/u-boot co -P u-boot - diff --git a/doc/README.TQM8260 b/doc/README.TQM8260 index 7e03010aab..05710954ea 100644 --- a/doc/README.TQM8260 +++ b/doc/README.TQM8260 @@ -77,7 +77,7 @@ run - run commands in an environment variable bootm - boot application image from memory bootp - boot image via network using BootP/TFTP protocol tftpboot- boot image via network using TFTP protocol - and env variables ipaddr and serverip + and env variables ipaddr and serverip rarpboot- boot image via network using RARP/TFTP protocol bootd - boot default, i.e., run 'bootcmd' loads - load S-Record file over serial line diff --git a/doc/README.autoboot b/doc/README.autoboot index 20736ca476..a6d5f992da 100644 --- a/doc/README.autoboot +++ b/doc/README.autoboot @@ -69,25 +69,25 @@ What they do bootretry environment variable - These options determine what happens after autoboot is - stopped and U-Boot is waiting for commands. - - CONFIG_BOOT_RETRY_TIME must be defined to enable the boot - retry feature. If the environment variable 'bootretry' is - found then its value is used, otherwise the retry timeout is - CONFIG_BOOT_RETRY_TIME. CONFIG_BOOT_RETRY_MIN is optional and - defaults to CONFIG_BOOT_RETRY_TIME. All times are in seconds. - - If the retry timeout is negative, the U-Boot command prompt - never times out. Otherwise it is forced to be at least - CONFIG_BOOT_RETRY_MIN seconds. If no valid U-Boot command is - entered before the specified time the boot delay sequence is - restarted. Each command that U-Boot executes restarts the - timeout. - - If CONFIG_BOOT_RETRY_TIME < 0 the feature is there, but - doesn't do anything unless the environment variable - 'bootretry' is >= 0. + These options determine what happens after autoboot is + stopped and U-Boot is waiting for commands. + + CONFIG_BOOT_RETRY_TIME must be defined to enable the boot + retry feature. If the environment variable 'bootretry' is + found then its value is used, otherwise the retry timeout is + CONFIG_BOOT_RETRY_TIME. CONFIG_BOOT_RETRY_MIN is optional and + defaults to CONFIG_BOOT_RETRY_TIME. All times are in seconds. + + If the retry timeout is negative, the U-Boot command prompt + never times out. Otherwise it is forced to be at least + CONFIG_BOOT_RETRY_MIN seconds. If no valid U-Boot command is + entered before the specified time the boot delay sequence is + restarted. Each command that U-Boot executes restarts the + timeout. + + If CONFIG_BOOT_RETRY_TIME < 0 the feature is there, but + doesn't do anything unless the environment variable + 'bootretry' is >= 0. CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_PROMPT @@ -101,9 +101,9 @@ What they do bootdelaykey2 environment variable bootstopkey2 environment variable - These options give more control over stopping autoboot. When - they are used a specific character or string is required to - stop or delay autoboot. + These options give more control over stopping autoboot. When + they are used a specific character or string is required to + stop or delay autoboot. Define CONFIG_AUTOBOOT_KEYED (no value required) to enable this group of options. CONFIG_AUTOBOOT_DELAY_STR, @@ -111,48 +111,47 @@ What they do specified by the corresponding environment variable), otherwise there is no way to stop autoboot. - CONFIG_AUTOBOOT_PROMPT is displayed before the boot delay - selected by CONFIG_BOOTDELAY starts. If it is not defined - there is no output indicating that autoboot is in progress. - If "%d" is included, it is replaced by the number of seconds - remaining before autoboot will start, but it does not count - down the seconds. "autoboot in %d seconds\n" is a reasonable - prompt. - - If CONFIG_AUTOBOOT_DELAY_STR or bootdelaykey is specified and - this string is received from console input before autoboot - starts booting, U-Boot gives a command prompt. The U-Boot - prompt will time out if CONFIG_BOOT_RETRY_TIME is used, - otherwise it never times out. - - If CONFIG_AUTOBOOT_STOP_STR or bootstopkey is specified and - this string is received from console input before autoboot - starts booting, U-Boot gives a command prompt. The U-Boot - prompt never times out, even if CONFIG_BOOT_RETRY_TIME is - used. - - The string recognition is not very sophisticated. If a - partial match is detected, the first non-matching character - is checked to see if starts a new match. There is no check - for a shorter partial match, so it's best if the first - character of a key string does not appear in the rest of the - string. - - Using the CONFIG_AUTOBOOT_DELAY_STR2 / bootdelaykey2 and/or - CONFIG_AUTOBOOT_STOP_STR2 / bootstopkey #defines and/or - environment variables you can specify a second, alternate - string (which allows you to haw two "password" strings). + CONFIG_AUTOBOOT_PROMPT is displayed before the boot delay + selected by CONFIG_BOOTDELAY starts. If it is not defined + there is no output indicating that autoboot is in progress. + If "%d" is included, it is replaced by the number of seconds + remaining before autoboot will start, but it does not count + down the seconds. "autoboot in %d seconds\n" is a reasonable + prompt. + + If CONFIG_AUTOBOOT_DELAY_STR or bootdelaykey is specified and + this string is received from console input before autoboot + starts booting, U-Boot gives a command prompt. The U-Boot + prompt will time out if CONFIG_BOOT_RETRY_TIME is used, + otherwise it never times out. + + If CONFIG_AUTOBOOT_STOP_STR or bootstopkey is specified and + this string is received from console input before autoboot + starts booting, U-Boot gives a command prompt. The U-Boot + prompt never times out, even if CONFIG_BOOT_RETRY_TIME is + used. + + The string recognition is not very sophisticated. If a + partial match is detected, the first non-matching character + is checked to see if starts a new match. There is no check + for a shorter partial match, so it's best if the first + character of a key string does not appear in the rest of the + string. + + Using the CONFIG_AUTOBOOT_DELAY_STR2 / bootdelaykey2 and/or + CONFIG_AUTOBOOT_STOP_STR2 / bootstopkey #defines and/or + environment variables you can specify a second, alternate + string (which allows you to haw two "password" strings). CONFIG_ZERO_BOOTDELAY_CHECK - If this option is defined, you can stop the autoboot process - by hitting a key even in that case when "bootdelay" has been - set to 0. You can set "bootdelay" to a negative value to - prevent the check for console input. + If this option is defined, you can stop the autoboot process + by hitting a key even in that case when "bootdelay" has been + set to 0. You can set "bootdelay" to a negative value to + prevent the check for console input. CONFIG_RESET_TO_RETRY - (Only effective when CONFIG_BOOT_RETRY_TIME is also set) - After the countdown timed out, the board will be reset to restart - again. - + (Only effective when CONFIG_BOOT_RETRY_TIME is also set) + After the countdown timed out, the board will be reset to restart + again. diff --git a/doc/README.bedbug b/doc/README.bedbug index ed7bc122ca..56aeb090c1 100644 --- a/doc/README.bedbug +++ b/doc/README.bedbug @@ -61,7 +61,6 @@ can be easily implemented. IBM PPC405 specific debugger routines. - Bedbug support for the MPC860 ----------------------------- diff --git a/doc/README.cmi b/doc/README.cmi index 48052b867b..884854d884 100644 --- a/doc/README.cmi +++ b/doc/README.cmi @@ -3,9 +3,9 @@ Summary: ======== This file contains information about the cmi board configuration. -Please see cmi_mpc5xx_config for further details. The cmi board is -a customer specific board but should work with small modifications -on every board which has a MPC5xx and either a 28F128J3A, +Please see cmi_mpc5xx_config for further details. The cmi board is +a customer specific board but should work with small modifications +on every board which has a MPC5xx and either a 28F128J3A, 28F320J3A or 28F640J3A Intel flash mounted. Board Discription: @@ -16,14 +16,14 @@ Board Discription: * Intel flash 28F640J3A * Micron SRAM 1M * Altera PLD - + Bootstrap: ========== In contrast to the usual boot sequence used in U-Boot, on the cmi board we don't boot from the external flash directly. Because of we use a 16-bit flash and don't sample a RCW -from the data bus to set the startup buswidth to 16-bit. +from the data bus to set the startup buswidth to 16-bit. Unfortunatly the default width, sampled from the default RCW is 32-bit. For this reason we burn the proper RCW into the internal flash shadow location and boot after power-on or @@ -35,16 +35,16 @@ Memory Map: Memory Map after relocation: - 0x0000 0000 CFG_SDRAM_BASE + 0x0000 0000 CFG_SDRAM_BASE : 0x000F 9FFF : - : - 0x0100 0000 CFG_IMMR (Internal memory map base adress) + : + 0x0100 0000 CFG_IMMR (Internal memory map base adress) : 0x0130 7FFF : - : + : 0x0200 0000 CFG_FLASH_BASE : 0x027C FFFF @@ -53,15 +53,15 @@ Memory Map after relocation: 0x0300 0000 PLD_BASE Flash Partition: - - 0x0200 0000 Block 0 and 1 contain U-Boot except + + 0x0200 0000 Block 0 and 1 contain U-Boot except : environment : 0x0201 FFFF 0x0202 0000 Block 2 contains environment (.ppcenv) : - 0x0202 FFFF - + 0x0202 FFFF + See README file for futher information about U-Boot relocation and partitioning. @@ -71,7 +71,7 @@ Tested Features: * U-Boot commands: go, loads, loadb, all memory features, printenv, setenv, saveenv, protect, erase, fli, bdi, mtest, reset, version, coninfo, help (see configuration file for available commands) - + * Blinking led to indicate boot process Added or Changed Files: diff --git a/doc/README.ebony b/doc/README.ebony index 12a0d70389..6e2a8115a4 100644 --- a/doc/README.ebony +++ b/doc/README.ebony @@ -1,6 +1,6 @@ - IBM Ebony Board + IBM Ebony Board - Last Update: September 12, 2002 + Last Update: September 12, 2002 ======================================================================= This file contains some handy info regarding U-Boot and the IBM @@ -131,8 +131,6 @@ We never tested anything other than 33 MHz/32-bit cards. If you have the chance to do this, please let me know how things turn out :-) - Regards, --Scott - diff --git a/doc/README.fads b/doc/README.fads index 0128ef735c..bae9652f01 100644 --- a/doc/README.fads +++ b/doc/README.fads @@ -87,4 +87,3 @@ Next, in MPC8BUG: go Now U-Boot is running with the U-Boot value for SYPCR. - diff --git a/doc/README.mpc5xx b/doc/README.mpc5xx index 2c1a29321b..07be8637fa 100644 --- a/doc/README.mpc5xx +++ b/doc/README.mpc5xx @@ -5,14 +5,14 @@ Summary: This file contains information about the port of U-Boot to the Motorola mpc5xx series of CPUs. Most of this code is taken from existing code mainly from the mpc8xx port. In contrast to mpc8xx, -the mpc5xx has no CPM, MMU and cache facilities. +the mpc5xx has no CPM, MMU and cache facilities. -The implemented features have been tested on the cmi board, a -customer specific board (see README.cmi). +The implemented features have been tested on the cmi board, a +customer specific board (see README.cmi). -Hence this port is only tested on the cmi board further possible +Hence this port is only tested on the cmi board further possible tests on other boards will be very valuable. - + Not Tested Features: ==================== diff --git a/doc/README.nand b/doc/README.nand index af7fbfdd5b..0f2bdc5cc4 100644 --- a/doc/README.nand +++ b/doc/README.nand @@ -52,7 +52,7 @@ Commands: nand read addr ofs size Read `size' bytes from `ofs' in NAND flash to `addr'. If a page cannot be read because it is marked bad or an uncorrectable data - error is found the command stops with an error. + error is found the command stops with an error. nand read.jffs2 addr ofs size Like `read', but the data for blocks that are marked bad is read as @@ -68,7 +68,7 @@ Commands: nand write addr ofs size Write `size' bytes from `addr' to `ofs' in NAND flash. If a page cannot be written because it is marked bad or the write fails the - command stops with an error. + command stops with an error. nand write.jffs2 addr ofs size Like `write', but blocks that are marked bad are skipped and the @@ -158,13 +158,13 @@ NAND Interface: #define NAND_CTL_SETCLE(nandptr) Set CLE (command latch enable) high. If CLE control is handled by WRITE_NAND_ADDRESS() this can be empty. - + More Definitions: These definitions are needed in the board configuration for now, but may really belong in a header file. TODO: Figure which ones are truly configuration settings and rename - them to CFG_NAND_... and move the rest somewhere appropriate. + them to CFG_NAND_... and move the rest somewhere appropriate. #define SECTORSIZE 512 #define ADDR_COLUMN 1 @@ -173,4 +173,3 @@ More Definitions: #define NAND_ChipID_UNKNOWN 0x00 #define NAND_MAX_FLOORS 1 #define NAND_MAX_CHIPS 1 - diff --git a/doc/README.ppc440 b/doc/README.ppc440 index acb0c6f8ea..95d63fc508 100644 --- a/doc/README.ppc440 +++ b/doc/README.ppc440 @@ -1,6 +1,6 @@ - PowerPC 440 + PowerPC 440 - Last Update: September 11, 2002 + Last Update: September 11, 2002 ======================================================================= @@ -197,8 +197,6 @@ to decide at run-time. If your board is always configured a certain way, then just hardcode a return of 1 or 0 as appropriate. - Regards, --Scott - -- cgit v1.2.3