December 2008 - U-Boot

[U-Boot] [PATCH] UBI: Set ubi_dev.type back to DEV_TYPE_NONE upon failing initialization
by Stefan Roese 10 Dec '08

10 Dec '08

With this patch we set the type back to NONE upon failing UBI partition initialization. Otherwise further calls to the UBI subsystem would try to really access the non-existing UBI partition. Thanks to Michael Lawnick for pointing this out. Signed-off-by: Stefan Roese <sr(a)denx.de> --- common/cmd_ubi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index fd33a67..4c35892 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -508,6 +508,7 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) err = ubi_dev_scan(ubi_dev.mtd_info, ubi_dev.part_name); if (err) { printf("UBI init error %d\n", err); + ubi_dev.type = DEV_TYPE_NONE; return err; } -- 1.6.0.5

1 0

[U-Boot] [PATCH] UBI: Return -ENOMEM upon failing malloc
by Stefan Roese 10 Dec '08

10 Dec '08

Return with correct error code (-ENOMEM) from ubi_attach_mtd_dev() upon failing malloc(). Thanks to Michael Lawnick for pointing this out. Signed-off-by: Stefan Roese <sr(a)denx.de> --- drivers/mtd/ubi/build.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index bdf75c9..7feaff6 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -785,18 +785,24 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset) goto out_free; ubi->peb_buf1 = vmalloc(ubi->peb_size); - if (!ubi->peb_buf1) + if (!ubi->peb_buf1) { + err = -ENOMEM; goto out_free; + } ubi->peb_buf2 = vmalloc(ubi->peb_size); - if (!ubi->peb_buf2) - goto out_free; + if (!ubi->peb_buf2) { + err = -ENOMEM; + goto out_free; + } #ifdef CONFIG_MTD_UBI_DEBUG mutex_init(&ubi->dbg_buf_mutex); ubi->dbg_peb_buf = vmalloc(ubi->peb_size); - if (!ubi->dbg_peb_buf) - goto out_free; + if (!ubi->dbg_peb_buf) { + err = -ENOMEM; + goto out_free; + } #endif err = attach_by_scanning(ubi); -- 1.6.0.5

1 0

[U-Boot] [PATCH] ppc4xx: Remove some features from ALPR to fit into 256k again
by Stefan Roese 10 Dec '08

10 Dec '08

Signed-off-by: Stefan Roese <sr(a)denx.de> --- include/configs/alpr.h | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/include/configs/alpr.h b/include/configs/alpr.h index 6e9f5e5..7ce8205 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -235,18 +235,15 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_DIAG #define CONFIG_CMD_EEPROM -#define CONFIG_CMD_ELF #define CONFIG_CMD_FPGA #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII #define CONFIG_CMD_NAND #define CONFIG_CMD_NET -#define CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING -#define CONFIG_CMD_REGINFO - +#undef CONFIG_CMD_NFS #undef CONFIG_WATCHDOG /* watchdog disabled */ -- 1.6.0.5

2 2

[U-Boot] [PATCH] Fix compile error in building MBX860T.
by Ben Warren 10 Dec '08

10 Dec '08

Signed-off-by: Ben Warren <biggerbadderben(a)gmail.com> --- cpu/mpc8xx/cpu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cpu/mpc8xx/cpu.c b/cpu/mpc8xx/cpu.c index 40f81ef..2eb848b 100644 --- a/cpu/mpc8xx/cpu.c +++ b/cpu/mpc8xx/cpu.c @@ -644,7 +644,7 @@ void reset_8xx_watchdog (volatile immap_t * immr) */ int cpu_eth_init(bd_t *bis) { -#if defined(SCC_ENET) +#if defined(SCC_ENET) && defined(CONFIG_CMD_NET) scc_initialize(bis); #endif #if defined(FEC_ENET) -- 1.5.4.3

2 1

[U-Boot] [PATCH] fs/fat: handle FAT on SATA
by Mike Frysinger 10 Dec '08

10 Dec '08

From: Sonic Zhang <Sonic.Zhang(a)analog.com> The FAT file system driver should also handle FAT on SATA devices. Signed-off-by: Sonic Zhang <Sonic.Zhang(a)analog.com> Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- fs/fat/fat.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 06eabc3..a9dde7d 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -84,6 +84,7 @@ fat_register_device(block_dev_desc_t *dev_desc, int part_no) return -1; } #if (defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SATA) || \ defined(CONFIG_CMD_SCSI) || \ defined(CONFIG_CMD_USB) || \ defined(CONFIG_MMC) || \ @@ -980,12 +981,14 @@ file_fat_detectfs(void) return 1; } #if defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SATA) || \ defined(CONFIG_CMD_SCSI) || \ defined(CONFIG_CMD_USB) || \ defined(CONFIG_MMC) printf("Interface: "); switch(cur_dev->if_type) { case IF_TYPE_IDE : printf("IDE"); break; + case IF_TYPE_SATA : printf("SATA"); break; case IF_TYPE_SCSI : printf("SCSI"); break; case IF_TYPE_ATAPI : printf("ATAPI"); break; case IF_TYPE_USB : printf("USB"); break; -- 1.6.0.4

2 1

[U-Boot] Microblaze patches
by Michal Simek 10 Dec '08

10 Dec '08

Hi All, here are 4 microblaze patches. All patches are in microblaze custodian repository - master branch. Thanks for your review, Michal -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854

2 2

[U-Boot] confirm ab7aa8d57acab3af6153abdd3ca6718a0607f956
by Uday Pavadshetty 10 Dec '08

10 Dec '08

Mailing list subscription confirmation notice for mailing list U-Boot-Users We have received a request from 172.29.29.1 for subscription of your email address, "udaypavashetty(a)gmail.com", to the u-boot-users(a)lists.sourceforge.net mailing list. To confirm that you want to be added to this mailing list, simply reply to this message, keeping the Subject: header intact. Or visit this web page: https://lists.sourceforge.net/lists/confirm/u-boot-users/ab7aa8d57acab3af61… Or include the following line -- and only the following line -- in a message to u-boot-users-request(a)lists.sourceforge.net: confirm ab7aa8d57acab3af6153abdd3ca6718a0607f956 Note that simply sending a `reply' to this message should work from most mail readers, since that usually leaves the Subject: line in the right form (additional "Re:" text in the Subject: is okay). If you do not wish to be subscribed to this list, please simply disregard this message. If you think you are being maliciously subscribed to the list, or have any other questions, send them to u-boot-users-owner(a)lists.sourceforge.net.

1 0

[U-Boot] [PATCH] Add support for boards where the NOR FLASH is not memory-mapped
by Stefan Roese 10 Dec '08

10 Dec '08

This patch adds the CONFIG_FLASH_NOT_MEM_MAPPED define which can be used on boards where the NOR FLASH is not memory-mapped and special accessor functions are needed to access the NOR FLASH. This affects the memory commands (cmd_mem.c) and the environment (env_flash.c). Boards using CONFIG_FLASH_NOT_MEM_MAPPED need to additionally specify CONFIG_FLASH_BASE and CONFIG_FLASH_END so that the NOR FLASH region can be detected. This will be used by the upcoming VCTH board support. Signed-off-by: Stefan Roese <sr(a)denx.de> --- common/cmd_mem.c | 66 +++++++++++++++++++++++++++++++++++++++----------- common/env_flash.c | 61 +++++++++++++++++++++++++++++++++++++---------- lib_generic/crc32.c | 11 ++++++++ 3 files changed, 110 insertions(+), 28 deletions(-) diff --git a/common/cmd_mem.c b/common/cmd_mem.c index d7666c2..f545f6a 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -43,6 +43,43 @@ #define PRINTF(fmt,args...) #endif +#if defined(CONFIG_HAS_DATAFLASH) +#define CONFIG_FLASH_NOT_MEM_MAPPED +#define OK DATAFLASH_OK +#endif + +#if !defined(OK) +#define OK 1 +#endif + +void *board_flash_read_memcpy(void *__to, __const__ void *__from, int n); + +#if defined(CONFIG_FLASH_NOT_MEM_MAPPED) +static inline int flash_read(void *__to, __const__ void *__from, int n) +{ +#if defined(CONFIG_HAS_DATAFLASH) + return read_dataflash(__from, n, __to); +#elif defined(CONFIG_FLASH_NOT_MEM_MAPPED) + if ((addr2info((u32)__from) != NULL)) + board_flash_read_memcpy(__to, __from, n); + else + memcpy(__to, __from, n); + return OK; +#endif +} +#endif /* defined(CONFIG_FLASH_NOT_MEM_MAPPED) */ + +static inline int is_flash_addr(u32 addr) +{ +#if defined(CONFIG_HAS_DATAFLASH) + return addr_dataflash(addr); +#elif defined(CONFIG_FLASH_NOT_MEM_MAPPED) + return (addr2info(addr) != NULL); +#else + return 1; +#endif +} + static int mod_mem(cmd_tbl_t *, int, int, int, char *[]); /* Display values from last command. @@ -63,7 +100,7 @@ static ulong base_address = 0; int do_mem_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { ulong addr, length; -#if defined(CONFIG_HAS_DATAFLASH) +#if defined(CONFIG_FLASH_NOT_MEM_MAPPED) ulong nbytes, linebytes; #endif int size; @@ -100,7 +137,7 @@ int do_mem_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) length = simple_strtoul(argv[2], NULL, 16); } -#if defined(CONFIG_HAS_DATAFLASH) +#if defined(CONFIG_FLASH_NOT_MEM_MAPPED) /* Print the lines. * * We buffer all read data, so we can make sure data is read only @@ -112,10 +149,13 @@ int do_mem_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) void* p; linebytes = (nbytes>DISP_LINE_LEN)?DISP_LINE_LEN:nbytes; - rc = read_dataflash(addr, (linebytes/size)*size, linebuf); - p = (rc == DATAFLASH_OK) ? linebuf : (void*)addr; + rc = flash_read(linebuf, (void *)addr, (linebytes/size)*size); + p = (rc == OK) ? linebuf : (void *)addr; print_buffer(addr, p, size, linebytes/size, DISP_LINE_LEN/size); + /* Clear rc, otherwise command repeat doesn't work */ + rc = 0; + nbytes -= linebytes; addr += linebytes; if (ctrlc()) { @@ -294,9 +334,9 @@ int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) count = simple_strtoul(argv[3], NULL, 16); -#ifdef CONFIG_HAS_DATAFLASH - if (addr_dataflash(addr1) | addr_dataflash(addr2)){ - puts ("Comparison with DataFlash space not supported.\n\r"); +#ifdef CONFIG_FLASH_NOT_MEM_MAPPED + if (is_flash_addr(addr1) || is_flash_addr(addr2)) { + puts ("Comparison with FLASH space not supported.\n\r"); return 0; } #endif @@ -385,11 +425,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #ifndef CONFIG_SYS_NO_FLASH /* check if we are copying to Flash */ - if ( (addr2info(dest) != NULL) -#ifdef CONFIG_HAS_DATAFLASH - && (!addr_dataflash(dest)) -#endif - ) { + if (is_flash_addr(dest)) { int rc; puts ("Copy to Flash... "); @@ -1010,9 +1046,9 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]) addr += base_address; } -#ifdef CONFIG_HAS_DATAFLASH - if (addr_dataflash(addr)){ - puts ("Can't modify DataFlash in place. Use cp instead.\n\r"); +#ifdef CONFIG_FLASH_NOT_MEM_MAPPED + if (is_flash_addr(addr)) { + puts ("Can't modify FLASH in place. Use cp instead.\n\r"); return 0; } #endif diff --git a/common/env_flash.c b/common/env_flash.c index 75ee8dd..9c53ec0 100644 --- a/common/env_flash.c +++ b/common/env_flash.c @@ -85,9 +85,41 @@ static ulong end_addr_new = CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1; extern uchar default_environment[]; extern int default_environment_size; +void *board_flash_read_memcpy(void *__to, __const__ void *__from, int n); +u8 flash_read8(void *addr); +u32 flash_read32(void *addr); + +static inline u8 read_env8(u8 *addr) +{ +#if defined(CONFIG_FLASH_NOT_MEM_MAPPED) + if (((u32)addr >= CONFIG_FLASH_BASE) && ((u32)addr < CONFIG_FLASH_END)) + return flash_read8((void *)addr); +#endif + return *addr; +} + +static inline u32 read_env32(u32 *addr) +{ +#if defined(CONFIG_FLASH_NOT_MEM_MAPPED) + if (((u32)addr >= CONFIG_FLASH_BASE) && ((u32)addr < CONFIG_FLASH_END)) + return flash_read32((void *)addr); +#endif + return *addr; +} + +#if defined(CONFIG_FLASH_NOT_MEM_MAPPED) +#define FLASH_READ_MEMCPY(d, s, n) board_flash_read_memcpy(d, s, n) +#else +#define FLASH_READ_MEMCPY(d, s, n) memcpy(d, s, n); +#endif /* CONFIG_FLASH_NOT_MEM_MAPPED */ uchar env_get_char_spec (int index) { +#if defined(CONFIG_FLASH_NOT_MEM_MAPPED) + if (((u32)gd->env_addr >= CONFIG_FLASH_BASE) && + ((u32)gd->env_addr < CONFIG_FLASH_END)) + return (flash_read8((void *)gd->env_addr + index)); +#endif return ( *((uchar *)(gd->env_addr + index)) ); } @@ -97,15 +129,17 @@ int env_init(void) { int crc1_ok = 0, crc2_ok = 0; - uchar flag1 = flash_addr->flags; - uchar flag2 = flash_addr_new->flags; + uchar flag1 = read_env8(&flash_addr->flags); + uchar flag2 = read_env8(&flash_addr_new->flags); ulong addr_default = (ulong)&default_environment[0]; ulong addr1 = (ulong)&(flash_addr->data); ulong addr2 = (ulong)&(flash_addr_new->data); - crc1_ok = (crc32(0, flash_addr->data, ENV_SIZE) == flash_addr->crc); - crc2_ok = (crc32(0, flash_addr_new->data, ENV_SIZE) == flash_addr_new->crc); + crc1_ok = (crc32(0, flash_addr->data, ENV_SIZE) == + read_env32(&flash_addr->crc)); + crc2_ok = (crc32(0, flash_addr_new->data, ENV_SIZE) == + read_env32(&flash_addr_new->crc)); if (crc1_ok && ! crc2_ok) { gd->env_addr = addr1; @@ -169,8 +203,9 @@ int saveenv(void) up_data); goto Done; } - memcpy(saved_data, - (void *)((long)flash_addr_new + CONFIG_ENV_SIZE), up_data); + FLASH_READ_MEMCPY(saved_data, + (void *)((long)flash_addr_new + CONFIG_ENV_SIZE), + up_data); debug ("Data (start 0x%x, len 0x%x) saved at 0x%x\n", (long)flash_addr_new + CONFIG_ENV_SIZE, up_data, saved_data); @@ -246,7 +281,7 @@ Done: int env_init(void) { - if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) { + if (crc32(0, env_ptr->data, ENV_SIZE) == read_env32(&env_ptr->crc)) { gd->env_addr = (ulong)&(env_ptr->data); gd->env_valid = 1; return(0); @@ -282,7 +317,7 @@ int saveenv(void) flash_sect_addr, (ulong)flash_addr, flash_offset); /* copy old contents to temporary buffer */ - memcpy (env_buffer, (void *)flash_sect_addr, CONFIG_ENV_SECT_SIZE); + FLASH_READ_MEMCPY(env_buffer, (void *)flash_sect_addr, CONFIG_ENV_SECT_SIZE); /* copy current environment to temporary buffer */ memcpy ((uchar *)((unsigned long)env_buffer + flash_offset), @@ -346,9 +381,9 @@ void env_relocate_spec (void) end_addr_new = ltmp; } - if (flash_addr_new->flags != OBSOLETE_FLAG && + if (read_env8(&flash_addr_new->flags) != OBSOLETE_FLAG && crc32(0, flash_addr_new->data, ENV_SIZE) == - flash_addr_new->crc) { + read_env32(&flash_addr_new->crc)) { char flag = OBSOLETE_FLAG; gd->env_valid = 2; @@ -359,8 +394,8 @@ void env_relocate_spec (void) flash_sect_protect (1, (ulong)flash_addr_new, end_addr_new); } - if (flash_addr->flags != ACTIVE_FLAG && - (flash_addr->flags & ACTIVE_FLAG) == ACTIVE_FLAG) { + if (read_env8(&flash_addr->flags) != ACTIVE_FLAG && + (read_env8(&flash_addr->flags) & ACTIVE_FLAG) == ACTIVE_FLAG) { char flag = ACTIVE_FLAG; gd->env_valid = 2; @@ -376,7 +411,7 @@ void env_relocate_spec (void) "reading environment; recovered successfully\n\n"); #endif /* CONFIG_ENV_ADDR_REDUND */ #ifdef CMD_SAVEENV - memcpy (env_ptr, (void*)flash_addr, CONFIG_ENV_SIZE); + FLASH_READ_MEMCPY(env_ptr, (void*)flash_addr, CONFIG_ENV_SIZE); #endif #endif /* ! ENV_IS_EMBEDDED || CONFIG_ENV_ADDR_REDUND */ } diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index b6a7a91..d698cc6 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -148,7 +148,18 @@ const uint32_t * ZEXPORT get_crc_table() #endif /* ========================================================================= */ +#if defined(CONFIG_FLASH_NOT_MEM_MAPPED) +u8 flash_read8(void *addr); +#define DO1(buf) \ + if (((u32)buf >= CONFIG_FLASH_BASE) && ((u32)buf < CONFIG_FLASH_END)) { \ + crc = crc_table[((int)crc ^ (flash_read8((void *)buf++))) & 0xff] ^ \ + (crc >> 8); \ + } else { \ + crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8); \ + } +#else #define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8); +#endif #define DO2(buf) DO1(buf); DO1(buf); #define DO4(buf) DO2(buf); DO2(buf); #define DO8(buf) DO4(buf); DO4(buf); -- 1.6.0.4

2 2

[U-Boot] [PATCH] OneNAND: Fix compiler warnings
by Stefan Roese 10 Dec '08

10 Dec '08

Signed-off-by: Stefan Roese <sr(a)denx.de> --- This patch has to be applied on top of the patch submitted by Kyungmin Park on 2008-11-04: [PATCH] [OneNAND] Sync with 2.6.27 It replaces my patch "[PATCH] OneNAND: Fix compiler warnings and add weak attribute to memcpy_16()". The weak method is not needed. Thanks to Scott for pointing this out. drivers/mtd/onenand/onenand_base.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 66214e8..8d004d3 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -409,6 +409,30 @@ static int onenand_write_bufferram(struct mtd_info *mtd, loff_t addr, int area, } /** + * onenand_get_2x_blockpage - [GENERIC] Get blockpage at 2x program mode + * @param mtd MTD data structure + * @param addr address to check + * @return blockpage address + * + * Get blockpage address at 2x program mode + */ +static int onenand_get_2x_blockpage(struct mtd_info *mtd, loff_t addr) +{ + struct onenand_chip *this = mtd->priv; + int blockpage, block, page; + + /* Calculate the even block number */ + block = (int) (addr >> this->erase_shift) & ~1; + /* Is it the odd plane? */ + if (addr & this->writesize) + block++; + page = (int) (addr >> (this->page_shift + 1)) & this->page_mask; + blockpage = (block << 7) | page; + + return blockpage; +} + +/** * onenand_check_bufferram - [GENERIC] Check BufferRAM information * @param mtd MTD data structure * @param addr address to check @@ -1666,6 +1690,7 @@ static int onenand_do_lock_cmd(struct mtd_info *mtd, loff_t ofs, size_t len, int return 0; } +#ifdef ONENAND_LINUX /** * onenand_lock - [MTD Interface] Lock block(s) * @param mtd MTD device structure @@ -1701,6 +1726,7 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len) onenand_release_device(mtd); return ret; } +#endif /** * onenand_check_lock_status - [OneNAND Interface] Check lock status -- 1.6.0.4

5 10

[U-Boot] We have data for Physicians, Chiropractors, Physicians etc..
by Genevieve clue 10 Dec '08

10 Dec '08

Currently Practicing Doctors in the US 788,324 in total <> 17,750 emails Data for the many various medical specialties you can sort by many different fields like primary or secondary specialty Cost just slashed - $390 {}{}{} A gift to you when you purchase, receive these 4 databases below {}{}{} US Pharmaceutical Company Executives Contact List 47,000 names and emails of the major positions Complete Marketing List of Hospitals in the USA complete contact information for CEO's, CFO's, Directors and more - over 23,000 listings in total for more than 7,000 hospitals in the USA Directory of American Dentists Practically every dentist in the United States is listed here American Chiropractors Mailing List 100,000 Chiropractors in the USA (worth $250 alone) send email to: Hamm(a)contactpluscorp.com during this week only By emailing suspend(a)contactpluscorp.com you will have your email taken off

1 0