Merge branch 'master' of rsync://rsync.denx.de/git/u-boot

[platform/kernel/u-boot.git] / board / sixnet / sixnet.c

diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c
index 42d1497..a4cb4dc 100644 (file)
--- a/board/sixnet/sixnet.c
+++ b/board/sixnet/sixnet.c
@@ -34,10 +34,12 @@
 #endif
 
 #if (CONFIG_COMMANDS & CFG_CMD_NAND)
-#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_legacy.h>
 extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define ORMASK(size) ((-size) & OR_AM_MSK)
 
 static long ram_size(ulong *, long);
@@ -256,8 +258,6 @@ int board_postclk_init (void)
 
 int misc_init_r (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        volatile immap_t     *immap = (immap_t *)CFG_IMMR;
        volatile memctl8xx_t *memctl = &immap->im_memctl;
        char* s;
@@ -356,7 +356,7 @@ void nand_init(void)
 static long ram_size(ulong *base, long maxsize)
 {
     volatile long      *test_addr;
-    volatile long      *base_addr = base;
+    volatile ulong     *base_addr = base;
     ulong              ofs;            /* byte offset from base_addr */
     ulong              save;           /* to make test non-destructive */
     ulong              save2;          /* to make test non-destructive */
@@ -601,70 +601,3 @@ long int initdram(int board_type)
 
        return (size_sdram);
 }
-
-#ifdef CFG_JFFS_CUSTOM_PART
-
-static struct part_info part;
-
-#define jffs2_block(i) \
-       ((struct jffs2_unknown_node*)(CFG_JFFS2_BASE + (i) * 65536))
-
-struct part_info* jffs2_part_info(int part_num)
-{
-       DECLARE_GLOBAL_DATA_PTR;
-       bd_t *bd = gd->bd;
-       char* s;
-       int i;
-       int bootnor = 0;        /* assume booting from NAND flash */
-
-       if (part_num != 0)
-               return 0;       /* only support one partition */
-
-       if (part.usr_priv == (void*)1)
-               return &part;   /* already have part info */
-
-       memset(&part, 0, sizeof(part));
-
-       if (nand_dev_desc[0].ChipID == NAND_ChipID_UNKNOWN)
-               bootnor = 1;
-       else if (bd->bi_flashsize < 0x800000)
-               bootnor = 0;
-       else for (i = 0; !bootnor && i < 4; ++i) {
-               /* boot from NOR if JFFS2 info in any of
-                * first 4 erase blocks
-                */
-
-               if (jffs2_block(i)->magic == JFFS2_MAGIC_BITMASK)
-                       bootnor = 1;
-       }
-
-       if (bootnor) {
-               /* no NAND flash or boot in NOR, use NOR flash */
-               part.offset = (unsigned char *)CFG_JFFS2_BASE;
-               part.size = CFG_JFFS2_SIZE;
-       }
-       else {
-               char readcmd[60];
-
-               /* boot info in NAND flash, get and use copy in RAM */
-
-               /* override info from environment if present */
-               s = getenv("fsaddr");
-               part.offset = s ? (void *)simple_strtoul(s, NULL, 16)
-                               : (void *)CFG_JFFS2_RAMBASE;
-               s = getenv("fssize");
-               part.size = s ? simple_strtoul(s, NULL, 16)
-                             : CFG_JFFS2_RAMSIZE;
-
-               /* read from nand flash */
-               sprintf(readcmd, "nand read.jffs2 %x 0 %x",
-                       (uint32_t)part.offset, part.size);
-               run_command(readcmd, 0);
-       }
-
-       part.erasesize = 0;     /* unused */
-       part.usr_priv=(void*)1; /* ready */
-
-       return &part;
-}
-#endif /* ifdef CFG_JFFS_CUSTOM_PART */