# Recovery block' size should be 1 block (256K)
# Recovery block includes the onenand_ipl(16K), so actual size is 240K
-TEXT_BASE = 0xD0020000
+TEXT_BASE = 0x34800000
# 256K - 16K(IPL Size)
-TEXT_BASE_256K = 0xD005C000
+TEXT_BASE_256K = 0x3483C000
LDSCRIPT= $(TOPDIR)/recovery/board/$(BOARDDIR)/recovery.lds
LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
OBJCFLAGS += --gap-fill=0x00
SOBJS += start.o _memcpy32.o
-COBJS += recovery.o onenand_read.o
+COBJS += recovery.o onenand.o
SRCS := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c))
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
ln -s $(SRCTREE)/recovery/recovery.c $@
# from onenand_ipl directory
-$(obj)onenand_ipl.h:
+$(obj)onenand.h:
@rm -f $@
- ln -s $(SRCTREE)/onenand_ipl/onenand_ipl.h $@
+ ln -s $(SRCTREE)/recovery/onenand.h $@
-$(obj)onenand_read.c: $(obj)onenand_ipl.h
+$(obj)onenand.c: $(obj)onenand.h
@rm -f $@
- ln -s $(SRCTREE)/onenand_ipl/onenand_read.c $@
+ ln -s $(SRCTREE)/recovery/onenand.c $@
$(obj)%.o: $(obj)%.S
$(CC) $(AFLAGS) -c -o $@ $<
sinclude $(obj).depend
clean:
- rm recovery.c onenand_read.c
+ rm recovery.c onenand.c
--- /dev/null
+/*
+ * (C) Copyright 2005-2009 Samsung Electronics
+ * Kyungmin Park <kyungmin.park@samsung.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+
+#include <asm/io.h>
+#include <asm/string.h>
+
+#include "onenand.h"
+
+#define onenand_block_address(block) (block)
+#define onenand_sector_address(page) (page << 2)
+#define onenand_buffer_address() ((1 << 3) << 8)
+#define onenand_bufferram_address(block) (0)
+
+#ifdef __HAVE_ARCH_MEMCPY32
+extern void *memcpy32(void *dest, void *src, int size);
+#endif
+
+int (*onenand_read_page)(ulong block, ulong page, u_char *buf, int pagesize);
+
+/* read a page with ECC */
+static int generic_onenand_read_page(ulong block, ulong page,
+ u_char * buf, int pagesize)
+{
+ unsigned long *base;
+
+#ifndef __HAVE_ARCH_MEMCPY32
+ unsigned int offset, value;
+ unsigned long *p;
+#endif
+
+ onenand_writew(onenand_block_address(block),
+ ONENAND_REG_START_ADDRESS1);
+
+ onenand_writew(onenand_bufferram_address(block),
+ ONENAND_REG_START_ADDRESS2);
+
+ onenand_writew(onenand_sector_address(page),
+ ONENAND_REG_START_ADDRESS8);
+
+ onenand_writew(onenand_buffer_address(),
+ ONENAND_REG_START_BUFFER);
+
+ onenand_writew(ONENAND_INT_CLEAR, ONENAND_REG_INTERRUPT);
+
+ onenand_writew(ONENAND_CMD_READ, ONENAND_REG_COMMAND);
+
+#ifndef __HAVE_ARCH_MEMCPY32
+ p = (unsigned long *) buf;
+#endif
+ base = (unsigned long *) (CONFIG_SYS_ONENAND_BASE + ONENAND_DATARAM);
+
+ while (!(READ_INTERRUPT() & ONENAND_INT_READ))
+ continue;
+
+ /* Check for invalid block mark */
+ if (page < 2 && (onenand_readw(ONENAND_SPARERAM) != 0xffff))
+ return 1;
+
+#ifdef __HAVE_ARCH_MEMCPY32
+ /* 32 bytes boundary memory copy */
+ memcpy32(buf, base, pagesize);
+#else
+ for (offset = 0; offset < (pagesize >> 2); offset++) {
+ value = *(base + offset);
+ *p++ = value;
+ }
+#endif
+
+ return 0;
+}
+
+#ifndef CONFIG_ONENAND_START_PAGE
+#define CONFIG_ONENAND_START_PAGE 1
+#endif
+#define ONENAND_PAGES_PER_BLOCK 64
+
+static int onenand_generic_init(int *page_is_4KiB, int *page)
+{
+ int dev_id, density;
+
+ if (onenand_readw(ONENAND_REG_TECHNOLOGY))
+ *page_is_4KiB = 1;
+ dev_id = onenand_readw(ONENAND_REG_DEVICE_ID);
+ density = dev_id >> ONENAND_DEVICE_DENSITY_SHIFT;
+ density &= ONENAND_DEVICE_DENSITY_MASK;
+ if (density >= ONENAND_DEVICE_DENSITY_4Gb &&
+ !(dev_id & ONENAND_DEVICE_IS_DDP))
+ *page_is_4KiB = 1;
+
+ return ONENAND_USE_DEFAULT;
+}
+
+int onenand_board_init(int *page_is_4KiB, int *page)
+ __attribute__((weak, alias("onenand_generic_init")));
+
+/**
+ * onenand_read_block - Read CONFIG_RECOVERY_BOOT_BLOCKS from block #1
+ * @return 0 on success
+ */
+int onenand_read_block(unsigned char *buf)
+{
+ int block, nblocks;
+ int page = 0, offset = 0;
+ int pagesize, erase_shift;
+ int page_is_4KiB = 0, ret;
+
+ pagesize = 2048; /* OneNAND has 2KiB pagesize */
+ erase_shift = 17;
+ onenand_read_page = generic_onenand_read_page;
+
+ ret = onenand_board_init(&page_is_4KiB, &page);
+ if (ret == ONENAND_USE_GENERIC)
+ onenand_generic_init(&page_is_4KiB, &page);
+
+ if (page_is_4KiB) {
+ pagesize = 4096; /* OneNAND has 4KiB pagesize */
+ erase_shift = 18;
+ }
+
+ nblocks = CONFIG_RECOVERY_BOOT_BLOCKS;
+
+ /* NOTE: you must read page from page 1 of block 0 */
+ /* read the block page by page */
+ for (block = 1; block < nblocks; block++) {
+ for (; page < ONENAND_PAGES_PER_BLOCK; page++) {
+ if (onenand_read_page(block, page, buf + offset,
+ pagesize)) {
+ /* This block is bad. Skip it
+ * and read next block */
+ offset -= page * pagesize;
+ nblocks++;
+ break;
+ }
+ offset += pagesize;
+ }
+ page = 0;
+ }
+
+ return 0;
+}
--- /dev/null
+/*
+ * (C) Copyright 2005-2008 Samsung Electronics
+ * Kyungmin Park <kyungmin.park@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _ONENAND_IPL_H
+#define _ONENAND_IPL_H
+
+#include <linux/mtd/onenand_regs.h>
+
+#define onenand_readw(a) readw(THIS_ONENAND(a))
+#define onenand_writew(v, a) writew(v, THIS_ONENAND(a))
+
+#define THIS_ONENAND(a) (CONFIG_SYS_ONENAND_BASE + (a))
+
+#define READ_INTERRUPT() onenand_readw(ONENAND_REG_INTERRUPT)
+
+enum {
+ ONENAND_USE_DEFAULT,
+ ONENAND_USE_GENERIC,
+ ONENAND_USE_BOARD,
+};
+
+extern int (*onenand_read_page)(ulong block, ulong page,
+ u_char *buf, int pagesize);
+extern int onenand_read_block(unsigned char *buf);
+#endif
projects / kernel / u-boot.git / commitdiff