ecos: packages/redboot/current/src/flash.c comparison

comparison packages/redboot/current/src/flash.c @ 1740:0031b615f51c

Add support for reverse endianess of fis and config data

author	msalter
date	Wed, 01 Sep 2004 21:21:30 +0000
parents	9091309eb665
children	ecd76f498508

comparison

equal deleted inserted replaced

-:5ee8bd19b4f5
+:0031b615f51c
 //
 //==========================================================================
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Red Hat, Inc.
 // Copyright (C) 2003, 2004 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.
 #include <sib.h>
 #include <cyg/infra/cyg_ass.h>         // assertion macros
 #ifdef CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG
 // Note horrid intertwining of functions, to save precious FLASH
+extern void conf_endian_fixup(void *p);
 #endif
 // Round a quantity up
 #define _rup(n,s) ((((n)+(s-1))/s)*s)
 diag_printf("Invalid FLASH address %p: %s\n", (void *)flash_addr, flash_errmsg(stat));
 diag_printf("   valid range is %p-%p\n", (void *)flash_start, (void *)flash_end);
 }
 #ifdef CYGOPT_REDBOOT_FIS
+// fis_endian_fixup() is used to swap endianess if required.
+//
+static inline void fis_endian_fixup(void *addr)
+{
+#ifdef REDBOOT_FLASH_REVERSE_BYTEORDER
+struct fis_image_desc *p = addr;
+int cnt = fisdir_size / sizeof(struct fis_image_desc);
+while (cnt-- > 0) {
+p->flash_base = CYG_SWAP32(p->flash_base);
+p->mem_base = CYG_SWAP32(p->mem_base);
+p->size = CYG_SWAP32(p->size);
+p->entry_point = CYG_SWAP32(p->entry_point);
+p->data_length = CYG_SWAP32(p->data_length);
+p->desc_cksum = CYG_SWAP32(p->desc_cksum);
+p->file_cksum = CYG_SWAP32(p->file_cksum);
+p++;
+}
+#endif
+}
+void
+fis_read_directory(void)
+{
+void *err_addr;
+FLASH_READ(fis_addr, fis_work_block, fisdir_size, (void **)&err_addr);
+fis_endian_fixup(fis_work_block);
+}
 struct fis_image_desc *
 fis_lookup(char *name, int *num)
 {
 int i;
 struct fis_image_desc *img;
-void *err_addr;
+fis_read_directory();
-flash_read(fis_addr, fis_work_block, fisdir_size, (void **)&err_addr);
 img = (struct fis_image_desc *)fis_work_block;
 for (i = 0;  i < fisdir_size/sizeof(*img);  i++, img++) {
 if ((img->name[0] != (unsigned char)0xFF) &&
 (strcasecmp(name, img->name) == 0)) {
 if (num) *num = i;
 fis_update_directory(void)
 {
 int stat;
 void *err_addr;
+fis_endian_fixup(fis_work_block);
 #ifdef CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG
 memcpy((char *)fis_work_block+fisdir_size, config, cfg_size);
+conf_endian_fixup((char *)fis_work_block+fisdir_size);
 #endif
 #ifdef CYGSEM_REDBOOT_FLASH_LOCK_SPECIAL
 // Ensure [quietly] that the directory is unlocked before trying to update
 flash_unlock((void *)fis_addr, flash_block_size, (void **)&err_addr);
 #endif
 if ((stat = flash_erase(fis_addr, flash_block_size, (void **)&err_addr)) != 0) {
 diag_printf("Error erasing FIS directory at %p: %s\n", err_addr, flash_errmsg(stat));
 } else {
-if ((stat = flash_program(fis_addr, fis_work_block, flash_block_size,
+if ((stat = FLASH_PROGRAM(fis_addr, fis_work_block,
-(void **)&err_addr)) != 0) {
+flash_block_size, (void **)&err_addr)) != 0) {
 diag_printf("Error writing FIS directory at %p: %s\n",
 err_addr, flash_errmsg(stat));
 }
 }
 #ifdef CYGSEM_REDBOOT_FLASH_LOCK_SPECIAL
 // Ensure [quietly] that the directory is locked after the update
 flash_lock((void *)fis_addr, flash_block_size, (void **)&err_addr);
 #endif
+fis_endian_fixup(fis_work_block);
 }
 static void
 fis_init(int argc, char *argv[])
 {
 struct fis_image_desc *img;
 int i, image_indx;
 bool show_cksums = false;
 bool show_datalen = false;
 struct option_info opts[2];
-void *err_addr;
 unsigned long last_addr, lowest_addr;
 bool image_found;
 #ifdef CYGHWR_REDBOOT_ARM_FLASH_SIB
 // FIXME: this is somewhat half-baked
 i = 1;
 #endif
 if (!scan_opts(argc, argv, 2, opts, i, 0, 0, "")) {
 return;
 }
-flash_read(fis_addr, fis_work_block, fisdir_size, (void **)&err_addr);
+fis_read_directory();
 // Let diag_printf do the formatting in both cases, rather than counting
 // cols by hand....
 diag_printf("%-16s  %-10s  %-10s  %-10s  %-s\n",
 "Name","FLASH addr",
 show_cksums ? "Checksum" : "Mem addr",
 static int
 find_free(struct free_chunk *chunks)
 {
 CYG_ADDRESS *fis_ptr, *fis_end;
-void *err_addr;
 struct fis_image_desc *img;
 int i, idx;
 int num_chunks = 1;
 // Do not search the area reserved for pre-RedBoot systems:
 CYGNUM_REDBOOT_FLASH_RESERVED_BASE +
 CYGBLD_REDBOOT_MIN_IMAGE_SIZE);
 fis_end = (CYG_ADDRESS *)flash_end;
 chunks[num_chunks-1].start = (CYG_ADDRESS)fis_ptr;
 chunks[num_chunks-1].end = (CYG_ADDRESS)fis_end;
-flash_read(fis_addr, fis_work_block, fisdir_size, (void **)&err_addr);
+fis_read_directory();
 img = (struct fis_image_desc *) fis_work_block;
 for (i = 0;  i < fisdir_size/sizeof(*img);  i++, img++) {
 if (img->name[0] != (unsigned char)0xFF) {
 // Figure out which chunk this is in and split it
 for (idx = 0;  idx < num_chunks;  idx++) {
 {
 fis_usage("invalid arguments");
 return;
 }
-flash_read(fis_addr, fis_work_block, fisdir_size, (void **)&err_addr);
+fis_read_directory();
 defaults_assumed = false;
 if (name) {
 // Search existing files to acquire defaults for params not specified:
 img = fis_lookup(name, NULL);
 if (img) {
 prog_ok = false;
 }
 }
 if (prog_ok) {
 // Now program it
-if ((stat = flash_program((void *)flash_addr, (void *)mem_addr, img_size, (void **)&err_addr)) != 0) {
+if ((stat = FLASH_PROGRAM((void *)flash_addr, (void *)mem_addr, img_size, (void **)&err_addr)) != 0) {
 diag_printf("Can't program region at %p: %s\n", err_addr, flash_errmsg(stat));
 prog_ok = false;
 }
 }
 }
 // Set load address/top
 load_address = mem_addr;
 load_address_end = (unsigned long)p->out_buf;
-	// Reload fis directory
+// Reload fis directory
-flash_read(fis_addr, fis_work_block, fisdir_size, (void **)&err_addr);
+fis_read_directory();
 } else // dangling block
 #endif
 {
 flash_read((void *)img->flash_base, (void *)mem_addr, img->data_length, (void **)&err_addr);
 prog_ok = false;
 }
 }
 if (prog_ok) {
 // Now program it
-if ((stat = flash_program((void *)flash_addr, (void *)mem_addr, length, (void **)&err_addr)) != 0) {
+if ((stat = FLASH_PROGRAM((void *)flash_addr, (void *)mem_addr, length, (void **)&err_addr)) != 0) {
 diag_printf("Can't program region at %p: %s\n", err_addr, flash_errmsg(stat));
 prog_ok = false;
 }
 }
 }
 init_opts(&opts[0], 'f', true, OPTION_ARG_TYPE_NUM,
 (void *)&flash_addr, (bool *)&flash_addr_set, "FLASH memory base address");
 init_opts(&opts[1], 'l', true, OPTION_ARG_TYPE_NUM,
 (void *)&length, (bool *)&length_set, "length");
-if (!scan_opts(argc, argv, 2, opts, 2, (void **)&name, OPTION_ARG_TYPE_STR, "image name"))
+if (!scan_opts(argc, argv, 2, opts, 2, &name, OPTION_ARG_TYPE_STR, "image name"))
 {
 fis_usage("invalid arguments");
 return;
 }
 init_opts(&opts[0], 'f', true, OPTION_ARG_TYPE_NUM,
 (void *)&flash_addr, (bool *)&flash_addr_set, "FLASH memory base address");
 init_opts(&opts[1], 'l', true, OPTION_ARG_TYPE_NUM,
 (void *)&length, (bool *)&length_set, "length");
-if (!scan_opts(argc, argv, 2, opts, 2, (void **)&name, OPTION_ARG_TYPE_STR, "image name"))
+if (!scan_opts(argc, argv, 2, opts, 2, &name, OPTION_ARG_TYPE_STR, "image name"))
 {
 fis_usage("invalid arguments");
 return;
 }
 bool
 do_flash_init(void)
 {
 int stat;
-void *err_addr;
 if (!__flash_init) {
 __flash_init = 1;
 if ((stat = flash_init(diag_printf)) != 0) {
 diag_printf("FLASH: driver init failed: %s\n", flash_errmsg(stat));
 }
 if (((CYG_ADDRESS)fis_addr + fisdir_size - 1) > (CYG_ADDRESS)flash_end) {
 diag_printf("FIS directory doesn't fit\n");
 return false;
 }
-flash_read(fis_addr, fis_work_block, fisdir_size, (void **)&err_addr);
+fis_read_directory();
 #endif
 }
 return true;
 }

Mercurial > ecos

comparison packages/redboot/current/src/flash.c @ 1740:0031b615f51c