December 2008 - U-Boot

[U-Boot] [PATCH 0/3] sbc8548 PHY fix, cmdline editing.
by Paul Gortmaker 11 Dec '08

11 Dec '08

Hi Andy, Would you please merge these three sbc8548 patches via the mpc85xx tree? This fixes an incorrect PHY address issue that was masked by the tsec driver inadvertently doing an "if (0) {...}" Rather than put in bogus PHY address for the eTSEC3 and eTSEC4, I just purged them from the board config file altogether. I also got sick of not having command line editing, and so enabled that. Thanks, Paul.

1 3

[U-Boot] [RFC USB PATCH] USB ehci I/O function fix
by Michael Trimarchi 11 Dec '08

11 Dec '08

>From e2f57c5cee96b506d9580cf93d4bd2a0de1c3e3d Mon Sep 17 00:00:00 2001 From: michael <michael(a)panicking.retis> Date: Thu, 11 Dec 2008 13:43:55 +0100 Subject: [PATCH] This patch add varius fix to the ehci. - fix ehci_readl, ehci_writel - introduce new define in ehci.h - introduce the handshake function for waiting on a register - fix usb_ehci_fsl with the new HC_LENGTH macro Signed-off-by: Michael Trimarchi <trimarchimichael(a)yahoo.it> --- drivers/usb/usb_ehci.h | 27 +++++++-- drivers/usb/usb_ehci_core.c | 147 ++++++++++++++++++++++++++++++++----------- drivers/usb/usb_ehci_fsl.c | 3 +- include/usb.h | 2 +- 4 files changed, 134 insertions(+), 45 deletions(-) diff --git a/drivers/usb/usb_ehci.h b/drivers/usb/usb_ehci.h index 3e7a2ab..90b137a 100644 --- a/drivers/usb/usb_ehci.h +++ b/drivers/usb/usb_ehci.h @@ -45,15 +45,24 @@ struct ehci_hccr { #define HC_LENGTH(p) (((p) >> 0) & 0x00ff) #define HC_VERSION(p) (((p) >> 16) & 0xffff) uint32_t cr_hcsparams; +#define HCS_N_PORTS(p) (((p) >> 0) & 0xf) uint32_t cr_hccparams; uint8_t cr_hcsp_portrt[8]; }; struct ehci_hcor { uint32_t or_usbcmd; -#define CMD_ASE (1 << 5) +#define CMD_PARK (1 << 11) /* enable "park" */ +#define CMD_PARK_CNT(c) (((c) >> 8) & 3) /* how many transfers to park */ +#define CMD_ASE (1 << 5) /* async schedule enable */ +#define CMD_LRESET (1 << 7) /* partial reset */ +#define CMD_IAAD (1 << 5) /* "doorbell" interrupt */ +#define CMD_PSE (1 << 4) /* periodic schedule enable */ +#define CMD_RESET (1 << 1) /* reset HC not bus */ +#define CMD_RUN (1 << 0) /* start/stop HC */ uint32_t or_usbsts; #define STD_ASS (1 << 15) +#define STS_HALT (1 << 12) uint32_t or_usbintr; uint32_t or_frindex; uint32_t or_ctrldssegment; @@ -61,10 +70,17 @@ struct ehci_hcor { uint32_t or_asynclistaddr; uint32_t _reserved_[9]; uint32_t or_configflag; +#define FLAG_CF (1 << 0) /* true: we'll support "high speed" */ uint32_t or_portsc[2]; uint32_t or_systune; }; +#define USBMODE 0x68 /* USB Device mode */ +#define USBMODE_SDIS (1 << 3) /* Stream disable */ +#define USBMODE_BE (1 << 2) /* BE/LE endiannes select */ +#define USBMODE_CM_HC (3 << 0) /* host controller mode */ +#define USBMODE_CM_IDLE (0 << 0) /* idle state */ + /* Interface descriptor */ struct usb_linux_interface_descriptor { unsigned char bLength; @@ -91,11 +107,12 @@ struct usb_linux_config_descriptor { } __attribute__ ((packed)); #if defined CONFIG_EHCI_DESC_BIG_ENDIAN -#define ehci_readl(x) (x) -#define ehci_writel(a, b) (a) = (b) +#define ehci_readl(x) (*((volatile u32 *)(x))) +#define ehci_writel(a, b) (*((volatile u32 *)(a)) = ((volatile u32)b)) #else -#define ehci_readl(x) cpu_to_le32((x)) -#define ehci_writel(a, b) (a) = cpu_to_le32((b)) +#define ehci_readl(x) cpu_to_le32((*((volatile u32 *)(x)))) +#define ehci_writel(a, b) (*((volatile u32 *)(a)) = \ + cpu_to_le32(((volatile u32)b))) #endif #if defined CONFIG_EHCI_MMIO_BIG_ENDIAN diff --git a/drivers/usb/usb_ehci_core.c b/drivers/usb/usb_ehci_core.c index 869bea3..ec50874 100644 --- a/drivers/usb/usb_ehci_core.c +++ b/drivers/usb/usb_ehci_core.c @@ -99,8 +99,55 @@ static struct descriptor { }, }; -static void ehci_free (void *p, size_t sz) +static int handshake(uint32_t *ptr, uint32_t mask, uint32_t done, int msec) { + uint32_t result; + do { + result = ehci_readl(ptr); + debug("handshake read reg(%x)=%x\n", (uint32_t)ptr, result); + if (result == ~(uint32_t)0) + return -1; + result &= mask; + if (result == done) + return 0; + wait_ms(1); + msec--; + } while (msec > 0); + return -1; +} + +static void ehci_free(void *p, size_t sz) +{ + +} + +static int ehci_reset(void) +{ + uint32_t cmd; + uint32_t tmp; + uint32_t *reg_ptr; + int ret = 0; + + cmd = ehci_readl(&hcor->or_usbcmd); + cmd |= CMD_RESET; + ehci_writel(&hcor->or_usbcmd, cmd); + ret = handshake(&hcor->or_usbcmd, CMD_RESET, 0, 250); + if (ret < 0) { + printf("EHCI fail to reset\n"); + goto out; + } + +#if defined CONFIG_EHCI_IS_TDI + reg_ptr = (uint32_t *)((u8 *)hcor + USBMODE); + tmp = ehci_readl(reg_ptr); + tmp |= USBMODE_CM_HC; +#if defined CONFIG_EHCI_MMIO_BIG_ENDIAN + tmp |= USBMODE_BE; +#endif + ehci_writel(reg_ptr, tmp); +#endif +out: + return ret; } static void *ehci_alloc(size_t sz, size_t align) @@ -170,6 +217,7 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, uint32_t endpt, token, usbsts; uint32_t c, toggle; uint32_t cmd; + uint32_t sts; debug("dev=%p, pipe=%lx, buffer=%p, length=%d, req=%p\n", dev, pipe, buffer, length, req); @@ -277,16 +325,19 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, qh_list.qh_link = cpu_to_hc32((uint32_t) qh | QH_LINK_TYPE_QH); - usbsts = ehci_readl(hcor->or_usbsts); - ehci_writel(hcor->or_usbsts, (usbsts & 0x3f)); + usbsts = ehci_readl(&hcor->or_usbsts); + ehci_writel(&hcor->or_usbsts, (usbsts & 0x3f)); /* Enable async. schedule. */ - cmd = ehci_readl(hcor->or_usbcmd); - hcor->or_usbcmd |= CMD_ASE; - ehci_writel(hcor->or_usbcmd, cmd); - - while ((ehci_readl(hcor->or_usbsts) & STD_ASS) == 0) - udelay(1); + cmd = ehci_readl(&hcor->or_usbcmd); + cmd |= CMD_ASE; + ehci_writel(&hcor->or_usbcmd, cmd); + + sts = ehci_readl(&hcor->or_usbsts); + while ((sts & STD_ASS) == 0) { + sts = ehci_readl(&hcor->or_usbsts); + udelay(10); + } /* Wait for TDs to be processed. */ ts = get_timer(0); @@ -298,11 +349,15 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, } while (get_timer(ts) < CONFIG_SYS_HZ); /* Disable async schedule. */ - cmd = ehci_readl(hcor->or_usbcmd); + cmd = ehci_readl(&hcor->or_usbcmd); cmd &= ~CMD_ASE; - ehci_writel(hcor->or_usbcmd, cmd); - while ((ehci_readl(hcor->or_usbsts) & STD_ASS) != 0) - udelay(1); + ehci_writel(&hcor->or_usbcmd, cmd); + + sts = ehci_readl(&hcor->or_usbsts); + while ((sts & STD_ASS) != 0) { + sts = ehci_readl(&hcor->or_usbsts); + udelay(10); + } qh_list.qh_link = cpu_to_hc32((uint32_t)&qh_list | QH_LINK_TYPE_QH); @@ -335,9 +390,9 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, } else { dev->act_len = 0; debug("dev=%u, usbsts=%#x, p[1]=%#x, p[2]=%#x\n", - dev->devnum, ehci_readl(hcor->or_usbsts), - ehci_readl(hcor->or_portsc[0]), - ehci_readl(hcor->or_portsc[1])); + dev->devnum, ehci_readl(&hcor->or_usbsts), + ehci_readl(&hcor->or_portsc[0]), + ehci_readl(&hcor->or_portsc[1])); } return (dev->status != USB_ST_NOT_PROC) ? 0 : -1; @@ -451,7 +506,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, break; case USB_REQ_GET_STATUS | ((USB_RT_PORT | USB_DIR_IN) << 8): memset(tmpbuf, 0, 4); - reg = ehci_readl(hcor->or_portsc[le16_to_cpu(req->index) + reg = ehci_readl(&hcor->or_portsc[le16_to_cpu(req->index) - 1]); if (reg & EHCI_PS_CS) tmpbuf[0] |= USB_PORT_STAT_CONNECTION; @@ -479,9 +534,12 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, srclen = 4; break; case USB_REQ_SET_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8): - reg = ehci_readl(hcor->or_portsc[le16_to_cpu(req->index) - 1]); + reg = ehci_readl(&hcor->or_portsc[le16_to_cpu(req->index) - 1]); reg &= ~EHCI_PS_CLEAR; switch (le16_to_cpu(req->value)) { + case USB_PORT_FEAT_ENABLE: + reg |= EHCI_PS_PE; + break; case USB_PORT_FEAT_POWER: reg |= EHCI_PS_PP; break; @@ -495,22 +553,22 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, /* Start reset sequence. */ reg &= ~EHCI_PS_PE; reg |= EHCI_PS_PR; - ehci_writel(hcor->or_portsc[ + ehci_writel(&hcor->or_portsc[ le16_to_cpu(req->index) - 1], reg); /* Wait for reset to complete. */ - udelay(500000); + wait_ms(500); /* Terminate reset sequence. */ reg &= ~EHCI_PS_PR; /* TODO: is it only fsl chip that requires this * manual setting of port enable? */ reg |= EHCI_PS_PE; - ehci_writel(hcor->or_portsc[ + ehci_writel(&hcor->or_portsc[ le16_to_cpu(req->index) - 1], reg); /* Wait for HC to complete reset. */ - udelay(2000); + wait_ms(10); reg = - ehci_readl(hcor->or_portsc[le16_to_cpu(req->index) + ehci_readl(&hcor->or_portsc[le16_to_cpu(req->index) - 1]); reg &= ~EHCI_PS_CLEAR; if ((reg & EHCI_PS_PE) == 0) { @@ -525,10 +583,10 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, debug("unknown feature %x\n", le16_to_cpu(req->value)); goto unknown; } - ehci_writel(hcor->or_portsc[le16_to_cpu(req->index) - 1], reg); + ehci_writel(&hcor->or_portsc[le16_to_cpu(req->index) - 1], reg); break; case USB_REQ_CLEAR_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8): - reg = ehci_readl(hcor->or_portsc[le16_to_cpu(req->index) - 1]); + reg = ehci_readl(&hcor->or_portsc[le16_to_cpu(req->index) - 1]); reg &= ~EHCI_PS_CLEAR; switch (le16_to_cpu(req->value)) { case USB_PORT_FEAT_ENABLE: @@ -537,6 +595,9 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, case USB_PORT_FEAT_C_CONNECTION: reg |= EHCI_PS_CSC; break; + case USB_PORT_FEAT_OVER_CURRENT: + reg |= EHCI_PS_OCC; + break; case USB_PORT_FEAT_C_RESET: portreset &= ~(1 << le16_to_cpu(req->index)); break; @@ -544,7 +605,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, debug("unknown feature %x\n", le16_to_cpu(req->value)); goto unknown; } - ehci_writel(hcor->or_portsc[le16_to_cpu(req->index) - 1], reg); + ehci_writel(&hcor->or_portsc[le16_to_cpu(req->index) - 1], reg); break; default: debug("Unknown request\n"); @@ -585,6 +646,10 @@ int usb_lowlevel_init(void) if (ehci_hcd_init() != 0) return -1; + /* EHCI spec section 4.1 */ + if (ehci_reset() != 0) + return -1; + /* Set head of reclaim list */ memset(&qh_list, 0, sizeof(qh_list)); qh_list.qh_link = cpu_to_hc32((uint32_t)&qh_list | QH_LINK_TYPE_QH); @@ -595,25 +660,31 @@ int usb_lowlevel_init(void) qh_list.qh_overlay.qt_token = cpu_to_hc32(0x40); /* Set async. queue head pointer. */ - ehci_writel(hcor->or_asynclistaddr, (uint32_t)&qh_list); + ehci_writel(&hcor->or_asynclistaddr, (uint32_t)&qh_list); - reg = ehci_readl(hccr->cr_hcsparams); - descriptor.hub.bNbrPorts = reg & 0xf; - printf("NbrPorts %x\n", descriptor.hub.bNbrPorts); + reg = ehci_readl(&hccr->cr_hcsparams); + descriptor.hub.bNbrPorts = HCS_N_PORTS(reg); + printf("Register %x NbrPorts %d\n", reg, descriptor.hub.bNbrPorts); if (reg & 0x10000) /* Port Indicators */ descriptor.hub.wHubCharacteristics |= 0x80; if (reg & 0x10) /* Port Power Control */ descriptor.hub.wHubCharacteristics |= 0x01; - /* take control over the ports */ - cmd = ehci_readl(hcor->or_configflag); - cmd |= 1; - ehci_writel(hcor->or_configflag, cmd); - /* Start the host controller. */ - cmd = ehci_readl(hcor->or_configflag); - cmd |= 1; - ehci_writel(hcor->or_usbcmd, cmd); + cmd = ehci_readl(&hcor->or_usbcmd); + /* Philips, Intel, and maybe others need CMD_RUN before the + * root hub will detect new devices (why?); NEC doesn't */ + cmd &= ~(CMD_LRESET|CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET); + cmd |= CMD_RUN; + ehci_writel(&hcor->or_usbcmd, cmd); + + /* take control over the ports */ + cmd = ehci_readl(&hcor->or_configflag); + cmd |= FLAG_CF; + ehci_writel(&hcor->or_configflag, cmd); + /* unblock posted writes */ + cmd = ehci_readl(&hcor->or_usbcmd); + wait_ms(5); rootdev = 0; diff --git a/drivers/usb/usb_ehci_fsl.c b/drivers/usb/usb_ehci_fsl.c index 9ca6c56..81d5d21 100644 --- a/drivers/usb/usb_ehci_fsl.c +++ b/drivers/usb/usb_ehci_fsl.c @@ -43,7 +43,8 @@ int ehci_hcd_init(void) addr = (uint32_t)&(im->usb[0]); hccr = (struct ehci_hccr *)(addr + FSL_SKIP_PCI); - hcor = (struct ehci_hcor *)((uint32_t) hccr + hccr->cr_caplength); + hcor = (struct ehci_hcor *)((uint32_t) hccr + + HC_LENGTH(ehci_readl(&hccr->cr_capbase))); /* Configure clock */ clrsetbits_be32(&(im->clk.sccr), MPC83XX_SCCR_USB_MASK, diff --git a/include/usb.h b/include/usb.h index cd6f37a..b8f2fa2 100644 --- a/include/usb.h +++ b/include/usb.h @@ -181,7 +181,7 @@ struct usb_device { */ #if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || \ - defined(CONFI_USB_EHCI) || defined(CONFIG_USB_OHCI_NEW) || \ + defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_OHCI_NEW) || \ defined(CONFIG_USB_SL811HS) || defined(CONFIG_USB_ISP116X_HCD) || \ defined(CONFIG_USB_R8A66597_HCD) -- 1.5.6.5

2 1

[U-Boot] [PATCH] nand: move board_nand_init to nand.h
by Mike Frysinger 11 Dec '08

11 Dec '08

Rather than putting the function prototype for board_nand_init() in the one place where it gets called, put it into nand.h so that every place that also defines it gets the prototype. Otherwise, errors can go silently unnoticed such as using the wrong return value (void rather than int) when defining the function. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- drivers/mtd/nand/nand.c | 2 -- include/nand.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c index 71a0e4b..1921d08 100644 --- a/drivers/mtd/nand/nand.c +++ b/drivers/mtd/nand/nand.c @@ -36,8 +36,6 @@ static ulong base_address[CFG_MAX_NAND_DEVICE] = CFG_NAND_BASE_LIST; static const char default_nand_name[] = "nand"; -extern int board_nand_init(struct nand_chip *nand); - static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand, ulong base_addr) { diff --git a/include/nand.h b/include/nand.h index 3296e10..70246b6 100644 --- a/include/nand.h +++ b/include/nand.h @@ -31,6 +31,8 @@ extern void nand_init(void); #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> +extern int board_nand_init(struct nand_chip *nand); + typedef struct mtd_info nand_info_t; extern int nand_curr_device; -- 1.6.0.4

2 1

Re: [U-Boot] NetLoop() code ordering
by Ben Warren 11 Dec '08

11 Dec '08

Hi Curtis, Please copy the U-boot mailing list on all correspondence. Curtis Wald wrote: > > Hi, > > As you’re listed as the custodian for the U-Boot Network Library I had > a question: > > Looking in net/net.c NetLoop() starting at line 322: > > eth_halt(); > > #ifdef CONFIG_NET_MULTI > > eth_set_current(); > > #endif > > > > Since eth_halt() makes calls to eth_current members, should the code > flow be: > > #ifdef CONFIG_NET_MULTI > > eth_set_current(); > > #endif > > eth_halt(); > > Moving eth_halt() after the CONFIG_NET_MULTI stanza would setup > eth_current before trying to use. > This initialization sequence is meant to ensure that everything's in a happy, known state. Calling eth_halt() first ensures that whatever device is currently being pointed to gets wound down in an orderly manner. The subsequent call to eth_init() turns up the active interface before using it. > > -- > Sincerely, > > *Curtis Wald* > /Senior Software Engineer/ > WatchGuard Video > regards, Ben

1 0

[U-Boot] [PATCH] [ONENAND] Reduce OneNAND IPL code size v2
by Kyungmin Park 11 Dec '08

11 Dec '08

OneNAND IPL has common codes for RAM init, load data, and jump to 2nd bootloader, but it's common code used about 300~400 bytes. So board specific codes, such as lowlevel_init, can't has enough code. It make a difficult to implement OneNAND IPL. This patch make this common code as small as possible. and give lowlevel_init can have more codes. Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- diff --git a/cpu/arm1136/start.S b/cpu/arm1136/start.S index e622338..132cc4a 100644 --- a/cpu/arm1136/start.S +++ b/cpu/arm1136/start.S @@ -33,23 +33,7 @@ .globl _start _start: b reset #ifdef CONFIG_ONENAND_IPL - ldr pc, _hang - ldr pc, _hang - ldr pc, _hang - ldr pc, _hang - ldr pc, _hang - ldr pc, _hang - ldr pc, _hang - -_hang: - .word do_hang - .word 0x12345678 - .word 0x12345678 - .word 0x12345678 - .word 0x12345678 - .word 0x12345678 - .word 0x12345678 - .word 0x12345678 /* now 16*4=64 */ + . = _start + 64 /* now 16*4=64 */ #else ldr pc, _undefined_instruction ldr pc, _software_interrupt @@ -362,12 +346,7 @@ cpu_init_crit: /* * exception handlers */ -#ifdef CONFIG_ONENAND_IPL - .align 5 -do_hang: - ldr sp, _TEXT_BASE /* use 32 words about stack */ - bl hang /* hang and never return */ -#else /* !CONFIG_ONENAND IPL */ +#ifndef CONFIG_ONENAND_IPL .align 5 undefined_instruction: get_bad_stack diff --git a/onenand_ipl/onenand_boot.c b/onenand_ipl/onenand_boot.c index aff62d2..2440d8b 100644 --- a/onenand_ipl/onenand_boot.c +++ b/onenand_ipl/onenand_boot.c @@ -39,6 +39,7 @@ int print_info(void) typedef int (init_fnc_t)(void); +#ifdef CONFIG_USE_ONENAND_INIT init_fnc_t *init_sequence[] = { board_init, /* basic board dependent setup */ #ifdef CONFIG_SYS_PRINTF @@ -47,24 +48,23 @@ init_fnc_t *init_sequence[] = { #endif NULL, }; +#endif void start_oneboot(void) { - init_fnc_t **init_fnc_ptr; uchar *buf; +#ifdef CONFIG_USE_ONENAND_INIT + init_fnc_t **init_fnc_ptr; for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) { if ((*init_fnc_ptr)() != 0) hang(); } +#endif buf = (uchar *) CONFIG_SYS_LOAD_ADDR; - if (!onenand_read_block0(buf)) - buf += ONENAND_BLOCK_SIZE; - - if (buf == (uchar *)CONFIG_SYS_LOAD_ADDR) - hang(); + onenand_read_block0(buf); /* go run U-Boot and never return */ printf("Starting OS Bootloader...\n"); @@ -73,9 +73,11 @@ void start_oneboot(void) /* should never come here */ } +#ifdef CONFIG_USE_ONENAND_INIT void hang(void) { /* if board_hang() returns, hange here */ printf("X-Loader hangs\n"); for (;;); } +#endif diff --git a/onenand_ipl/onenand_ipl.h b/onenand_ipl/onenand_ipl.h index 3387998..438e58c 100644 --- a/onenand_ipl/onenand_ipl.h +++ b/onenand_ipl/onenand_ipl.h @@ -23,7 +23,7 @@ #include <linux/mtd/onenand_regs.h> -#define ONENAND_BLOCK_SIZE 2048 +#define ONENAND_BLOCK_SIZE 0x20000 #ifndef CONFIG_SYS_PRINTF #define printf(format, args...) @@ -39,5 +39,5 @@ #define ONENAND_PAGE_SIZE 2048 -extern int onenand_read_block0(unsigned char *buf); +extern void onenand_read_block0(unsigned char *buf); #endif diff --git a/onenand_ipl/onenand_read.c b/onenand_ipl/onenand_read.c index 6d04943..38703fb 100644 --- a/onenand_ipl/onenand_read.c +++ b/onenand_ipl/onenand_read.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2005-2008 Samsung Electronis + * (C) Copyright 2005-2008 Samsung Electronics * Kyungmin Park <kyungmin.park(a)samsung.com> * * See file CREDITS for list of people who contributed to this @@ -87,14 +87,16 @@ static inline int onenand_read_page(ulong block, ulong page, #define ONENAND_START_PAGE 1 #define ONENAND_PAGES_PER_BLOCK 64 +#ifndef CONFIG_ONENAND_END_BLOCK +#define CONFIG_ONENAND_END_BLOCK 1 +#endif /** * onenand_read_block - Read a block data to buf - * @return 0 on success */ -int onenand_read_block0(unsigned char *buf) +void onenand_read_block0(unsigned char *buf) { - int page, offset = 0; + int block, page, offset = 0; int pagesize = ONENAND_PAGE_SIZE; /* MLC OneNAND has 4KiB page size */ @@ -103,12 +105,12 @@ int onenand_read_block0(unsigned char *buf) /* NOTE: you must read page from page 1 of block 0 */ /* read the block page by page*/ - for (page = ONENAND_START_PAGE; - page < ONENAND_PAGES_PER_BLOCK; page++) { - - onenand_read_page(0, page, buf + offset, pagesize); - offset += pagesize; + page = ONENAND_START_PAGE; + for (block = 0; block < CONFIG_ONENAND_END_BLOCK; block++) { + for (; page < ONENAND_PAGES_PER_BLOCK; page++) { + onenand_read_page(block, page, buf + offset, pagesize); + offset += pagesize; + } + page = 0; } - - return 0; }

2 3

[U-Boot] [PATCH] Hardware diagnosis for inka4x0 boards.
by ap＠denx.de 11 Dec '08

11 Dec '08

From: Andreas Pfefferle <ap(a)denx.de> This patch adds diagnosis functions for the buzzer, UARTs and digital IOs on inka4x0 hardware. Signed-off-by: Andreas Pfefferle <ap(a)denx.de> --- board/inka4x0/Makefile | 2 +- board/inka4x0/inkadiag.c | 515 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 516 insertions(+), 1 deletions(-) create mode 100644 board/inka4x0/inkadiag.c diff --git a/board/inka4x0/Makefile b/board/inka4x0/Makefile index 442e2d0..2264dae 100644 --- a/board/inka4x0/Makefile +++ b/board/inka4x0/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := $(BOARD).o +COBJS := $(BOARD).o inkadiag.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/inka4x0/inkadiag.c b/board/inka4x0/inkadiag.c new file mode 100644 index 0000000..6194b58 --- /dev/null +++ b/board/inka4x0/inkadiag.c @@ -0,0 +1,515 @@ +/* + * (C) Copyright 2008 + * Andreas Pfefferle, DENX Software Engineering, ap(a)denx.de. + * + * 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 <asm/io.h> +#include <common.h> +#include <config.h> +#include <mpc5xxx.h> +#include <pci.h> + +#include <command.h> + +#define TEST_NAME(test, name) static char test##_program_name[] = name +#define TEST_USAGE(test, usage) static char test##_program_usage[] = usage +#define TEST_FUNCTION(test) do_##test +#define PRINT_TEST_USAGE(test) do {\ + printf(test##_program_usage, test##_program_name);\ + return -1;\ +} while (0) + +#define GPIO_BASE (u_char *)0x30400000 + +#define DIGIN_TOUCHSCR_MASK 0x00003000 /* Inputs 12-13 */ +#define DIGIN_KEYB_MASK 0x00010000 /* Input 16 */ + +#define DIGIN_DRAWER_SW1 0x00400000 /* Input 22 */ +#define DIGIN_DRAWER_SW2 0x00800000 /* Input 23 */ + +#define DIGIO_LED0 0x00000001 /* Output 0 */ +#define DIGIO_LED1 0x00000002 /* Output 1 */ +#define DIGIO_LED2 0x00000004 /* Output 2 */ +#define DIGIO_LED3 0x00000008 /* Output 3 */ +#define DIGIO_LED4 0x00000010 /* Output 4 */ +#define DIGIO_LED5 0x00000020 /* Output 5 */ + +#define DIGIO_DRAWER1 0x00000100 /* Output 8 */ +#define DIGIO_DRAWER2 0x00000200 /* Output 9 */ + +static unsigned int inka_digin_get_input(void) +{ + return in_8(GPIO_BASE + 0) << 0 | in_8(GPIO_BASE + 1) << 8 | + in_8(GPIO_BASE + 2) << 16 | in_8(GPIO_BASE + 3) << 24; +} + +#define LED_HIGH(NUM)\ +out_be32((unsigned *)MPC5XXX_GPT##NUM##_ENABLE,\ + in_be32((unsigned *)MPC5XXX_GPT##NUM##_ENABLE) | 0x10) + +#define LED_LOW(NUM)\ +out_be32((unsigned *)MPC5XXX_GPT##NUM##_ENABLE,\ + in_be32((unsigned *)MPC5XXX_GPT##NUM##_ENABLE) & ~0x10) + +#define CHECK_LED(NUM) do {\ + if (state & (1 << NUM)) {\ + LED_HIGH(NUM);\ + } else {\ + LED_LOW(NUM);\ + } \ +} while (0) + +static void inka_digio_set_output(unsigned int state, int which) +{ + if (which == 0) { + CHECK_LED(0); + CHECK_LED(1); + CHECK_LED(2); + CHECK_LED(3); + CHECK_LED(4); + CHECK_LED(5); + } else { + struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO; + if (which == 1) { + if (state & DIGIO_DRAWER1) { + gpio->simple_dvo &= ~0x1000; + udelay(1); + gpio->simple_dvo |= 0x1000; + } else { + gpio->simple_dvo |= 0x1000; + udelay(1); + gpio->simple_dvo &= ~0x1000; + } + } + if (which == 2) { + if (state & DIGIO_DRAWER2) { + gpio->simple_dvo &= ~0x2000; + udelay(1); + gpio->simple_dvo |= 0x2000; + } else { + gpio->simple_dvo |= 0x2000; + udelay(1); + gpio->simple_dvo &= ~0x2000; + } + } + } + udelay(1); +} + +TEST_NAME(io, "inkadiag io"); +TEST_USAGE(io, "Usage: %s\n\ + <which> # get which[drawer1|drawer2|other] input\n\ + <which> <val> # set which[drawer1|drawer2|other] output to val\n\ +"); + +static int io_helper(int argc, char *argv[]) +{ + unsigned int state = inka_digin_get_input(); + if (strcmp(argv[1], "drawer1") == 0) { + printf("exit code: 0x%X\n", + (state & DIGIN_DRAWER_SW1) >> (ffs(DIGIN_DRAWER_SW1) - 1)); + } else if (strcmp(argv[1], "drawer2") == 0) { + printf("exit code: 0x%X\n", + (state & DIGIN_DRAWER_SW2) >> (ffs(DIGIN_DRAWER_SW2) - 1)); + } else if (strcmp(argv[1], "other") == 0) { + printf("exit code: 0x%X\n", + ((state & DIGIN_KEYB_MASK) >> (ffs(DIGIN_KEYB_MASK) - 1)) + | ((state & DIGIN_TOUCHSCR_MASK) >> + (ffs(DIGIN_TOUCHSCR_MASK) - 2))); + } else { + printf("Invalid argument: %s\n", argv[1]); + return -1; + } + return 0; +} + +static int TEST_FUNCTION(io) (cmd_tbl_t *cmdtp, int flag, int argc, + char *argv[]) { + if ((argc < 2) || (argc > 3)) + PRINT_TEST_USAGE(io); + + if (argc == 2) + return io_helper(argc, argv); + + unsigned int val = simple_strtol(argv[2], NULL, 16); + + if (strcmp(argv[1], "drawer1") == 0) { + val <<= (ffs(DIGIO_DRAWER1) - 1); + inka_digio_set_output(val, 1); + } else if (strcmp(argv[1], "drawer2") == 0) { + val <<= (ffs(DIGIO_DRAWER2) - 1); + inka_digio_set_output(val, 2); + } else if (strcmp(argv[1], "other") == 0) + inka_digio_set_output(val, 0); + else { + printf("Invalid argument: %s\n", argv[1]); + return -1; + } + return io_helper(argc, argv); +} + +DECLARE_GLOBAL_DATA_PTR; + +static int ser_init(volatile struct mpc5xxx_psc *psc, int baudrate) +{ + unsigned long baseclk; + int div; + + /* reset PSC */ + psc->command = PSC_SEL_MODE_REG_1; + + /* select clock sources */ + + psc->psc_clock_select = 0; + baseclk = (gd->ipb_clk + 16) / 32; + + /* switch to UART mode */ + psc->sicr = 0; + + /* configure parity, bit length and so on */ + + psc->mode = PSC_MODE_8_BITS | PSC_MODE_PARNONE; + + psc->mode = PSC_MODE_ONE_STOP; + + /* set up UART divisor */ + div = (baseclk + (baudrate / 2)) / baudrate; + psc->ctur = (div >> 8) & 0xff; + psc->ctlr = div & 0xff; + + /* disable all interrupts */ + psc->psc_imr = 0; + + /* reset and enable Rx/Tx */ + psc->command = PSC_RST_RX; + psc->command = PSC_RST_TX; + psc->command = PSC_RX_ENABLE | PSC_TX_ENABLE; + + return 0; +} + +static void ser_putc(volatile struct mpc5xxx_psc *psc, const char c) +{ + /* Wait for last character to go. */ + int i = 0; + while (!(psc->psc_status & PSC_SR_TXEMP) && (i++ < CONFIG_SYS_HZ)) + udelay(10); + psc->psc_buffer_8 = c; + +} + +static int ser_getc(volatile struct mpc5xxx_psc *psc) +{ + /* Wait for a character to arrive. */ + int i = 0; + while (!(psc->psc_status & PSC_SR_RXRDY) && (i++ < CONFIG_SYS_HZ)) + udelay(10); + + return psc->psc_buffer_8; +} + +#define SERIAL_PORT_BASE (u_char *)0x80000000 + +#define UART_RX 0 /* In: Receive buffer (DLAB=0) */ +#define UART_TX 0 /* Out: Transmit buffer (DLAB=0) */ +#define UART_DLL 0 /* Out: Divisor Latch Low (DLAB=1) */ + +#define UART_LCR 3 /* Out: Line Control Register */ +#define UART_MCR 4 /* Out: Modem Control Register */ + +#define UART_LSR 5 /* In: Line Status Register */ +#define UART_MSR 6 /* In: Modem Status Register */ + +#define UART_LCR_WLEN8 0x03 /* Wordlength: 8 bits */ +#define UART_LCR_DLAB 0x80 /* Divisor latch access bit */ + +#define UART_LSR_THRE 0x20 /* Transmit-hold-register empty */ +#define UART_LSR_DR 0x01 /* Receiver data ready */ + +#define UART_MCR_LOOP 0x10 /* Enable loopback test mode */ +#define UART_MCR_RTS 0x02 /* RTS complement */ +#define UART_MCR_DTR 0x01 /* DTR complement */ + +#define UART_MSR_DCD 0x80 /* Data Carrier Detect */ +#define UART_MSR_DSR 0x20 /* Data Set Ready */ +#define UART_MSR_CTS 0x10 /* Clear to Send */ +#define PSC_OP1_RTS 0x01 +#define PSC_OP0_RTS 0x01 + +static unsigned char serial_in(unsigned char num, int offset) +{ + return in_8(SERIAL_PORT_BASE + (num << 3) + offset); +} + +static void serial_out(unsigned char num, int offset, unsigned char value) +{ + out_8(SERIAL_PORT_BASE + (num << 3) + offset, value); +} + +TEST_NAME(serial, "inkadiag serial"); +TEST_USAGE(serial, "Usage: %s\n\ + <num> <mode> <baudrate> <msg> # test uart num [0..11] in mode\ + and baudrate with msg\n\ +"); + +static int TEST_FUNCTION(serial) (cmd_tbl_t *cmdtp, int flag, int argc, + char *argv[]) { + if (argc < 5) + PRINT_TEST_USAGE(serial); + + argc--; + argv++; + + unsigned int num = simple_strtol(argv[0], NULL, 0); + if (num < 0 || num > 11) { + printf("invalid argument for num: %d\n", num); + return -1; + } + + unsigned int mode = simple_strtol(argv[1], NULL, 0); + + int combrd = 0; + + if (strcmp(argv[2], "115200") == 0) + combrd = 1; + else if (strcmp(argv[2], "57600") == 0) + combrd = 2; + else if (strcmp(argv[2], "38400") == 0) + combrd = 3; + else if (strcmp(argv[2], "19200") == 0) + combrd = 6; + else if (strcmp(argv[2], "9600") == 0) + combrd = 12; + else if (strcmp(argv[2], "2400") == 0) + combrd = 48; + else if (strcmp(argv[2], "1200") == 0) + combrd = 96; + else if (strcmp(argv[2], "300") == 0) + combrd = 384; + else + printf("Invalid baudrate: %s", argv[2]); + + printf("Testing uart %d.\n\n", num); + + if ((num >= 0) && (num <= 7)) { + if (mode & 1) + /* turn on 'loopback' mode */ + serial_out(num, UART_MCR, UART_MCR_LOOP); + else { + /* establish the UART's operational parameters */ + /* set DLAB=1 */ + serial_out(num, UART_LCR, UART_LCR_DLAB); + /* set baudrate */ + serial_out(num, UART_DLL, combrd); + /* set data-format: 8-N-1 */ + serial_out(num, UART_LCR, UART_LCR_WLEN8); + } + + if (mode & 2) { + /* set request to send */ + serial_out(num, UART_MCR, UART_MCR_RTS); + udelay(10); + /* check clear to send */ + if ((serial_in(num, UART_MSR) & UART_MSR_CTS) == 0x00) + return -1; + } + if (mode & 4) { + /* set data terminal ready */ + serial_out(num, UART_MCR, UART_MCR_DTR); + udelay(10); + /* check data set ready and carrier detect */ + if ((serial_in(num, UART_MSR) & + (UART_MSR_DSR | UART_MSR_DCD)) + != (UART_MSR_DSR | UART_MSR_DCD)) + return -1; + } + + /* write each message-character, read it back, and display it */ + int i, len = strlen(argv[3]); + for (i = 0; i < len; ++i) { + int j = 0; + while ((serial_in(num, UART_LSR) & UART_LSR_THRE) == + 0x00) { + if (j++ > CONFIG_SYS_HZ) + break; + udelay(10); + } + serial_out(num, UART_TX, argv[3][i]); + j = 0; + while ((serial_in(num, UART_LSR) & UART_LSR_DR) == + 0x00) { + if (j++ > CONFIG_SYS_HZ) + break; + udelay(10); + } + unsigned char data = serial_in(num, UART_RX); + printf("%c", data); + } + printf("\n\n"); + serial_out(num, UART_MCR, 0x00); + } else { + int address, irq; + switch (num) { + case 8: + address = MPC5XXX_PSC6; + irq = MPC5XXX_PSC6_IRQ; + break; + case 9: + address = MPC5XXX_PSC3; + irq = MPC5XXX_PSC3_IRQ; + break; + case 10: + address = MPC5XXX_PSC2; + irq = MPC5XXX_PSC2_IRQ; + break; + case 11: + address = MPC5XXX_PSC1; + irq = MPC5XXX_PSC1_IRQ; + break; + } + volatile struct mpc5xxx_psc *psc = + (struct mpc5xxx_psc *)address; + ser_init(psc, simple_strtol(argv[2], NULL, 0)); + if (mode & 2) { + /* set request to send */ + out_8(&psc->op0, PSC_OP0_RTS); + udelay(10); + /* check clear to send */ + if ((in_8(&psc->ip) & PSC_IPCR_CTS) == 0) + return -1; + } + int i, len = strlen(argv[3]); + for (i = 0; i < len; ++i) { + ser_putc(psc, argv[3][i]); + printf("%c", ser_getc(psc)); + } + printf("\n\n"); + } + return 0; +} + +#define BUZZER_GPT (MPC5XXX_GPT + 0x60) /* GPT6 */ +static void buzzer_turn_on(unsigned int freq) +{ + struct mpc5xxx_gpt *gpt = (struct mpc5xxx_gpt *)(BUZZER_GPT); + + const u32 prescale = gd->ipb_clk / freq / 128; + const u32 count = 128; + const u32 width = 64; + + gpt->cir = (prescale << 16) | count; + gpt->pwmcr = width << 16; + gpt->emsr = 3; /* Timer enabled for PWM */ +} + +static void buzzer_turn_off(void) +{ + struct mpc5xxx_gpt *gpt = (struct mpc5xxx_gpt *)(BUZZER_GPT); + gpt->emsr = 0; +} + +TEST_NAME(buzzer, "inkadiag buzzer"); +TEST_USAGE(buzzer, "Usage: %s\n\ + <period> <freq> # turn buzzer on for period ms with freq hz\n\ +"); + +static int TEST_FUNCTION(buzzer) (cmd_tbl_t *cmdtp, int flag, int argc, + char *argv[]) { + + if (argc != 3) + PRINT_TEST_USAGE(buzzer); + + argc--; + argv++; + + unsigned int period = simple_strtol(argv[0], NULL, 0); + if (!period) + printf("Zero period is senseless\n"); + argc--; + argv++; + + unsigned int freq = simple_strtol(argv[0], NULL, 0); + /* avoid zero prescale in buzzer_turn_on() */ + if (freq > gd->ipb_clk / 128) + printf("%dHz exceeds maximum (%dHz)\n", freq, + gd->ipb_clk / 128); + else if (!freq) + printf("Zero frequency is senseless\n"); + else + buzzer_turn_on(freq); + + clear_ctrlc(); + int prev = disable_ctrlc(0); + + printf("Buzzing for %d ms. Type ^C to abort!\n\n", period); + + int i = 0; + + while (!ctrlc() && (i++ < CONFIG_SYS_HZ)) + udelay(period); + + clear_ctrlc(); + disable_ctrlc(prev); + + buzzer_turn_off(); + + return 0; +} + +TEST_NAME(inkadiag, "inkadiag"); +TEST_USAGE(inkadiag, "Usage: %s\n\ + [buzzer]\n\ + [io]\n\ + [serial]\n\ +"); + +#define IS_TEST(test) \ + (strncmp(&argv[0][0], #test, strlen(#test)) == 0) + +#define CHECK_TEST(test) do {\ + if (IS_TEST(test)) {\ + return TEST_FUNCTION(test) (cmdtp, flag, argc, argv);\ + } \ +} while (0) + +static int TEST_FUNCTION(inkadiag) (cmd_tbl_t *cmdtp, int flag, int argc, + char *argv[]) { + switch (argc) { + case 1: + PRINT_TEST_USAGE(inkadiag); + default: + argc--; + argv++; + CHECK_TEST(io); + CHECK_TEST(serial); + CHECK_TEST(buzzer); + } + PRINT_TEST_USAGE(inkadiag); +} + +U_BOOT_CMD(inkadiag, 6, 1, TEST_FUNCTION(inkadiag), + "inkadiag- inka diagnosis\n", + "[inkadiag what ...]\n" + " - perform a diagnosis on inka hardware\n" + "'inkadiag' performs hardware tests.\n\n" + "Without arguments, inkadiag prints a list of available tests.\n\n" + "To get detailed help information for specific tests you can type\n" + "'inkadiag what' with a test name 'what' as argument.\n"); -- 1.6.0.4

4 13

[U-Boot] bootm command: is there any load address limitation for fdt?
by Richard Retanubun 11 Dec '08

11 Dec '08

Hi, I am using u-boot version 2008.10 + git commit 13d36ec849785453953d00220b2c7dc66644a3c2 The board is a custom MPC8360E, similar to MPC8360EMDS from freescale. My DDR-SDRAM is at address 0x0 - 0x1FFFFFFF I am trying to limit the amount of memory needed to load and boot a linux kernel (2.6.26) to do this I loaded my fdt at address 0x20_0000 and uImage at 0x_30_0000 When I run bootm, I both the kernel and fdt passed their checksum tests, and then I got this error. ERROR: image is not a fdt - must RESET the board to recover. However, if I loaded my fdt at address 0x40_0000 and uImage at 0x50_0000, bootm works fine. Is there a reason why fdt must be loaded at a specific offset from the start of RAM? Thank you for all your time - Richard Retanubun.

3 3

[U-Boot] [PATCH 3/3] Create bad block aware partition table
by Rohit Hagargundgi 11 Dec '08

11 Dec '08

The idea and most of the code is from the following thread http://lists.denx.de/pipermail/u-boot/2008-July/036604.html The idea is that existing bad blocks can reduce the usable size in the partition. User defines partition table only once but bad blocks are different on different chips. The following command creates a new partition table based on 'mtdparts' variable so that the usable size in the partition remains as desired by the user. This is done by adding a good block to the partition for every bad block. The last partition will bear the penalty for the bad blocks. The new partition table is stored in environment variable 'newmtdparts'. Signed-off-by: Rohit Hagargundgi <h.rohit(a)samsung.com> --- common/cmd_onenand.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 151 insertions(+), 0 deletions(-) diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c index e4e933c..8c687f2 100644 --- a/common/cmd_onenand.c +++ b/common/cmd_onenand.c @@ -23,8 +23,20 @@ extern struct onenand_chip onenand_chip; #if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) +#include <malloc.h> #include <jffs2/jffs2.h> +#define MTDPARTS_MAXLEN 512 + +/* this flag needs to be set in part_info struct mask_flags + * field for read-only partitions */ +#define MTD_WRITEABLE_CMD 1 + +/* Name of last SLC partition of Flex-OneNAND + * Used when rebuilding a partition. + * For OneNAND, it is name of first partition. + */ +static char* last_slc_partition; /* parition handling routines */ int mtdparts_init(void); int find_dev_and_part(const char *id, struct mtd_device **dev, @@ -204,6 +216,136 @@ readout: printf("Done\n"); return 0; } + +/* + *rebuild_partition - Build new partition information for this partition + * based on bad blocks present in it. + * @param mtd MTD info structure + * @param part partition info structure + * @param mtdparts new partition information will be appended to this string + * @param cur_offs Current offset in flash + */ +static unsigned rebuild_partition(struct mtd_info *mtd, struct part_info *part, char *mtdparts, unsigned cur_offs) +{ + unsigned int bb_delta = 0, erasesize = 0, bbcount = 0; + unsigned int offs, ro = 0; + char mtdpart[32]; + unsigned partsize = part->size, last_partition = 0; + int parterasesize; + + /* Flex-OneNAND support */ + if (mtd->eraseregions) { + struct mtd_device *dev; + struct part_info *p; + u8 pnum; + struct onenand_chip *this = mtd->priv; + + find_dev_and_part(last_slc_partition, &dev, &pnum, &p); + + /* + * parterasesize indicates eventual block size for this partition. + * For all partitions which will be configured as SLC, partition + * size is increased by SLC block size for every bad block. + * For all partitions which will be configured as MLC, partition + * size is increased by MLC block size for every bad block. + */ + if (part->offset > p->offset) + /* This partition will lie in MLC area */ + parterasesize = 1 << this->erase_shift; + else + /* This partition will lie in SLC area */ + parterasesize = 1 << (this->erase_shift - 1); + } else + parterasesize = mtd->erasesize; + + for (offs = cur_offs; offs < cur_offs + partsize + bb_delta; offs += erasesize) { + if (offs == mtd->size) + /* This is the last partition */ + break; + erasesize = get_erasesize(mtd, offs); + if (mtd->block_isbad(mtd, offs)) { + bb_delta += parterasesize; + bbcount++; + } + } + + /* + * Absorb bad blocks immediately following this partition also + * into the partition, in order to make next partition start + * with a good block. + */ + while (offs < mtd->size && mtd->block_isbad(mtd, offs)) { + erasesize = get_erasesize(mtd, offs); + bb_delta += parterasesize; + offs += erasesize; + bbcount++; + } + + /* Fix partition size of last partition */ + if (cur_offs + partsize + bb_delta >= mtd->size) { + partsize = mtd->size - cur_offs - bb_delta; + last_partition = 1; + } + + printf(" %-20s %-20u %d KB\n", part->name, bbcount, + ((int) (partsize + bb_delta - part->size)/ 1024)); + + cur_offs += partsize + bb_delta; + if (part->mask_flags && MTD_WRITEABLE_CMD) + ro = 1; + + if (last_partition) + sprintf(mtdpart, "-(%.16s)%s,", part->name, ro ? "ro" : ""); + else + sprintf(mtdpart, "0x%.8x(%.16s)%s,", partsize + bb_delta, + part->name, ro ? "ro" : ""); + + mtdpart[sizeof(mtdpart) - 1] = '\0'; + strncat(mtdparts, mtdpart, MTDPARTS_MAXLEN - strlen(mtdparts) - 1); + return cur_offs; +} + +static int rebuild_mtdparts(char *part_name) +{ + struct mtd_info *mtd = &onenand_mtd; + char *newmtdparts; + struct list_head *entry; + unsigned cur_offs = 0; + struct mtd_device *dev; + struct part_info *p; + u8 pnum; + + /* Check if partition table information is available */ + if (mtdparts_init()) + return -1; + + /* For Flex-OneNAND, in addition to partition table, + * last desired SLC partition information is also required. + * User inputs last SLC partition name as parameter + */ + if (find_dev_and_part(part_name, &dev, &pnum, &p)) + return -1; + last_slc_partition = part_name; + + newmtdparts = malloc(MTDPARTS_MAXLEN); + if (!newmtdparts) + return -1; + sprintf(newmtdparts, "mtdparts=onenand:"); + + printf("%-20s %-20s %-20s\n", " Partition Name", "Bad Blocks Count", "Partition Size Change"); + + list_for_each(entry, &dev->parts) { + p = list_entry(entry, struct part_info, link); + cur_offs = rebuild_partition(mtd, p, newmtdparts, cur_offs); + } + + newmtdparts[strlen(newmtdparts) - 1] = '\0'; + printf("\nnewmtdparts: %s\n", newmtdparts); + setenv("newmtdparts", newmtdparts); + free(newmtdparts); + return 0; +} + #endif /** @@ -440,6 +582,10 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } return 0; } + + if (strcmp(argv[1], "rebuild") == 0) + /* Generate new mtdparts string taking care of bad blocks */ + return rebuild_mtdparts(argv[2]); #endif if (strncmp(argv[1], "setboundary", 11) == 0) { unsigned die = simple_strtoul(argv[2], NULL, 0); @@ -471,6 +617,11 @@ U_BOOT_CMD( "onenand setboundary DIE BOUNDARY [LOCK] - " "Change SLC boundary of Flex-OneNAND\n" #if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) + "onenand rebuild <part-name>\n" + " - create new partition table based on mtdparts taking care of bad blocks.\n" + " For OneNAND, part-name is first partition name.\n" + " For Flex-OneNAND, part-name is last SLC partition name.\n" + " The new partition table is stored in environment variable newmtdparts\n" "onenand partread <part-name> <addr> <len>\n" " - read image from partition with length len to addr\n" "onenand partwrite <part-name> <addr> <len>\n" -- 1.5.4.3

1 0

[U-Boot] [PATCH 0/3] Bad blocks and Partition support for OneNAND / Flex-OneNAND
by Rohit Hagargundgi 11 Dec '08

11 Dec '08

Hi, The following patches improve partitioning and bad block support for OneNAND / Flex-OneNAND devices. The idea is to be able to use U-Boot as a utility to write images to flash. Any comments are much appreciated. Thanks, Rohit

1 0

[U-Boot] [PATCH v2 0/4] Flex-OneNAND support
by Rohit Hagargundgi 11 Dec '08

11 Dec '08

Hi, This is a repost of support for Flex-OneNAND devices. Changes since v1(last post): - Rebased to u-boot-nand-flash. - Updated review comments from MTD list. - Support eraseregions with odd number of blocks. - JFFS2 commands support for Flex-OneNAND. I have split the patches so that it is more readable. patch 1 : Flex-OneNAND driver patch 2 : Environment support for Flex-OneNAND patch 3 : JFFS2 commands support for Flex-OneNAND patch 4 : Flex-OneNAND boundary setting command Any comments are appreciated. Thanks, Rohit

1 0