Build system fixes.

eerimoq · Oct 22, 2016 · 5d724e3 · 5d724e3
1 parent e28e952
commit 5d724e3
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 100 deletions.
diff --git a/bin/dbgen.py b/bin/dbgen.py
@@ -129,10 +129,6 @@ def main():
         ldflags = get_make_variable(board, "LDFLAGS").split()
         database["boards"][board]["ldflags"] = ldflags
 
-        # Get LDFLAGS_AFTER.
-        ldflags_after = get_make_variable(board, "LDFLAGS_AFTER").split()
-        database["boards"][board]["ldflags_after"] = ldflags_after
-
         # Get LIB.
         lib = get_make_variable(board, "LIB").split()
         database["boards"][board]["lib"] = lib

diff --git a/bin/release.py b/bin/release.py
@@ -70,7 +70,8 @@ def test():
                           ("avr", "pro-micro"),
                           ("sam", "arduino_due_x_dbg"),
                           ("esp", "esp01"),
-                          ("esp", "esp12e")]:
+                          ("esp", "esp12e"),
+                          ("esp32", "nano32")]:
         command = [
             "make",
             "all",

diff --git a/doc/developer-guide/releasing.rst b/doc/developer-guide/releasing.rst
@@ -46,9 +46,11 @@ Follow these steps to create a new release:
       scp simba-arduino/simba-arduino-avr-*.zip <user>@frs.sourceforge.net:/home/frs/project/simba-arduino/avr
       scp simba-arduino/simba-arduino-sam-*.zip <user>@frs.sourceforge.net:/home/frs/project/simba-arduino/sam
       scp simba-arduino/simba-arduino-esp-*.zip <user>@frs.sourceforge.net:/home/frs/project/simba-arduino/esp
+      scp simba-arduino/simba-arduino-esp32-*.zip <user>@frs.sourceforge.net:/home/frs/project/simba-arduino/esp32
       scp make/arduino/avr/package_simba_avr_index.json <user>@frs.sourceforge.net:/home/frs/project/simba-arduino/avr
       scp make/arduino/sam/package_simba_sam_index.json <user>@frs.sourceforge.net:/home/frs/project/simba-arduino/sam
       scp make/arduino/esp/package_simba_esp_index.json <user>@frs.sourceforge.net:/home/frs/project/simba-arduino/esp
+      scp make/arduino/esp32/package_simba_esp32_index.json <user>@frs.sourceforge.net:/home/frs/project/simba-arduino/esp32
 
 10. Download the release zip-file from Github and calculate its SHA1
    checksum. Upload the zip-file to sourceforge and add the new

diff --git a/make/app.mk b/make/app.mk
@@ -173,7 +173,7 @@ release:
 
 $(EXE): $(OBJ) $(GENOBJ)
 	@echo "LD $@"
-	$(CXX) -o $@ $(LIBPATH:%=-L%) $(LDFLAGS) $^ $(LDFLAGS_AFTER)
+	$(CXX) $(LIBPATH:%=-L%) $(LDFLAGS) -Wl,--start-group $(LIB:%=-l%) $^ -Wl,--end-group -o $@
 
 settings-generate: $(SETTINGS_INI)
 	@echo "Generating settings from $<"
@@ -251,7 +251,8 @@ RSFLAGS = \
 	$(RSFLAGS_EXTRA)
 
 ifeq ($(RUST), yes)
-    LDFLAGS_AFTER += -lsimba $(RUST_LIBRARIES:%=-l%) -L $(RUSTLIB)
+    LIB += simba $(RUST_LIBRARIES)
+    LDFLAGS += -L $(RUSTLIB)
 
 generate: $(RUST_LIBRARIES:%=$(RUSTLIB)/lib%.a) $(RUSTLIB)/$(RUST_LIBSIMBA)
 endif

diff --git a/make/arduino/arduino.py b/make/arduino/arduino.py
@@ -71,9 +71,6 @@ def generate_cores(family, database):
 
         if database["mcus"][mcu]["family"] != family:
             continue
-
-        # For ESP...
-        board["src"] = list(set(board["src"]) - set(["3pp/libc/string0.c"]))
 
         if cores_srcs is None:
             cores_srcs = set(board["src"])
@@ -269,14 +266,14 @@ def get_c_elf_extra_flags(board, database):
                        for libpath in libpaths])
 
 
-def get_c_elf_extra_flags_after(board, database):
-    """Get library path, defines and flags to the linker.
+def get_c_elf_libs(board, database):
+    """Get libraries.
 
     """
 
-    ldflags_after = database["boards"][board]["ldflags_after"]
+    libs = database["boards"][board]["lib"]
 
-    return " ".join(ldflags_after)
+    return " ".join(["-l" + lib for lib in libs])
 
 
 def generate_boards_txt_avr(database, boards_txt_fmt):
@@ -340,11 +337,11 @@ def generate_boards_txt_esp(database, boards_txt_fmt):
         esp01_compiler_c_extra_flags=get_c_extra_flags("esp01", database),
         esp01_compiler_cxx_extra_flags=get_cxx_extra_flags("esp01", database),
         esp01_compiler_c_elf_extra_flags=esp01_compiler_c_elf_extra_flags,
-        esp01_compiler_c_elf_extra_flags_after=get_c_elf_extra_flags_after("esp01", database),
+        esp01_compiler_c_elf_libs=get_c_elf_libs("esp01", database),
         esp12e_compiler_c_extra_flags=get_c_extra_flags("esp12e", database),
         esp12e_compiler_cxx_extra_flags=get_cxx_extra_flags("esp12e", database),
         esp12e_compiler_c_elf_extra_flags=esp12e_compiler_c_elf_extra_flags,
-        esp12e_compiler_c_elf_extra_flags_after=get_c_elf_extra_flags_after("esp12e", database))
+        esp12e_compiler_c_elf_libs=get_c_elf_libs("esp12e", database))
 
 def generate_boards_txt_esp32(database, boards_txt_fmt):
     """Generate boards.txt for ESP32.
@@ -362,7 +359,7 @@ def generate_boards_txt_esp32(database, boards_txt_fmt):
         nano32_compiler_c_extra_flags=get_c_extra_flags("nano32", database),
         nano32_compiler_cxx_extra_flags=get_cxx_extra_flags("nano32", database),
         nano32_compiler_c_elf_extra_flags=nano32_compiler_c_elf_extra_flags,
-        nano32_compiler_c_elf_extra_flags_after=get_c_elf_extra_flags_after("nano32", database))
+        nano32_compiler_c_elf_libs=get_c_elf_libs("nano32", database))
 
 
 def generate_configuration_files(family, database):

diff --git a/make/arduino/esp/boards.txt b/make/arduino/esp/boards.txt
@@ -41,7 +41,7 @@ esp01.build.flash_freq=40
 esp01.compiler.c.extra_flags={esp01_compiler_c_extra_flags}
 esp01.compiler.cpp.extra_flags={esp01_compiler_cxx_extra_flags}
 esp01.compiler.c.elf.extra_flags={esp01_compiler_c_elf_extra_flags}
-esp01.compiler.c.elf.extra_flags_after={esp01_compiler_c_elf_extra_flags_after}
+esp01.compiler.c.elf.libs={esp01_compiler_c_elf_libs}
 
 ##################################################################
 
@@ -68,6 +68,6 @@ esp12e.build.flash_freq=40
 esp12e.compiler.c.extra_flags={esp12e_compiler_c_extra_flags}
 esp12e.compiler.cpp.extra_flags={esp12e_compiler_cxx_extra_flags}
 esp12e.compiler.c.elf.extra_flags={esp12e_compiler_c_elf_extra_flags}
-esp12e.compiler.c.elf.extra_flags_after={esp12e_compiler_c_elf_extra_flags_after}
+esp12e.compiler.c.elf.libs={esp12e_compiler_c_elf_libs}
 
 ##################################################################
diff --git a/make/arduino/esp/platform.txt b/make/arduino/esp/platform.txt
@@ -65,7 +65,6 @@ build.extra_flags=
 # These can be overridden in platform.local.txt
 compiler.c.extra_flags=
 compiler.c.elf.extra_flags=
-compiler.c.elf.extra_flags_after=
 compiler.S.extra_flags=
 compiler.ar.extra_flags=
 compiler.elf2hex.extra_flags=
@@ -89,7 +88,7 @@ archive_file_path={build.path}/{archive_file}
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.combine.flags} {object_files} "{build.path}/{archive_file}" {compiler.c.elf.extra_flags_after}
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.combine.flags} -Wl,--start-group {object_files} "{build.path}/{archive_file}" {compiler.c.elf.libs} -Wl,--end-group
 
 ## Create output (.bin file)
 recipe.objcopy.hex.pattern="{runtime.tools.esptool.path}/{compiler.esptool.cmd}" -eo "{runtime.platform.path}/bootloaders/eboot/eboot.elf" -bo "{build.path}/{build.project_name}.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bp 4096 -ec -eo "{build.path}/{build.project_name}.elf" -bs .irom0.text -bs .text -bs .data -bs .rodata -bc -ec

diff --git a/make/arduino/esp32/boards.txt b/make/arduino/esp32/boards.txt
@@ -33,14 +33,14 @@ nano32.build.f_cpu=80000000L
 nano32.build.board=NANO32
 nano32.build.variant=nano32
 nano32.build.core=Simba:simba
-nano32.build.ldscript=simba.flash.1m.ld
-nano32.build.flash_size=512K
+nano32.build.ldscript=simba.flash.ld
+nano32.build.flash_size=4M
 nano32.build.flash_mode=dio
 nano32.build.flash_freq=40
 
 nano32.compiler.c.extra_flags={nano32_compiler_c_extra_flags}
 nano32.compiler.cpp.extra_flags={nano32_compiler_cxx_extra_flags}
 nano32.compiler.c.elf.extra_flags={nano32_compiler_c_elf_extra_flags}
-nano32.compiler.c.elf.extra_flags_after={nano32_compiler_c_elf_extra_flags_after}
+nano32.compiler.c.elf.libs={nano32_compiler_c_elf_libs}
 
 ##################################################################
diff --git a/make/arduino/esp32/package_simba_esp32_index.json b/make/arduino/esp32/package_simba_esp32_index.json
@@ -19,7 +19,7 @@
                     },
                     "url": "https://sourceforge.net/projects/simba-arduino/files/esp32/simba-arduino-esp32-esp32.zip",
                     "archiveFileName": "simba-arduino-esp32-esp32.zip",
-                    "checksum": "SHA-256:60c45b7feb37dc19cf5a922215aa5a018aa1e0737e8bfe339c005d0b8527f0cf",
+                    "checksum": "SHA-256:fe28fd07d5a877e55d495fc8b076c07aaa4ae439408ec7401d6a8757d71b1862",
                     "size": "17456828",
                     "boards": [
                         {"name" : "NANO32"}

diff --git a/make/arduino/esp32/platform.txt b/make/arduino/esp32/platform.txt
@@ -64,7 +64,6 @@ build.extra_flags=
 # These can be overridden in platform.local.txt
 compiler.c.extra_flags=
 compiler.c.elf.extra_flags=
-compiler.c.elf.extra_flags_after=
 compiler.S.extra_flags=
 compiler.ar.extra_flags=
 compiler.elf2hex.extra_flags=
@@ -90,7 +89,7 @@ archive_file_path={build.path}/{archive_file}
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.combine.flags} {object_files} "{build.path}/{archive_file}" {compiler.c.elf.extra_flags_after}
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.combine.flags} -Wl,--start-group {object_files} "{build.path}/{archive_file}" {compiler.c.elf.libs} -Wl,--end-group
 
 ## Create output (.bin file)
 recipe.objcopy.hex.pattern="{compiler.python.cmd}" "{runtime.platform.path}/tools/esptool.py" --chip esp32 elf2image --flash_mode dio --flash_freq 40m -o "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.elf"

diff --git a/make/gnu/linux.mk b/make/gnu/linux.mk
@@ -20,14 +20,18 @@
 CROSS_COMPILE =
 CFLAGS += -Werror -Wno-error=unused-variable -DCONFIG_PROFILE_STACK=0
 CXXFLAGS += -Werror -Wno-error=unused-variable -DCONFIG_PROFILE_STACK=0
-LDFLAGS_AFTER += -lpthread -lrt
 
 CFLAGS += -pg -fprofile-arcs -ftest-coverage
 CXXFLAGS += -pg -fprofile-arcs -ftest-coverage
-LDFLAGS += -pg -fprofile-arcs -ftest-coverage -lgcov
+LDFLAGS += -pg -fprofile-arcs -ftest-coverage
 
 CFLAGS += -g
 CXXFLAGS += -g
 LDFLAGS += -g
 
+LIB += \
+	gcov \
+	pthread \
+	rt
+
 include $(SIMBA_ROOT)/make/gnu.mk
diff --git a/make/platformio.sconscript b/make/platformio.sconscript
@@ -874,7 +874,6 @@ BOARDS = {
             "-pg", 
             "-fprofile-arcs", 
             "-ftest-coverage", 
-            "-lgcov", 
             "-g", 
             "-Wl,-Map=build/cygwin/default_configuration.map", 
             "-Wl,--gc-sections"
@@ -1006,17 +1005,6 @@ BOARDS = {
             "src/mcus/esp8266"
         ], 
         "ldflags": [
-            "-Wl,--start-group", 
-            "-lhal", 
-            "-lphy", 
-            "-lpp", 
-            "-lnet80211", 
-            "-lwpa", 
-            "-lcrypto", 
-            "-lmain", 
-            "-lfreertos", 
-            "-llwip", 
-            "-Wl,--end-group", 
             "-Wl,-Tsimba.flash.512k.ld", 
             "-u", 
             "call_user_start", 
@@ -1160,17 +1148,6 @@ BOARDS = {
             "src/mcus/esp8266"
         ], 
         "ldflags": [
-            "-Wl,--start-group", 
-            "-lhal", 
-            "-lphy", 
-            "-lpp", 
-            "-lnet80211", 
-            "-lwpa", 
-            "-lcrypto", 
-            "-lmain", 
-            "-lfreertos", 
-            "-llwip", 
-            "-Wl,--end-group", 
             "-Wl,-Tsimba.flash.4m.ld", 
             "-u", 
             "call_user_start", 
@@ -1305,7 +1282,6 @@ BOARDS = {
             "-pg", 
             "-fprofile-arcs", 
             "-ftest-coverage", 
-            "-lgcov", 
             "-g", 
             "-Wl,-Map=build/linux/default_configuration.map", 
             "-Wl,--gc-sections"
@@ -1434,6 +1410,7 @@ BOARDS = {
             "src/drivers/ports/esp32"
         ], 
         "ldflags": [
+            "-Wl,-Tsimba.flash.ld", 
             "-Wl,--cref", 
             "-nostdlib", 
             "-Wl,-EL", 

diff --git a/src/boards/photon/board.mk b/src/boards/photon/board.mk
@@ -24,7 +24,7 @@ SRC += $(SIMBA_ROOT)/src/boards/photon/board.c
 INC += $(SIMBA_ROOT)/3pp/wiced/WWD/include
 INC += $(SIMBA_ROOT)/3pp/wiced/WWD/internal/bus_protocols/SDIO
 INC += $(SIMBA_ROOT)/3pp/wiced/WWD/internal/chips/43362A2
-LDFLAGS_AFTER += -lwwdsdio
+LIB += wwdsdio
 LIBPATH += "$(SIMBA_ROOT)/3pp/wiced/WWD/lib"
 
 BOARD_HOMEPAGE = "https://docs.particle.io/datasheets/photon-datasheet/"

diff --git a/src/mcus/esp32/mcu.mk b/src/mcus/esp32/mcu.mk
@@ -34,15 +34,9 @@ LIBPATH += "$(SIMBA_ROOT)/src/mcus/esp32/ld" \
 	$(ESP_IDF_ROOT)/components/newlib/lib \
 	$(ESP32_ROOT)/lib
 
-LDFLAGS_AFTER += -Wl,--start-group \
-            $(ESPLIBS:%=-l%) \
-            -Wl,--end-group \
-            -Wl,-T$(LINKER_SCRIPT)
+LDFLAGS += -Wl,-T$(LINKER_SCRIPT)
 
-LDFLAGS_AFTER += \
-	$(ESPLIBS_AFTER:%=-l%)
-
-ESPLIBS += \
+LIB += \
 	hal \
 	core \
 	crypto \
@@ -64,16 +58,11 @@ ESPLIBS += \
 	nghttp \
 	nvs_flash \
 	spi_flash \
-	tcpip_adapter
-
-ESPLIBS_AFTER += \
+	tcpip_adapter \
 	gcc \
 	g \
 	c_rom \
-	m \
-
-# Used by arduino script to find the libraries.
-LIB ?= $(ESPLIBS) $(ESPLIBS_AFTER)
+	m
 
 F_CPU = 240000000
 
@@ -84,12 +73,4 @@ MCU_HOMEPAGE = "http://www.espressif.com"
 MCU_NAME = "Espressif ESP32"
 MCU_DESC = "Espressif ESP32 @ 80 MHz, 82 kB dram, 4 MB flash"
 
-#SIZE_SUMMARY_CMD ?= $(SIMBA_ROOT)/bin/memory_usage.py \
-#			--ram-section .data \
-#			--ram-section .rodata \
-#			--ram-section .bss \
-#			--rom-section .text \
-#			--rom-section .irom0.text \
-#			${EXE}
-
 include $(SIMBA_ROOT)/make/$(TOOLCHAIN)/esp32.mk
diff --git a/src/mcus/esp8266/mcu.mk b/src/mcus/esp8266/mcu.mk
@@ -33,30 +33,19 @@ SRC += $(SIMBA_ROOT)/src/mcus/esp8266/mcu.c \
 
 LIBPATH += "$(SIMBA_ROOT)/src/mcus/esp8266/ld"
 
-LDFLAGS += -Wl,--start-group \
-            $(ESPLIBS:%=-l%) \
-            -Wl,--end-group \
-            -Wl,-T$(LINKER_SCRIPT)
+LDFLAGS += -Wl,-T$(LINKER_SCRIPT)
 
-LDFLAGS_AFTER += \
-	$(ESPLIBS_AFTER:%=-l%)
-
-ESPLIBS += \
- hal \
- phy \
- pp \
- net80211 \
- wpa \
- crypto \
- main \
- freertos \
- lwip
-
-ESPLIBS_AFTER += \
- gcc
-
-# Used by arduino script to find the libraries.
-LIB ?= $(ESPLIBS) $(ESPLIBS_AFTER)
+LIB += \
+	hal \
+	gcc \
+	phy \
+	pp \
+	net80211 \
+	wpa \
+	crypto \
+	main \
+	freertos \
+	lwip
 
 F_CPU = 80000000