diff options
-rw-r--r-- | rbutil/mkimxboot/Makefile | 4 | ||||
-rw-r--r-- | utils/imxtools/sbtools/Makefile | 3 | ||||
-rw-r--r-- | utils/imxtools/sbtools/crypto.c (renamed from utils/imxtools/sbtools/crypto.cpp) | 0 |
3 files changed, 1 insertions, 6 deletions
diff --git a/rbutil/mkimxboot/Makefile b/rbutil/mkimxboot/Makefile index d2c487c475..966423159a 100644 --- a/rbutil/mkimxboot/Makefile +++ b/rbutil/mkimxboot/Makefile | |||
@@ -13,18 +13,16 @@ COMPILEFLAGS := -Wall -g -O3 -I$(IMXTOOLS_DIR) | |||
13 | 13 | ||
14 | # std=gnu99 is required by MinGW on Windows (c99 is sufficient for Linux / MXE) | 14 | # std=gnu99 is required by MinGW on Windows (c99 is sufficient for Linux / MXE) |
15 | CFLAGS += -std=gnu99 $(COMPILEFLAGS) | 15 | CFLAGS += -std=gnu99 $(COMPILEFLAGS) |
16 | CXXFLAGS += $(COMPILEFLAGS) | ||
17 | 16 | ||
18 | TOMCRYPT_DIR := ../../utils/tomcrypt | 17 | TOMCRYPT_DIR := ../../utils/tomcrypt |
19 | 18 | ||
20 | CXXFLAGS += -I$(TOMCRYPT_DIR)/src/headers | ||
21 | CFLAGS += -I$(TOMCRYPT_DIR)/src/headers | 19 | CFLAGS += -I$(TOMCRYPT_DIR)/src/headers |
22 | LDOPTS += -lpthread $(TOMCRYPT_DIR)/librbtomcrypt.a | 20 | LDOPTS += -lpthread $(TOMCRYPT_DIR)/librbtomcrypt.a |
23 | 21 | ||
24 | OUTPUT = mkimxboot | 22 | OUTPUT = mkimxboot |
25 | 23 | ||
26 | # inputs for lib | 24 | # inputs for lib |
27 | IMXTOOLS_SOURCES = misc.c sb.c crypto.cpp crc.c elf.c | 25 | IMXTOOLS_SOURCES = misc.c sb.c crypto.c crc.c elf.c |
28 | LIBSOURCES := dualboot.c mkimxboot.c md5.c \ | 26 | LIBSOURCES := dualboot.c mkimxboot.c md5.c \ |
29 | $(addprefix $(IMXTOOLS_DIR),$(IMXTOOLS_SOURCES)) | 27 | $(addprefix $(IMXTOOLS_DIR),$(IMXTOOLS_SOURCES)) |
30 | 28 | ||
diff --git a/utils/imxtools/sbtools/Makefile b/utils/imxtools/sbtools/Makefile index b1d0313f77..64a9651f4a 100644 --- a/utils/imxtools/sbtools/Makefile +++ b/utils/imxtools/sbtools/Makefile | |||
@@ -15,9 +15,6 @@ all: $(BINS) | |||
15 | %.o: %.c | 15 | %.o: %.c |
16 | $(CC) $(CFLAGS) -c -o $@ $< | 16 | $(CC) $(CFLAGS) -c -o $@ $< |
17 | 17 | ||
18 | %.o: %.cpp | ||
19 | $(CXX) $(CXXFLAGS) -c -o $@ $< | ||
20 | |||
21 | sbtoelf: sbtoelf.o crc.o crypto.o xorcrypt.o dbparser.o elf.o misc.o sb.o sb1.o $(TOMCRYPT_DIR)/librbtomcrypt.a | 18 | sbtoelf: sbtoelf.o crc.o crypto.o xorcrypt.o dbparser.o elf.o misc.o sb.o sb1.o $(TOMCRYPT_DIR)/librbtomcrypt.a |
22 | $(LD) -o $@ $^ $(LDFLAGS) | 19 | $(LD) -o $@ $^ $(LDFLAGS) |
23 | 20 | ||
diff --git a/utils/imxtools/sbtools/crypto.cpp b/utils/imxtools/sbtools/crypto.c index d3ec18bd11..d3ec18bd11 100644 --- a/utils/imxtools/sbtools/crypto.cpp +++ b/utils/imxtools/sbtools/crypto.c | |||