Fix device partition intialization for SystemACE disks.

Patch by Stephen Williams, 28 Apr 2005

diff --git a/CHANGELOG b/CHANGELOG
index 98a15159b82bf8632249e1e0942137e61b4ab1fb..144c53ba3a72cdc48da1f23f1db8682be84b1270 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fix device partition intialization for SystemACE disks.
+  Patch by Stephen Williams, 28 Apr 2005
+
 * Added support for KwikByte KB920x boards (based on AT91RM9200)
   Patch by Matt ?? <kb9200_dev@kwikbyte.com>, 27 Apr 2005
 

diff --git a/common/cmd_ace.c b/common/cmd_ace.c
index fb4d3584b5039690e3e4475327df1cc3996eb0b7..b6d61057fdebe10e34a80d9746f0ede1a758c565 100644 (file)
--- a/common/cmd_ace.c
+++ b/common/cmd_ace.c
@@ -131,6 +131,7 @@ block_dev_desc_t *  systemace_get_dev(int dev)
           not yet initialized. In that case, fill it in. */
       if (systemace_dev.blksz == 0) {
            systemace_dev.if_type   = IF_TYPE_UNKNOWN;
+           systemace_dev.dev       = 0;
            systemace_dev.part_type = PART_TYPE_UNKNOWN;
            systemace_dev.type      = DEV_TYPE_HARDDISK;
            systemace_dev.blksz     = 512;

diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index 060272cd18ad236ab6fe1d8e3add0b7982610c50..ccd1f19903b40ed3871c9998dfb9ce97515c6055 100644 (file)
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -135,16 +135,16 @@
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
 
 #define CONFIG_COMMANDS               (CONFIG_CMD_DFL  | \
-                               CFG_CMD_PCI     | \
-                               CFG_CMD_IRQ     | \
-                               CFG_CMD_FLASH   | \
-                               CFG_CMD_NET     | \
                                CFG_CMD_DHCP    | \
-                               CFG_CMD_PING    | \
-                               CFG_CMD_MII     | \
                                CFG_CMD_EEPROM  | \
+                               CFG_CMD_ELF     | \
                                CFG_CMD_FAT     | \
-                               CFG_CMD_ELF     )
+                               CFG_CMD_FLASH   | \
+                               CFG_CMD_IRQ     | \
+                               CFG_CMD_MII     | \
+                               CFG_CMD_NET     | \
+                               CFG_CMD_PCI     | \
+                               CFG_CMD_PING    )
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>