From 6a4bbf217d95c199afd8b0763dace481e381a461 Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Sun, 8 Apr 2018 18:16:19 +0800 Subject: [PATCH] feat(structure): Remove unused makefile --- Makefile | 431 ----------------------------- components/axtls/source/Makefile | 47 ---- components/esp8266/driver/Makefile | 43 --- 3 files changed, 521 deletions(-) delete mode 100644 Makefile delete mode 100644 components/axtls/source/Makefile delete mode 100644 components/esp8266/driver/Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 02bab09c..00000000 --- a/Makefile +++ /dev/null @@ -1,431 +0,0 @@ -# copyright (c) 2010 Espressif System -# -ifndef PDIR - -endif - -ifeq ($(COMPILE), xcc) - AR = xt-ar - CC = xt-xcc - NM = xt-nm - CPP = xt-xt++ - OBJCOPY = xt-objcopy - OBJDUMP = xt-objdump -else - AR = xtensa-lx106-elf-ar - CC = xtensa-lx106-elf-gcc - NM = xtensa-lx106-elf-nm - CPP = xtensa-lx106-elf-g++ - OBJCOPY = xtensa-lx106-elf-objcopy - OBJDUMP = xtensa-lx106-elf-objdump -endif - -BOOT?=none -APP?=0 -SPI_SPEED?=40 -SPI_MODE?=QIO -SPI_SIZE_MAP?=0 - -ifeq ($(BOOT), new) - boot = new -else - ifeq ($(BOOT), old) - boot = old - else - boot = none - endif -endif - -ifeq ($(APP), 1) - app = 1 -else - ifeq ($(APP), 2) - app = 2 - else - app = 0 - endif -endif - -ifeq ($(SPI_SPEED), 26.7) - freqdiv = 1 -else - ifeq ($(SPI_SPEED), 20) - freqdiv = 2 - else - ifeq ($(SPI_SPEED), 80) - freqdiv = 15 - else - freqdiv = 0 - endif - endif -endif - - -ifeq ($(SPI_MODE), QOUT) - mode = 1 -else - ifeq ($(SPI_MODE), DIO) - mode = 2 - else - ifeq ($(SPI_MODE), DOUT) - mode = 3 - else - mode = 0 - endif - endif -endif - -addr = 0x01000 - -ifeq ($(SPI_SIZE_MAP), 1) - size_map = 1 - flash = 256 -else - ifeq ($(SPI_SIZE_MAP), 2) - size_map = 2 - flash = 1024 - ifeq ($(app), 2) - addr = 0x81000 - endif - else - ifeq ($(SPI_SIZE_MAP), 3) - size_map = 3 - flash = 2048 - ifeq ($(app), 2) - addr = 0x81000 - endif - else - ifeq ($(SPI_SIZE_MAP), 4) - size_map = 4 - flash = 4096 - ifeq ($(app), 2) - addr = 0x81000 - endif - else - ifeq ($(SPI_SIZE_MAP), 5) - size_map = 5 - flash = 2048 - ifeq ($(app), 2) - addr = 0x101000 - endif - else - ifeq ($(SPI_SIZE_MAP), 6) - size_map = 6 - flash = 4096 - ifeq ($(app), 2) - addr = 0x101000 - endif - else - ifeq ($(SPI_SIZE_MAP), 8) - size_map = 8 - flash = 8192 - ifeq ($(app), 2) - addr = 0x101000 - endif - else - ifeq ($(SPI_SIZE_MAP), 9) - size_map = 9 - flash = 16384 - ifeq ($(app), 2) - addr = 0x101000 - endif - else - size_map = 0 - flash = 512 - ifeq ($(app), 2) - addr = 0x41000 - endif - endif - endif - endif - endif - endif - endif - endif -endif - -LD_FILE = $(LDDIR)/eagle.app.v6.ld - -ifneq ($(boot), none) -ifneq ($(app),0) - ifneq ($(findstring $(size_map), 6 8 9),) - LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).2048.ld - else - ifeq ($(size_map), 5) - LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).2048.ld - else - ifeq ($(size_map), 4) - LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).1024.app$(app).ld - else - ifeq ($(size_map), 3) - LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).1024.app$(app).ld - else - ifeq ($(size_map), 2) - LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).1024.app$(app).ld - else - ifeq ($(size_map), 0) - LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).512.app$(app).ld - endif - endif - endif - endif - endif - endif - BIN_NAME = user$(app).$(flash).$(boot).$(size_map) -endif -else - app = 0 -endif - -CSRCS ?= $(wildcard *.c) -CPPSRCS ?= $(wildcard *.cpp) -ASRCs ?= $(wildcard *.s) -ASRCS ?= $(wildcard *.S) -SUBDIRS ?= $(patsubst %/,%,$(dir $(wildcard */Makefile))) - -ODIR := .output -OBJODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/obj - -OBJS := $(CSRCS:%.c=$(OBJODIR)/%.o) \ - $(CPPSRCS:%.cpp=$(OBJODIR)/%.o) \ - $(ASRCs:%.s=$(OBJODIR)/%.o) \ - $(ASRCS:%.S=$(OBJODIR)/%.o) - -DEPS := $(CSRCS:%.c=$(OBJODIR)/%.d) \ - $(CPPSRCS:%.cpp=$(OBJODIR)/%.d) \ - $(ASRCs:%.s=$(OBJODIR)/%.d) \ - $(ASRCS:%.S=$(OBJODIR)/%.d) - -LIBODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/lib -OLIBS := $(GEN_LIBS:%=$(LIBODIR)/%) - -IMAGEODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/image -OIMAGES := $(GEN_IMAGES:%=$(IMAGEODIR)/%) - -BINODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/bin -OBINS := $(GEN_BINS:%=$(BINODIR)/%) - -CCFLAGS += \ - -g \ - -Wpointer-arith \ - -Wundef \ - -Werror \ - -Wl,-EL \ - -fno-inline-functions \ - -nostdlib \ - -mlongcalls \ - -mtext-section-literals \ - -ffunction-sections \ - -fdata-sections \ - -fno-builtin-printf \ - -fno-jump-tables -# -Wall - -CFLAGS = $(CCFLAGS) $(DEFINES) $(EXTRA_CCFLAGS) $(INCLUDES) -DFLAGS = $(CCFLAGS) $(DDEFINES) $(EXTRA_CCFLAGS) $(INCLUDES) - - -############################################################# -# Functions -# - -define ShortcutRule -$(1): .subdirs $(2)/$(1) -endef - -define MakeLibrary -DEP_LIBS_$(1) = $$(foreach lib,$$(filter %.a,$$(COMPONENTS_$(1))),$$(dir $$(lib))$$(LIBODIR)/$$(notdir $$(lib))) -DEP_OBJS_$(1) = $$(foreach obj,$$(filter %.o,$$(COMPONENTS_$(1))),$$(dir $$(obj))$$(OBJODIR)/$$(notdir $$(obj))) -$$(LIBODIR)/$(1).a: $$(OBJS) $$(DEP_OBJS_$(1)) $$(DEP_LIBS_$(1)) $$(DEPENDS_$(1)) - @mkdir -p $$(LIBODIR) - $$(if $$(filter %.a,$$?),mkdir -p $$(EXTRACT_DIR)_$(1)) - $$(if $$(filter %.a,$$?),cd $$(EXTRACT_DIR)_$(1); $$(foreach lib,$$(filter %.a,$$?),$$(AR) xo $$(UP_EXTRACT_DIR)/$$(lib);)) - $$(AR) ru $$@ $$(filter %.o,$$?) $$(if $$(filter %.a,$$?),$$(EXTRACT_DIR)_$(1)/*.o) - $$(if $$(filter %.a,$$?),$$(RM) -r $$(EXTRACT_DIR)_$(1)) -endef - -define MakeImage -DEP_LIBS_$(1) = $$(foreach lib,$$(filter %.a,$$(COMPONENTS_$(1))),$$(dir $$(lib))$$(LIBODIR)/$$(notdir $$(lib))) -DEP_OBJS_$(1) = $$(foreach obj,$$(filter %.o,$$(COMPONENTS_$(1))),$$(dir $$(obj))$$(OBJODIR)/$$(notdir $$(obj))) -$$(IMAGEODIR)/$(1).out: $$(OBJS) $$(DEP_OBJS_$(1)) $$(DEP_LIBS_$(1)) $$(DEPENDS_$(1)) - @mkdir -p $$(IMAGEODIR) - $$(CC) $$(LDFLAGS) $$(if $$(LINKFLAGS_$(1)),$$(LINKFLAGS_$(1)),$$(LINKFLAGS_DEFAULT) $$(OBJS) $$(DEP_OBJS_$(1)) $$(DEP_LIBS_$(1))) -o $$@ -endef - -$(BINODIR)/%.bin: $(IMAGEODIR)/%.out - @mkdir -p $(BIN_PATH) - @mkdir -p $(BINODIR) - -ifeq ($(APP), 0) - @$(RM) -r $(BIN_PATH)/eagle.S $(BIN_PATH)/eagle.dump - @$(OBJDUMP) -x -s $< > $(BIN_PATH)/eagle.dump - @$(OBJDUMP) -S $< > $(BIN_PATH)/eagle.S -else - @mkdir -p $(BIN_PATH)/upgrade - @$(RM) -r $(BIN_PATH)/upgrade/$(BIN_NAME).S $(BIN_PATH)/upgrade/$(BIN_NAME).dump - @$(OBJDUMP) -x -s $< > $(BIN_PATH)/upgrade/$(BIN_NAME).dump - @$(OBJDUMP) -S $< > $(BIN_PATH)/upgrade/$(BIN_NAME).S -endif - - @$(OBJCOPY) --only-section .text -O binary $< eagle.app.v6.text.bin - @$(OBJCOPY) --only-section .data -O binary $< eagle.app.v6.data.bin - @$(OBJCOPY) --only-section .rodata -O binary $< eagle.app.v6.rodata.bin - @$(OBJCOPY) --only-section .irom0.text -O binary $< eagle.app.v6.irom0text.bin - - @echo "" - @echo "!!!" - @echo "SDK_PATH: $(SDK_PATH)" - -ifeq ($(app), 0) - @python $(SDK_PATH)/tools/gen_appbin.py $< 0 $(mode) $(freqdiv) $(size_map) - @mv eagle.app.flash.bin $(BIN_PATH)/eagle.flash.bin - @mv eagle.app.v6.irom0text.bin $(BIN_PATH)/eagle.irom0text.bin - @rm eagle.app.v6.* - @echo "BIN_PATH: $(BIN_PATH)" - @echo "" - @echo "No boot needed." - @echo "Generate eagle.flash.bin and eagle.irom0text.bin successully in BIN_PATH" - @echo "eagle.flash.bin-------->0x00000" - @echo "eagle.irom0text.bin---->0x20000" -else - @echo "BIN_PATH: $(BIN_PATH)/upgrade" - @echo "" - - ifneq ($(boot), new) - @python $(SDK_PATH)/tools/gen_appbin.py $< 1 $(mode) $(freqdiv) $(size_map) - @echo "Support boot_v1.1 and +" - else - @python $(SDK_PATH)/tools/gen_appbin.py $< 2 $(mode) $(freqdiv) $(size_map) - - ifeq ($(size_map), 6) - @echo "Support boot_v1.4 and +" - else - ifeq ($(size_map), 5) - @echo "Support boot_v1.4 and +" - else - @echo "Support boot_v1.2 and +" - endif - endif - endif - - @mv eagle.app.flash.bin $(BIN_PATH)/upgrade/$(BIN_NAME).bin - @rm eagle.app.v6.* - @echo "Generate $(BIN_NAME).bin successully in BIN_PATH" - @echo "boot.bin------------>0x00000" - @echo "$(BIN_NAME).bin--->$(addr)" -endif - - @echo "!!!" - -############################################################# -# Rules base -# Should be done in top-level makefile only -# - -all: .subdirs $(OBJS) $(OLIBS) $(OIMAGES) $(OBINS) $(SPECIAL_MKTARGETS) - -clean: - $(foreach d, $(SUBDIRS), $(MAKE) -C $(d) clean;) - $(RM) -r $(ODIR)/$(TARGET)/$(FLAVOR) - -clobber: $(SPECIAL_CLOBBER) - $(foreach d, $(SUBDIRS), $(MAKE) -C $(d) clobber;) - $(RM) -r $(ODIR) - -.subdirs: - @set -e; $(foreach d, $(SUBDIRS), $(MAKE) -C $(d);) - -#.subdirs: -# $(foreach d, $(SUBDIRS), $(MAKE) -C $(d)) - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),clobber) -ifdef DEPS -sinclude $(DEPS) -endif -endif -endif - -$(OBJODIR)/%.o: %.c - @mkdir -p $(OBJODIR); - $(CC) $(if $(findstring $<,$(DSRCS)),$(DFLAGS),$(CFLAGS)) $(COPTS_$(*F)) -o $@ -c $< - -$(OBJODIR)/%.d: %.c - @mkdir -p $(OBJODIR); - @echo DEPEND: $(CC) -M $(CFLAGS) $< - @set -e; rm -f $@; \ - $(CC) -M $(CFLAGS) $< > $@.$$$$; \ - sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \ - rm -f $@.$$$$ - -$(OBJODIR)/%.o: %.cpp - @mkdir -p $(OBJODIR); - $(CPP) $(if $(findstring $<,$(DSRCS)),$(DFLAGS),$(CFLAGS)) $(COPTS_$(*F)) -o $@ -c $< - -$(OBJODIR)/%.d: %.cpp - @mkdir -p $(OBJODIR); - @echo DEPEND: $(CPP) -M $(CFLAGS) $< - @set -e; rm -f $@; \ - $(CPP) -M $(CFLAGS) $< > $@.$$$$; \ - sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \ - rm -f $@.$$$$ - -$(OBJODIR)/%.o: %.s - @mkdir -p $(OBJODIR); - $(CC) $(CFLAGS) -o $@ -c $< - -$(OBJODIR)/%.d: %.s - @mkdir -p $(OBJODIR); \ - set -e; rm -f $@; \ - $(CC) -M $(CFLAGS) $< > $@.$$$$; \ - sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \ - rm -f $@.$$$$ - -$(OBJODIR)/%.o: %.S - @mkdir -p $(OBJODIR); - $(CC) $(CFLAGS) -D__ASSEMBLER__ -o $@ -c $< - -$(OBJODIR)/%.d: %.S - @mkdir -p $(OBJODIR); \ - set -e; rm -f $@; \ - $(CC) -M $(CFLAGS) $< > $@.$$$$; \ - sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \ - rm -f $@.$$$$ - -$(foreach lib,$(GEN_LIBS),$(eval $(call ShortcutRule,$(lib),$(LIBODIR)))) - -$(foreach image,$(GEN_IMAGES),$(eval $(call ShortcutRule,$(image),$(IMAGEODIR)))) - -$(foreach bin,$(GEN_BINS),$(eval $(call ShortcutRule,$(bin),$(BINODIR)))) - -$(foreach lib,$(GEN_LIBS),$(eval $(call MakeLibrary,$(basename $(lib))))) - -$(foreach image,$(GEN_IMAGES),$(eval $(call MakeImage,$(basename $(image))))) - -############################################################# -# Recursion Magic - Don't touch this!! -# -# Each subtree potentially has an include directory -# corresponding to the common APIs applicable to modules -# rooted at that subtree. Accordingly, the INCLUDE PATH -# of a module can only contain the include directories up -# its parent path, and not its siblings -# -# Required for each makefile to inherit from the parent -# - -INCLUDES := $(INCLUDES) -I $(SDK_PATH)/include -I $(SDK_PATH)/extra_include -INCLUDES += -I $(SDK_PATH)/driver_lib/include -INCLUDES += -I $(SDK_PATH)/components/esp8266/include -INCLUDES += -I $(SDK_PATH)/components/esp8266/include/espressif -INCLUDES += -I $(SDK_PATH)/components/lwip/include -INCLUDES += -I $(SDK_PATH)/components/lwip/include/lwip -INCLUDES += -I $(SDK_PATH)/components/lwip/include/lwip/ipv4 -INCLUDES += -I $(SDK_PATH)/components/lwip/include/lwip/ipv6 -INCLUDES += -I $(SDK_PATH)/components/nopoll/include -INCLUDES += -I $(SDK_PATH)/include/spiffs -INCLUDES += -I $(SDK_PATH)/components/axtls/include -INCLUDES += -I $(SDK_PATH)/include/json -INCLUDES += -I $(SDK_PATH)/components/openssl/include -INCLUDES += -I $(SDK_PATH)/include/mqtt -INCLUDES += -I $(SDK_PATH)/components/freertos/include diff --git a/components/axtls/source/Makefile b/components/axtls/source/Makefile deleted file mode 100644 index b476376b..00000000 --- a/components/axtls/source/Makefile +++ /dev/null @@ -1,47 +0,0 @@ - -############################################################# -# Required variables for each makefile -# Discard this section from all parent makefiles -# Expected variables (with automatic defaults): -# CSRCS (all "C" files in the dir) -# SUBDIRS (all subdirs with a Makefile) -# GEN_LIBS - list of libs to be generated () -# GEN_IMAGES - list of images to be generated () -# COMPONENTS_xxx - a list of libs/objs in the form -# subdir/lib to be extracted and rolled up into -# a generated lib/image xxx.a () -# -ifndef PDIR -UP_EXTRACT_DIR = .. -GEN_LIBS = libssl.a -COMPONENTS_libssl = crypto/libsslcrypto.a \ - ssl/libsslssl.a -endif - - -############################################################# -# Configuration i.e. compile options etc. -# Target specific stuff (defines etc.) goes in here! -# Generally values applying to a tree are captured in the -# makefile at its root level - these are then overridden -# for a subtree within the makefile rooted therein -# -#DEFINES += - -############################################################# -# Recursion Magic - Don't touch this!! -# -# Each subtree potentially has an include directory -# corresponding to the common APIs applicable to modules -# rooted at that subtree. Accordingly, the INCLUDE PATH -# of a module can only contain the include directories up -# its parent path, and not its siblings -# -# Required for each makefile to inherit from the parent -# - -INCLUDES := $(INCLUDES) -I $(PDIR)include -INCLUDES += -I ./ -PDIR := ../$(PDIR) -sinclude $(PDIR)Makefile - diff --git a/components/esp8266/driver/Makefile b/components/esp8266/driver/Makefile deleted file mode 100644 index ff6a9afb..00000000 --- a/components/esp8266/driver/Makefile +++ /dev/null @@ -1,43 +0,0 @@ - -############################################################# -# Required variables for each makefile -# Discard this section from all parent makefiles -# Expected variables (with automatic defaults): -# CSRCS (all "C" files in the dir) -# SUBDIRS (all subdirs with a Makefile) -# GEN_LIBS - list of libs to be generated () -# GEN_IMAGES - list of images to be generated () -# COMPONENTS_xxx - a list of libs/objs in the form -# subdir/lib to be extracted and rolled up into -# a generated lib/image xxx.a () -# -ifndef PDIR -GEN_LIBS = libdriver.a -endif - - -############################################################# -# Configuration i.e. compile options etc. -# Target specific stuff (defines etc.) goes in here! -# Generally values applying to a tree are captured in the -# makefile at its root level - these are then overridden -# for a subtree within the makefile rooted therein -# -#DEFINES += - -############################################################# -# Recursion Magic - Don't touch this!! -# -# Each subtree potentially has an include directory -# corresponding to the common APIs applicable to modules -# rooted at that subtree. Accordingly, the INCLUDE PATH -# of a module can only contain the include directories up -# its parent path, and not its siblings -# -# Required for each makefile to inherit from the parent -# - -INCLUDES := $(INCLUDES) -I $(PDIR)include -PDIR := ../$(PDIR) -sinclude $(PDIR)Makefile -