This is the mail archive of the ecos-patches@sources.redhat.com mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: JFFS2 support for RedBoot.


Hello,
this looks very interesting to me, could you tell me which size does such
RedBoot have now?

Thank you,
Roland

----- Original Message -----
From: "David Woodhouse" <dwmw2@infradead.org>
To: <ecos-patches@sources.redhat.com>
Sent: Thursday, November 27, 2003 4:17 PM
Subject: JFFS2 support for RedBoot.


> RedBoot> mount -t jffs2 -f jffs2
> Mount jffs2 file system succeeded
> RedBoot> load /hello
> Using default protocol (file)
> Entry point: 0x00100000, address range: 0x00010000-0x0010c94c
> RedBoot> go
> Hello World
> Program completed with status 90
> RedBoot>
>
>
>
> --
> dwmw2
>
>


----------------------------------------------------------------------------
----


> --- redboot/current/ChangeLog.orig 2003-11-27 15:10:36.000000000 +0000
> +++ redboot/current/ChangeLog 2003-11-27 15:15:08.000000000 +0000
> @@ -1,3 +1,9 @@
> +2003-11-27  David Woodhouse  <dwmw2@redhat.com>
> +
> + * cdl/redboot.cdl, fs/fileio.c, include/fs/fileio.h, src/load.c:
> + Support for mounting and loading files from fileio file systems
> + such as JFFS2.
> +
>  2003-11-25  John Dallaway  <jld@ecoscentric.com>
>
>   * src/fconfig.c (load_flash_config):
> --- redboot/current/cdl/redboot.cdl.orig 2003-11-27 15:07:46.000000000
+0000
> +++ redboot/current/cdl/redboot.cdl 2003-11-27 15:07:40.000000000 +0000
> @@ -839,6 +839,17 @@
>              }
>          }
>
> +        cdl_component CYGPKG_REDBOOT_FILEIO {
> +            display       "Allow RedBoot to support fileio"
> +            flavor        bool
> +            default_value 1
> +            active_if     CYGPKG_IO_FILEIO
> +            description   "
> +              If this option is enabled then RedBoot will provide
commands
> +              to load files from fileio file systems such as JFFS2."
> +            compile -library=libextras.a fs/fileio.c
> +        }
> +
>          cdl_component CYGPKG_REDBOOT_DISK {
>              display       "Allow RedBoot to support disks"
>              flavor        bool
> --- redboot/current/src/load.c.orig 2003-11-19 10:37:59.000000000 +0000
> +++ redboot/current/src/load.c 2003-11-27 15:14:15.000000000 +0000
> @@ -61,6 +61,9 @@
>  #ifdef CYGPKG_REDBOOT_DISK
>  #include <fs/disk.h>
>  #endif
> +#ifdef CYGPKG_REDBOOT_FILEIO
> +#include <fs/fileio.h>
> +#endif
>  #ifdef CYGPKG_REDBOOT_NETWORKING
>  #ifdef CYGSEM_REDBOOT_NET_TFTP_DOWNLOAD
>  #include <net/tftp_support.h>
> @@ -694,6 +697,12 @@
>          io = &http_io;
>  #endif
>  #endif
> +#ifdef CYGPKG_REDBOOT_FILEIO
> + if (fileio_mounted) {
> +     which = "file";
> +     io = &fileio_io;
> + }
> +#endif
>          if (!io) {
>  #ifdef CYGBLD_BUILD_REDBOOT_WITH_XYZMODEM
>              which = "Xmodem";
> --- redboot/current/src/fs/fileio.c.orig 2003-11-27 15:08:25.000000000
+0000
> +++ redboot/current/src/fs/fileio.c 2003-11-27 15:11:41.000000000 +0000
> @@ -0,0 +1,222 @@
>
+//=========================================================================
=
> +//
> +//      fileio.c
> +//
> +//      RedBoot fileio support
> +//
>
+//=========================================================================
=
> +//####ECOSGPLCOPYRIGHTBEGIN####
> +// -------------------------------------------
> +// This file is part of eCos, the Embedded Configurable Operating System.
> +// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
> +// Copyright (C) 2002 Gary Thomas
> +//
> +// eCos 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 or (at your option) any later
version.
> +//
> +// eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,
> +// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> +//
> +// As a special exception, if other files instantiate templates or use
macros
> +// or inline functions from this file, or you compile this file and link
it
> +// with other works to produce a work based on this file, this file does
not
> +// by itself cause the resulting work to be covered by the GNU General
Public
> +// License. However the source code for this file must still be made
available
> +// in accordance with section (3) of the GNU General Public License.
> +//
> +// This exception does not invalidate any other reasons why a work based
on
> +// this file might be covered by the GNU General Public License.
> +//
> +// Alternative licenses for eCos may be arranged by contacting Red Hat,
Inc.
> +// at http://sources.redhat.com/ecos/ecos-license/
> +// -------------------------------------------
> +//####ECOSGPLCOPYRIGHTEND####
>
+//=========================================================================
=
> +//#####DESCRIPTIONBEGIN####
> +//
> +// Author(s):    dwmw2, msalter
> +// Date:         2003-11-27
> +// Purpose:
> +// Description:
> +//
> +// This code is part of RedBoot (tm).
> +//
> +//####DESCRIPTIONEND####
> +//
>
+//=========================================================================
=
> +
> +// Shoot me. But I don't want struct timeval because redboot provides it.
> +#define _POSIX_SOURCE
> +#include <time.h>
> +#undef _POSIX_SOURCE
> +
> +#include <redboot.h>
> +#include <errno.h>
> +#include <stdio.h>
> +#include <fcntl.h>
> +#include <unistd.h>
> +#include <string.h>
> +#include <cyg/io/io.h>
> +#include <cyg/io/flash.h>
> +#include <cyg/io/config_keys.h>
> +#include <cyg/fileio/fileio.h>
> +
> +static void do_mount(int argc, char *argv[]);
> +static void do_umount(int argc, char *argv[]);
> +
> +#ifdef CYGPKG_IO_FLASH_BLOCK_DEVICE
> +#define FLASHPART "[-f <partition>] "
> +#else
> +#define FLASHPART
> +#endif
> +
> +RedBoot_cmd("mount",
> +            "Mount file system",
> +     FLASHPART "[-d <device>] -t fstype",
> +            do_mount
> +    );
> +RedBoot_cmd("umount",
> +            "Unmount file system",
> +            "",
> +            do_umount
> +    );
> +
> +int fileio_mounted = 0;
> +
> +// List disk partitions
> +static void
> +do_mount(int argc, char *argv[])
> +{
> + char *part_str, *dev_str, *type_str;
> + bool part_set = false, dev_set = false, type_set = false;
> + struct option_info opts[3];
> + int err, num_opts = 2;
> +
> + init_opts(&opts[0], 'd', true, OPTION_ARG_TYPE_STR,
> +   (void *)&dev_str, &dev_set, "device");
> + init_opts(&opts[1], 't', true, OPTION_ARG_TYPE_STR,
> +   (void *)&type_str, &type_set, "fstype");
> +#ifdef CYGPKG_IO_FLASH_BLOCK_DEVICE
> + init_opts(&opts[2], 'f', true, OPTION_ARG_TYPE_STR,
> +   (void *)&part_str, &part_set, "partition");
> + num_opts++;
> +#endif
> +
> + if (!scan_opts(argc, argv, 1, opts, num_opts, NULL, 0, NULL))
> + return;
> +
> + if (!type_set) {
> + diag_printf("Must specify file system type\n");
> + return;
> + }
> + if (fileio_mounted) {
> + diag_printf("A file system is already mounted\n");
> + return;
> + }
> +#ifdef CYGPKG_IO_FLASH_BLOCK_DEVICE
> + if (part_set) {
> + int len;
> + cyg_io_handle_t h;
> +
> + if (dev_set && strcmp(dev_str, CYGDAT_IO_FLASH_BLOCK_DEVICE_NAME_1)) {
> + diag_printf("May only set one of <device> or <partition>\n");
> + return;
> + }
> +
> + dev_str = CYGDAT_IO_FLASH_BLOCK_DEVICE_NAME_1;
> + len = strlen(part_str);
> +
> + err = cyg_io_lookup( dev_str, &h );
> + if (err < 0) {
> + diag_printf("cyg_io_lookup of \"%s\" returned %d\n", err);
> + return;
> + }
> + err = cyg_io_set_config( h, CYG_IO_SET_CONFIG_FLASH_FIS_NAME,
> + part_str, &len );
> + if (err < 0) {
> + diag_printf("FIS partition \"%s\" not found\n",
> +     part_str);
> + return;
> + }
> + }
> +#endif
> + err = mount(dev_str, "/", type_str);
> +
> + if (err) {
> + diag_printf("Mount failed %d\n", err);
> + } else {
> + diag_printf("Mount %s file system succeeded\n", type_str);
> + fileio_mounted = 1;
> + }
> +}
> +
> +static void
> +do_umount(int argc, char *argv[])
> +{
> + if (argc > 1) {
> + diag_printf("Bogus argc %d\n", argc);
> + }
> + if (!fileio_mounted) {
> + diag_printf("No file system mounted\n");
> + return;
> + }
> + umount ("/");
> + fileio_mounted = 0;
> +}
> +
> +static int fd;
> +
> +externC int
> +fileio_stream_open(connection_info_t *info, int *err)
> +{
> +    char *filename = info->filename;
> +
> +    fd = open(filename, O_RDONLY);
> +    if (fd < 0) {
> +     diag_printf("Open failed, error %d\n", errno);
> +     return -1;
> +    }
> +    return 0;
> +}
> +
> +externC int
> +fileio_stream_read(char *buf, int size, int *err)
> +{
> +    int nread;
> +
> +    if ((nread = read (fd, buf, size)) < 0) {
> +     *err = errno;
> +     return -1;
> +    }
> +    return nread;
> +}
> +
> +externC void
> +fileio_stream_close(int *err)
> +{
> + close(fd);
> +}
> +
> +externC char *
> +fileio_error(int err)
> +{
> + static char myerr[10];
> +
> + diag_sprintf(myerr, "error %d\n", err);
> + return myerr;
> +}
> +
> +//
> +// RedBoot interface
> +//
> +GETC_IO_FUNCS(fileio_io, fileio_stream_open, fileio_stream_close,
> +              0, fileio_stream_read, fileio_error);
> +RedBoot_load(file, fileio_io, true, true, 0);
> +
> --- redboot/current/include/fs/fileio.h.orig 2003-11-27 15:08:12.000000000
+0000
> +++ redboot/current/include/fs/fileio.h 2003-11-27 14:48:32.000000000
+0000
> @@ -0,0 +1,61 @@
>
+//=========================================================================
=
> +//
> +//      fileio.h
> +//
> +//      Fileio subsystem support for RedBoot
> +//
>
+//=========================================================================
=
> +//####ECOSGPLCOPYRIGHTBEGIN####
> +// -------------------------------------------
> +// This file is part of eCos, the Embedded Configurable Operating System.
> +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
> +//
> +// eCos 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 or (at your option) any later
version.
> +//
> +// eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,
> +// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> +//
> +// As a special exception, if other files instantiate templates or use
macros
> +// or inline functions from this file, or you compile this file and link
it
> +// with other works to produce a work based on this file, this file does
not
> +// by itself cause the resulting work to be covered by the GNU General
Public
> +// License. However the source code for this file must still be made
available
> +// in accordance with section (3) of the GNU General Public License.
> +//
> +// This exception does not invalidate any other reasons why a work based
on
> +// this file might be covered by the GNU General Public License.
> +//
> +// Alternative licenses for eCos may be arranged by contacting Red Hat,
Inc.
> +// at http://sources.redhat.com/ecos/ecos-license/
> +// -------------------------------------------
> +//####ECOSGPLCOPYRIGHTEND####
>
+//=========================================================================
=
> +//#####DESCRIPTIONBEGIN####
> +//
> +// Author(s):    dwmw2
> +// Contributors: dwmw2
> +// Date:         2003-11-24
> +// Purpose:
> +// Description:
> +//
> +// This code is part of RedBoot (tm).
> +//
> +//####DESCRIPTIONEND####
> +//
>
+//=========================================================================
=
> +
> +#ifndef CYGONCE_REDBOOT_FILEIO_H
> +#define CYGONCE_REDBOOT_FILEIO_H
> +
> +extern getc_io_funcs_t fileio_io;
> +extern int fileio_mounted;
> +
> +#endif // CYGONCE_REDBOOT_FILEIO_H
>


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]