Fixes to the Lubbock (PXA 25x) support:

- Resolve the FIXME with respect to saving the u-boot environment.
- Make the default load address land in real memory.
- Fix lan91c96 SMC_{in,out}{b,w,l}() macros
Patch by David Brownell, 10 Mar 2005

diff --git a/CHANGELOG b/CHANGELOG
index 1d356633629d6849dc05f8b18d855756355a30d3..fc4e521cebe71cd55832e586e4b97f7e7df74645 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,12 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fixes to the Lubbock (PXA 25x) support:
+  - Resolve the FIXME with respect to saving the u-boot environment.
+  - Make the default load address land in real memory.
+  - Fix lan91c96 SMC_{in,out}{b,w,l}() macros
+  Patch by David Brownell, 10 Mar 2005
+
 * Add Barco Streaming Video Card (SVC) and Sample Compress Network (SCN) board
   Patch by Marc Leeman, 04 Mar 2005
 

diff --git a/drivers/lan91c96.h b/drivers/lan91c96.h
index 5c2afcef231cb8e8766b1737f62951b3f54f35a3..b7d7455b9d083ee415fb2f351e12914b38c9e7cb 100644 (file)
--- a/drivers/lan91c96.h
+++ b/drivers/lan91c96.h
@@ -78,17 +78,27 @@ typedef unsigned long int           dword;
 
 #ifdef CONFIG_PXA250
 
-#define        SMC_inl(r)      (*((volatile dword *)(SMC_BASE_ADDRESS+( r * 4 ))))
-#define        SMC_inw(r)      (*((volatile word *)(SMC_BASE_ADDRESS+( r * 4 ))))
-#define SMC_inb(p)     ({ \
-       unsigned int __p = (unsigned int)(SMC_BASE_ADDRESS + (p * 4)); \
-       unsigned int __v = *(volatile unsigned short *)((__p) & ~1); \
+#ifdef CONFIG_LUBBOCK
+#define        SMC_IO_SHIFT    2
+#undef USE_32_BIT
+
+#else
+#define        SMC_IO_SHIFT    0
+#endif
+
+#define        SMCREG(r)       (SMC_BASE_ADDRESS+((r)<<SMC_IO_SHIFT))
+
+#define        SMC_inl(r)      (*((volatile dword *)SMCREG(r)))
+#define        SMC_inw(r)      (*((volatile word *)SMCREG(r)))
+#define SMC_inb(p) ({ \
+       unsigned int __p = p; \
+       unsigned int __v = SMC_inw(__p & ~1); \
        if (__p & 1) __v >>= 8; \
        else __v &= 0xff; \
        __v; })
 
-#define        SMC_outl(d,r)   (*((volatile dword *)(SMC_BASE_ADDRESS+(r * 4))) = d)
-#define        SMC_outw(d,r)   (*((volatile word *)(SMC_BASE_ADDRESS+(r * 4))) = d)
+#define        SMC_outl(d,r)   (*((volatile dword *)SMCREG(r)) = d)
+#define        SMC_outw(d,r)   (*((volatile word *)SMCREG(r)) = d)
 #define        SMC_outb(d,r)   ({      word __d = (byte)(d);  \
                                word __w = SMC_inw((r)&~1);  \
                                __w &= ((r)&1) ? 0x00FF : 0xFF00;  \

diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 9ac62c7e076a6add6461b0e382e90e8982421b8a..ad1035b6d63173dda5c1ab3553c9715fb798278d 100644 (file)
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -77,9 +77,10 @@
 #define CONFIG_NETMASK         255.255.0.0
 #define CONFIG_IPADDR          192.168.0.21
 #define CONFIG_SERVERIP                192.168.0.250
-#define CONFIG_BOOTCOMMAND     "bootm 40000"
+#define CONFIG_BOOTCOMMAND     "bootm 80000"
 #define CONFIG_BOOTARGS                "root=/dev/mtdblock2 rootfstype=cramfs console=ttyS0,115200"
 #define CONFIG_CMDLINE_TAG
+#define CONFIG_TIMESTAMP
 
 #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400          /* speed to run kgdb serial port */
@@ -109,7 +110,7 @@
 
 #undef CFG_CLKS_IN_HZ          /* everything, incl board info, in Hz */
 
-#define CFG_LOAD_ADDR          0xa8000000      /* default load address */
+#define CFG_LOAD_ADDR  (CFG_DRAM_BASE + 0x8000) /* default load address */
 
 #define CFG_HZ                 3686400         /* incrementer freq: 3.6864 MHz */
 #define CFG_CPUSPEED           0x161           /* set core clock to 400/200/100 MHz */
@@ -211,10 +212,14 @@
 #define CFG_FLASH_ERASE_TOUT   (25*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (25*CFG_HZ) /* Timeout for Flash Write */
 
-/* FIXME */
+/* NOTE: many default partitioning schemes assume the kernel starts at the
+ * second sector, not an environment.  You have been warned!
+ */
+#define        CFG_MONITOR_LEN         PHYS_FLASH_SECT_SIZE
 #define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x1C000)        /* Addr of Environment Sector   */
-#define CFG_ENV_SIZE           0x4000  /* Total Size of Environment Sector     */
+#define CFG_ENV_ADDR           (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
+#define CFG_ENV_SECT_SIZE      PHYS_FLASH_SECT_SIZE
+#define CFG_ENV_SIZE           (PHYS_FLASH_SECT_SIZE / 16)
 
 
 /*