March 2009 - U-Boot

[U-Boot] Creating partitions on NAND flash
by Afzal Nadirshah 09 Mar '09

09 Mar '09

Hi All, I would like to partition the NAND flash on a canyonlands board. As per my understanding, the partitioning is done using the "add_mtd_partitions" function in the file "drivers/mtd/mtdpart.c". I also understand that the information about a partition is stored in the structure : "struct mtd_partition" . I could not find out where this structure is getting populated in the u-boot code. Could somebody point out the file in which these partitions are created? I am also interested in knowing the file in which the different start / end addresses for these partitions are defined. On DaVinci EVM's I have found something like this when the u-boot comes up : Creating 5 MTD partitions on "nand_davinci.0": 0x00000000-0x00060000 : "bootloader" 0x00060000-0x00200000 : "params" 0x00200000-0x00400000 : "kernel" 0x00400000-0x01800000 : "filesystem" 0x01800000-0x02000000 : "data" My aim is to add more such partitions on the NAND flash on my board. Any information regarding partitioning the flash is highly appreciated. Thanks in advance. Regards, Afzal Nadirshah http://www.mindtree.com/email/disclaimer.html

2 2

[U-Boot] [PATCH 1/1] Changes for single binary image for u-boot for NAND/OneNAND flash.
by Manikandan Pillai 09 Mar '09

09 Mar '09

Support for single binary image for NAND/OneNAND based OMAP3 EVM boards. The software has to set the flag CONFIG_ENV_IS_RUNTIME_SEL in include/configs/omap3_evm.h. The software is able to detect whether it is NAND or OneNAND flash at runtime. The flash detected is set as the environment store also. As per the comments received, the change is done only for OMAP3 EVM. Signed-off-by: Manikandan Pillai <mani.pillai(a)ti.com> --- board/omap3/evm/evm.c | 2 + common/Makefile | 1 + common/cmd_nvedit.c | 5 ++ common/env_common.c | 8 +++- common/env_nand.c | 33 +++++++++++- common/env_onenand.c | 26 +++++++++- cpu/arm_cortexa8/omap3/board.c | 13 +++++ cpu/arm_cortexa8/omap3/mem.c | 100 ++++++++++++++++++++++++++++++++++++- cpu/arm_cortexa8/omap3/sys_info.c | 27 +++++++++- include/common.h | 10 +++- include/configs/omap3_evm.h | 6 ++- lib_arm/board.c | 25 +++++++--- 12 files changed, 237 insertions(+), 19 deletions(-) diff --git a/board/omap3/evm/evm.c b/board/omap3/evm/evm.c index b406312..9924432 100644 --- a/board/omap3/evm/evm.c +++ b/board/omap3/evm/evm.c @@ -44,7 +44,9 @@ int board_init(void) { DECLARE_GLOBAL_DATA_PTR; +#if !defined(CONFIG_ENV_IS_RUNTIME_SEL) gpmc_init(); /* in SRAM or SDRAM, finish GPMC */ +#endif /* board id for Linux */ gd->bd->bi_arch_number = MACH_TYPE_OMAP3EVM; /* boot param addr */ diff --git a/common/Makefile b/common/Makefile index f13cd11..a6c55d2 100644 --- a/common/Makefile +++ b/common/Makefile @@ -58,6 +58,7 @@ COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o +COBJS-$(CONFIG_ENV_IS_RUNTIME_SEL) += env_onenand.o env_nand.o # command COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 68c673e..628bcf4 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -59,6 +59,7 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_NAND) && \ !defined(CONFIG_ENV_IS_IN_ONENAND) && \ !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \ + !defined(CONFIG_ENV_IS_RUNTIME_SEL) && \ !defined(CONFIG_ENV_IS_NOWHERE) # error Define one of CONFIG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE} #endif @@ -66,6 +67,10 @@ DECLARE_GLOBAL_DATA_PTR; #define XMK_STR(x) #x #define MK_STR(x) XMK_STR(x) +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +extern saveenv_p saveenv; +#endif + /************************************************************************ ************************************************************************/ diff --git a/common/env_common.c b/common/env_common.c index 6be3bb0..b692900 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -46,8 +46,13 @@ DECLARE_GLOBAL_DATA_PTR; extern env_t *env_ptr; +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +extern env_get_char_spec_p env_get_char_spec; +extern env_relocate_spec_p env_relocate_spec; +#else extern void env_relocate_spec (void); extern uchar env_get_char_spec(int); +#endif static uchar env_get_char_init (int index); @@ -140,7 +145,8 @@ uchar default_environment[] = { }; #if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */ \ - || defined(CONFIG_ENV_IS_IN_SPI_FLASH) + || defined(CONFIG_ENV_IS_IN_SPI_FLASH) \ + || (defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_RUNTIME_SEL)) int default_environment_size = sizeof(default_environment); #endif diff --git a/common/env_nand.c b/common/env_nand.c index 76569da..add74c2 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -65,17 +65,22 @@ int nand_legacy_rw (struct nand_chip* nand, int cmd, extern uchar default_environment[]; extern int default_environment_size; +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +char *nand_env_name_spec = "NAND"; +#else char * env_name_spec = "NAND"; - +#endif #ifdef ENV_IS_EMBEDDED extern uchar environment[]; env_t *env_ptr = (env_t *)(&environment[0]); +#elif defined(CONFIG_ENV_IS_RUNTIME_SEL) +env_t *nand_env_ptr; +env_t *env_ptr; #else /* ! ENV_IS_EMBEDDED */ env_t *env_ptr = 0; #endif /* ENV_IS_EMBEDDED */ - /* local functions */ #if !defined(ENV_IS_EMBEDDED) static void use_default(void); @@ -83,7 +88,11 @@ static void use_default(void); DECLARE_GLOBAL_DATA_PTR; +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +uchar nand_env_get_char_spec(int index) +#else uchar env_get_char_spec (int index) +#endif { return ( *((uchar *)(gd->env_addr + index)) ); } @@ -100,7 +109,11 @@ uchar env_get_char_spec (int index) * the SPL loads not only the U-Boot image from NAND but also the * environment. */ +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +int nand_env_init(void) +#else int env_init(void) +#endif { #if defined(ENV_IS_EMBEDDED) size_t total; @@ -181,7 +194,11 @@ int writeenv(size_t offset, u_char *buf) return 0; } #ifdef CONFIG_ENV_OFFSET_REDUND +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +int nand_saveenv(void) +#else int saveenv(void) +#endif { size_t total; int ret = 0; @@ -224,7 +241,11 @@ int saveenv(void) return ret; } #else /* ! CONFIG_ENV_OFFSET_REDUND */ +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +int nand_saveenv(void) +#else int saveenv(void) +#endif { size_t total; int ret = 0; @@ -284,7 +305,11 @@ int readenv (size_t offset, u_char * buf) } #ifdef CONFIG_ENV_OFFSET_REDUND +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +void nand_env_relocate_spec(void) +#else void env_relocate_spec (void) +#endif { #if !defined(ENV_IS_EMBEDDED) size_t total; @@ -343,7 +368,11 @@ void env_relocate_spec (void) * The legacy NAND code saved the environment in the first NAND device i.e., * nand_dev_desc + 0. This is also the behaviour using the new NAND code. */ +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +void nand_env_relocate_spec(void) +#else void env_relocate_spec (void) +#endif { #if !defined(ENV_IS_EMBEDDED) int ret; diff --git a/common/env_onenand.c b/common/env_onenand.c index dbccc79..7aaa83c 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -39,11 +39,19 @@ extern uchar default_environment[]; #define ONENAND_ENV_SIZE(mtd) (mtd.writesize - ENV_HEADER_SIZE) +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +char *onenand_env_name_spec = "OneNAND"; +#else char *env_name_spec = "OneNAND"; +#endif #ifdef ENV_IS_EMBEDDED extern uchar environment[]; env_t *env_ptr = (env_t *) (&environment[0]); +#elif defined(CONFIG_ENV_IS_RUNTIME_SEL) +static unsigned char onenand_env[MAX_ONENAND_PAGESIZE]; +env_t *onenand_env_ptr = (env_t *)&onenand_env[0]; +extern env_t *env_ptr; #else /* ! ENV_IS_EMBEDDED */ static unsigned char onenand_env[MAX_ONENAND_PAGESIZE]; env_t *env_ptr = (env_t *) onenand_env; @@ -51,12 +59,20 @@ env_t *env_ptr = (env_t *) onenand_env; DECLARE_GLOBAL_DATA_PTR; +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +uchar onenand_env_get_char_spec(int index) +#else uchar env_get_char_spec(int index) +#endif { return (*((uchar *) (gd->env_addr + index))); } +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +void onenand_env_relocate_spec(void) +#else void env_relocate_spec(void) +#endif { unsigned long env_addr; int use_default = 0; @@ -87,7 +103,11 @@ void env_relocate_spec(void) gd->env_valid = 1; } +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +int onenand_saveenv(void) +#else int saveenv(void) +#endif { unsigned long env_addr = CONFIG_ENV_ADDR; struct erase_info instr = { @@ -102,7 +122,6 @@ int saveenv(void) printf("OneNAND: erase failed at 0x%08lx\n", env_addr); return 1; } - /* update crc */ env_ptr->crc = crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd)); @@ -112,11 +131,14 @@ int saveenv(void) printf("OneNAND: write failed at 0x%08x\n", instr.addr); return 2; } - return 0; } +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +int onenand_env_init(void) +#else int env_init(void) +#endif { /* use default */ gd->env_addr = (ulong) & default_environment[0]; diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c index 7bb3e28..ba0eec6 100644 --- a/cpu/arm_cortexa8/omap3/board.c +++ b/cpu/arm_cortexa8/omap3/board.c @@ -313,6 +313,19 @@ void abort(void) { } +/****************************************************************************** + * Routine: print_board_info + * Description: Displays cpu and memory information for the board + *****************************************************************************/ +void print_board_info(void) +{ + u32 btype; + + btype = get_board_type(); + + display_board_info(btype); +} + #ifdef CONFIG_NAND_OMAP_GPMC /****************************************************************************** * OMAP3 specific command to switch between NAND HW and SW ecc diff --git a/cpu/arm_cortexa8/omap3/mem.c b/cpu/arm_cortexa8/omap3/mem.c index 3cc22c4..159ed87 100644 --- a/cpu/arm_cortexa8/omap3/mem.c +++ b/cpu/arm_cortexa8/omap3/mem.c @@ -26,10 +26,12 @@ */ #include <common.h> +#include <environment.h> #include <asm/io.h> #include <asm/arch/mem.h> #include <asm/arch/sys_proto.h> #include <command.h> +#include <nand.h> /* * Only One NAND allowed on board at a time. @@ -41,7 +43,21 @@ unsigned int boot_flash_sec; unsigned int boot_flash_type; volatile unsigned int boot_flash_env_addr; +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +extern env_t *env_ptr; +extern char *nand_env_name_spec; +extern char *onenand_env_name_spec; +extern env_t *nand_env_ptr; +extern env_t *onenand_env_ptr; + +extern void onenand_init(void); +extern int nand_scan_ident(struct mtd_info *mtd, int maxchips); +#endif + #if defined(CONFIG_CMD_NAND) +u8 is_nand; +extern nand_info_t nand_info[2]; + static u32 gpmc_m_nand[GPMC_MAX_REG] = { M_NAND_GPMC_CONFIG1, M_NAND_GPMC_CONFIG2, @@ -63,6 +79,8 @@ gpmc_t *gpmc_cfg_base; #endif #if defined(CONFIG_CMD_ONENAND) +u8 is_onenand; +extern struct mtd_info onenand_mtd; static u32 gpmc_onenand[GPMC_MAX_REG] = { ONENAND_GPMC_CONFIG1, ONENAND_GPMC_CONFIG2, @@ -84,6 +102,24 @@ gpmc_csx_t *onenand_cs_base; static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE; +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +char *env_name_spec; +env_get_char_spec_p env_get_char_spec; +env_init_p env_init; +saveenv_p saveenv; +env_relocate_spec_p env_relocate_spec; + +extern uchar nand_env_get_char_spec(int index); +extern int nand_env_init(void); +extern int nand_saveenv(void); +extern void nand_env_relocate_spec(void); + +extern uchar onenand_env_get_char_spec(int index); +extern int onenand_env_init(void); +extern int onenand_saveenv(void); +extern void onenand_env_relocate_spec(void); +#endif /* CONFIG_ENV_IS_RUNTIME_SEL */ + /************************************************************************** * make_cs1_contiguous() - for es2 and above remap cs1 behind cs0 to allow * command line mem=xyz use all memory with out discontinuous support @@ -229,6 +265,7 @@ void gpmc_init(void) u32 f_off = CONFIG_SYS_MONITOR_LEN; u32 f_sec = 0; u32 config = 0; + u32 gpmc_index = 0; /* global settings */ writel(0, &gpmc_base->irqenable); /* isr's sources masked */ @@ -245,7 +282,7 @@ void gpmc_init(void) writel(0, &gpmc_cs_base->config7); sdelay(1000); -#if defined(CONFIG_CMD_NAND) /* CS 0 */ +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_ENV_IS_RUNTIME_SEL) gpmc_config = gpmc_m_nand; gpmc_cfg_base = gpmc_base; nand_cs_base = (gpmc_csx_t *)(GPMC_CONFIG_CS0_BASE + @@ -264,7 +301,37 @@ void gpmc_init(void) #endif #endif -#if defined(CONFIG_CMD_ONENAND) +#if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_RUNTIME_SEL) + gpmc_config = gpmc_m_nand; + nand_cs_base = (gpmc_csx_t *)(GPMC_CONFIG_CS0_BASE + + (gpmc_index * GPMC_CONFIG_WIDTH)); + base = PISMO1_NAND_BASE; + size = PISMO1_NAND_SIZE; + enable_gpmc_config(gpmc_config, nand_cs_base, base, size); + /* NAND and/or ONENAND is to be scanned */ + is_nand = 0; + nand_init(); + if (nand_info[0].size) { + is_nand = 1; + f_off = SMNAND_ENV_OFFSET; + f_sec = SZ_128K; + /* env setup */ + boot_flash_base = base; + boot_flash_off = f_off; + boot_flash_sec = f_sec; + boot_flash_env_addr = f_off; + + env_name_spec = nand_env_name_spec; + env_ptr = nand_env_ptr; + env_get_char_spec = nand_env_get_char_spec; + env_init = nand_env_init; + saveenv = nand_saveenv; + env_relocate_spec = nand_env_relocate_spec; + gpmc_index++; + } +#endif + +#if defined(CONFIG_CMD_ONENAND) && !defined(CONFIG_ENV_IS_RUNTIME_SEL) gpmc_config = gpmc_onenand; onenand_cs_base = (gpmc_csx_t *)(GPMC_CONFIG_CS0_BASE + (GPMC_CS * GPMC_CONFIG_WIDTH)); @@ -281,4 +348,33 @@ void gpmc_init(void) boot_flash_env_addr = f_off; #endif #endif + +#if defined(CONFIG_CMD_ONENAND) && defined(CONFIG_ENV_IS_RUNTIME_SEL) + gpmc_config = gpmc_onenand; + onenand_cs_base = (gpmc_csx_t *)(GPMC_CONFIG_CS0_BASE + + (gpmc_index * GPMC_CONFIG_WIDTH)); + base = PISMO1_ONEN_BASE; + size = PISMO1_ONEN_SIZE; + enable_gpmc_config(gpmc_config, onenand_cs_base, base, size); + /* NAND and/or ONENAND is to be scanned */ + is_onenand = 0; + onenand_init(); + if (onenand_mtd.size) { + is_onenand = 1; + f_off = ONENAND_ENV_OFFSET; + f_sec = SZ_128K; + /* env setup */ + boot_flash_base = base; + boot_flash_off = f_off; + boot_flash_sec = f_sec; + boot_flash_env_addr = f_off; + env_name_spec = onenand_env_name_spec; + env_ptr = onenand_env_ptr; + env_get_char_spec = onenand_env_get_char_spec; + env_init = onenand_env_init; + saveenv = onenand_saveenv; + env_relocate_spec = onenand_env_relocate_spec; + gpmc_index++; + } +#endif } diff --git a/cpu/arm_cortexa8/omap3/sys_info.c b/cpu/arm_cortexa8/omap3/sys_info.c index 28a1020..86cc95f 100644 --- a/cpu/arm_cortexa8/omap3/sys_info.c +++ b/cpu/arm_cortexa8/omap3/sys_info.c @@ -36,6 +36,14 @@ static gpmc_csx_t *gpmc_cs_base = (gpmc_csx_t *)GPMC_CONFIG_CS0_BASE; static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE; static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE; +#if defined(CONFIG_CMD_NAND) +extern u8 is_nand; +#endif + +#if defined(CONFIG_CMD_ONENAND) +extern u8 is_onenand; +#endif + /****************************************** * get_cpu_type(void) - extract cpu info ******************************************/ @@ -208,9 +216,22 @@ void display_board_info(u32 btype) printf("OMAP%s-%s rev %d, CPU-OPP2 L3-165MHz\n", cpu_s, - sec_s, get_cpu_rev()); - printf("%s + %s/%s\n", sysinfo.board_string, - mem_s, sysinfo.nand_string); + sec_s, get_cpu_rev()); +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) + printf("%s + %s/", sysinfo.board_string, + mem_s); +#if defined(CONFIG_CMD_NAND) + if (is_nand) + printf("%s\n", "NAND"); +#endif +#if defined(CONFIG_CMD_ONENAND) + if (is_onenand) + printf("%s\n", "ONENAND"); +#endif +#else + printf("%s + %s/%s\n", sysinfo.board_string, + mem_s, sysinfo.nand_string); +#endif } diff --git a/include/common.h b/include/common.h index b75ea60..fd3da2c 100644 --- a/include/common.h +++ b/include/common.h @@ -243,12 +243,20 @@ extern ulong load_addr; /* Default Load Address */ void doc_probe(unsigned long physadr); /* common/cmd_nvedit.c */ +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +typedef uchar (*env_get_char_spec_p)(int index); +typedef int (*env_init_p)(void); +typedef int (*saveenv_p)(void); +typedef void (*env_relocate_spec_p)(void); +#else int env_init (void); +int saveenv(void); +#endif void env_relocate (void); int envmatch (uchar *, int); char *getenv (char *); int getenv_r (char *name, char *buf, unsigned len); -int saveenv (void); + #ifdef CONFIG_PPC /* ARM version to be fixed! */ int inline setenv (char *, char *); #else diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index f4498a9..bf5614e 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -107,6 +107,7 @@ #define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_ONENAND /* ONENAND support */ +#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING @@ -125,12 +126,15 @@ /* * Board NAND Info. */ +#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access */ /* nand at CS0 */ +#define GPMC_NAND_ECC_LP_x16_LAYOUT 1 + #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */ /* NAND devices */ #define SECTORSIZE 512 @@ -271,7 +275,7 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -#define CONFIG_ENV_IS_IN_ONENAND 1 +#define CONFIG_ENV_IS_RUNTIME_SEL 1 #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ diff --git a/lib_arm/board.c b/lib_arm/board.c index 09eaaf2..9a0c285 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -60,6 +60,11 @@ DECLARE_GLOBAL_DATA_PTR; ulong monitor_flash_len; +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) +extern void gpmc_init(void); +extern void print_board_info(void); +#endif + #ifdef CONFIG_HAS_DATAFLASH extern int AT91F_DataflashInit(void); extern void dataflash_print_info(void); @@ -259,12 +264,17 @@ static int arm_pci_init(void) typedef int (init_fnc_t) (void); int print_cpuinfo (void); /* test-only */ +extern env_init_p env_init; init_fnc_t *init_sequence[] = { cpu_init, /* basic cpu dependent setup */ board_init, /* basic board dependent setup */ interrupt_init, /* set up exceptions */ +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) + NULL, /* initialize environment */ +#else env_init, /* initialize environment */ +#endif init_baudrate, /* initialze baudrate settings */ serial_init, /* serial communications setup */ console_init_f, /* stage 1 init of console */ @@ -350,13 +360,14 @@ void start_armboot (void) /* armboot_start is defined in the board-specific linker script */ mem_malloc_init (_armboot_start - CONFIG_SYS_MALLOC_LEN); -#if defined(CONFIG_CMD_NAND) - puts ("NAND: "); - nand_init(); /* go init the NAND */ -#endif - -#if defined(CONFIG_CMD_ONENAND) - onenand_init(); +#if defined(CONFIG_ENV_IS_RUNTIME_SEL) + gpmc_init(); /* in SRAM or SDRAM, finish GPMC */ + env_init(); + init_baudrate(); /* initialze baudrate settings */ + serial_init(); /* serial communications setup */ + console_init_f(); /* stage 1 init of console */ + display_banner(); + print_board_info(); #endif #ifdef CONFIG_HAS_DATAFLASH -- 1.5.6

4 5

[U-Boot] AT91 Pull Request
by Jean-Christophe PLAGNIOL-VILLARD 09 Mar '09

09 Mar '09

Hi Wolfgang, Please pull The following changes since commit 32688e572ff96715b41420e9a7f280db6c399b65: Wolfgang Denk (1): Update CHANGELOG; Prepare 2009.03-rc1 are available in the git repository at: git://git.denx.de/u-boot-at91.git master Jean-Christophe PLAGNIOL-VILLARD (11): at91sam9xeek: fix soc name at91sam9: add watchdog support at91sam9263ek: active watchdog support via at91sam9263ek_wdt_config at91sam9/cap9: use define instead hardcoded value for the USB_OHCI_REGS_BASE AT91RM9200EK: fix broken boot from NOR flash at91: rename DATAFLASH_MMC_SELECT to CONFIG_SYS_DATAFLASH_MMC_PIO at91rm9200dk: Move conditional compilation to Makefile at91rm9200: move serial driver to drivers/serial at91rm9200: fix DCC support at91sam9263ek add dcc support with at91sam9263ek_dcc_config at91rm9200ek: add dcc support with at91rm9200ek_dcc_config Jens Scharsig (1): AT91RM9200 BGA port D defines Ulf Samuelsson (1): Add support for the AT91RM9200EK Board. MAKEALL | 1 + Makefile | 34 ++- board/atmel/at91rm9200dk/Makefile | 14 +- board/atmel/at91rm9200dk/mux.c | 34 +-- board/atmel/at91rm9200ek/Makefile | 56 ++++ board/atmel/at91rm9200ek/at91rm9200ek.c | 86 ++++++ board/atmel/at91rm9200ek/config.mk | 1 + board/atmel/at91rm9200ek/led.c | 89 ++++++ board/atmel/at91rm9200ek/misc.c | 51 +++ board/atmel/at91rm9200ek/mux.c | 40 +++ board/atmel/at91rm9200ek/partition.c | 38 +++ board/atmel/at91rm9200ek/u-boot.lds | 56 ++++ cpu/arm920t/at91rm9200/Makefile | 2 +- cpu/arm920t/at91rm9200/interrupts.c | 2 + cpu/arm920t/start.S | 4 +- doc/README.at91 | 9 + drivers/mtd/cfi_flash.c | 5 +- drivers/serial/Makefile | 1 + .../serial.c => drivers/serial/at91rm9200_usart.c | 0 drivers/serial/atmel_usart.c | 4 +- drivers/watchdog/Makefile | 46 +++ drivers/watchdog/at91sam9_wdt.c | 79 +++++ include/asm-arm/arch-at91/at91_wdt.h | 38 +++ include/asm-arm/arch-at91rm9200/AT91RM9200.h | 31 ++ include/at45.h | 2 +- include/configs/afeb9260.h | 3 +- include/configs/at91cap9adk.h | 3 +- include/configs/at91rm9200dk.h | 1 + include/configs/at91rm9200ek.h | 318 ++++++++++++++++++++ include/configs/at91sam9260ek.h | 3 +- include/configs/at91sam9261ek.h | 3 +- include/configs/at91sam9263ek.h | 10 +- include/configs/cmc_pu2.h | 1 + include/configs/csb637.h | 1 + include/configs/kb9202.h | 1 + include/configs/m501sk.h | 1 + include/configs/mp2usb.h | 1 + 37 files changed, 1030 insertions(+), 39 deletions(-) create mode 100644 board/atmel/at91rm9200ek/Makefile create mode 100644 board/atmel/at91rm9200ek/at91rm9200ek.c create mode 100644 board/atmel/at91rm9200ek/config.mk create mode 100644 board/atmel/at91rm9200ek/led.c create mode 100644 board/atmel/at91rm9200ek/misc.c create mode 100644 board/atmel/at91rm9200ek/mux.c create mode 100644 board/atmel/at91rm9200ek/partition.c create mode 100644 board/atmel/at91rm9200ek/u-boot.lds rename cpu/arm920t/at91rm9200/serial.c => drivers/serial/at91rm9200_usart.c (100%) create mode 100644 drivers/watchdog/Makefile create mode 100644 drivers/watchdog/at91sam9_wdt.c create mode 100644 include/asm-arm/arch-at91/at91_wdt.h create mode 100644 include/configs/at91rm9200ek.h Best Regards, J.

2 1

[U-Boot] Pull request: u-boot-i2c
by Heiko Schocher 09 Mar '09

09 Mar '09

Hello Wolfgang, The following changes since commit 00cc5595a7caac8066b408774383a956c2e26797: Anatolij Gustschin (1): lcd: Fix compilation warning in common/lcd.c are available in the git repository at: git://git.denx.de/u-boot-i2c.git master Heiko Schocher (1): i2c, dtt: move dtt_init () to board_init_r () lib_ppc/board.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) [hs@pollux u-boot-i2c]$ bye Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH] ppc: Increase precision of ticks2usec
by Benoit Monin 08 Mar '09

08 Mar '09

The tick of some PowerPC cpu is running at high frequency and it can be used to get microsecond precision from it. Make use of div64 to achieve this precision in ticks2usec. Signed-off-by: Benoît Monin <bmonin(a)adeneo.eu> --- lib_ppc/time.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lib_ppc/time.c b/lib_ppc/time.c index 173ffab..ebda13a 100644 --- a/lib_ppc/time.c +++ b/lib_ppc/time.c @@ -22,6 +22,7 @@ */ #include <common.h> +#include <div64.h> #ifndef CONFIG_WD_PERIOD # define CONFIG_WD_PERIOD (10 * 1000 * 1000) /* 10 seconds default*/ @@ -71,17 +72,11 @@ void udelay(unsigned long usec) unsigned long ticks2usec(unsigned long ticks) { ulong tbclk = get_tbclk(); + u64 tmp; - /* usec = ticks * 1000000 / tbclk - * Multiplication would overflow at ~4.2e3 ticks, - * so we break it up into - * usec = ( ( ticks * 1000) / tbclk ) * 1000; - */ - ticks *= 1000L; - ticks /= tbclk; - ticks *= 1000L; - - return ((ulong)ticks); + tmp = ticks * 1000000ULL; + do_div (tmp, tbclk); + return (unsigned long)tmp; } #endif /* ------------------------------------------------------------------------- */ -- Créez votre adresse électronique prenom.nom(a)laposte.net 1 Go d'espace de stockage, anti-spam et anti-virus intégrés.

2 1

Re: [U-Boot] [PATCH] Add the "mfill" and "mcheck" memory commands.
by Benoit Monin 08 Mar '09

08 Mar '09

> De : "Wolfgang Denk" > > Dear Benoit Monin, > > In message <28907262.11403.1236090567026.JavaMail.www@wwinf8303> you wrote: > > > > The mfill command writes the value of a counter to a memory area. > > The mcheck command verifies the memory area against the counter value. > > Those commands are useful for debugging memory/framebuffer controller. > > > > The configuration option is CONFIG_MFILL and this only takes effect if > > the memory commands are activated globally (CONFIG_CMD_MEM). > > What exactly is the purpose of this patch? Looks like an extremely > simple memory test to me. Don't we have already a rich selection of > better ones available yet? > I should have detailed more the intent of those commands. We have here a video controller embedded in an fpga with its own video ram. We use mfill to fill the video ram as fast as possible with variable data for each vram address. And we use mcheck to verify (as fast as possible) the content of the vram. So this is not intended to test the main memory but it is a development and debug tool for peripheral containing memory. I've sent a patch because they are useful to us and generic enough, and might be handy for debugging accesses to memory mapped behind programmable logic. But maybe this debug tool is beyond the scope of U-Boot ? > Best regards, > > Wolfgang Denk > Sincerely, Benoît. -- Créez votre adresse électronique prenom.nom(a)laposte.net 1 Go d'espace de stockage, anti-spam et anti-virus intégrés.

2 1

[U-Boot] Timer on OMAP3430SDP.
by Radha Krishna 08 Mar '09

08 Mar '09

Hi All, I am using get_timer() function to find nof system ticks the NAND Read API is using. When I convert these system ticks into second I am not getting the expected value. I observed that 1 sec = 50781 ticks on OMAP3430SDP. Is this timer fine tuned for performance. Could someone suggest me on this. Thanks, Krishna.

2 1

[U-Boot] [PATCH v2 3/4] JFFS2 commands support for Flex-OneNAND
by Rohit Hagargundgi 08 Mar '09

08 Mar '09

Add sanity check for the partitions. Some special cases handled by the check are: - A partition can span across erase regions. - A region can have odd number of blocks. Signed-off-by: Rohit Hagargundgi <h.rohit(a)samsung.com> --- common/cmd_jffs2.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 59 insertions(+), 6 deletions(-) diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c index 791a572..5d2d69c 100644 --- a/common/cmd_jffs2.c +++ b/common/cmd_jffs2.c @@ -421,17 +421,70 @@ static int part_validate_onenand(struct mtdids *id, struct part_info *part) #if defined(CONFIG_CMD_ONENAND) /* info for OneNAND chips */ struct mtd_info *mtd; + int erasesize = 0; mtd = &onenand_mtd; - if ((unsigned long)(part->offset) % mtd->erasesize) { - printf("%s%d: partition (%s) start offset" - "alignment incorrect\n", - MTD_DEV_TYPE(id->type), id->num, part->name); - return 1; + if (mtd->numeraseregions > 1) { + int i, rgn, max = mtd->numeraseregions; + unsigned end = part->offset + part->size; + struct mtd_erase_region_info *regions = mtd->eraseregions; + unsigned portion_start, portion_end, region_end; + + /* Find the first erase regions which is part of this + * partition. + */ + i = flexonenand_region(mtd, part->offset); + + /* Partition offset within region must align + * on region's erase size + */ + if ((part->offset - regions[i].offset) % regions[i].erasesize) { + printf("%s%d: partition (%s) doesn't start on an erase" + " block boundary\n", MTD_DEV_TYPE(id->type), + id->num, part->name); + return 1; + } + + erasesize = regions[i].erasesize; + + /* A partition spanning across multiple erase regions has + * erase size equal to greatest erase size among the regions. + */ + rgn = i; + for (; i < max && regions[i].offset < end; i++) + if (erasesize < regions[i].erasesize) + erasesize = regions[i].erasesize; + + /* If partition spans many erase regions, + * the partition portion present in each region + * should be multiple of biggest erase size + */ + for (i = rgn; i < max && regions[i].offset < end; i++) { + portion_start = max(regions[i].offset, part->offset); + region_end = regions[i].offset + + regions[i].erasesize * regions[i].numblocks; + portion_end = min(end, region_end); + + if ((portion_end - portion_start) % erasesize) { + printf("%s%d: partition (%s) is not erase block" + " aligned within erase region\n", + MTD_DEV_TYPE(id->type), id->num, part->name); + return 1; + } + } + } else { + /* Single erase size */ + erasesize = mtd->erasesize; + if ((unsigned long)(part->offset) % erasesize) { + printf("%s%d: partition (%s) start offset" + "alignment incorrect\n", + MTD_DEV_TYPE(id->type), id->num, part->name); + return 1; + } } - if (part->size % mtd->erasesize) { + if (part->size % erasesize) { printf("%s%d: partition (%s) size alignment incorrect\n", MTD_DEV_TYPE(id->type), id->num, part->name); return 1; -- 1.5.4.3

1 1

[U-Boot] [PATCH v2 2/4] Environment support for Flex-OneNAND
by Rohit Hagargundgi 08 Mar '09

08 Mar '09

Define and use CONFIG_ENV_ADDR_FLEX and CONFIG_ENV_SIZE_FLEX for storing environment variables. Signed-off-by: Rohit Hagargundgi <h.rohit(a)samsung.com> --- common/env_onenand.c | 10 ++++++++++ include/configs/apollon.h | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/common/env_onenand.c b/common/env_onenand.c index dbccc79..cd44781 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -58,11 +58,14 @@ uchar env_get_char_spec(int index) void env_relocate_spec(void) { + struct onenand_chip *this = &onenand_chip; unsigned long env_addr; int use_default = 0; size_t retlen; env_addr = CONFIG_ENV_ADDR; + if (FLEXONENAND(this)) + env_addr = CONFIG_ENV_ADDR_FLEX; /* Check OneNAND exist */ if (onenand_mtd.writesize) @@ -89,6 +92,7 @@ void env_relocate_spec(void) int saveenv(void) { + struct onenand_chip *this = &onenand_chip; unsigned long env_addr = CONFIG_ENV_ADDR; struct erase_info instr = { .callback = NULL, @@ -96,6 +100,12 @@ int saveenv(void) size_t retlen; instr.len = CONFIG_ENV_SIZE; + if (FLEXONENAND(this)) { + env_addr = CONFIG_ENV_ADDR_FLEX; + instr.len = CONFIG_ENV_SIZE_FLEX; + instr.len <<= onenand_mtd.eraseregions[0].numblocks == 1 ? + 1 : 0; + } instr.addr = env_addr; instr.mtd = &onenand_mtd; if (onenand_erase(&onenand_mtd, &instr)) { diff --git a/include/configs/apollon.h b/include/configs/apollon.h index dff47fc..0fcb22b 100644 --- a/include/configs/apollon.h +++ b/include/configs/apollon.h @@ -76,6 +76,7 @@ * Size of malloc() pool */ #define CONFIG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE_FLEX SZ_256K #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_1M) /* bytes reserved for initial data */ #define CONFIG_SYS_GBL_DATA_SIZE 128 @@ -256,6 +257,7 @@ #define CONFIG_SYS_ONENAND_BASE 0x00000000 #define CONFIG_ENV_IS_IN_ONENAND 1 #define CONFIG_ENV_ADDR 0x00020000 +#define CONFIG_ENV_ADDR_FLEX 0x00040000 #ifdef CONFIG_SYS_USE_UBI #define CONFIG_JFFS2_CMDLINE -- 1.5.4.3

1 1

[U-Boot] [PATCH] NIOS2: Added DE2 board with SD support
by ivanchuklist ivanchu 08 Mar '09

08 Mar '09

Hi list, I wrote about my work with u-boot in the thread "[U-Boot] DE2 board with MMC interface (PIO based) and FAT support enabled" and i decided to post a patch. I would like to discuss the changes. I have changed the Makefile to match the binutils provided by Altera and i added the DE2 board. I have also made changes to the files cmd_mem.c to add one more command "dmmc". Because the SD card is not a memory mapped device in the bus like a flash memory, we can't deduce the direction of data (i mean when copying data to sd or from sd) with the function mmc2info(). I tried to solve this trick by using the command dmmc. I found problems at link level with cmd_mmc.o and cmd_mem.o because both files includes mmc.h, then i have two copies of the same functions in both objects files. I solved this problem by declaring extern the function mmc_init in cmd_mmc.c. I think i should post the file include/asm-nios2/arch-nios2/mmc.h and the board related files but i will wait your response. In include/asm-nios2/arch-nios2/mmc.h i implemented mmc_get_dev() and mmc_read_block() to provide access to the FAT table. The code is working with all the examples distributed by Altera in the DE2 board and it should work with any SD socket interfaced by PIO cores. diff --git a/Makefile b/Makefile index 4df4812..6501d08 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,7 @@ ifeq ($(ARCH),nios) CROSS_COMPILE = nios-elf- endif ifeq ($(ARCH),nios2) -CROSS_COMPILE = nios2-elf- +CROSS_COMPILE = nios2-linux- endif ifeq ($(ARCH),m68k) CROSS_COMPILE = m68k-elf- @@ -3137,6 +3137,9 @@ PK1C20_config : unconfig PCI5441_config : unconfig @$(MKCONFIG) PCI5441 nios2 nios2 pci5441 psyent +DE2_config : unconfig + @$(MKCONFIG) DE2 nios2 nios2 de2 altera + #======================================================================== ## Microblaze #======================================================================== diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 400cfd7..4585795 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -53,6 +53,7 @@ uint dp_last_length = 0x40; uint mm_last_addr, mm_last_size; static ulong base_address = 0; +static ulong mmc_direction = 0; /* Memory Display * @@ -355,6 +356,17 @@ int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return rcode; } +int do_dmmc( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + if (argc > 1) + mmc_direction = simple_strtoul(argv[1], NULL, 10); + if (mmc_direction) + printf("Mem to mmc\n"); + else + printf("Mmc to mem\n"); + return 0; +} + int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { ulong addr, dest, count; @@ -405,7 +417,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #endif #if defined(CONFIG_CMD_MMC) - if (mmc2info(dest)) { + if (mmc_direction) { int rc; puts ("Copy to MMC... "); @@ -422,9 +434,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } puts ("done\n"); return 0; - } - - if (mmc2info(addr)) { + } else { int rc; puts ("Copy from MMC... "); @@ -1221,6 +1231,14 @@ U_BOOT_CMD( "[.b, .w, .l] address value [count]\n - write memory\n" ); +#if defined(CONFIG_CMD_MMC) +U_BOOT_CMD( + dmmc, 2, 1, do_dmmc, + "dmmc - set mmc-memory copy direction\n", + "direction\n - copy mmc<->mem\n" +); +#endif + U_BOOT_CMD( cp, 4, 1, do_mem_cp, "cp - memory copy\n", diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 25c9702..c9a5ac6 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -23,7 +23,8 @@ #include <common.h> #include <command.h> -#include <mmc.h> + +extern int mmc_init(int); int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { @@ -31,6 +32,7 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) printf ("No MMC card found\n"); return 1; } + printf ("MMC card found\n"); return 0; }

2 1