summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/application/spidinit/Makefile5
l---------cleopatre/include/spid_img_desc.h2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/.gitignore1
-rwxr-xr-xcleopatre/linux-2.6.25.10-spc300/scripts/cpincludes7
-rw-r--r--cleopatre/u-boot-1.1.6/cpincludes.mk6
-rw-r--r--common/include/spid_img_desc.h (renamed from common/include/asm/arch/spid_img_desc.h)8
-rw-r--r--common/tools/mksimage/Makefile6
l---------polux/include/spid_img_desc.h2
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/.gitignore1
-rwxr-xr-xpolux/linux-2.6.10/scripts/cpincludes7
l---------polux/linux-2.6.10/scripts/mksimage1
-rw-r--r--polux/linux-2.6.10/scripts/mksimage/Makefile11
-rw-r--r--polux/linux-2.6.10/scripts/mksimage/mksimage.c114
13 files changed, 25 insertions, 146 deletions
diff --git a/cleopatre/application/spidinit/Makefile b/cleopatre/application/spidinit/Makefile
index d4a878b59c..b9795f889e 100644
--- a/cleopatre/application/spidinit/Makefile
+++ b/cleopatre/application/spidinit/Makefile
@@ -2,19 +2,20 @@ BIN=spidinit
OBJPATH=obj
SRCPATH=src
INCPATH=inc
+BASE=../..
ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -g -Os
CC_WITHOUT_CFLAGS=$(CC)
-LINUX_DIR=../../linux-2.6.25.10-spc300
LIBSPID_DIR=../libspid
LIBMME_DIR=../libmme
else #compile from buildroot
CC_WITH_CFLAGS=$(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
-EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -MMD
+EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include/asm-arm/arch-spc300 \
+ -I$(BASE)/include -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -MMD
LIBS=-L$(LIBMME_DIR) -L$(LIBSPID_DIR) -lmme -lspid
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
diff --git a/cleopatre/include/spid_img_desc.h b/cleopatre/include/spid_img_desc.h
index a87638a213..bac9ec1a02 120000
--- a/cleopatre/include/spid_img_desc.h
+++ b/cleopatre/include/spid_img_desc.h
@@ -1 +1 @@
-../../common/include/asm/arch/spid_img_desc.h \ No newline at end of file
+../../common/include/spid_img_desc.h \ No newline at end of file
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/.gitignore b/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/.gitignore
index 09d2b18c3e..7fa0b18306 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/.gitignore
+++ b/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/.gitignore
@@ -9,7 +9,6 @@ memory.h
nvram.h
platform.h
serial.h
-spid_img_desc.h
system.h
timex.h
uncompress.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/scripts/cpincludes b/cleopatre/linux-2.6.25.10-spc300/scripts/cpincludes
index ac8b61b2c1..3a6b73c26f 100755
--- a/cleopatre/linux-2.6.25.10-spc300/scripts/cpincludes
+++ b/cleopatre/linux-2.6.25.10-spc300/scripts/cpincludes
@@ -5,6 +5,9 @@
# $1 - Kernel src directory
LINUX_INC=$1/include/asm-arm/arch-spc300
-COMMON_INC=$1/../../common/include/asm/arch
+COMMON_INC=$1/../../common/include
+COMMON_INC_ASM=$COMMON_INC/asm/arch
+MKSIMAGE=$1/scripts/mksimage
-cp -r $COMMON_INC/* $LINUX_INC
+cp $COMMON_INC/spid_img_desc.h $MKSIMAGE
+cp -r $COMMON_INC_ASM/* $LINUX_INC
diff --git a/cleopatre/u-boot-1.1.6/cpincludes.mk b/cleopatre/u-boot-1.1.6/cpincludes.mk
index aadf26a954..8f0d89c721 100644
--- a/cleopatre/u-boot-1.1.6/cpincludes.mk
+++ b/cleopatre/u-boot-1.1.6/cpincludes.mk
@@ -1,6 +1,8 @@
UBOOT_INC=$(SRCTREE)/include/asm-arm/arch-spc300
-COMMON_INC=$(SRCTREE)/../../common/include/asm/arch
+COMMON_INC=$(SRCTREE)/../../common/include
+COMMON_INC_ASM=$(COMMON_INC)/asm/arch
cpincludes:
- cp -r $(COMMON_INC)/* $(UBOOT_INC)
+ cp $(COMMON_INC)/spid_img_desc.h $(UBOOT_INC)
+ cp -r $(COMMON_INC_ASM)/* $(UBOOT_INC)
diff --git a/common/include/asm/arch/spid_img_desc.h b/common/include/spid_img_desc.h
index cc2b158fd7..a1540b469e 100644
--- a/common/include/asm/arch/spid_img_desc.h
+++ b/common/include/spid_img_desc.h
@@ -1,5 +1,5 @@
/*
- * include/asm/arch/spid_img_desc.h
+ * include/spid_img_desc.h
*
* Copyright (C) 2012 MStar Semiconductor.
*
@@ -17,8 +17,8 @@
* along with this program; if not, write to the Free Software Foundation,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef __ASM_ARCH_SPID_IMG_DESC_H
-#define __ASM_ARCH_SPID_IMG_DESC_H
+#ifndef __SPID_IMG_DESC_H
+#define __SPID_IMG_DESC_H
#ifndef __KERNEL__
#include <stdint.h>
@@ -132,4 +132,4 @@ typedef char all_spidcom_images_desc_must_have_the_same_size[error_size];
#undef error_size
-#endif /* __ASM_ARCH_SPID_IMG_DESC_H */
+#endif /* __SPID_IMG_DESC_H */
diff --git a/common/tools/mksimage/Makefile b/common/tools/mksimage/Makefile
index 744726c0f2..ee3415ca1b 100644
--- a/common/tools/mksimage/Makefile
+++ b/common/tools/mksimage/Makefile
@@ -3,9 +3,5 @@ always := $(hostprogs-y)
mksimage-objs := mksimage.o
-# spid_img_desc.h is under include/asm/arch directory so add -I
-HOSTCFLAGS_mksimage.o := -I$(srctree)/include/asm-arm/arch-spc300
-
# dependencies on generated files need to be listed explicitly
-$(obj)/mksimage.o: $(srctree)/include/asm-arm/arch-spc300/spid_img_desc.h
-
+$(obj)/mksimage.o: $(srctree)/scripts/mksimage/spid_img_desc.h
diff --git a/polux/include/spid_img_desc.h b/polux/include/spid_img_desc.h
index a87638a213..bac9ec1a02 120000
--- a/polux/include/spid_img_desc.h
+++ b/polux/include/spid_img_desc.h
@@ -1 +1 @@
-../../common/include/asm/arch/spid_img_desc.h \ No newline at end of file
+../../common/include/spid_img_desc.h \ No newline at end of file
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/.gitignore b/polux/linux-2.6.10/include/asm-arm/arch-mse500/.gitignore
index a2ad947475..bf858cd121 100644
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/.gitignore
+++ b/polux/linux-2.6.10/include/asm-arm/arch-mse500/.gitignore
@@ -9,7 +9,6 @@ memory.h
nvram.h
platform.h
serial.h
-spid_img_desc.h
system.h
timex.h
uncompress.h
diff --git a/polux/linux-2.6.10/scripts/cpincludes b/polux/linux-2.6.10/scripts/cpincludes
index 94e060385e..f17a159510 100755
--- a/polux/linux-2.6.10/scripts/cpincludes
+++ b/polux/linux-2.6.10/scripts/cpincludes
@@ -5,6 +5,9 @@
# $1 - Kernel src directory
LINUX_INC=$1/include/asm-arm/arch-mse500
-COMMON_INC=$1/../../common/include/asm/arch
+COMMON_INC=$1/../../common/include
+COMMON_INC_ASM=$COMMON_INC/asm/arch
+MKSIMAGE=$1/scripts/mksimage
-cp -r $COMMON_INC/* $LINUX_INC
+cp $COMMON_INC/spid_img_desc.h $MKSIMAGE
+cp -r $COMMON_INC_ASM/* $LINUX_INC
diff --git a/polux/linux-2.6.10/scripts/mksimage b/polux/linux-2.6.10/scripts/mksimage
new file mode 120000
index 0000000000..714ed84c60
--- /dev/null
+++ b/polux/linux-2.6.10/scripts/mksimage
@@ -0,0 +1 @@
+../../../common/tools/mksimage \ No newline at end of file
diff --git a/polux/linux-2.6.10/scripts/mksimage/Makefile b/polux/linux-2.6.10/scripts/mksimage/Makefile
deleted file mode 100644
index 7f88360b08..0000000000
--- a/polux/linux-2.6.10/scripts/mksimage/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-hostprogs-y := mksimage
-always := $(hostprogs-y)
-
-mksimage-objs := mksimage.o
-
-# spid_img_desc.h is under include/asm/arch directory so add -I
-HOSTCFLAGS_mksimage.o := -I$(srctree)/include/asm-arm/arch-mse500
-
-# dependencies on generated files need to be listed explicitly
-$(obj)/mksimage.o: $(srctree)/include/asm-arm/arch-mse500/spid_img_desc.h
-
diff --git a/polux/linux-2.6.10/scripts/mksimage/mksimage.c b/polux/linux-2.6.10/scripts/mksimage/mksimage.c
deleted file mode 100644
index 99df798ab9..0000000000
--- a/polux/linux-2.6.10/scripts/mksimage/mksimage.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * scripts/spidhdr/spidhdr.c
- *
- * (C) Copyright 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
- *
- * Author(s):
- * 30 Apr 2009 Drasko DRASKOVIC <drasko.draskovic@spidcom.com>
- */
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include "spid_img_desc.h"
-
-spidcom_image_desc_t image = {
- .magic = SPIDCOM_IMG_DESC_MAGIC,
- .index = 0xffffffff, /* mandatory to be changed into the flash */
- .is_valid = 1,
- .is_1st_boot = 1,
- .is_not_success = 1,
- .is_not_update = 1,
- .type = 0,
- .version = "v0.0",
- .description = "SPiDCOM image",
- .arch = SPIDCOM_IMG_DESC_SPC300,
- .plc_ram = SPIDCOM_IMG_DESC_PLC_RAM
-};
-
-static void print_usage(const char *cmd)
-{
- fprintf(stderr, "%s : \n", cmd);
-}
-
-int main(int argc, char **argv)
-{
- int c, i = 0;
- int j = 0;
- char tmpstr[3];
-
- struct option opt[] =
- {
- { "size", required_argument, NULL, 's' },
- { "ldaddr", required_argument, NULL, 'l' },
- { "ver", required_argument, NULL, 'v' },
- { "desc", required_argument, NULL, 'd' },
- { "md5", required_argument, NULL, 'm' },
- { "platform", required_argument, NULL, 'p' },
- { "plc-ram", required_argument, NULL, 'r' },
- { "help", no_argument, NULL, 'h' }
- };
-
- while((c = getopt_long(argc, argv, "s:l:v:d:m:p:r:h", opt, &i)) != EOF)
- {
- switch(c)
- {
- case 's' :
- image.size = atoi(optarg);
- break;
- case 'v' :
- strncpy(image.version, optarg, sizeof(image.version));
- break;
- case 'd' :
- strncpy(image.description, optarg, sizeof(image.description));
- break;
- case 'm' :
- for (j=0; j<16; j++)
- {
- strncpy(tmpstr, optarg + j*2, 2);
- tmpstr[2] = '\0';
- image.md5_sum[j] = (unsigned char)strtoul(tmpstr, NULL, 16);
- }
- break;
-#if 0
- case 'p' :
- if (!strncmp(optarg, "arizona", 7))
- image.arch = SPIDCOM_IMG_DESC_SPC300;
- else
- image.arch = SPIDCOM_IMG_DESC_SPC300_UNKNOWN;
- break;
-#endif
- case 'r' :
- image.plc_ram = atoi(optarg) * 1024 * 1024;
- break;
- case 'h' :
- case '?' :
- print_usage(argv[0]);
- return -1;
- }
- }
-
- write(fileno(stdout), &image, sizeof(spidcom_image_desc_t));
- return 0;
-}