[Balloon-svn] r999 - balloon/trunk/bootldr

Author: wookey
Date: 2010-02-18 18:09:36 +0000 (Thu, 18 Feb 2010)
New Revision: 999

Modified:
balloon/trunk/bootldr/boot-pxa.s
balloon/trunk/bootldr/config.local.mk
Log:
Remove the two changes that I just accidentally committed

Modified: balloon/trunk/bootldr/boot-pxa.s
===================================================================
--- balloon/trunk/bootldr/boot-pxa.s    2010-02-18 18:07:32 UTC (rev 998)
+++ balloon/trunk/bootldr/boot-pxa.s    2010-02-18 18:09:36 UTC (rev 999)
@@ -2634,17 +2634,10 @@
 // RDF is minimum number of clock cycles nOE/nPWE are asserted
 // we want this to be 3 for quick NAND access
 // any slower cycles will be created by the VLIO timer in CPLD
-//.long 0x74a47734
+.long 0x74a47734
 //below is correct magic value for use with 'fast bus' mode - i.e if
 //CPU_FREQ turned on in kernel
 //    .long 0x74a45dd1
-// and this is the 'novlio' version
-// 15  14 13 12 11 10 09 08 07 06 05 04 03  02 01 00
-//RBUF|  RRR   |    RDN    |    RDF    |RBW|   RT
-// for Samosa, asssuming 104MHz bus clock,
-// SRAM timing
-// RDF=14, RDN=14, RRR=4, RBUF=0, RBW=0, RT=1
-.long 0x74a44ee1
 #else
 MSC2_INIT:
     .long 0x74a42494

Modified: balloon/trunk/bootldr/config.local.mk
===================================================================
--- balloon/trunk/bootldr/config.local.mk    2010-02-18 18:07:32 UTC (rev 998)
+++ balloon/trunk/bootldr/config.local.mk    2010-02-18 18:09:36 UTC (rev 999)
@@ -7,7 +7,7 @@
 CONFIG_MACH=BALLOON

# optional definitions
-CONFIG_BALLOON_DEBUG=y
+CONFIG_BALLOON_DEBUG=n
CONFIG_FAKE_CFI_FLASH=y

CONFIG_NOSPLASH=y