[aadk-commits] qwell: uClinux/trunk r93 - /uClinux/trunk/uClinux-dist/linux-2.6.x/arch/black...

[aadk-commits at lists.digium.com]

Author: qwell
Date: Wed Dec 27 14:54:15 2006
New Revision: 93

URL: http://svn.digium.com/view/aadk?view=rev&rev=93
Log:
I reported a bug upstream, and here is the fix that I proposed.

If they fix it later, fine - but until then, I'm calling this the fix.

This allows using romfs without having memory get wasted.

Modified:
    uClinux/trunk/uClinux-dist/linux-2.6.x/arch/blackfin/kernel/setup.c

Modified: uClinux/trunk/uClinux-dist/linux-2.6.x/arch/blackfin/kernel/setup.c
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/linux-2.6.x/arch/blackfin/kernel/setup.c?view=diff&rev=93&r1=92&r2=93
==============================================================================
--- uClinux/trunk/uClinux-dist/linux-2.6.x/arch/blackfin/kernel/setup.c (original)
+++ uClinux/trunk/uClinux-dist/linux-2.6.x/arch/blackfin/kernel/setup.c Wed Dec 27 14:54:15 2006
@@ -260,20 +260,6 @@
 	    && ((unsigned long *)mtd_phys)[1] == ROMSB_WORD1)
 		mtd_size =
 		    PAGE_ALIGN(be32_to_cpu(((unsigned long *)mtd_phys)[2]));
-# if (defined(CONFIG_BLKFIN_CACHE) && defined(ANOMALY_05000263))
-	/* Due to a Hardware Anomaly we need to limit the size of usable
-	 * instruction memory to max 60MB, 56 if HUNT_FOR_ZERO is on
-	 * 05000263 - Hardware loop corrupted when taking an ICPLB exception
-	 */
-#  if (defined(CONFIG_DEBUG_HUNT_FOR_ZERO))
-	if (memory_end >= 56 * 1024 * 1024)
-		memory_end = 56 * 1024 * 1024;
-#  else
-	if (memory_end >= 60 * 1024 * 1024)
-		memory_end = 60 * 1024 * 1024;
-#  endif				/* CONFIG_DEBUG_HUNT_FOR_ZERO */
-	printk(KERN_NOTICE "Warning: limiting memory to %liMB due to hardware anomaly 05000263\n", memory_end >> 20);
-# endif				/* ANOMALY_05000263 */
 # endif				/* CONFIG_ROMFS_FS */
 
 	memory_end -= mtd_size;
@@ -301,7 +287,7 @@
 	if (memory_end >= 60 * 1024 * 1024)
 		memory_end = 60 * 1024 * 1024;
 #endif				/* CONFIG_DEBUG_HUNT_FOR_ZERO */
-
+	printk(KERN_NOTICE "Warning: limiting memory to %liMB due to hardware anomaly 05000263\n", memory_end >> 20);
 #endif				/* ANOMALY_05000263 */
 
 	init_mm.start_code = (unsigned long)_stext;