From 5653fc335a450fa46d89989e1afe5e8bb9a0a52e Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sun, 8 Feb 2004 22:55:38 +0000
Subject: * Patch by Yuli Barcohen, 26 Jan 2004:   Allow bzip2 compression for
 small memory footprint boards

* Patch by Brad Kemp, 21 Jan 2004:
  Add support for CFI flash driver for both the Intel and the AMD
  command sets.

* Patch by Travis Sawyer, 20 Jan 2004:
  Fix pci bridge auto enumeration of sibling p2p bridges.

* Patch by Tolunay Orkun, 12 Jan 2004:
  Add some delays as needed for Intel LXT971A PHY support

* Patches by Stephan Linz, 09 Jan 2004:
  - avoid warning: unused variable `piop' in board/altera/common/sevenseg.c
  - make DK1C20 board configuration related to ASMI conform to
    documentation
---
 common/cmd_bootm.c  | 8 +++++++-
 common/miiphyutil.c | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'common')

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 34a74ce2c5..ac9c32e7b8 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -333,8 +333,14 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #ifdef CONFIG_BZIP2
 	case IH_COMP_BZIP2:
 		printf ("   Uncompressing %s ... ", name);
+		/*
+		 * If we've got less than 4 MB of malloc() space,
+		 * use slower decompression algorithm which requires
+		 * at most 2300 KB of memory.
+		 */
 		i = BZ2_bzBuffToBuffDecompress ((char*)ntohl(hdr->ih_load),
-						&unc_len, (char *)data, len, 0, 0);
+						&unc_len, (char *)data, len,
+						CFG_MALLOC_LEN < (4096 * 1024), 0);
 		if (i != BZ_OK) {
 			printf ("BUNZIP2 ERROR %d - must RESET board to recover\n", i);
 			SHOW_BOOT_PROGRESS (-6);
diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index af8c7c7a31..03964da81f 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -99,7 +99,9 @@ int miiphy_reset (unsigned char addr)
 #endif
 		return (-1);
 	}
-
+#ifdef CONFIG_PHY_RESET_DELAY
+	udelay (CONFIG_PHY_RESET_DELAY);	/* Intel LXT971A needs this */
+#endif
 	/*
 	 * Poll the control register for the reset bit to go to 0 (it is
 	 * auto-clearing).  This should happen within 0.5 seconds per the
-- 
cgit v1.2.3