X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fenv_onenand.c;h=dcf09dee1bcf9d3162ef20974677e5ed98a72752;hb=0fc52948bda0734431cb528ee4fd82f1dec8c7b5;hp=66107f91f17ff027c8b8d58f2ed6bcc23b7eca3c;hpb=d7e8ce101a4a45ed6ed45739fc2de5f87b13f7f1;p=u-boot

diff --git a/common/env_onenand.c b/common/env_onenand.c
index 66107f91f1..dcf09dee1b 100644
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2005-2007 Samsung Electronics
+ * (C) Copyright 2005-2009 Samsung Electronics
  * Kyungmin Park <kyungmin.park@samsung.com>
  *
  * See file CREDITS for list of people who contributed to this
@@ -22,9 +22,6 @@
  */
 
 #include <common.h>
-
-#if defined(CFG_ENV_IS_IN_ONENAND)	/* Environment is in OneNAND */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -40,52 +37,51 @@ extern struct onenand_chip onenand_chip;
 /* References to names in env_common.c */
 extern uchar default_environment[];
 
-#define ONENAND_ENV_SIZE(mtd)	(mtd.oobblock - ENV_HEADER_SIZE)
-
 char *env_name_spec = "OneNAND";
 
+#define ONENAND_MAX_ENV_SIZE	4096
+#define ONENAND_ENV_SIZE(mtd)	(ONENAND_MAX_ENV_SIZE - ENV_HEADER_SIZE)
+
 #ifdef ENV_IS_EMBEDDED
 extern uchar environment[];
 env_t *env_ptr = (env_t *) (&environment[0]);
 #else /* ! ENV_IS_EMBEDDED */
-static unsigned char onenand_env[MAX_ONENAND_PAGESIZE];
+static unsigned char onenand_env[ONENAND_MAX_ENV_SIZE];
 env_t *env_ptr = (env_t *) onenand_env;
 #endif /* ENV_IS_EMBEDDED */
 
+DECLARE_GLOBAL_DATA_PTR;
+
 uchar env_get_char_spec(int index)
 {
-	DECLARE_GLOBAL_DATA_PTR;
-
 	return (*((uchar *) (gd->env_addr + index)));
 }
 
 void env_relocate_spec(void)
 {
-	DECLARE_GLOBAL_DATA_PTR;
-	unsigned long env_addr;
+	struct mtd_info *mtd = &onenand_mtd;
+	loff_t env_addr;
 	int use_default = 0;
-	int retlen;
+	size_t retlen;
 
-	env_addr = CFG_ENV_ADDR;
-	env_addr -= (unsigned long)onenand_chip.base;
+	env_addr = CONFIG_ENV_ADDR;
 
 	/* Check OneNAND exist */
-	if (onenand_mtd.oobblock)
+	if (mtd->writesize)
 		/* Ignore read fail */
-		onenand_read(&onenand_mtd, env_addr, onenand_mtd.oobblock,
+		mtd->read(mtd, env_addr, ONENAND_MAX_ENV_SIZE,
 			     &retlen, (u_char *) env_ptr);
 	else
-		onenand_mtd.oobblock = MAX_ONENAND_PAGESIZE;
+		mtd->writesize = MAX_ONENAND_PAGESIZE;
 
-	if (crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd)) !=
-	    env_ptr->crc)
+	if (crc32(0, env_ptr->data, ONENAND_ENV_SIZE(mtd)) != env_ptr->crc)
 		use_default = 1;
 
 	if (use_default) {
 		memcpy(env_ptr->data, default_environment,
-		       ONENAND_ENV_SIZE(onenand_mtd));
+		       ONENAND_ENV_SIZE(mtd));
 		env_ptr->crc =
-		    crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd));
+		    crc32(0, env_ptr->data, ONENAND_ENV_SIZE(mtd));
 	}
 
 	gd->env_addr = (ulong) & env_ptr->data;
@@ -94,26 +90,27 @@ void env_relocate_spec(void)
 
 int saveenv(void)
 {
-	unsigned long env_addr = CFG_ENV_ADDR;
-	struct erase_info instr;
-	int retlen;
-
-	instr.len = CFG_ENV_SIZE;
+	struct mtd_info *mtd = &onenand_mtd;
+	loff_t env_addr = CONFIG_ENV_ADDR;
+	struct erase_info instr = {
+		.callback	= NULL,
+	};
+	size_t retlen;
+
+	instr.len = CONFIG_ENV_SIZE;
 	instr.addr = env_addr;
-	instr.addr -= (unsigned long)onenand_chip.base;
-	if (onenand_erase(&onenand_mtd, &instr)) {
-		printf("OneNAND: erase failed at 0x%08x\n", env_addr);
+	instr.mtd = mtd;
+	if (mtd->erase(mtd, &instr)) {
+		printf("OneNAND: erase failed at 0x%08llx\n", env_addr);
 		return 1;
 	}
 
 	/* update crc */
-	env_ptr->crc =
-	    crc32(0, env_ptr->data, onenand_mtd.oobblock - ENV_HEADER_SIZE);
+	env_ptr->crc = crc32(0, env_ptr->data, ONENAND_ENV_SIZE(mtd));
 
-	env_addr -= (unsigned long)onenand_chip.base;
-	if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.oobblock, &retlen,
+	if (mtd->write(mtd, env_addr, ONENAND_MAX_ENV_SIZE, &retlen,
 	     (u_char *) env_ptr)) {
-		printf("OneNAND: write failed at 0x%08x\n", instr.addr);
+		printf("OneNAND: write failed at 0x%llx\n", instr.addr);
 		return 2;
 	}
 
@@ -122,13 +119,9 @@ int saveenv(void)
 
 int env_init(void)
 {
-	DECLARE_GLOBAL_DATA_PTR;
-
 	/* use default */
 	gd->env_addr = (ulong) & default_environment[0];
 	gd->env_valid = 1;
 
 	return 0;
 }
-
-#endif /* CFG_ENV_IS_IN_ONENAND */