omap1610h2: fix build breaks

[u-boot] / doc / README.mpc8315erdb

diff --git a/doc/README.mpc8315erdb b/doc/README.mpc8315erdb
index c630cf88b3d2a64bdadc0d00b90d83ce7a1792d3..b32132d0533eba9a5004cc9341008be6ff9e5f73 100644 (file)
--- a/doc/README.mpc8315erdb
+++ b/doc/README.mpc8315erdb
@@ -3,10 +3,10 @@ Freescale MPC8315ERDB Board
 
 1.     Board Switches and Jumpers
 
 
 1.     Board Switches and Jumpers
 

-       S3 is used to set CFG_RESET_SOURCE.
+       S3 is used to set CONFIG_SYS_RESET_SOURCE.

 
        To boot the image at 0xFE000000 in NOR flash, use these DIP
 
        To boot the image at 0xFE000000 in NOR flash, use these DIP

-       switche settings for S3 S4:
+       switch settings for S3 S4:

 
        +------+        +------+
        |      |        | **** |
 
        +------+        +------+
        |      |        | **** |


@@ -15,6 +15,18 @@ Freescale MPC8315ERDB Board
          4321            4321
        (where the '*' indicates the position of the tab of the switch.)
 
          4321            4321
        (where the '*' indicates the position of the tab of the switch.)
 

+       To boot the image at the beginning of NAND flash, use these
+       DIP switch settings for S3 S4:
+
+       +------+        +------+
+       | *    |        |  *** |
+       |  *** |        | *    |
+       +------+ ON     +------+ ON
+         4321            4321
+       (where the '*' indicates the position of the tab of the switch.)
+
+       When booting from NAND, use u-boot-nand.bin, not u-boot.bin.
+

 2.     Memory Map
        The memory map looks like this:
 
 2.     Memory Map
        The memory map looks like this:
 


@@ -26,6 +38,9 @@ Freescale MPC8315ERDB Board
        0xe060_0000     0xe060_7fff     NAND FLASH (CS1) 32K
        0xfe00_0000     0xfe7f_ffff     NOR FLASH (CS0)  8M
 
        0xe060_0000     0xe060_7fff     NAND FLASH (CS1) 32K
        0xfe00_0000     0xfe7f_ffff     NOR FLASH (CS0)  8M
 

+       When booting from NAND, NAND flash is CS0 and NOR flash
+       is CS1.
+

 3.     Definitions
 
 3.1    Explanation of NEW definitions in:
 3.     Definitions
 
 3.1    Explanation of NEW definitions in:


@@ -43,13 +58,15 @@ Freescale MPC8315ERDB Board
 
        export CROSS_COMPILE=your-cross-compiler-prefix-
        make distclean
 
        export CROSS_COMPILE=your-cross-compiler-prefix-
        make distclean

-       make MPC8315ERDB_config
+       make MPC8315ERDB_config (or MPC8315ERDB_NAND_config for u-boot-nand.bin)

        make all
 
 5.     Downloading and Flashing Images
 
 5.1    Reflash U-boot Image using U-boot
 
        make all
 
 5.     Downloading and Flashing Images
 
 5.1    Reflash U-boot Image using U-boot
 

+       NOR flash:
+

        tftp 40000 u-boot.bin
        protect off all
        erase fe000000 fe1fffff
        tftp 40000 u-boot.bin
        protect off all
        erase fe000000 fe1fffff


@@ -60,6 +77,15 @@ Freescale MPC8315ERDB Board
        You have to supply the correct byte count with 'xxxx'
        from the TFTP result log.
 
        You have to supply the correct byte count with 'xxxx'
        from the TFTP result log.
 

+       NAND flash:
+
+       =>tftpboot $loadaddr <filename>
+       =>nand erase 0 0x80000
+       =>nand write $loadaddr 0 0x80000
+
+       ...where 0x80000 is the filesize rounded up to
+       the next 0x20000 increment.
+

 5.2    Downloading and Booting Linux Kernel
 
        Ensure that all networking-related environment variables are set
 5.2    Downloading and Booting Linux Kernel
 
        Ensure that all networking-related environment variables are set


@@ -76,5 +102,4 @@ Freescale MPC8315ERDB Board
 
 6      Notes
 
 
 6      Notes
 

-       Booting from NAND flash is not yet supported.

        The console baudrate for MPC8315ERDB is 115200bps.
        The console baudrate for MPC8315ERDB is 115200bps.