summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-10-05 00:25:17 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-10-05 00:25:17 +0200
commit29ca46c4453c41e0617b76248cae3be628e03cc2 (patch)
tree73ae3cdc3d160331d15984adc7ca410a4037eb88
parent99b0d2851a137453f4aca5f0a3d301b776bda28b (diff)
downloadu-boot-imx-29ca46c4453c41e0617b76248cae3be628e03cc2.zip
u-boot-imx-29ca46c4453c41e0617b76248cae3be628e03cc2.tar.gz
u-boot-imx-29ca46c4453c41e0617b76248cae3be628e03cc2.tar.bz2
Fix device partition intialization for SystemACE disks.
Patch by Stephen Williams, 28 Apr 2005
-rw-r--r--CHANGELOG3
-rw-r--r--common/cmd_ace.c1
-rw-r--r--include/configs/JSE.h14
3 files changed, 11 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 98a1515..144c53b 100644
--- 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 fb4d358..b6d6105 100644
--- 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 060272c..ccd1f19 100644
--- 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>