summaryrefslogtreecommitdiff
path: root/cleopatre/linux-2.6.25.10-spc300/scripts
diff options
context:
space:
mode:
authorsave2009-08-19 09:27:11 +0000
committersave2009-08-19 09:27:11 +0000
commit3dff153736c5deee3a1a39a88b30d72411ab9b96 (patch)
tree7de7fbcf19743b43448e0bf130378a63bc35ebf0 /cleopatre/linux-2.6.25.10-spc300/scripts
parent072678cc6386cfc3b89aa3256b91889544e1eeb7 (diff)
[CLEO][BUILDROOT]Moved spid_img_desc from mksimage to include/asm/arch.
- spid_img_desc is used under spidlib and libmme so it's better to put it with all other include files. - For lib Makefile I suppressed "-I.../mkimage" and a added -Ilinux/include/asm/arch that is more retrictif so better. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@5259 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/linux-2.6.25.10-spc300/scripts')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/scripts/mksimage/Makefile6
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/scripts/mksimage/spid_img_desc.h68
2 files changed, 4 insertions, 70 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/scripts/mksimage/Makefile b/cleopatre/linux-2.6.25.10-spc300/scripts/mksimage/Makefile
index 5c2c2285c0..744726c0f2 100644
--- a/cleopatre/linux-2.6.25.10-spc300/scripts/mksimage/Makefile
+++ b/cleopatre/linux-2.6.25.10-spc300/scripts/mksimage/Makefile
@@ -3,7 +3,9 @@ always := $(hostprogs-y)
mksimage-objs := mksimage.o
-# dependencies on generated files need to be listed explicitly
+# spid_img_desc.h is under include/asm/arch directory so add -I
+HOSTCFLAGS_mksimage.o := -I$(srctree)/include/asm-arm/arch-spc300
-$(obj)/mksimage.o: $(obj)/spid_img_desc.h
+# dependencies on generated files need to be listed explicitly
+$(obj)/mksimage.o: $(srctree)/include/asm-arm/arch-spc300/spid_img_desc.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/scripts/mksimage/spid_img_desc.h b/cleopatre/linux-2.6.25.10-spc300/scripts/mksimage/spid_img_desc.h
deleted file mode 100644
index ed4d377d12..0000000000
--- a/cleopatre/linux-2.6.25.10-spc300/scripts/mksimage/spid_img_desc.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * scripts/spidhdr/image_desc.h
- *
- * Copyright (C) 2009 SPiDCOM Technologies
- *
- * 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
- */
-
-#ifndef __IMAGE_DESC_H
-#define __IMAGE_DESC_H
-
-#include <stdint.h>
-
-#define SPIDCOM_IMG_DESC_MTD_NAME_0 "image 0"
-#define SPIDCOM_IMG_DESC_MTD_NAME_1 "image 1"
-
-#define SPIDCOM_IMG_DESC_SPC300 0x00
-#define SPIDCOM_IMG_DESC_UNKNOWN 0x01
-
-#define SPIDCOM_IMG_DESC_MAGIC "SPIDIMG\0"
-#define SPIDCOM_IMG_DESC_SIZE 1024
-
-#define SPIDCOM_IMG_DESC_INVALID_INDEX 0x7fffffff
-#define SPIDCOM_IMG_DESC_ORIGIN_INDEX 0xffffffff
-
-#define SPIDCOM_IMG_DESC_NORMAL_TYPE 0x0
-
-#define SPIDCOM_IMG_DESC_PLC_RAM 0x400000 /* 4M */
-
-#define SPIDCOM_IMG_DESC_IS_VALID(desc) ( !memcmp((desc)->magic, SPIDCOM_IMG_DESC_MAGIC, 8) && \
- (desc)->is_valid && \
- ( (desc)->index != SPIDCOM_IMG_DESC_INVALID_INDEX ) )
-
-/* /!\ All values are LITTLE-ENDIAN */
-typedef struct {
- char magic[8]; /* Magic number = "SPIDIMG\0"
- * = { 0x53, 0x50, 0x49, 0x44,
- * 0x49, 0x4d, 0x47, 0x00 } */
- uint32_t index; /* The biggest one is the image to boot */
- uint32_t is_valid:1; /* Is image valid (bootable ?) */
- uint32_t is_1st_boot:1; /* Is first image boot ? */
- uint32_t is_not_success:1; /* Is first boot successful ? */
- uint32_t is_not_update:1; /* Is update process finished correctly? */
- uint32_t size; /* Firmware size (descriptor included) */
- uint32_t type; /* Image type : 0 is normal image */
- uint8_t md5_sum[16]; /* MD5 checksum of the whole firmware */
- char version[16]; /* Image version string */
- char description[64]; /* Image description string */
- uint32_t arch; /* spc300 or unknown */
- uint32_t plc_ram; /* RAM size needed for the PLC processor */
- char reserved[900];
- char image[0]; /* Used in bootloader to mark beging of the payload */
-} spidcom_image_desc_t;
-
-#endif /* __IMAGE_DESC_H */