RedBoot STK5 Release 2010-03-04

[karo-tx-redboot.git] / packages / hal / arm / mx51 / karo / v1_0 / include / plf_mmap.h

diff --git a/packages/hal/arm/mx51/karo/v1_0/include/plf_mmap.h b/packages/hal/arm/mx51/karo/v1_0/include/plf_mmap.h
index 90ec1523f56c5b2cde241b384c724edbb9fe5f55..767d33a1444ce6b47bd8eaf44d513bffd7931678 100644 (file)
--- a/packages/hal/arm/mx51/karo/v1_0/include/plf_mmap.h
+++ b/packages/hal/arm/mx51/karo/v1_0/include/plf_mmap.h
@@ -52,22 +52,10 @@
 CYG_MACRO_END
 
 // Get the physical address from a virtual address:
-#if 1
 #define HAL_VIRT_TO_PHYS_ADDRESS(vaddr, paddr) \
        CYG_MACRO_START                                                         \
        (paddr) = hal_virt_to_phy(vaddr);                       \
        CYG_MACRO_END
-#else
-#define HAL_VIRT_TO_PHYS_ADDRESS(vaddr, paddr)                 \
-       CYG_MACRO_START                                                                         \
-       cyg_uint32 _v_ = (cyg_uint32)(vaddr);                           \
-       if ( _v_ < 128 * SZ_1M )                  /* SDRAM */           \
-               _v_ += SDRAM_BASE_ADDR;                                                 \
-       else                                                     /* Rest of it */       \
-               /* no change */ ;                                                               \
-       (paddr) = _v_;                                                                          \
-       CYG_MACRO_END
-#endif
 
 /*
  * translate the virtual address of ram space to physical address
@@ -105,8 +93,9 @@ static unsigned long __inline__ hal_virt_to_phy(unsigned long virt)
  */
 static unsigned long __inline__ hal_ioremap_nocache(unsigned long phy)
 {
-       /* (CSD0_BASE_ADDR + SZ_128M) .. (CSD0_BASE_ADDR + SZ_256M - 1) is
-          uncacheable memory space which is mapped to SDRAM */
+       /* 0xf0000000 .. (0xf0000000 + SDRAM_SIZE) is
+        * uncacheable memory space which is mapped to SDRAM
+        */
        if ((phy & 0xF0000000) == CSD0_BASE_ADDR) {
                phy = (phy - CSD0_BASE_ADDR) | UNCACHED_RAM_BASE_VIRT;
        }