From: Wolfgang Denk Date: Tue, 4 Oct 2005 22:25:17 +0000 (+0200) Subject: Fix device partition intialization for SystemACE disks. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29ca46c4453c41e0617b76248cae3be628e03cc2;p=people%2Fms%2Fu-boot.git Fix device partition intialization for SystemACE disks. Patch by Stephen Williams, 28 Apr 2005 --- diff --git a/CHANGELOG b/CHANGELOG index 98a15159b8..144c53ba3a 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 ?? , 27 Apr 2005 diff --git a/common/cmd_ace.c b/common/cmd_ace.c index fb4d3584b5..b6d61057fd 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 060272cd18..ccd1f19903 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