December 2003 - U-Boot

RE: [U-Boot-Users] Linux port for MPC855T
by David Aldrich 10 Dec '03

10 Dec '03

Hi Steve Thanks for replying. I will now try to digest this information! David Telecom MODUS is an ISO9001/TickIT approved Company. LRQA Certificate of Approval reference 0965133 ************************************************************ THIS MESSAGE IS INTENDED ONLY FOR THE USE OF THE INDIVIDUAL TO WHOM IT IS ADDRESSED AND CONTAINS INFORMATION THAT IS PRIVATE AND/OR PROPRIETARY. If the reader of this message is not the intended recipient, or the employee or agent responsible for delivering the message to the intended recipient, you are hereby notified that any dissemination, distribution or copying of this communication is strictly prohibited. If you have received this communication in error, please forward the whole message to admin(a)t-modus.nec.co.uk Company Registration No.3493954 Telephone Number +44 (0) 1372 381880 Fax Number +44 (0) 1372 381804 Email general(a)t-modus.nec.co.uk ************************************************************

1 0

RE: [U-Boot-Users] Linux port for MPC855T
by Steve Gray 10 Dec '03

10 Dec '03

Hi David Your doing exactly the same thing that i am doing right now :) We too are evaluating Linux, but Im trying to evaluate it without any 3rd party costs involed. i.e paying monta vista to do the work for us and not learning a thing in the process. We use vxWorks on an 860T, and Im using u-boot to get linux running on it. >From the moment I got u-boot source, it took about 1 day to get u-boot working. and so far ive spent 2days trying to hand control from u-boot to the linux kernel. In my opinion you should not use your vxWorks BSPs. the features in u-boot are far better than those we have in our vxWorks BSP. You use alot of the values from your vxWorks for example the UPM tables. The chip selects etc etc. Just plug in those values from your vxWorks bsp into custom board u-boot "bsp" you should find you can get it running very quickly. -----Original Message----- From: David Aldrich [mailto:david.aldrich@t-modus.nec.co.uk] Sent: 10 December 2003 11:00 To: 'u-boot-users(a)lists.sourceforge.net' Subject: [U-Boot-Users] Linux port for MPC855T Hi I have newly subscribed to this mailing list. I notice that neither the ppcboot nor the uboot lists are presently archived on Sourceforge, so I cannot see how active the lists are. I wish to discuss Linux BSPs for MPC855T. Is the uboot list appropriate for such discussion? I am evaluating the use of Embedded Linux on MPC860 PowerPC, specifically the MPC855T. I am currently requesting quotations from Linux suppliers to port Linux to our 855T card. Currently, we run VxWorks on this card so a VxWorks BSP is fully tested. I know that a major part of the port will be programming the 855T's UPM (User Programmable Machine) that is responsible for setting up memory controller, CPU core etc. I would like advice on how to handle this. - Should such setup be already available in an open source Linux MPC860 BSP? - Should I try to make use of our existing BSP? - Is it reasonable for the supplier to quote for BSP development or should they be using open source code? I will be grateful for any advice, as this is a very new area for me. Best regards David Telecom MODUS is an ISO9001/TickIT approved Company. LRQA Certificate of Approval reference 0965133 ************************************************************ THIS MESSAGE IS INTENDED ONLY FOR THE USE OF THE INDIVIDUAL TO WHOM IT IS ADDRESSED AND CONTAINS INFORMATION THAT IS PRIVATE AND/OR PROPRIETARY. If the reader of this message is not the intended recipient, or the employee or agent responsible for delivering the message to the intended recipient, you are hereby notified that any dissemination, distribution or copying of this communication is strictly prohibited. If you have received this communication in error, please forward the whole message to admin(a)t-modus.nec.co.uk Company Registration No.3493954 Telephone Number +44 (0) 1372 381880 Fax Number +44 (0) 1372 381804 Email general(a)t-modus.nec.co.uk ************************************************************ ------------------------------------------------------- This SF.net email is sponsored by: IBM Linux Tutorials. Become an expert in LINUX or just sharpen your skills. Sign up for IBM's Free Linux Tutorials. Learn everything from the bash shell to sys admin. Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click _______________________________________________ U-Boot-Users mailing list U-Boot-Users(a)lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users

1 0

RE: [U-Boot-Users] u-boot & linux kernel help on mpc860
by Steve Gray 10 Dec '03

10 Dec '03

Hi Wolfgang thanks for the prompt response. I have removed clocks_in_mhz from the environment and i still have a hanging kernel. Im going to check the bd_info is correct, as also mentioned in that link. I will let you know how i progress. Steve -----Original Message----- From: Wolfgang Grandegger [mailto:wolfgang.grandegger@bluewin.ch] Sent: 10 December 2003 10:04 To: Steve Gray; U-Boot-Users (E-mail) Subject: RE: [U-Boot-Users] u-boot & linux kernel help on mpc860 Hi, remove "clocks_in_mhz=1" in your environment. This problem is documented in: http://www.denx.de/twiki/bin/view/DULG/LinuxHangsAfterUncompressingKernel Wolfgang.

1 0

[U-Boot-Users] NAND booting on S3C2410 and NS9750
by Markus Pietrek 10 Dec '03

10 Dec '03

Hi folks, we'd like to use U-Boot (1.0) on our S3C2410 and NS9750 ARM920 platforms, but will be using NAND flash only. If i'm informed correctly NAND Booting is not yet supported in U-Boot. Therefore I would have to add this myself and want to share my ideas before. o The relocation in cpu/arm920t/start.S (after relocate:) needs to be replaced by generic code reading the bootloader blocks from NAND and put them in RAM. The NAND_read_block functions are processor/board specific and need to be placed somewhere in board/smdk2410/ etc. o As the S3C2410 reads only the first 4kB of the NAND itself, this code must be placed altogether in the first 4kB o The linker script needs to be modified to put _start, _armboot_start, _armboot_end and _TEXT_BASE in the first 4kB, too, so u-boot can be placed correctly at the end of the RAM o for NAND flashes only, the relocation code may need only the number of blocks to read or may determine that itself by _armboot_end. But using a "block list" programmed into, U-Boot could be used on smart media cards with part of the boot-loader in the filesystem, too. Any comments? Best regards, -- Markus Pietrek FS Forth-Systeme GmbH Phone: +49 (7667) 908 145, FAX +49 (7667) 908 221

1 0

[U-Boot-Users] [PATCH 2/6] bootz command
by Robert Schwebel 09 Dec '03

09 Dec '03

# # Author: Robert Schwebel <r.schwebel(a)pengutronix.de> # # Description: Holger Schurig's patch to boot a normal zImage if you do # need the functionality of U-Boot's uImages. # # State: 2003-12-09: submit # # # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-patches/include/cmd_bootz.h 2003-12-09 19:39:58.000000000 +0100 @@ -0,0 +1,38 @@ +/* + * (C) Copyright 2003 + * Holger Schurig, M&N Logistik-Loesungen Online GmbH, <h.schurig@mn...> + * + * 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 + */ + +/* + * Linux zImage Boot support + */ +#ifndef _CMD_BOOTZ_H +#define _CMD_BOOTZ_H +int do_bootz (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); + +#define CMD_TBL_BOOTZ MK_CMD_TBL_ENTRY( \ + "bootz", 5, CFG_MAXARGS, 1, do_bootz, \ + "bootz - boot Linux zImage from memory\n", \ + "[addr [arg ...]]\n - boot zImage stored in memory\n" \ + " passing arguments 'arg ...'\n" \ +), + +#endif /* _CMD_BOOTZ_H */ --- u-boot-patches/include/cmd_confdefs.h~cmdbootz 2003-12-09 19:39:58.000000000 +0100 +++ u-boot-patches/include/cmd_confdefs.h 2003-12-09 19:39:58.000000000 +0100 @@ -86,6 +86,7 @@ #define CFG_CMD_FAT 0x0010000000000000U /* FAT support */ #define CFG_CMD_IMLS 0x0020000000000000U /* List all found images */ #define CFG_CMD_XIMG 0x0040000000000000U /* load part of multi image */ +#define CFG_CMD_BOOTZ 0x0080000000000000U /* directly boot Linux zImage */ #define CFG_CMD_ALL 0xFFFFFFFFFFFFFFFFU /* ALL commands */ --- u-boot-patches/common/cmd_bootz.c~cmdbootz 2003-12-09 19:39:58.000000000 +0100 +++ u-boot-patches/common/cmd_bootz.c 2003-12-09 19:40:32.000000000 +0100 @@ -1,3 +1,4 @@ + /* * (C) Copyright 2003 * Holger Schurig, M&N Logistik-Loesungen Online GmbH, <h.schurig@mn...> @@ -30,7 +31,7 @@ #include <asm/byteorder.h> #define DEBUG - + #ifdef CONFIG_SHOW_BOOT_PROGRESS # include <status_led.h> # define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg) @@ -38,63 +39,63 @@ # define SHOW_BOOT_PROGRESS(arg) #endif - #define CONFIG_KERNEL_RAM_BASE 0x40000 -int do_bootz (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +int +do_bootz(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { - DECLARE_GLOBAL_DATA_PTR; + DECLARE_GLOBAL_DATA_PTR; - ulong addr = 0x40000; - ulong initrd_start = 0; - ulong initrd_end = 0; - ulong data; - void (*theKernel)(int zero, int arch, struct tag *params); - bd_t *bd = gd->bd; + ulong addr = 0x40000; + ulong initrd_start = 0; + ulong initrd_end = 0; + ulong data; + void (*theKernel) (int zero, int arch, struct tag * params); + bd_t *bd = gd->bd; #ifdef CONFIG_CMDLINE_TAG - char *commandline = getenv("bootargs"); + char *commandline = getenv("bootargs"); #endif - addr = simple_strtoul(argv[1], NULL, 16); + addr = simple_strtoul(argv[1], NULL, 16); - theKernel = (void (*)(int, int, struct tag*))addr; + theKernel = (void (*)(int, int, struct tag *)) addr; - SHOW_BOOT_PROGRESS (14); + SHOW_BOOT_PROGRESS(14); #ifdef DEBUG - printf ("## Transferring control to Linux (at address %08lx) ...\n", - (ulong)theKernel); + printf("## Transferring control to Linux (at address %08lx) ...\n", + (ulong) theKernel); #endif #if defined (CONFIG_SETUP_MEMORY_TAGS) || \ defined (CONFIG_CMDLINE_TAG) || \ defined (CONFIG_INITRD_TAG) || \ defined (CONFIG_VFD) - setup_start_tag(bd); + setup_start_tag(bd); #ifdef CONFIG_SETUP_MEMORY_TAGS - setup_memory_tags(bd); + setup_memory_tags(bd); #endif #ifdef CONFIG_CMDLINE_TAG - setup_commandline_tag(bd, commandline); + setup_commandline_tag(bd, commandline); #endif #ifdef CONFIG_INITRD_TAG - setup_initrd_tag(bd, initrd_start, initrd_end); + setup_initrd_tag(bd, initrd_start, initrd_end); #endif #if 0 - setup_ramdisk_tag(bd); + setup_ramdisk_tag(bd); #endif #if defined (CONFIG_VFD) - setup_videolfb_tag(gd); + setup_videolfb_tag(gd); #endif - setup_end_tag(bd); + setup_end_tag(bd); #endif - /* we assume that the kernel is in place */ - printf("\nStarting kernel ...\n\n"); + /* we assume that the kernel is in place */ + printf("\nStarting kernel ...\n\n"); - cleanup_before_linux(); + cleanup_before_linux(); - theKernel(0, bd->bi_arch_number, params); + theKernel(0, bd->bi_arch_number, params); - printf("ERROR: we should never come to this place ...\n\n"); - return 0; + printf("ERROR: we should never come to this place ...\n\n"); + return 0; } --- u-boot-patches/cmd_bootz.c~cmdbootz +++ u-boot-patches/cmd_bootz.c

1 0

[U-Boot-Users] [PATCH 0/6] Some patches
by Robert Schwebel 09 Dec '03

09 Dec '03

Hi, here are some of the patches from our -ptx tree. Please review as I'm not sure any more which ones I've already sent to the list. Patches are against CVS as of this morning. Robert -- Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hornemannstraße 12, 31137 Hildesheim, Germany Phone: +49-5121-28619-0 | Fax: +49-5121-28619-4

1 0

[U-Boot-Users] [PATCH 6/6] add cramfs support
by Robert Schwebel 09 Dec '03

09 Dec '03

# # Author: Robert Schwebel <r.schwebel(a)pengutronix.de> # # Description: Patch by Kai-Uwe Bloem: add support for cramfs. # # State: 2003-12-09: submit # # # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-patches/fs/cramfs/cramfs.c 2003-12-09 19:42:28.000000000 +0100 @@ -0,0 +1,362 @@ +/* + * cramfs.c + * + * Copyright (C) 1999 Linus Torvalds + * + * Copyright (C) 2000-2002 Transmeta Corporation + * + * Copyright (C) 2003 Kai-Uwe Bloem, + * Auerswald GmbH & Co KG, <linux-development(a)auerswald.de> + * - adapted from the www.tuxbox.org u-boot tree, added "ls" command + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License (Version 2) as + * published by the Free Software Foundation. + * + * Compressed ROM filesystem for Linux. + * + * TODO: + * add support for resolving symbolic links + */ + +/* + * These are the VFS interfaces to the compressed ROM filesystem. + * The actual compression is based on zlib, see the other files. + */ + +#include <common.h> +#include <malloc.h> + +#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) + +#include <asm/byteorder.h> +#include <linux/stat.h> +#include <jffs2/load_kernel.h> +#include "cramfs_fs.h" + +/* These two macros may change in future, to provide better st_ino + semantics. */ +#define CRAMINO(x) (CRAMFS_GET_OFFSET(x) ? CRAMFS_GET_OFFSET(x)<<2 : 1) +#define OFFSET(x) ((x)->i_ino) + +struct cramfs_super super; + +static int cramfs_read_super (struct part_info *info) +{ + unsigned long root_offset; + + /* Read the first block and get the superblock from it */ + memcpy (&super, (void *) info->offset, sizeof(super)); + + /* Do sanity checks on the superblock */ + if (super.magic != CRAMFS_32 (CRAMFS_MAGIC)) { + /* check at 512 byte offset */ + memcpy (&super, (void *) info->offset + 512, sizeof(super)); + if (super.magic != CRAMFS_32 (CRAMFS_MAGIC)) { + printf ("cramfs: wrong magic\n"); + return -1; + } + } + + /* flags is reused several times, so swab it once */ + super.flags = CRAMFS_32 (super.flags); + super.size = CRAMFS_32 (super.size); + + /* get feature flags first */ + if (super.flags & ~CRAMFS_SUPPORTED_FLAGS) { + printf ("cramfs: unsupported filesystem features\n"); + return -1; + } + + /* Check that the root inode is in a sane state */ + if (!S_ISDIR (CRAMFS_16 (super.root.mode))) { + printf ("cramfs: root is not a directory\n"); + return -1; + } + root_offset = CRAMFS_GET_OFFSET (&(super.root)) << 2; + if (root_offset == 0) + printf ("cramfs: empty filesystem"); + else if (!(super.flags & CRAMFS_FLAG_SHIFTED_ROOT_OFFSET) && + ((root_offset != sizeof (struct cramfs_super)) && + (root_offset != 512 + sizeof (struct cramfs_super)))) + { + printf ("cramfs: bad root offset %lu\n", root_offset); + return -1; + } + + return 0; +} + +static unsigned long cramfs_resolve (char *begin, unsigned long offset, + unsigned long size, int raw, char *filename) +{ + unsigned long inodeoffset = 0, nextoffset; + + while (inodeoffset < size) { + struct cramfs_inode *inode; + char *name; + int namelen; + + inode = (struct cramfs_inode *) (begin + offset + inodeoffset); + + /* + * Namelengths on disk are shifted by two + * and the name padded out to 4-byte boundaries + * with zeroes. + */ + namelen = CRAMFS_GET_NAMELEN(inode) << 2; + name = (char *) inode + sizeof (struct cramfs_inode); + + nextoffset = inodeoffset + sizeof (struct cramfs_inode) + namelen; + + for (;;) { + if (!namelen) + return -1; + if (name[namelen-1]) + break; + namelen--; + } + + if (!strncmp (filename, name, namelen)) + { + char *p = strtok (NULL, "/"); + if (raw && (p == NULL || *p == '\0')) + return offset + inodeoffset; + + if (S_ISDIR (CRAMFS_16 (inode->mode))) + { + return cramfs_resolve (begin, + CRAMFS_GET_OFFSET(inode) << 2, + CRAMFS_24(inode->size), raw, p); + } + else if (S_ISREG (CRAMFS_16 (inode->mode))) + { + return offset + inodeoffset; + } + else + { + printf ("%*.*s: unsupported file type (%x)\n", + namelen, namelen, name, + CRAMFS_16 (inode->mode)); + return 0; + } + } + + inodeoffset = nextoffset; + } + + printf ("can't find corresponding entry\n"); + return 0; +} + +static int cramfs_uncompress (char * begin, unsigned long offset, + unsigned long loadoffset) +{ + struct cramfs_inode *inode = (struct cramfs_inode *) (begin + offset); + unsigned long *block_ptrs = (unsigned long *) + (begin + (CRAMFS_GET_OFFSET (inode) << 2)); + unsigned long curr_block = (CRAMFS_GET_OFFSET (inode) + + (((CRAMFS_24 (inode->size)) + 4095) >> 12)) << 2; + int size, total_size = 0; + int i; + + cramfs_uncompress_init (); + + for (i = 0; i < ((CRAMFS_24(inode->size) + 4095) >> 12); i++) + { + size = cramfs_uncompress_block ((void *) loadoffset, + (void *) (begin + curr_block), + (CRAMFS_32 (block_ptrs[i]) - curr_block)); + if (size < 0) + return size; + loadoffset += size; + total_size += size; + curr_block = CRAMFS_32 (block_ptrs[i]); + } + + cramfs_uncompress_exit (); + return total_size; +} + +int cramfs_load (char *loadoffset, struct part_info *info, char *filename) +{ + unsigned long offset; + + if (cramfs_read_super (info)) + return -1; + + offset = cramfs_resolve (info->offset, + CRAMFS_GET_OFFSET(&(super.root)) << 2, + CRAMFS_24(super.root.size), 0, strtok (filename, "/")); + + if (offset <= 0) + return offset; + + return cramfs_uncompress (info->offset, offset, + (unsigned long) loadoffset); +} + +static char *mkmodestr(unsigned long mode, char *str) +{ + static const char *l = "xwr"; + int mask = 1, i; + char c; + + switch (mode & S_IFMT) { + case S_IFDIR: str[0] = 'd'; break; + case S_IFBLK: str[0] = 'b'; break; + case S_IFCHR: str[0] = 'c'; break; + case S_IFIFO: str[0] = 'f'; break; + case S_IFLNK: str[0] = 'l'; break; + case S_IFSOCK: str[0] = 's'; break; + case S_IFREG: str[0] = '-'; break; + default: str[0] = '?'; + } + + for(i = 0; i < 9; i++) { + c = l[i%3]; + str[9-i] = (mode & mask)?c:'-'; + mask = mask<<1; + } + + if(mode & S_ISUID) str[3] = (mode & S_IXUSR)?'s':'S'; + if(mode & S_ISGID) str[6] = (mode & S_IXGRP)?'s':'S'; + if(mode & S_ISVTX) str[9] = (mode & S_IXOTH)?'t':'T'; + str[10] = '\0'; + return str; +} + +static int cramfs_list_inode(struct part_info *info, unsigned long offset) +{ + struct cramfs_inode *inode = (struct cramfs_inode *) + (info->offset + offset); + char *name, str[20]; + int namelen, nextoff; + + /* + * Namelengths on disk are shifted by two + * and the name padded out to 4-byte boundaries + * with zeroes. + */ + namelen = CRAMFS_GET_NAMELEN(inode) << 2; + name = (char *) inode + sizeof (struct cramfs_inode); + nextoff = namelen; + + for (;;) { + if (!namelen) + return namelen; + if (name[namelen-1]) + break; + namelen--; + } + + printf(" %s %8d %*.*s", mkmodestr(CRAMFS_16 (inode->mode),str), + CRAMFS_24(inode->size), namelen, namelen, name); + + if ((CRAMFS_16 (inode->mode) & S_IFMT) == S_IFLNK) { + /* symbolic link. + * Unpack the link target, trusting in the inode's size field. + */ + unsigned long size = CRAMFS_24 (inode->size); + char *link = malloc(size); + if (link != NULL && cramfs_uncompress(info->offset, offset, + (unsigned long)link) == size) + printf(" -> %*.*s\n", (int)size, (int)size, link); + else + printf(" [Error reading link]\n"); + if (link) free (link); + } else + printf("\n"); + + return nextoff; +} + +int cramfs_ls (struct part_info *info, char *filename) +{ + struct cramfs_inode *inode; + unsigned long inodeoffset = 0, nextoffset; + unsigned long offset, size; + + if (cramfs_read_super (info)) + return -1; + + if (strlen(filename) == 0 || !strcmp(filename, "/")) { + /* Root directory. Use root inode in super block */ + offset = CRAMFS_GET_OFFSET(&(super.root)) << 2; + size = CRAMFS_24(super.root.size); + } else { + /* Resolve the path */ + offset = cramfs_resolve (info->offset, + CRAMFS_GET_OFFSET(&(super.root)) << 2, + CRAMFS_24(super.root.size), 1, strtok (filename, "/")); + + if (offset <= 0) + return offset; + + /* Resolving was successful. Examine the inode */ + inode = (struct cramfs_inode *) (info->offset + offset); + if (! S_ISDIR (CRAMFS_16 (inode->mode))) { + /* It's not a directory - list it, and that's that */ + return (cramfs_list_inode(info, offset) > 0); + } + + /* It's a directory. List files within */ + offset = CRAMFS_GET_OFFSET(inode) << 2; + size = CRAMFS_24(inode->size); + } + + /* List the given directory */ + while (inodeoffset < size) { + inode = (struct cramfs_inode *) (info->offset + offset + inodeoffset); + + nextoffset = cramfs_list_inode(info, offset + inodeoffset); + if (nextoffset == 0) + break; + inodeoffset += sizeof (struct cramfs_inode) + nextoffset; + } + + return 1; +} + +int cramfs_info (struct part_info *info) +{ + if (cramfs_read_super (info)) + return 0; + + printf ("size: 0x%x (%u)\n", super.size, super.size); + + if (super.flags != 0) + { + printf ("flags:\n"); + if (super.flags & CRAMFS_FLAG_FSID_VERSION_2) + printf ("\tFSID version 2\n"); + if (super.flags & CRAMFS_FLAG_SORTED_DIRS) + printf ("\tsorted dirs\n"); + if (super.flags & CRAMFS_FLAG_HOLES) + printf ("\tholes\n"); + if (super.flags & CRAMFS_FLAG_SHIFTED_ROOT_OFFSET) + printf ("\tshifted root offset\n"); + } + + printf ("fsid:\n\tcrc: 0x%x\n\tedition: 0x%x\n", + super.fsid.crc, super.fsid.edition); + printf ("name: %16s\n", super.name); + + return 1; +} + +int cramfs_check (struct part_info *info) +{ + struct cramfs_super *sb = (struct cramfs_super *)info->offset; + + if (sb->magic != CRAMFS_32 (CRAMFS_MAGIC)) { + /* check at 512 byte offset */ + sb = (struct cramfs_super *)(info->offset + 512); + if (sb->magic != CRAMFS_32 (CRAMFS_MAGIC)) { + return 0; + } + } + return 1; +} + +#endif /* CFG_FS_CRAMFS */ --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-patches/fs/cramfs/cramfs_fs.h 2003-12-09 19:41:53.000000000 +0100 @@ -0,0 +1,133 @@ +#ifndef __CRAMFS_FS_H +#define __CRAMFS_FS_H + +/* Uncompression interfaces to the underlying zlib */ +int cramfs_uncompress_block (void *dst, void *src, int srclen); +int cramfs_uncompress_init (void); + +#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ +#define CRAMFS_SIGNATURE "Compressed ROMFS" + +/* + * Width of various bitfields in struct cramfs_inode. + * Primarily used to generate warnings in mkcramfs. + */ +#define CRAMFS_MODE_WIDTH 16 +#define CRAMFS_UID_WIDTH 16 +#define CRAMFS_SIZE_WIDTH 24 +#define CRAMFS_GID_WIDTH 8 +#define CRAMFS_NAMELEN_WIDTH 6 +#define CRAMFS_OFFSET_WIDTH 26 + +/* + * Since inode.namelen is a unsigned 6-bit number, the maximum cramfs + * path length is 63 << 2 = 252. + */ +#define CRAMFS_MAXPATHLEN (((1 << CRAMFS_NAMELEN_WIDTH) - 1) << 2) + +/* + * Reasonably terse representation of the inode data. + */ +struct cramfs_inode { + u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH; + /* SIZE for device files is i_rdev */ + u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH; + /* NAMELEN is the length of the file name, divided by 4 and + rounded up. (cramfs doesn't support hard links.) */ + /* OFFSET: For symlinks and non-empty regular files, this + contains the offset (divided by 4) of the file data in + compressed form (starting with an array of block pointers; + see README). For non-empty directories it is the offset + (divided by 4) of the inode of the first file in that + directory. For anything else, offset is zero. */ + u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH; +}; + +struct cramfs_info { + u32 crc; + u32 edition; + u32 blocks; + u32 files; +}; + +/* + * Superblock information at the beginning of the FS. + */ +struct cramfs_super { + u32 magic; /* 0x28cd3d45 - random number */ + u32 size; /* length in bytes */ + u32 flags; /* feature flags */ + u32 future; /* reserved for future use */ + u8 signature[16]; /* "Compressed ROMFS" */ + struct cramfs_info fsid; /* unique filesystem info */ + u8 name[16]; /* user-defined name */ + struct cramfs_inode root; /* root inode data */ +}; + +/* + * Feature flags + * + * 0x00000000 - 0x000000ff: features that work for all past kernels + * 0x00000100 - 0xffffffff: features that don't work for past kernels + */ +#define CRAMFS_FLAG_FSID_VERSION_2 0x00000001 /* fsid version #2 */ +#define CRAMFS_FLAG_SORTED_DIRS 0x00000002 /* sorted dirs */ +#define CRAMFS_FLAG_HOLES 0x00000100 /* support for holes */ +#define CRAMFS_FLAG_WRONG_SIGNATURE 0x00000200 /* reserved */ +#define CRAMFS_FLAG_SHIFTED_ROOT_OFFSET 0x00000400 /* shifted root fs */ + +/* + * Valid values in super.flags. Currently we refuse to mount + * if (flags & ~CRAMFS_SUPPORTED_FLAGS). Maybe that should be + * changed to test super.future instead. + */ +#define CRAMFS_SUPPORTED_FLAGS ( 0x000000ff \ + | CRAMFS_FLAG_HOLES \ + | CRAMFS_FLAG_WRONG_SIGNATURE \ + | CRAMFS_FLAG_SHIFTED_ROOT_OFFSET ) + +/* + * Since cramfs is little-endian, provide macros to swab the bitfields. + */ + +#ifndef __BYTE_ORDER +#if defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN) +#define __BYTE_ORDER __LITTLE_ENDIAN +#elif defined(__BIG_ENDIAN) && !defined(__LITTLE_ENDIAN) +#define __BYTE_ORDER __BIG_ENDIAN +#else +#error "unable to define __BYTE_ORDER" +#endif +#endif /* not __BYTE_ORDER */ + +#if __BYTE_ORDER == __LITTLE_ENDIAN +#define CRAMFS_16(x) (x) +#define CRAMFS_24(x) (x) +#define CRAMFS_32(x) (x) +#define CRAMFS_GET_NAMELEN(x) ((x)->namelen) +#define CRAMFS_GET_OFFSET(x) ((x)->offset) +#define CRAMFS_SET_OFFSET(x,y) ((x)->offset = (y)) +#define CRAMFS_SET_NAMELEN(x,y) ((x)->namelen = (y)) +#elif __BYTE_ORDER == __BIG_ENDIAN +#ifdef __KERNEL__ +#define CRAMFS_16(x) swab16(x) +#define CRAMFS_24(x) ((swab32(x)) >> 8) +#define CRAMFS_32(x) swab32(x) +#else /* not __KERNEL__ */ +#define CRAMFS_16(x) bswap_16(x) +#define CRAMFS_24(x) ((bswap_32(x)) >> 8) +#define CRAMFS_32(x) bswap_32(x) +#endif /* not __KERNEL__ */ +#define CRAMFS_GET_NAMELEN(x) (((u8*)(x))[8] & 0x3f) +#define CRAMFS_GET_OFFSET(x) ((CRAMFS_24(((u32*)(x))[2] & 0xffffff) << 2) |\ + ((((u32*)(x))[2] & 0xc0000000) >> 30)) +#define CRAMFS_SET_NAMELEN(x,y) (((u8*)(x))[8] = (((0x3f & (y))) | \ + (0xc0 & ((u8*)(x))[8]))) +#define CRAMFS_SET_OFFSET(x,y) (((u32*)(x))[2] = (((y) & 3) << 30) | \ + CRAMFS_24((((y) & 0x03ffffff) >> 2)) | \ + (((u32)(((u8*)(x))[8] & 0x3f)) << 24)) +#else +#error "__BYTE_ORDER must be __LITTLE_ENDIAN or __BIG_ENDIAN" +#endif + +#endif /* not __CRAMFS_FS_H */ --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-patches/fs/cramfs/Makefile 2003-12-09 19:41:53.000000000 +0100 @@ -0,0 +1,47 @@ +# +# (C) Copyright 2000, 2001 +# Wolfgang Denk, DENX Software Engineering, wd(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 $(TOPDIR)/config.mk + +LIB = libcramfs.a + +AOBJS = +COBJS = cramfs.o uncompress.o +OBJS = $(AOBJS) $(COBJS) + +#CPPFLAGS += + +all: $(LIB) $(AOBJS) + +$(LIB): .depend $(OBJS) + $(AR) crv $@ $(OBJS) + + +######################################################################### + +.depend: Makefile $(AOBJS:.o=.S) $(COBJS:.o=.c) + $(CC) -M $(CFLAGS) $(AOBJS:.o=.S) $(COBJS:.o=.c) > $@ + +sinclude .depend + +######################################################################### --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-patches/fs/cramfs/uncompress.c 2003-12-09 19:41:53.000000000 +0100 @@ -0,0 +1,107 @@ +/* + * uncompress.c + * + * Copyright (C) 1999 Linus Torvalds + * Copyright (C) 2000-2002 Transmeta Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License (Version 2) as + * published by the Free Software Foundation. + * + * cramfs interfaces to the uncompression library. There's really just + * three entrypoints: + * + * - cramfs_uncompress_init() - called to initialize the thing. + * - cramfs_uncompress_exit() - tell me when you're done + * - cramfs_uncompress_block() - uncompress a block. + * + * NOTE NOTE NOTE! The uncompression is entirely single-threaded. We + * only have one stream, and we'll initialize it only once even if it + * then is used by multiple filesystems. + */ + +#include <common.h> +#include <malloc.h> +#include <watchdog.h> +#include <zlib.h> + +#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) + +static z_stream stream; + +#define ZALLOC_ALIGNMENT 16 + +static void *zalloc(void *x, unsigned items, unsigned size) +{ + void *p; + + size *= items; + size = (size + ZALLOC_ALIGNMENT - 1) & ~(ZALLOC_ALIGNMENT - 1); + + p = malloc (size); + + return (p); +} + +static void zfree(void *x, void *addr, unsigned nb) +{ + free (addr); +} + +/* Returns length of decompressed data. */ +int cramfs_uncompress_block (void *dst, void *src, int srclen) +{ + int err; + + inflateReset (&stream); + + stream.next_in = src; + stream.avail_in = srclen; + + stream.next_out = dst; + stream.avail_out = 4096*2; + + err = inflate (&stream, Z_FINISH); + + if (err != Z_STREAM_END) + goto err; + return stream.total_out; + +err: + //printf ("Error %d while decompressing!\n", err); + //printf ("%p(%d)->%p\n", src, srclen, dst); + return -1; +} + +int cramfs_uncompress_init (void) +{ + int err; + + stream.zalloc = zalloc; + stream.zfree = zfree; + stream.next_in = 0; + stream.avail_in = 0; + +#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) + stream.outcb = (cb_func) WATCHDOG_RESET; +#else + stream.outcb = Z_NULL; +#endif /* CONFIG_HW_WATCHDOG */ + + err = inflateInit (&stream); + if (err != Z_OK) + { + printf ("Error: inflateInit2() returned %d\n", err); + return -1; + } + + return 0; +} + +int cramfs_uncompress_exit (void) +{ + inflateEnd (&stream); + return 0; +} + +#endif /* CFG_FS_CRAMFS */ --- u-boot-patches/fs/Makefile~cramfs 2003-12-09 17:23:10.000000000 +0100 +++ u-boot-patches/fs/Makefile 2003-12-09 19:41:53.000000000 +0100 @@ -22,7 +22,7 @@ # # -SUBDIRS := jffs2 fdos fat +SUBDIRS := jffs2 cramfs fdos fat .depend all: @for dir in $(SUBDIRS) ; do \ --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-patches/include/cramfs/cramfs_fs.h 2003-12-09 19:41:53.000000000 +0100 @@ -0,0 +1,98 @@ +#ifndef __CRAMFS_H +#define __CRAMFS_H + +#ifndef __KERNEL__ + +typedef unsigned char u8; +typedef unsigned short u16; +typedef unsigned int u32; + +#endif + +#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ +#define CRAMFS_SIGNATURE "Compressed ROMFS" + +/* + * Width of various bitfields in struct cramfs_inode. + * Primarily used to generate warnings in mkcramfs. + */ +#define CRAMFS_MODE_WIDTH 16 +#define CRAMFS_UID_WIDTH 16 +#define CRAMFS_SIZE_WIDTH 24 +#define CRAMFS_GID_WIDTH 8 +#define CRAMFS_NAMELEN_WIDTH 6 +#define CRAMFS_OFFSET_WIDTH 26 + +/* + * Since inode.namelen is a unsigned 6-bit number, the maximum cramfs + * path length is 63 << 2 = 252. + */ +#define CRAMFS_MAXPATHLEN (((1 << CRAMFS_NAMELEN_WIDTH) - 1) << 2) + +/* + * Reasonably terse representation of the inode data. + */ +struct cramfs_inode { + u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH; + /* SIZE for device files is i_rdev */ + u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH; + /* NAMELEN is the length of the file name, divided by 4 and + rounded up. (cramfs doesn't support hard links.) */ + /* OFFSET: For symlinks and non-empty regular files, this + contains the offset (divided by 4) of the file data in + compressed form (starting with an array of block pointers; + see README). For non-empty directories it is the offset + (divided by 4) of the inode of the first file in that + directory. For anything else, offset is zero. */ + u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH; +}; + +struct cramfs_info { + u32 crc; + u32 edition; + u32 blocks; + u32 files; +}; + +/* + * Superblock information at the beginning of the FS. + */ +struct cramfs_super { + u32 magic; /* 0x28cd3d45 - random number */ + u32 size; /* length in bytes */ + u32 flags; /* feature flags */ + u32 future; /* reserved for future use */ + u8 signature[16]; /* "Compressed ROMFS" */ + struct cramfs_info fsid; /* unique filesystem info */ + u8 name[16]; /* user-defined name */ + struct cramfs_inode root; /* root inode data */ +}; + +/* + * Feature flags + * + * 0x00000000 - 0x000000ff: features that work for all past kernels + * 0x00000100 - 0xffffffff: features that don't work for past kernels + */ +#define CRAMFS_FLAG_FSID_VERSION_2 0x00000001 /* fsid version #2 */ +#define CRAMFS_FLAG_SORTED_DIRS 0x00000002 /* sorted dirs */ +#define CRAMFS_FLAG_HOLES 0x00000100 /* support for holes */ +#define CRAMFS_FLAG_WRONG_SIGNATURE 0x00000200 /* reserved */ +#define CRAMFS_FLAG_SHIFTED_ROOT_OFFSET 0x00000400 /* shifted root fs */ + +/* + * Valid values in super.flags. Currently we refuse to mount + * if (flags & ~CRAMFS_SUPPORTED_FLAGS). Maybe that should be + * changed to test super.future instead. + */ +#define CRAMFS_SUPPORTED_FLAGS ( 0x000000ff \ + | CRAMFS_FLAG_HOLES \ + | CRAMFS_FLAG_WRONG_SIGNATURE \ + | CRAMFS_FLAG_SHIFTED_ROOT_OFFSET ) + +/* Uncompression interfaces to the underlying zlib */ +int cramfs_uncompress_block(void *dst, int dstlen, void *src, int srclen); +int cramfs_uncompress_init(void); +int cramfs_uncompress_exit(void); + +#endif --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-patches/include/cramfs/cramfs_fs_sb.h 2003-12-09 19:41:53.000000000 +0100 @@ -0,0 +1,19 @@ +#ifndef _CRAMFS_FS_SB +#define _CRAMFS_FS_SB + +/* + * cramfs super-block data in memory + */ +struct cramfs_sb_info { + unsigned long magic; + unsigned long size; + unsigned long blocks; + unsigned long files; + unsigned long flags; +#ifdef CONFIG_CRAMFS_LINEAR + unsigned long linear_phys_addr; + char * linear_virt_addr; +#endif +}; + +#endif --- u-boot-patches/common/cmd_jffs2.c~cramfs 2003-12-09 17:23:10.000000000 +0100 +++ u-boot-patches/common/cmd_jffs2.c 2003-12-09 19:41:53.000000000 +0100 @@ -1,6 +1,10 @@ /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * (C) Copyright 2002 + * Robert Schwebel, Pengutronix, <r.schwebel(a)pengutronix.de> + * (C) Copyright 2003 + * Kai-Uwe Bloem, Auerswald GmbH & Co KG, <linux-development(a)auerswald.de> * * See file CREDITS for list of people who contributed to this * project. @@ -31,6 +35,9 @@ #include <net.h> #if (CONFIG_COMMANDS & CFG_CMD_JFFS2) + +#include <cramfs/cramfs_fs.h> + static int part_num=0; #ifndef CFG_JFFS_CUSTOM_PART @@ -77,11 +84,13 @@ return 0; } #endif /* ifndef CFG_JFFS_CUSTOM_PART */ + int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { struct part_info* jffs2_part_info(int); int jffs2_1pass_load(char *, struct part_info *,const char *); + char *fsname; char *filename = "uImage"; ulong offset = CFG_LOAD_ADDR; @@ -98,17 +107,25 @@ if (0 != (part=jffs2_part_info(part_num))){ - printf("### JFFS2 loading '%s' to 0x%lx\n", filename, offset); - size = jffs2_1pass_load((char *)offset, part, filename); + /* check partition type for cramfs */ + fsname = (cramfs_check(part) ? "CRAMFS" : "JFFS2"); + printf("### %s loading '%s' to 0x%lx\n", fsname, filename, offset); + + if (cramfs_check(part)) { + size = cramfs_load ((char *) offset, part, filename); + } else { + /* if this is not cramfs assume jffs2 */ + size = jffs2_1pass_load((char *)offset, part, filename); + } if (size > 0) { char buf[10]; - printf("### JFFS2 load complete: %d bytes loaded to 0x%lx\n", - size, offset); + printf("### %s load complete: %d bytes loaded to 0x%lx\n", + fsname, size, offset); sprintf(buf, "%x", size); setenv("filesize", buf); } else { - printf("### JFFS2 LOAD ERROR<%x> for %s!\n", size, filename); + printf("### %s LOAD ERROR<%x> for %s!\n", fsname, size, filename); } return !(size > 0); @@ -132,7 +149,13 @@ if (0 != (part=jffs2_part_info(part_num))){ - ret = jffs2_1pass_ls(jffs2_part_info(part_num), filename); + /* check partition type for cramfs */ + if (cramfs_check(part)) { + ret = cramfs_ls (part, filename); + } else { + /* if this is not cramfs assume jffs2 */ + ret = jffs2_1pass_ls(part, filename); + } return (ret == 1); } @@ -143,15 +166,24 @@ int do_jffs2_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - struct part_info* jffs2_part_info(int); - int jffs2_1pass_info(struct part_info *); - - int ret; + struct part_info* jffs2_part_info(int); + int jffs2_1pass_info(struct part_info *); struct part_info *part; + char *fsname; + int ret; - if (0 != (part=jffs2_part_info(part_num))){ + if ((part=jffs2_part_info(part_num))){ - ret = jffs2_1pass_info(jffs2_part_info(part_num)); + /* check partition type for cramfs */ + fsname = (cramfs_check(part) ? "CRAMFS" : "JFFS2"); + printf("### filesystem type is %s\n", fsname); + + if (cramfs_check(part)) { + ret = cramfs_info (part); + } else { + /* if this is not cramfs assume jffs2 */ + ret = jffs2_1pass_info(part); + } return (ret == 1); } @@ -163,6 +195,7 @@ do_jffs2_chpart(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { int tmp_part; + char str_part_num[3]; struct part_info* jffs2_part_info(int); if (argc >= 2) { @@ -176,6 +209,8 @@ if (jffs2_part_info(tmp_part)){ printf("Partition changed to %d\n",tmp_part); part_num=tmp_part; + sprintf(str_part_num, "%d", part_num); + setenv("partition", str_part_num); return 0; } --- u-boot-patches/fs/jffs2/jffs2_1pass.c~cramfs 2003-12-09 17:23:10.000000000 +0100 +++ u-boot-patches/fs/jffs2/jffs2_1pass.c 2003-12-09 19:41:53.000000000 +0100 @@ -106,8 +106,8 @@ * * You still should have paper bags at hand :-(. The code lacks more or less * any comment, and is still arcane and difficult to read in places. As this - * is incompatible with any new code from the jffs2 maintainers anyway, it - * should probably be dumped and replaced by something like jffs2reader! + * might be incompatible with any new code from the jffs2 maintainers anyway, + * it should probably be dumped and replaced by something like jffs2reader! */

1 0

[U-Boot-Users] [PATCH 4/6] add multi image command
by Robert Schwebel 09 Dec '03

09 Dec '03

# # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-patches/common/cmd_ximg.c 2003-12-09 19:31:51.000000000 +0100 @@ -0,0 +1,150 @@ +/* + * (C) Copyright 2000-2002 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * (C) Copyright 2003 + * Kai-Uwe Bloem, Auerswald GmbH & Co KG, <linux-development(a)auerswald.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 + */ + +#if (CONFIG_COMMANDS & CFG_CMD_XIMG) + +/* + * Multi Image extract + */ +#include <common.h> +#include <command.h> +#include <image.h> +#include <asm/byteorder.h> + +#undef DEBUG + +int do_imgextract (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + ulong addr = load_addr, dest = 0; + ulong data, len, checksum; + ulong *len_ptr; + int i, verify, part = 0; + char pbuf[10], *s; + image_header_t header; + + s = getenv ("verify"); + verify = (s && (*s == 'n')) ? 0 : 1; + + if (argc > 1) { + addr = simple_strtoul(argv[1], NULL, 16); + } + if (argc > 2) { + part = simple_strtoul(argv[2], NULL, 16); + } + if (argc > 3) { + dest = simple_strtoul(argv[3], NULL, 16); + } + + printf ("## Copying from image at %08lx ...\n", addr); + + /* Copy header so we can blank CRC field for re-calculation */ + memmove (&header, (char *)addr, sizeof(image_header_t)); + + if (ntohl(header.ih_magic) != IH_MAGIC) { + { + printf ("Bad Magic Number\n"); + return 1; + } + } + + data = (ulong)&header; + len = sizeof(image_header_t); + + checksum = ntohl(header.ih_hcrc); + header.ih_hcrc = 0; + + if (crc32 (0, (char *)data, len) != checksum) { + printf ("Bad Header Checksum\n"); + return 1; + } + +#ifdef DEBUG + print_image_hdr ((image_header_t *) addr); +#endif + + data = addr + sizeof(image_header_t); + len = ntohl(header.ih_size); + + if (header.ih_type != IH_TYPE_MULTI) { + printf ("Wrong Image Type for %s command\n", cmdtp->name); + return 1; + } + + if (header.ih_comp != IH_COMP_NONE) { + printf ("Wrong Compression Type for %s command\n", cmdtp->name); + return 1; + } + + if (verify) { + printf (" Verifying Checksum ... "); + if (crc32 (0, (char *)data, len) != ntohl(header.ih_dcrc)) { + printf ("Bad Data CRC\n"); + return 1; + } + printf ("OK\n"); + } + + len_ptr = (ulong *)data; + + data += 4; /* terminator */ + for (i=0; len_ptr[i]; ++i) { + data += 4; + if (argc > 2 && part > i) { + u_long tail; + len = ntohl(len_ptr[i]); + tail = len % 4; + data += len; + if (tail) { + data += 4 - tail; + } + } + } + if (argc > 2 && part >= i) { + printf("Bad Image Part\n"); + return 1; + } + len = ntohl(len_ptr[part]); + + if (argc > 3) { + memcpy((char *)dest, (char *)data, len); + } + + sprintf(pbuf, "%8lx", data); + setenv("fileaddr", pbuf); + sprintf(pbuf, "%8lx", len); + setenv("filesize", pbuf); + + return 0; +} + +U_BOOT_CMD( + imxtract, 4, 1, do_imgextract, + "imxtract- extract a part of a multi-image\n", + "addr part [dest]\n" + " - extract <part> from image at <addr> and copy to <dest>\n" +); + +#endif --- u-boot-patches/common/Makefile~cmdximg 2003-12-09 19:31:18.000000000 +0100 +++ u-boot-patches/common/Makefile 2003-12-09 19:31:51.000000000 +0100 @@ -39,7 +39,7 @@ cmd_mem.o cmd_mii.o cmd_misc.o cmd_mmc.o \ cmd_nand.o cmd_net.o cmd_nvedit.o \ cmd_pci.o cmd_pcmcia.o cmd_portio.o \ - cmd_reginfo.o cmd_scsi.o cmd_spi.o cmd_usb.o cmd_vfd.o \ + cmd_reginfo.o cmd_scsi.o cmd_spi.o cmd_usb.o cmd_ximg.o cmd_vfd.o \ command.o console.o devices.o dlmalloc.o docecc.o \ environment.o env_common.o \ env_dataflash.o env_flash.o env_eeprom.o env_nvram.o env_nowhere.o exports.o \ --- u-boot-patches/include/cmd_confdefs.h~cmdximg 2003-12-09 19:31:34.000000000 +0100 +++ u-boot-patches/include/cmd_confdefs.h 2003-12-09 19:31:51.000000000 +0100 @@ -85,6 +85,7 @@ #define CFG_CMD_MMC 0x0008000000000000U /* MMC support */ #define CFG_CMD_FAT 0x0010000000000000U /* FAT support */ #define CFG_CMD_IMLS 0x0020000000000000U /* List all found images */ +#define CFG_CMD_XIMG 0x0040000000000000U /* load part of multi image */ #define CFG_CMD_ALL 0xFFFFFFFFFFFFFFFFU /* ALL commands */ --- u-boot-patches/README~cmdximg 2003-12-09 19:31:45.000000000 +0100 +++ u-boot-patches/README 2003-12-09 19:31:51.000000000 +0100 @@ -648,6 +648,7 @@ CFG_CMD_SPI * SPI serial bus support CFG_CMD_USB * USB support CFG_CMD_VFD * VFD support (TRAB) + CFG_CMD_XIMG * load part of a multi image CFG_CMD_BSP * Board SPecific functions ----------------------------------------------- CFG_CMD_ALL all

1 0

[U-Boot-Users] [PATCH 1/6] binary upload tool
by Robert Schwebel 09 Dec '03

09 Dec '03

# # Author: Robert Schwebel <r.schwebel(a)pengutronix.de> # # Description: Binary upload tool by Chris Hallinan # # State: 2003-12-09: submit # # # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-patches/tools/binupld.c 2003-12-09 18:59:59.000000000 +0100 @@ -0,0 +1,204 @@ +/* This utility downloads a binary file from Minicom to + * the serial port. It supports the Xon-Xoff software + * flow control protocol to use the highest possible speed + * + * (C) Copyright 2001, 2002 DS4.COM, Inc. + * Chris Hallinan clh(a)net1plus.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * To use this utility with Minicom, add the entry in Minicom's + * File Transfer Protocol as follows: + * Type Ctl-A, O (enter Configuration menu) + * Select File transfer protocols from menu + * Add the entry for binupld to look like the following (Item K) + * + * Name Program Name U/D FullScr IO-Red. Multi + * A zmodem /usr/bin/sz -vv -b Y U N Y Y + * B ymodem /usr/bin/sb -vv Y U N Y Y + * C xmodem /usr/bin/sx -vv Y U N Y N + * D zmodem /usr/bin/rz -vv -b -E N D N Y Y + * E ymodem /usr/bin/rb -vv N D N Y Y + * F xmodem /usr/bin/rx -vv Y D N Y N + * G kermit /usr/bin/kermit -i -l %l -s Y U Y N N + * H kermit /usr/bin/kermit -i -l %l -r N D Y N N + * I ascii /usr/bin/ascii-xfr -dsv Y U N Y N + * J srecdnld /usr/bin/srecdnl Y U N Y N + * K binupld /usr/bin/binupld Y U N Y N + */ + +#include <stdio.h> +#include <stdlib.h> +#include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> +#include <string.h> +#include <asm/errno.h> + +#define BUFSZ 1024 +#define TXBLK_SIZE 32 +#define XON 0x11 /* ASCII DC1 character */ +#define XOFF 0x13 /* ASCII DC3 character */ + +#define USE_STDERR +#undef USE_STDOUT + +#ifdef USE_STDERR +#define ERR_OUT stderr +#else +#define ERR_OUT err_fp +#define ERR_DEVICE "/dev/pts/0" +#endif + +#ifdef USE_STDOUT +#define LINE_OUT stdout +#else +#define LINE_OUT tty_fp +#endif + +int +main(int argc, char **argv) +{ + int bin_fd, i, fsize, nResult, count; + struct stat fst; + char lbuf; + int stepval, done, xoff, msgbidx = 0; + fd_set rfds; + struct timeval tv; + static char msgbuf[2048]; + static int got_xoff = 0; + +#ifndef USE_STDOUT + int LINE_OUT; +#endif + +#ifndef USE_STDERR + FILE *ERR_OUT; + + ERR_OUT = fopen(ERR_DEVICE, "w"); + if (ERR_OUT == NULL) { + perror("Error opening error output device"); + return -1; + } +#endif + +#ifndef USE_STDOUT + LINE_OUT = open("/dev/ttyS0", O_RDWR); + if (LINE_OUT == 1) { + perror("Error opening serial output device"); + return -1; + } +#endif + + if (argc != 2) { + fprintf(ERR_OUT, "Bad args\n"); + return -1; + } + + if (strlen(argv[1]) < 1) { + fprintf(ERR_OUT, "Bad file name\n"); + return -1; + } + + bin_fd = open(argv[1], O_RDONLY); + if (bin_fd == 1) { + perror("Open failed"); + return -1; + } + + /* Get file size */ + i = fstat(bin_fd, &fst); + if (i == -1) { + perror("stat failed"); + close(bin_fd); + return -1; + } + fsize = fst.st_size; + stepval = 100; + + /* Now ready for the file transfer! */ + fprintf(ERR_OUT, "\nUploading from %s --- xxxxxxx", argv[1]); + + i = 0; + done = 0; + xoff = 0; + while (!done) { + if (!xoff) { + count = read(bin_fd, &lbuf, TXBLK_SIZE); + if (count == 0) { + done = 1; + break; + } + + /* Write the output byte to tty port */ + if (write(LINE_OUT, &lbuf, count) != count) { + fprintf(ERR_OUT, + "Aw shit, binary write failed\n"); + return -1; + } + } + +#if 1 /* Delete if you don't need XON/XOFF spt */ + /* Setup for watching serial line input */ + FD_ZERO(&rfds); + FD_SET(LINE_OUT, &rfds); + /* Wait up to five hundred microseconds. */ + tv.tv_sec = 0; + tv.tv_usec = 500; + nResult = select(LINE_OUT + 1, &rfds, NULL, NULL, &tv); + if (nResult == -1) { + perror("Select failed"); + return -1; + } + + if (nResult && FD_ISSET(LINE_OUT, &rfds)) { + char c = getchar(); + /* Character received from serial port */ + switch (c) { + case XOFF: + xoff = 1; + got_xoff = 1; + break; + case XON: + xoff = 0; + break; + default: + msgbuf[msgbidx++] = c; + /* fprintf(ERR_OUT, " Data [%02x]\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b", c); */ + break; + } + } +#endif + + /* Display download progress */ + i += count; + fprintf(ERR_OUT, "\b\b\b\b\b\b\b%07d", i); + } + + fprintf(ERR_OUT, " - Done\n"); + msgbuf[msgbidx] = '\0'; + if (strlen(msgbuf)) + fprintf(ERR_OUT, "Msgbuf: %s\n", msgbuf); + + /* Report if we got an XOFF */ + if (got_xoff) + fprintf(ERR_OUT, "Got XOFF\n"); + + close(bin_fd); + return 0; +}

1 0

[U-Boot-Users] [PATCH 5/6] spartan fix
by Robert Schwebel 09 Dec '03

09 Dec '03

# # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # --- u-boot-patches/common/spartan2.c~commonspartan 2003-07-24 16:59:42.000000000 +0200 +++ u-boot-patches/common/spartan2.c 2003-12-09 08:52:06.000000000 +0100 @@ -516,7 +516,7 @@ (*fn->clk) (FALSE, TRUE, cookie); CONFIG_FPGA_DELAY (); /* Write data */ - (*fn->wr) ((val < 0), TRUE, cookie); + (*fn->wr) ((val & 0x80), TRUE, cookie); CONFIG_FPGA_DELAY (); /* Assert the clock */ (*fn->clk) (TRUE, TRUE, cookie);

1 0