Fix whitespace issues.

[u-boot] / include / configs / MPC8641HPCN.h

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 1f5e2dfd949fccc2e7c11545e05168d4da3ff005..6e883f73f80990aa4f71f0c8a8a34ebc64c27130 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -85,7 +85,6 @@
 #define CFG_MEMTEST_START      0x00200000      /* memtest region */
 #define CFG_MEMTEST_END                0x00400000
 
-
 /*
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
@@ -94,7 +93,6 @@
 #define CFG_CCSRBAR            0xf8000000      /* relocated CCSRBAR */
 #define CFG_IMMR               CFG_CCSRBAR     /* PQII uses CFG_IMMR */
 
-
 /*
  * DDR Setup
  */
@@ -317,7 +315,6 @@
 #define CFG_PCI2_IO_PHYS       CFG_PCI2_IO_BASE
 #define CFG_PCI2_IO_SIZE       0x1000000       /* 16M */
 
-
 #if defined(CONFIG_PCI)
 
 #define CONFIG_PCI_SCAN_SHOW            /* show pci devices on startup */
@@ -340,8 +337,18 @@
 
 #undef CONFIG_PCI_SCAN_SHOW            /* show pci devices on startup */
 
-#endif /* CONFIG_PCI */
+#define CONFIG_DOS_PARTITION
+#define CONFIG_SCSI_AHCI
 
+#ifdef CONFIG_SCSI_AHCI
+#define CONFIG_SATA_ULI5288
+#define CFG_SCSI_MAX_SCSI_ID   4
+#define CFG_SCSI_MAX_LUN       1
+#define CFG_SCSI_MAX_DEVICE    (CFG_SCSI_MAX_SCSI_ID * CFG_SCSI_MAX_LUN)
+#define CFG_SCSI_MAXDEVICE     CFG_SCSI_MAX_DEVICE
+#endif
+
+#endif /* CONFIG_PCI */
 
 #if defined(CONFIG_TSEC_ENET)
 
@@ -373,7 +380,6 @@
 
 #endif /* CONFIG_TSEC_ENET */
 
-
 /*
  * BAT0         2G     Cacheable, non-guarded
  * 0x0000_0000  2G     DDR
@@ -451,9 +457,6 @@
 #define CFG_IBAT7L 0x00000000
 #define CFG_IBAT7U 0x00000000
 
-
-
-
 /*
  * Environment
  */
@@ -477,7 +480,9 @@
     #define  CONFIG_COMMANDS   ((CONFIG_CMD_DFL        \
                                 | CFG_CMD_PING         \
                                 | CFG_CMD_PCI          \
-                                | CFG_CMD_I2C)         \
+                                | CFG_CMD_I2C          \
+                                | CFG_CMD_SCSI         \
+                                | CFG_CMD_EXT2)        \
                                &                       \
                                 ~(CFG_CMD_ENV          \
                                  | CFG_CMD_IMLS        \
@@ -486,7 +491,9 @@
   #else
     #define  CONFIG_COMMANDS   ((CONFIG_CMD_DFL        \
                                 | CFG_CMD_PING         \
-                                | CFG_CMD_I2C)         \
+                                | CFG_CMD_I2C          \
+                                | CFG_CMD_SCSI         \
+                                | CGF_CMD_EXT2)        \
                                &                       \
                                 ~(CFG_CMD_ENV          \
                                 | CFG_CMD_IMLS         \
@@ -498,7 +505,9 @@
     #define  CONFIG_COMMANDS   (CONFIG_CMD_DFL         \
                                | CFG_CMD_PCI           \
                                | CFG_CMD_PING          \
-                               | CFG_CMD_I2C)
+                               | CFG_CMD_I2C           \
+                               | CFG_CMD_SCSI          \
+                               | CFG_CMD_EXT2)
   #else
     #define  CONFIG_COMMANDS   (CONFIG_CMD_DFL         \
                                | CFG_CMD_PING          \
@@ -555,7 +564,6 @@
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
 
-
 /*
  * Environment Configuration
  */
@@ -593,15 +601,10 @@
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
    "netdev=eth0\0"                                                      \
    "consoledev=ttyS0\0"                                                 \
-   "ramdiskaddr=400000\0"                                              \
+   "ramdiskaddr=2000000\0"                                             \
    "ramdiskfile=your.ramdisk.u-boot\0"                                  \
-   "dtbaddr=2000000\0"                                         \
+   "dtbaddr=400000\0"                                          \
    "dtbfile=mpc8641_hpcn.dtb\0"                                  \
-   "pex0=echo ---------------------------; echo --------- PCI EXPRESS -----\0"\
-   "pexstat=mw f8008000 84000004; echo -expect:- 16000000; md f8008004 1\0" \
-   "pex1=pci write 1.0.0 4 146; pci write 1.0.0 10 80000000\0" \
-   "pexd=echo -expect:- xxx01002 00100146; pci display 1.0.0 0 2\0" \
-   "pex=run pexstat; run pex1; run pexd\0" \
    "en-wd=mw.b f8100010 0x08; echo -expect:- 08; md.b f8100010 1\0" \
    "dis-wd=mw.b f8100010 0x00; echo -expect:- 00; md.b f8100010 1\0" \
    "maxcpus=2"