fixes for broken builds

.gitignore

@@ -32,6 +32,7 @@ xtensa-lx106-elf
 app
 esp-idf
 xtensa-esp32-elf
+gcc-arm-none-eabi*
 *.c#
 /function_keywords.js
 /functions.html

Makefile

@@ -151,6 +151,7 @@ endif
 # ---------------------------------------------------------------------------------
 #                                                      Get info out of BOARDNAME.py
 # ---------------------------------------------------------------------------------
+# TODO: could check board here and make clean if it's different?
 $(shell rm -f CURRENT_BOARD.make)
 $(shell python scripts/get_makefile_decls.py $(BOARD) > CURRENT_BOARD.make)
 include CURRENT_BOARD.make

boards/HYSTM32_28.py

@@ -24,15 +24,13 @@ info = {
     'libraries' : [
       'GRAPHICS',
       'LCD_FSMC',
-      'FILESYSTEM',
       'NEOPIXEL'
     ],
     'makefile' : [
       'SAVE_ON_FLASH=1',
       'STLIB=STM32F10X_MD',
       'PRECOMPILED_OBJS+=$(ROOT)/targetlibs/stm32f1/lib/startup_stm32f10x_md.o',
-      'DEFINES+=-DFSMC_BITBANG # software implementation because FSMC HW causes strange crashes',
-      'DEFINES+=-DUSE_RTC'
+      'DEFINES+=-DFSMC_BITBANG # software implementation because FSMC HW causes strange crashes'
     ]
   }
 };

boards/NRF52832DK.py

@@ -24,7 +24,7 @@ info = {
  'default_console_rx' : "D8",
  'default_console_baudrate' : "9600",
  # Number of variables can be WAY higher on this board
- 'variables' : 1900, # How many variables are allocated for Espruino to use. RAM will be overflowed if this number is too high and code won't compile.
+ 'variables' : 1000, # How many variables are allocated for Espruino to use. RAM will be overflowed if this number is too high and code won't compile.
 # 'bootloader' : 1,
  'binary_name' : 'espruino_%v_nrf52832.bin',
  'build' : {

boards/STM32F3DISCOVERY.py

@@ -21,7 +21,7 @@ info = {
  'variables' : 1720,
  'binary_name' : 'espruino_%v_stm32f3discovery.bin',
  'build' : {
-   'optimizeflags' : '-O3',
+   'optimizeflags' : '-Os',
    'libraries' : [
      'NET',
      'GRAPHICS',

make/family/EFM32GG.make

@@ -0,0 +1,73 @@
+EFM32=1
+EFM32GG=1
+
+ARCHFLAGS += -mcpu=cortex-m3  -mthumb
+
+GECKO_SDK_PATH=$(ROOT)/targetlibs/Gecko_SDK
+
+ARM_HAS_OWN_CMSIS = 1
+INCLUDE += -I$(GECKO_SDK_PATH)/cmsis/Include
+
+LINKER_FILE = $(GECKO_SDK_PATH)/Device/SiliconLabs/EFM32GG/Source/GCC/efm32gg.ld
+
+INCLUDE += -I$(ROOT)/targets/efm32
+SOURCES +=                              \
+targets/efm32/main.c                    \
+targets/efm32/jshardware.c
+
+INCLUDE += -I$(GECKO_SDK_PATH)/Device/SiliconLabs/EFM32GG/Include
+INCLUDE += -I$(GECKO_SDK_PATH)/emdrv/gpiointerrupt/inc
+#  INCLUDE += -I$(GECKO_SDK_PATH)/emdrv/ustimer/inc
+INCLUDE += -I$(GECKO_SDK_PATH)/emdrv/rtcdrv/inc
+INCLUDE += -I$(GECKO_SDK_PATH)/emdrv/nvm/inc
+INCLUDE += -I$(GECKO_SDK_PATH)/emdrv/common/inc
+INCLUDE += -I$(GECKO_SDK_PATH)/emlib/inc
+
+TARGETSOURCES += \
+$(GECKO_SDK_PATH)/Device/SiliconLabs/EFM32GG/Source/GCC/startup_efm32gg.c \
+$(GECKO_SDK_PATH)/Device/SiliconLabs/EFM32GG/Source/system_efm32gg.c \
+$(GECKO_SDK_PATH)/emlib/src/em_gpio.c \
+$(GECKO_SDK_PATH)/emlib/src/em_cmu.c \
+$(GECKO_SDK_PATH)/emlib/src/em_assert.c \
+$(GECKO_SDK_PATH)/emlib/src/em_emu.c \
+$(GECKO_SDK_PATH)/emlib/src/em_msc.c \
+$(GECKO_SDK_PATH)/emlib/src/em_rtc.c \
+$(GECKO_SDK_PATH)/emlib/src/em_int.c \
+$(GECKO_SDK_PATH)/emlib/src/em_system.c \
+$(GECKO_SDK_PATH)/emlib/src/em_timer.c \
+$(GECKO_SDK_PATH)/emlib/src/em_usart.c \
+$(GECKO_SDK_PATH)/emdrv/gpiointerrupt/src/gpiointerrupt.c \
+$(GECKO_SDK_PATH)/emdrv/rtcdrv/src/rtcdriver.c \
+$(GECKO_SDK_PATH)/emdrv/nvm/src/nvm_hal.c
+#	$(GECKO_SDK_PATH)/emdrv/ustimer/src/ustimer.c
+
+# $(GECKO_SDK_PATH)/emdrv/nvm/src/nvm.c \
+# $(GECKO_SDK_PATH)/emdrv/nvm/src/nvm_hal.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_acmp.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_adc.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_aes.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_burtc.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_crc.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_cryotimer.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_crypto.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_dac.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_dbg.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_dma.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_ebi.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_i2c.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_idac.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_lcd.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_ldma.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_lesense.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_letimer.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_leuart.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_mpu.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_opamp.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_pcnt.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_prs.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_rmu.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_rtcc.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_vcmp.c \
+# $(GECKO_SDK_PATH)/emlib/src/em_wdog.c
+
+include make/common/ARM.make

make/family/LINUX.make

@@ -0,0 +1,35 @@
+$(info QHO)
+ifeq ($(BOARD),CARAMBOLA)
+TOOLCHAIN_DIR=$(shell cd ~/workspace/carambola/staging_dir/toolchain-*/bin;pwd)
+export STAGING_DIR=$(TOOLCHAIN_DIR)
+export CCPREFIX=$(TOOLCHAIN_DIR)/mipsel-openwrt-linux-
+endif
+
+ifeq ($(BOARD),DPTBOARD)
+export STAGING_DIR=$(shell cd ~/breakoutopenwrt/staging_dir/toolchain-*/bin;pwd)
+export CCPREFIX=$(STAGING_DIR)/mips-openwrt-linux-
+endif
+
+ifeq ($(BOARD),RASPBERRYPI)
+ ifneq ($(shell uname -m),armv6l)
+  $(info *********************************)
+  $(info *         CROSS COMPILING       *)
+  $(info *********************************)
+  export CCPREFIX=targetlibs/raspberrypi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-
+ else
+  # compiling in-place, so give it a normal name
+  PROJ_NAME=espruino
+ endif
+endif
+
+DEFINES += -DLINUX
+INCLUDE += -I$(ROOT)/targets/linux
+SOURCES +=                              \
+targets/linux/main.c                    \
+targets/linux/jshardware.c
+LIBS += -lpthread # thread lib for input processing
+ifdef OPENWRT_UCLIBC
+LIBS += -lc
+else
+LIBS += -lstdc++
+endif