October 2008 - U-Boot

[U-Boot] [PATCH v2 04/10] fdt: Add fdt_getprop_u32_default helpers
by Kumar Gala 23 Oct '08

23 Oct '08

Add helper functions to return find a node and return it's property or a default value. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- common/fdt_support.c | 27 +++++++++++++++++++++++++++ include/fdt_support.h | 2 ++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 8ceeb0f..f430777 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -35,6 +35,33 @@ */ DECLARE_GLOBAL_DATA_PTR; +/** + * fdt_getprop_u32_default - Find a node and return it's property or a default + * + * @fdt: ptr to device tree + * @path: path of node + * @prop: property name + * @dflt: default value if the property isn't found + * + * Convenience function to find a node and return it's property or a + * default value if it doesn't exist. + */ +u32 fdt_getprop_u32_default(void *fdt, const char *path, const char *prop, + const u32 dflt) +{ + const u32 *val; + int off; + + off = fdt_path_offset(fdt, path); + if (off < 0) + return dflt; + + val = fdt_getprop(fdt, off, prop, NULL); + if (val) + return *val; + else + return dflt; +} /** * fdt_find_and_setprop: Find a node and set it's property diff --git a/include/fdt_support.h b/include/fdt_support.h index ceaadc2..816c9d0 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -28,6 +28,8 @@ #include <fdt.h> +u32 fdt_getprop_u32_default(void *fdt, const char *path, const char *prop, + const u32 dflt); int fdt_chosen(void *fdt, int force); int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end, int force); void do_fixup_by_path(void *fdt, const char *path, const char *prop, -- 1.5.5.1

2 3

[U-Boot] [PATCH 3/3] iMX31: Add support to iMX31PDK board boots from NAND Flash
by Alan Carvalho de Assis 23 Oct '08

23 Oct '08

This patch adds support to iMX31PDK board to boot directly from NAND Flash. In order to it works the previous patches (which reduces start.S size and copy NAND code to RAM) need be applied first. Signed-off-by: Alan Carvalho de Assis <alan.assis(a)freescale.com> --- board/freescale/mx31pdk/lowlevel_init.S | 95 +++++++++++++++++++++++++++++- board/freescale/mx31pdk/u-boot.lds | 3 + include/configs/mx31pdk.h | 15 +++-- 3 files changed, 104 insertions(+), 9 deletions(-) diff --git a/board/freescale/mx31pdk/lowlevel_init.S b/board/freescale/mx31pdk/lowlevel_init.S index f368d10..58f6d3d 100644 --- a/board/freescale/mx31pdk/lowlevel_init.S +++ b/board/freescale/mx31pdk/lowlevel_init.S @@ -20,11 +20,98 @@ * MA 02111-1307 USA */ -/* - * This is just to keep the linker happy. - */ +#include <asm/arch/mx31-regs.h> + +.macro REG reg, val + ldr r2, =\reg + ldr r3, =\val + str r3, [r2] +.endm + +.macro REG8 reg, val + ldr r2, =\reg + ldr r3, =\val + strb r3, [r2] +.endm + +.macro DELAY loops + ldr r2, =\loops +1: + subs r2, r2, #1 + nop + bcs 1b +.endm .globl lowlevel_init lowlevel_init: - mov pc, lr + /* Store return address on the stack since lr is re-used in this file */ + /* and all other registers are re-used as well */ + str lr, [sp] + + /* Also setup the Peripheral Port Remap register inside the core */ + ldr r0, =ARM_PPMRR /* start from AIPS 2GB region */ + mcr p15, 0, r0, c15, c2, 4 + + REG IPU_CONF, IPU_CONF_DI_EN + REG CCM_CCMR, 0x074B0BF5 + + DELAY 0x40000 + + REG CCM_CCMR, 0x074B0BF5 | CCMR_MPE + REG CCM_CCMR, (0x074B0BF5 | CCMR_MPE) & ~CCMR_MDS + + /* Set up clock to 532MHz */ + REG CCM_PDR0, 0xFF871D58 + REG CCM_MPCTL, 0x0033280C + REG CCM_SPCTL, PLL_PD(1) | PLL_MFD(4) | PLL_MFI(12) | PLL_MFN(1) + + /* Set up CPLD on CS5 */ + REG CSCR_U(5), 0x0000D843 + REG CSCR_L(5), 0x22252521 + REG CSCR_A(5), 0x22220A00 + + /* Set up MX31 DDR Memory Controller */ + REG 0x43FAC26C, 0 /* SDCLK */ + REG 0x43FAC270, 0 /* CAS */ + REG 0x43FAC274, 0 /* RAS */ + REG 0x43FAC27C, 0x1000 /* CS2 CSD0) */ + REG 0x43FAC284, 0 /* DQM3 */ + REG 0x43FAC288, 0 /* DQM2, DQM1, DQM0, SD31-SD0, A25-A0, MA10 0x288..0x2DC) */ + REG 0x43FAC28C, 0 + REG 0x43FAC290, 0 + REG 0x43FAC294, 0 + REG 0x43FAC298, 0 + REG 0x43FAC29C, 0 + REG 0x43FAC2A0, 0 + REG 0x43FAC2A4, 0 + REG 0x43FAC2A8, 0 + REG 0x43FAC2AC, 0 + REG 0x43FAC2B0, 0 + REG 0x43FAC2B4, 0 + REG 0x43FAC2B8, 0 + REG 0x43FAC2BC, 0 + REG 0x43FAC2C0, 0 + REG 0x43FAC2C4, 0 + REG 0x43FAC2C8, 0 + REG 0x43FAC2CC, 0 + REG 0x43FAC2D0, 0 + REG 0x43FAC2D4, 0 + REG 0x43FAC2D8, 0 + REG 0x43FAC2DC, 0 + REG 0xB8001010, 0x00000004 + REG 0xB8001004, 0x006ac73a + REG 0xB8001000, 0x92100000 + REG 0x80000f00, 0x12344321 + REG 0xB8001000, 0xa2100000 + REG 0x80000000, 0x12344321 + REG 0x80000000, 0x12344321 + REG 0xB8001000, 0xb2100000 + REG8 0x80000033, 0xda + REG8 0x81000000, 0xff + REG 0xB8001000, 0x82226080 + REG 0x80000000, 0xDEADBEEF + REG 0xB8001010, 0x0000000c + + /* Copy from NAND to RAM */ + b nand_copy diff --git a/board/freescale/mx31pdk/u-boot.lds b/board/freescale/mx31pdk/u-boot.lds index 04a8f77..1cfa3ca 100644 --- a/board/freescale/mx31pdk/u-boot.lds +++ b/board/freescale/mx31pdk/u-boot.lds @@ -35,6 +35,9 @@ SECTIONS .text : { cpu/arm1136/start.o (.text) + board/freescale/mx31pdk/lowlevel_init.o (.text) + cpu/arm1136/mx31/nand_copy.o (.text) + . = 2K; /* lowlevel NAND needs to fit in 2KB of NFC buffer */ *(.text) } diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 5752856..183b0f3 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -38,6 +38,9 @@ #define CONFIG_MX31_HCLK_FREQ 26000000 #define CONFIG_MX31_CLK32 32768 +/* We are booting from NAND. Used to shrink start.S */ +#define CONFIG_BOOT_FROM_NAND 1 + #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO @@ -45,11 +48,6 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1 -/* No support for NAND boot for i.MX31 PDK yet, so we rely on some other - * program to initialize the SDRAM. - */ -#define CONFIG_SKIP_LOWLEVEL_INIT - /* * Size of malloc() pool */ @@ -136,6 +134,13 @@ #define CONFIG_CMDLINE_EDITING 1 /*----------------------------------------------------------------------- + * Early stack pointer + * + * Use internal SRAM memory as SP when booting from NAND (ie. to iMX NFC) + */ +#define CFG_INTERNAL_SRAM_STACK 0x1FFFFFF0 + +/*----------------------------------------------------------------------- * Stack sizes * * The stack sizes are set up in start.S using the settings below -- 1.5.4.3

1 0

[U-Boot] [PATCH 0/3] iMX31: Add iMX31 support to boots from NAND
by Alan Carvalho de Assis 23 Oct '08

23 Oct '08

Hi, This serie of patches was rebased to adds support to iMX31PDK board to boot directly from NAND. Notice these patches don't add support to MTD NAND Flash support to U-Boot (like reading and saving environment parameters in Flash because MTD NAND Flash driver still needs further revision).

1 0

[U-Boot] IXP43X and Ethernet NPE
by Mirko D. 23 Oct '08

23 Oct '08

Hello, I want to use Uboot on a Gateworks Cambria Board. This board includes an IXP430 CPU. Uboot is already running, but I have some problems getting Ethernet to work. All the NPE stuff, in Uboot, is based on IXP400 SW Release version 2.0 which doesn't support the IXP43X MCU NPEs. So what do you think, should I have to use the IXP400 SW Release 2.4, which offer support for IXP43X MCU NPEs? Or is there somethings else I can do? Thanks! Best regards Mirko

2 1

[U-Boot] FIT image documentation
by Bernhard Weirich 23 Oct '08

23 Oct '08

Hello, I'd like to switch to the new FIT image format, but I am at a loss at how to use it. Is there a documentation available somewhere or could someone tell me the steps necessary? I got as far as compiling a .its and got a .itb file but I do not know what to do with it, how to append data or load it in u-boot. Thanks, Bernhard Weirich

2 1

[U-Boot] [PATCH PPC_4XX V2] Print simple row of dots instead of spinning wheel
by Wolfgang Denk 23 Oct '08

23 Oct '08

Replace the "spinning wheel" eye candy by printing a simple row of dots. This avoids problems with control charactersin log files etc. Also, it saves a few bytes. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- This patch version fixes a few typos and also gets rid of a few now unused variables. board/esd/common/cmd_loadpci.c | 4 +--- board/esd/pci405/cmd_pci405.c | 4 +--- board/esd/pmc440/cmd_pmc440.c | 4 +--- cpu/ppc4xx/44x_spd_ddr2.c | 14 ++++---------- cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c | 16 ++++------------ 5 files changed, 11 insertions(+), 31 deletions(-) diff --git a/board/esd/common/cmd_loadpci.c b/board/esd/common/cmd_loadpci.c index d88b387..31d45b1 100644 --- a/board/esd/common/cmd_loadpci.c +++ b/board/esd/common/cmd_loadpci.c @@ -40,7 +40,6 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int count = 0; int count2 = 0; char addr[16]; - char str[] = "\\|/-"; char *local_args[2]; while(1) { @@ -60,8 +59,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) count++; if (!(count % 100)) { count2++; - putc(0x08); /* backspace */ - putc(str[count2 % 4]); + putc('.'); } /* Abort if ctrl-c was pressed */ diff --git a/board/esd/pci405/cmd_pci405.c b/board/esd/pci405/cmd_pci405.c index 5c717e2..670bc19 100644 --- a/board/esd/pci405/cmd_pci405.c +++ b/board/esd/pci405/cmd_pci405.c @@ -51,7 +51,6 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int status; int i; char addr[16]; - char str[] = "\\|/-"; char *local_args[2]; /* @@ -68,8 +67,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) count++; if (!(count % 100)) { count2++; - putc(0x08); /* backspace */ - putc(str[count2 % 4]); + putc('.'); } /* Abort if ctrl-c was pressed */ diff --git a/board/esd/pmc440/cmd_pmc440.c b/board/esd/pmc440/cmd_pmc440.c index 38ee74e..7108263 100644 --- a/board/esd/pmc440/cmd_pmc440.c +++ b/board/esd/pmc440/cmd_pmc440.c @@ -121,7 +121,6 @@ int do_fifo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int i; int n = 0; u32 ctrl, data, f; - char str[] = "\\|/-"; int abort = 0; int count = 0; int count2 = 0; @@ -175,8 +174,7 @@ int do_fifo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) count++; if (!(count % 100)) { count2++; - putc(0x08); /* backspace */ - putc(str[count2 % 4]); + putc('.'); } /* Abort if ctrl-c was pressed */ diff --git a/cpu/ppc4xx/44x_spd_ddr2.c b/cpu/ppc4xx/44x_spd_ddr2.c index b40e4b1..586fa74 100644 --- a/cpu/ppc4xx/44x_spd_ddr2.c +++ b/cpu/ppc4xx/44x_spd_ddr2.c @@ -2362,10 +2362,8 @@ static void program_ecc_addr(unsigned long start_address, unsigned long end_address; unsigned long address_increment; unsigned long mcopt1; - char str[] = "ECC generation -"; - char slash[] = "\\|/-\\|/-"; + char str[] = "ECC generation: "; int loop = 0; - int loopi = 0; current_address = start_address; mfsdram(SDRAM_MCOPT1, mcopt1); @@ -2390,8 +2388,7 @@ static void program_ecc_addr(unsigned long start_address, current_address += address_increment; if ((loop++ % (2 << 20)) == 0) { - putc('\b'); - putc(slash[loopi++ % 8]); + putc('.'); } } @@ -2571,9 +2568,7 @@ static void DQS_calibration_process(void) u32 rqfd; u32 rqfd_start; u32 rqfd_average; - int loopi = 0; - char str[] = "Auto calibration -"; - char slash[] = "\\|/-\\|/-"; + char str[] = "Auto calibration: "; /*------------------------------------------------------------------ * Test to determine the best read clock delay tuning bits. @@ -2760,8 +2755,7 @@ calibration_loop: *-----------------------------------------------------------------*/ if (window_found == FALSE) { if (rqfd_start < SDRAM_RQDC_RQFD_MAX) { - putc('\b'); - putc(slash[loopi++ % 8]); + putc('.'); /* try again from with a different RQFD start value */ rqfd_start++; diff --git a/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c b/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c index 1e3e20d..109bcc7 100644 --- a/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c +++ b/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c @@ -428,9 +428,6 @@ static u32 DQS_calibration_methodA(struct ddrautocal *cal) #endif ulong rdcc; - char slash[] = "\\|/-\\|/-"; - int loopi = 0; - /* start */ in_window = 0; @@ -483,15 +480,13 @@ static u32 DQS_calibration_methodA(struct ddrautocal *cal) debug("<%s>SDRAM_RFDC=0x%x\n", __func__, temp); #endif - putc(' '); for (rqfd = 0; rqfd <= SDRAM_RQDC_RQFD_MAX; rqfd++) { mfsdram(SDRAM_RQDC, rqdc_reg); rqdc_reg &= ~(SDRAM_RQDC_RQFD_MASK); mtsdram(SDRAM_RQDC, rqdc_reg | SDRAM_RQDC_RQFD_ENCODE(rqfd)); - putc('\b'); - putc(slash[loopi++ % 8]); + putc('.'); curr_win_min.rffd = 0; curr_win_max.rffd = 0; @@ -944,8 +939,6 @@ u32 DQS_autocalibration(void) u32 val; int verbose_lvl = 0; char *str; - char slash[] = "\\|/-\\|/-"; - int loopi = 0; struct sdram_timing *scan_list; #if defined(DEBUG_PPC4xx_DDR_AUTOCALIBRATION) @@ -962,9 +955,9 @@ u32 DQS_autocalibration(void) mfsdram(SDRAM_MCOPT1, val); if ((val & SDRAM_MCOPT1_MCHK_CHK_REP) == SDRAM_MCOPT1_MCHK_CHK_REP) - str = "ECC Auto calibration -"; + str = "ECC Auto calibration: "; else - str = "Auto calibration -"; + str = "Auto calibration: "; puts(str); @@ -1000,8 +993,7 @@ u32 DQS_autocalibration(void) relock_memory_DLL(); - putc('\b'); - putc(slash[loopi++ % 8]); + putc('.'); #ifdef DEBUG debug("\n"); -- 1.5.5.1

1 0

[U-Boot] [PATCH PPC_4xx] Print simple row of dots instead of spinning wheel
by Wolfgang Denk 23 Oct '08

23 Oct '08

Replease the "spinning wheel" eye candy by printing a simple row of dots. This avoids problems with control charactersin log files etc. Also, it saves a few bytes. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/esd/common/cmd_loadpci.c | 4 +--- board/esd/pci405/cmd_pci405.c | 4 +--- board/esd/pmc440/cmd_pmc440.c | 4 +--- cpu/ppc4xx/44x_spd_ddr2.c | 12 ++++-------- cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c | 13 ++++--------- 5 files changed, 11 insertions(+), 26 deletions(-) diff --git a/board/esd/common/cmd_loadpci.c b/board/esd/common/cmd_loadpci.c index d88b387..31d45b1 100644 --- a/board/esd/common/cmd_loadpci.c +++ b/board/esd/common/cmd_loadpci.c @@ -40,7 +40,6 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int count = 0; int count2 = 0; char addr[16]; - char str[] = "\\|/-"; char *local_args[2]; while(1) { @@ -60,8 +59,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) count++; if (!(count % 100)) { count2++; - putc(0x08); /* backspace */ - putc(str[count2 % 4]); + putc('.'); } /* Abort if ctrl-c was pressed */ diff --git a/board/esd/pci405/cmd_pci405.c b/board/esd/pci405/cmd_pci405.c index 5c717e2..670bc19 100644 --- a/board/esd/pci405/cmd_pci405.c +++ b/board/esd/pci405/cmd_pci405.c @@ -51,7 +51,6 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int status; int i; char addr[16]; - char str[] = "\\|/-"; char *local_args[2]; /* @@ -68,8 +67,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) count++; if (!(count % 100)) { count2++; - putc(0x08); /* backspace */ - putc(str[count2 % 4]); + putc('.'); } /* Abort if ctrl-c was pressed */ diff --git a/board/esd/pmc440/cmd_pmc440.c b/board/esd/pmc440/cmd_pmc440.c index 38ee74e..7108263 100644 --- a/board/esd/pmc440/cmd_pmc440.c +++ b/board/esd/pmc440/cmd_pmc440.c @@ -121,7 +121,6 @@ int do_fifo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int i; int n = 0; u32 ctrl, data, f; - char str[] = "\\|/-"; int abort = 0; int count = 0; int count2 = 0; @@ -175,8 +174,7 @@ int do_fifo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) count++; if (!(count % 100)) { count2++; - putc(0x08); /* backspace */ - putc(str[count2 % 4]); + putc('.'); } /* Abort if ctrl-c was pressed */ diff --git a/cpu/ppc4xx/44x_spd_ddr2.c b/cpu/ppc4xx/44x_spd_ddr2.c index b40e4b1..9587896 100644 --- a/cpu/ppc4xx/44x_spd_ddr2.c +++ b/cpu/ppc4xx/44x_spd_ddr2.c @@ -2362,8 +2362,7 @@ static void program_ecc_addr(unsigned long start_address, unsigned long end_address; unsigned long address_increment; unsigned long mcopt1; - char str[] = "ECC generation -"; - char slash[] = "\\|/-\\|/-"; + char str[] = "ECC generation: "; int loop = 0; int loopi = 0; @@ -2390,8 +2389,7 @@ static void program_ecc_addr(unsigned long start_address, current_address += address_increment; if ((loop++ % (2 << 20)) == 0) { - putc('\b'); - putc(slash[loopi++ % 8]); + putc('.'); } } @@ -2572,8 +2570,7 @@ static void DQS_calibration_process(void) u32 rqfd_start; u32 rqfd_average; int loopi = 0; - char str[] = "Auto calibration -"; - char slash[] = "\\|/-\\|/-"; + char str[] = "Auto calibration: "; /*------------------------------------------------------------------ * Test to determine the best read clock delay tuning bits. @@ -2760,8 +2757,7 @@ calibration_loop: *-----------------------------------------------------------------*/ if (window_found == FALSE) { if (rqfd_start < SDRAM_RQDC_RQFD_MAX) { - putc('\b'); - putc(slash[loopi++ % 8]); + putc('.'); /* try again from with a different RQFD start value */ rqfd_start++; diff --git a/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c b/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c index 1e3e20d..7f69336 100644 --- a/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c +++ b/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c @@ -428,7 +428,6 @@ static u32 DQS_calibration_methodA(struct ddrautocal *cal) #endif ulong rdcc; - char slash[] = "\\|/-\\|/-"; int loopi = 0; /* start */ @@ -483,15 +482,13 @@ static u32 DQS_calibration_methodA(struct ddrautocal *cal) debug("<%s>SDRAM_RFDC=0x%x\n", __func__, temp); #endif - putc(' '); for (rqfd = 0; rqfd <= SDRAM_RQDC_RQFD_MAX; rqfd++) { mfsdram(SDRAM_RQDC, rqdc_reg); rqdc_reg &= ~(SDRAM_RQDC_RQFD_MASK); mtsdram(SDRAM_RQDC, rqdc_reg | SDRAM_RQDC_RQFD_ENCODE(rqfd)); - putc('\b'); - putc(slash[loopi++ % 8]); + putc('.'); curr_win_min.rffd = 0; curr_win_max.rffd = 0; @@ -944,7 +941,6 @@ u32 DQS_autocalibration(void) u32 val; int verbose_lvl = 0; char *str; - char slash[] = "\\|/-\\|/-"; int loopi = 0; struct sdram_timing *scan_list; @@ -962,9 +958,9 @@ u32 DQS_autocalibration(void) mfsdram(SDRAM_MCOPT1, val); if ((val & SDRAM_MCOPT1_MCHK_CHK_REP) == SDRAM_MCOPT1_MCHK_CHK_REP) - str = "ECC Auto calibration -"; + str = "ECC Auto calibration: "; else - str = "Auto calibration -"; + str = "Auto calibration: "; puts(str); @@ -1000,8 +996,7 @@ u32 DQS_autocalibration(void) relock_memory_DLL(); - putc('\b'); - putc(slash[loopi++ % 8]); + putc('.'); #ifdef DEBUG debug("\n"); -- 1.5.5.1

1 0

[U-Boot] Problems erasing (and writing) to flash
by ffileppo＠alice.it 23 Oct '08

23 Oct '08

Hi guys, I'm facing problems when I try to erase flash memory on my embedded board (it's a custom Mainstone board, based on PXA270 ). I'm using u-boot 1.1.4 (since it is the only version with patch for Mainstone), "Protect off" seems to work ok: > protect off 1:7 > Un-Protect Flash Sector 7-7 in Bank # 1 (now I see that sector 7 is no longer RO) But when I try to erase that sector: > erase 1:7 > Erase Flash Sectors 7-7 in Bank # 1 > fwc addr 00080000 cmd 50 0050 16bit x 16 bit > fwc addr 00080000 cmd 20 0020 16bit x 16 bit > fwc addr 00080000 cmd d0 00d0 16bit x 16 bit > flash_is_busy: 0 >fwc addr 00080000 cmd ff 00ff 16bit x 16 bit >. done But the sector is not erased (I check with md) Anyone know what could be the problem here? I'll post more logs if needed NOTE (Flash memoy is not bro, I'm able to erase and write it using JTAG and/or linux mtd tools) Thank you, Francesco Flinfo output: Bank # 1: CFI conformant FLASH (16 x 16) Size: 32 MB in 259 Sectors Erase timeout 4096 ms, write timeout 0 ms, buffer write timeout 1024 ms, buffer size 64 Sector Start Addresses: 00000000 (RO) 00008000 (RO) 00010000 (RO) 00018000 (RO) 00020000 (RO) ............................................................................ Bank # 2: CFI conformant FLASH (16 x 16) Size: 32 MB in 259 Sectors Erase timeout 4096 ms, write timeout 0 ms, buffer write timeout 1024 ms, buffer size 64 Sector Start Addresses: 00000000 (RO) 00008000 (RO) 00010000 (RO) 00018000 (RO) 00020000 (RO) ............................................................................ Here is the debug info from startup: U-Boot 1.1.4 (Aug 1 2008 - 09:51:21) U-Boot code: A3080000 -> A30B6CA4 BSS: -> A30BBBB8 RAM Configuration: Bank #0: a0000000 128 MB flash detect cfi fwc addr 00000000 cmd 0 0 8bit x 8 bit fwc addr 00000055 cmd 98 98 8bit x 8 bit is= cmd 51(Q) addr 00000010 is= 14 51 fwc addr 00000000 cmd 0 0000 16bit x 8 bit fwc addr 000000aa cmd 98 9898 16bit x 8 bit is= cmd 51(Q) addr 00000020 is= 0051 5151 fwc addr 00000000 cmd 0 0000 16bit x 16 bit fwc addr 000000aa cmd 98 0098 16bit x 16 bit is= cmd 51(Q) addr 00000020 is= 0051 0051 is= cmd 52(R) addr 00000022 is= 0052 0052 is= cmd 59(Y) addr 00000024 is= 0059 0059 retval = 0x1 device interface is 1 found port 2 chip 2 port 16 bits chip 16 bits retval = 0x1 manufacturer is 1 size_ratio 1 port 16 bits chip 16 bits found 2 erase regions erase_region_count = 4 erase_region_size = 32768 erase_region_count = 255 erase_region_size = 131072 retval = 0x6 fwc addr 00000000 cmd ff 00ff 16bit x 16 bit flash detect cfi fwc addr 00000000 cmd 0 0 8bit x 8 bit fwc addr 00000055 cmd 98 98 8bit x 8 bit is= cmd 51(Q) addr 00000010 is= 14 51 fwc addr 00000000 cmd 0 0000 16bit x 8 bit fwc addr 000000aa cmd 98 9898 16bit x 8 bit is= cmd 51(Q) addr 00000020 is= 0051 5151 fwc addr 00000000 cmd 0 0000 16bit x 16 bit fwc addr 000000aa cmd 98 0098 16bit x 16 bit is= cmd 51(Q) addr 00000020 is= 0051 0051 is= cmd 52(R) addr 00000022 is= 0052 0052 is= cmd 59(Y) addr 00000024 is= 0059 0059 retval = 0x1 device interface is 1 found port 2 chip 2 port 16 bits chip 16 bits retval = 0x1 manufacturer is 1 size_ratio 1 port 16 bits chip 16 bits found 2 erase regions erase_region_count = 4 erase_region_size = 32768 erase_region_count = 255 erase_region_size = 131072 retval = 0x6 fwc addr 00000000 cmd ff 00ff 16bit x 16 bit Flash: 64 MB In: serial Out: serial Err: serial ### main_loop entered: bootdelay=1

2 1

[U-Boot] [PATCH] [ARM] Move machine specific code to board at s3c64xx
by Kyungmin Park 23 Oct '08

23 Oct '08

Move machine specific code to smdk6400. Some board use OneNAND instead of NAND. Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- diff --git a/board/samsung/smdk6400/lowlevel_init.S b/board/samsung/smdk6400/lowlevel_init.S index e0119a7..53d9125 100644 --- a/board/samsung/smdk6400/lowlevel_init.S +++ b/board/samsung/smdk6400/lowlevel_init.S @@ -104,6 +104,13 @@ lowlevel_init: bl nand_asm_init #endif + /* Memory subsystem address 0x7e00f120 */ + ldr r0, =ELFIN_MEM_SYS_CFG + + /* Xm0CSn2 = NFCON CS0, Xm0CSn3 = NFCON CS1 */ + mov r1, #0xd + str r1, [r0] + bl mem_ctrl_asm_init /* Wakeup support. Don't know if it's going to be used, untested. */ diff --git a/cpu/arm1176/s3c64xx/cpu_init.S b/cpu/arm1176/s3c64xx/cpu_init.S index 08bda99..32bb467 100644 --- a/cpu/arm1176/s3c64xx/cpu_init.S +++ b/cpu/arm1176/s3c64xx/cpu_init.S @@ -28,13 +28,6 @@ .globl mem_ctrl_asm_init mem_ctrl_asm_init: - /* Memory subsystem address 0x7e00f120 */ - ldr r0, =ELFIN_MEM_SYS_CFG - - /* Xm0CSn2 = NFCON CS0, Xm0CSn3 = NFCON CS1 */ - mov r1, #0xd - str r1, [r0] - /* DMC1 base address 0x7e001000 */ ldr r0, =ELFIN_DMC1_BASE

4 13

[U-Boot] [PATCH] [ONENAND] Reduce OneNAND IPL code size
by Kyungmin Park 23 Oct '08

23 Oct '08

To give more code at lowlevel_init at each boards 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