]> git.sur5r.net Git - u-boot/commitdiff
Coding Style cleanup.
authorWolfgang Denk <wd@pollux.denx.de>
Wed, 18 Oct 2006 20:44:38 +0000 (22:44 +0200)
committerWolfgang Denk <wd@pollux.denx.de>
Wed, 18 Oct 2006 20:44:38 +0000 (22:44 +0200)
board/v38b/ethaddr.c
board/v38b/v38b.c
doc/README.nand
include/configs/V38B.h

index 105608051c7488786eff6f9a51a0a5f36152b7dd..aaa629ef61119d3fb5565f2afdd916b2e53690a9 100644 (file)
@@ -118,7 +118,7 @@ void read_2501_memory(unsigned char *psernum, unsigned char *perr)
        crcval = 0;
 
        for (i=0; i<NBYTES; i++)
-               
+
 
        if (!check_device())
                *perr = ERR_NO_NUMBER;
@@ -224,7 +224,7 @@ static void read_byte(unsigned char  *data)
                        rdat = (rdat >> 1) | 0x80;
                else
                        rdat = rdat >> 1;
-               
+
                udelay(60);     /* at least 60 us */
        }
        /* copy the return value */
index c56c6c84d273b82bf8d379148e22ac22a8b47f92..99fe7dbc3c4efc1fa5e8b3bc2ebba9b6e3bda042 100644 (file)
@@ -250,4 +250,3 @@ void hw_watchdog_reset(void)
 {
 /* TODO fill this in */
 }
-
index 2b9a52966c518cb5bb34d8d4b90e18ce4a3a9265..5279a4f2bc5c345d4fd083bc7aeaa5f74bade3e9 100644 (file)
@@ -1,9 +1,7 @@
 NAND FLASH commands and notes
 
-
 See NOTE below!!!
 
-
 # (C) Copyright 2003
 # Dave Ellis, SIXNET, dge@sixnetio.com
 #
@@ -209,7 +207,6 @@ the tree until the DoC is ported to use the new NAND support (or boards
 with DoC will break).
 
 
-
 Additional improvements to the NAND subsystem by Guido Classen, 10-10-2006
 
 JFFS2 related commands:
index 9b8fc699a90d888f37b40ae21d4d481c74532fbe..8eea504742a0e2e7b72374e86b0f728a66d6674b 100644 (file)
@@ -11,7 +11,7 @@
  *
  * 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
+ * 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
  * (easy to change)
 */
 
-#define CONFIG_MPC5xxx                 1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200                 1       /* This is an MPC5200 CPU */
-#define CONFIG_V38B                    1       /* ... on V38B board */
-#define CFG_MPC5XXX_CLKIN      33000000        /* ... running at 33.000000MHz */
+#define CONFIG_MPC5xxx                 1       /* This is an MPC5xxx CPU       */
+#define CONFIG_MPC5200                 1       /* This is an MPC5200 CPU       */
+#define CONFIG_V38B                    1       /* ... on V38B board            */
+#define CFG_MPC5XXX_CLKIN      33000000        /* ... running at 33.000000MHz  */
 
-#define CONFIG_RTC_PCF8563             1       /* has PCF8563 RTC  */
-#define CONFIG_MPC5200_DDR             1       /* has DDR SDRAM    */
-#define CONFIG_HW_WATCHDOG             1       /* has watchdog     */
+#define CONFIG_RTC_PCF8563             1       /* has PCF8563 RTC              */
+#define CONFIG_MPC5200_DDR             1       /* has DDR SDRAM                */
+#define CONFIG_HW_WATCHDOG             1       /* has watchdog                 */
 
 #define CONFIG_NETCONSOLE              1
 
-#define CONFIG_BOARD_EARLY_INIT_R      1       /* make flash read/write */
+#define CONFIG_BOARD_EARLY_INIT_R      1       /* make flash read/write        */
 
-#define CFG_XLB_PIPELINING             1       /* gives better performance */
+#define CFG_XLB_PIPELINING             1       /* gives better performance     */
 
 
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH  */
-#define BOOTFLAG_WARM          0x02    /* Software reboot           */
+#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH     */
+#define BOOTFLAG_WARM          0x02    /* Software reboot                      */
 
-#define CFG_CACHELINE_SIZE     32      /* For MPC5xxx CPUs */
+#define CFG_CACHELINE_SIZE     32      /* For MPC5xxx CPUs                     */
 #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
-#  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value */
+#  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value        */
 #endif
 
 /*
  * Serial console configuration
  */
-#define CONFIG_PSC_CONSOLE     1       /* console is on PSC1 */
-#define CONFIG_BAUDRATE                115200  /* ... at 115200 bps */
+#define CONFIG_PSC_CONSOLE     1       /* console is on PSC1   */
+#define CONFIG_BAUDRATE                115200  /* ... at 115200 bps    */
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
 #define CONFIG_USB_OHCI
 #define CONFIG_USB_STORAGE
 
-#define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
+#define CONFIG_TIMESTAMP               /* Print image info with timestamp */
 
 /*
  * Supported commands
  */
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
+#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
                                 CFG_CMD_FAT    | \
                                 CFG_CMD_I2C    | \
                                 CFG_CMD_IDE    | \
                                 CFG_CMD_IRQ    | \
                                 CFG_CMD_JFFS2  | \
                                 CFG_CMD_MII    | \
-                                CFG_CMD_SDRAMi | \
+                                CFG_CMD_SDRAMi | \
                                 CFG_CMD_DATE   | \
                                 CFG_CMD_USB    | \
                                 CFG_CMD_FAT)
 /*
  * Boot low with 16 MB Flash
  */
-#   define CFG_LOWBOOT         1
+#   define CFG_LOWBOOT         1
 #   define CFG_LOWBOOT16       1
 
 /*
  */
 #define CONFIG_BOOTDELAY       3       /* autoboot after 3 seconds */
 
-#define CONFIG_PREBOOT "echo;" \
+#define CONFIG_PREBOOT "echo;" \
        "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
        "echo"
 
 #undef CONFIG_BOOTARGS
 
-#define        CONFIG_EXTRA_ENV_SETTINGS                                   \
-        "netdev=eth0\0"                                             \
-        "devno=5\0"                                                 \
-        "hostname=V38B_$(devno)\0"                                  \
-        "ipaddr=10.100.99.$(devno)\0"                               \
-        "netmask=255.255.0.0\0"                                     \
-        "serverip=10.100.10.90\0"                                   \
-        "gatewayip=10.100.254.254\0"                                \
-        "ramargs=setenv bootargs root=/dev/ram rw\0"                \
-        "rootpath=/opt/eldk/ppc_6xx\0"                              \
-        "bootfile=mpc5200/uImage\0"                                 \
-        "bootcmd=run net_nfs\0"                                     \
-        "addip=setenv bootargs $(bootargs) "                        \
-            "ip=$(ipaddr):$(serverip):$(gatewayip):"                \
-            "$(netmask):$(hostname):$(netdev):off panic=1\0"        \
-        "flash_nfs=run nfsargs addip;bootm $(kernel_addr)\0"        \
-        "flash_self=run ramargs addip;bootm $(kernel_addr) "        \
-            "$(ramdisk_addr)\0"                                     \
-        "net_nfs=tftp 200000 $(bootfile);run nfsargs "              \
-            "addip;bootm\0"                                         \
-        "nfsargs=setenv bootargs root=/dev/nfs rw "                 \
-            "nfsroot=$(serverip):$(rootpath)\0"                     \
-        ""
+#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+       "netdev=eth0\0"                                                 \
+       "devno=5\0"                                                     \
+       "hostname=V38B_$(devno)\0"                                      \
+       "ipaddr=10.100.99.$(devno)\0"                                   \
+       "netmask=255.255.0.0\0"                                         \
+       "serverip=10.100.10.90\0"                                       \
+       "gatewayip=10.100.254.254\0"                                    \
+       "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
+       "rootpath=/opt/eldk/ppc_6xx\0"                                  \
+       "bootfile=mpc5200/uImage\0"                                     \
+       "bootcmd=run net_nfs\0"                                         \
+       "addip=setenv bootargs $(bootargs) "                            \
+               "ip=$(ipaddr):$(serverip):$(gatewayip):"                \
+               "$(netmask):$(hostname):$(netdev):off panic=1\0"        \
+       "flash_nfs=run nfsargs addip;bootm $(kernel_addr)\0"            \
+       "flash_self=run ramargs addip;bootm $(kernel_addr) "            \
+               "$(ramdisk_addr)\0"                                     \
+       "net_nfs=tftp 200000 $(bootfile);run nfsargs "                  \
+               "addip;bootm\0"                                         \
+       "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
+               "nfsroot=$(serverip):$(rootpath)\0"                     \
+       ""
 
 #define CONFIG_BOOTCOMMAND     "run net_nfs"
 
  */
 #define CFG_FLASH_CFI          1               /* Flash is CFI conformant */
 #define CFG_FLASH_CFI_DRIVER   1               /* Use the common driver */
-#define CFG_FLASH_CFI_AMD_RESET        1
+#define CFG_FLASH_CFI_AMD_RESET 1
 #define CFG_FLASH_BASE         0xFF000000
 #define CFG_MAX_FLASH_BANKS    1               /* max num of flash banks */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_SIZE         0x01000000      /* 16 MiB */
 #define CFG_MAX_FLASH_SECT     256             /* max num of sects on one chip */
-#define CFG_FLASH_USE_BUFFER_WRITE     1       /* flash write speed-up */ 
+#define CFG_FLASH_USE_BUFFER_WRITE     1       /* flash write speed-up */
 
 /*
  * Environment settings
  */
 #define CONFIG_MPC5xxx_FEC     1
 #define CONFIG_PHY_ADDR                0x00
-#define CONFIG_MII              1
+#define CONFIG_MII             1
 
 /*
  * GPIO configuration
  *-----------------------------------------------------------------------
  */
 
-#undef  CONFIG_IDE_8xx_PCCARD          /* Don't use IDE with PC Card   Adapter */
+#undef CONFIG_IDE_8xx_PCCARD           /* Don't use IDE with PC Card   Adapter */
 
-#undef CONFIG_IDE_8xx_DIRECT           /* Direct IDE    not supported  */
-#undef CONFIG_IDE_LED                  /* LED   for ide not supported  */
+#undef CONFIG_IDE_8xx_DIRECT           /* Direct IDE    not supported  */
+#undef CONFIG_IDE_LED                  /* LED   for ide not supported  */
 
-#define        CONFIG_IDE_RESET                /* reset for ide supported      */
+#define CONFIG_IDE_RESET               /* reset for ide supported      */
 #define CONFIG_IDE_PREINIT
 
 #define CFG_IDE_MAXBUS         1       /* max. 1 IDE bus               */
 /* Offset for alternate registers      */
 #define CFG_ATA_ALT_OFFSET     (0x005C)
 
-/* Interval between registers                                                */
-#define CFG_ATA_STRIDE          4
+/* Interval between registers                                               */
+#define CFG_ATA_STRIDE         4
 
-/* Status LED                                                */
+/* Status LED                                               */
 
-#define  CONFIG_STATUS_LED               /* Status LED enabled           */
-#define  CONFIG_BOARD_SPECIFIC_LED       /* version has board specific leds */
+#define         CONFIG_STATUS_LED               /* Status LED enabled           */
+#define         CONFIG_BOARD_SPECIFIC_LED       /* version has board specific leds */
 
 #define CFG_LED_BASE   (0xf0000600 + 0x70)     /* Timer 7 GPIO */