Updated compiler command line in variant level boards.txt files for b…

…oards that over-ride the defaults from platforms.txt. Deleted boards.txt so that it doesn't confuse people in MPIDE anymore. Added _disableSeconaryOscillator() to WSystem.c, to be used in _board_init(); in the variant files for boards that need to turn off their secondary oscillators. This was part of the removal of dependance on plib.h.
EmbeddedMan · Oct 21, 2015 · f862978 · f862978
1 parent e32164c
commit f862978
Show file tree

Hide file tree

Showing 24 changed files with 97 additions and 1,381 deletions.
diff --git a/hardware/pic32/boards.txt b/hardware/pic32/boards.txt
diff --git a/hardware/pic32/cores/pic32/WSystem.c b/hardware/pic32/cores/pic32/WSystem.c
@@ -1002,6 +1002,46 @@ void __attribute__((nomips16)) _initCoreTimer(uint32_t prd)
 
 }
 
+/* ------------------------------------------------------------ */
+/***	_disableSeconaryOscillator
+**
+**	Parameters: none
+**
+**	Return Value: none
+**
+**	Errors: none
+**
+**	Description: Several of our boards need to disable the seconday
+**               oscillator on _boart_init(). This function expands
+**               the macros from plib.h that previously did the 
+**               unlocking/locking of OSCCON writing.
+**
+*/
+void _disableSeconaryOscillator(void)
+{
+	//*	Turn Secondary oscillator off
+	//*	this is only needed on the mega board because the mega uses secondary
+	// ocsilator pins as general I/O
+
+	unsigned int int_status;
+
+    // Expanded mSYSTEMLock() and mSYSTEMUnLock() macros from plib.h
+    /// WARNING: According to the datasheet, this unlock sequence should also
+    /// turn off DMA before writing the SYSKEY values, and retore it at the
+    /// end. This is what the mSYSTEM macros did from plib.h. But since we
+    /// don't have that piece of plib.h implemneted in chipKIT yet, we're
+    /// going to leave that part out.
+    int_status = disableInterrupts();
+	SYSKEY = 0;
+    SYSKEY = 0xAA996655;
+    SYSKEY = 0x556699AA;
+
+	OSCCONCLR =	_OSCCON_SOSCEN_MASK;
+
+	SYSKEY = 0x33333333; 
+    restoreInterrupts(int_status);	
+}
+
 /* ------------------------------------------------------------ */
 /***	ProcName
 **

diff --git a/hardware/pic32/cores/pic32/wiring.h b/hardware/pic32/cores/pic32/wiring.h
@@ -178,6 +178,7 @@ unsigned int executeSoftReset(uint32_t options);
 unsigned int attachCoreTimerService(uint32_t (*)(uint32_t count));
 unsigned int detachCoreTimerService(uint32_t (*)(uint32_t count));
 unsigned int callCoreTimerServiceNow(uint32_t (* service)(uint32_t));
+void _disableSeconaryOscillator(void);
 
 // if you are going to use setIntVector, then specify the interrupt routine as:
 // void __USER_ISR UserInterrupt(void) {}

diff --git a/hardware/pic32/variants/Cerebot_32MX4/boards.txt b/hardware/pic32/variants/Cerebot_32MX4/boards.txt
@@ -9,6 +9,8 @@ cerebot32mx4.board.define=
 cerebot32mx4.ccflags=ffff
 cerebot32mx4.ldscript=chipKIT-application-32MX460F512.ld
 # end of new items
+cerebot32mx4.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+cerebot32mx4.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 cerebot32mx4.upload.protocol=stk500v2
 cerebot32mx4.upload.maximum_size=520192

diff --git a/hardware/pic32/variants/Cerebot_MX3cK/boards.txt b/hardware/pic32/variants/Cerebot_MX3cK/boards.txt
@@ -13,8 +13,8 @@ cerebot_mx3ck.ldscript=chipKIT-application-32MX320F128.ld
 # Use a high -Gnum for devices that have less than 64K of data memory
 # For -G1024, objects 1024 bytes or smaller will be accessed by
 # gp-relative addressing
-cerebot_mx3ck.compiler.c.flags=-O2::-c::-mno-smart-io::-w::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
-cerebot_mx3ck.compiler.cpp.flags=-O2::-c::-mno-smart-io::-w::-fno-exceptions::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
+cerebot_mx3ck.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+cerebot_mx3ck.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 cerebot_mx3ck.upload.protocol=stk500v2
 cerebot_mx3ck.upload.maximum_size=126976
@@ -49,8 +49,8 @@ chipkit_mx3.ldscript=chipKIT-application-32MX320F128.ld
 # Use a high -Gnum for devices that have less than 64K of data memory
 # For -G1024, objects 1024 bytes or smaller will be accessed by
 # gp-relative addressing
-chipkit_mx3.compiler.c.flags=-O2::-c::-mno-smart-io::-w::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
-chipkit_mx3.compiler.cpp.flags=-O2::-c::-mno-smart-io::-w::-fno-exceptions::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
+chipkit_mx3.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+chipkit_mx3.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 chipkit_mx3.upload.protocol=stk500v2
 chipkit_mx3.upload.maximum_size=126976

diff --git a/hardware/pic32/variants/Cerebot_MX3cK_512/boards.txt b/hardware/pic32/variants/Cerebot_MX3cK_512/boards.txt
@@ -13,8 +13,8 @@ cerebot_mx3ck_512.ldscript=chipKIT-application-32MX340F512.ld
 # Use a high -Gnum for devices that have less than 64K of data memory
 # For -G1024, objects 1024 bytes or smaller will be accessed by
 # gp-relative addressing
-cerebot_mx3ck_512.compiler.c.flags=-O2::-c::-mno-smart-io::-w::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
-cerebot_mx3ck_512.compiler.cpp.flags=-O2::-c::-mno-smart-io::-w::-fno-exceptions::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
+cerebot_mx3ck_512.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+cerebot_mx3ck_512.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 cerebot_mx3ck_512.upload.protocol=stk500v2
 cerebot_mx3ck_512.upload.maximum_size=520192

diff --git a/hardware/pic32/variants/Cerebot_MX4cK/boards.txt b/hardware/pic32/variants/Cerebot_MX4cK/boards.txt
@@ -9,6 +9,8 @@ cerebot_mx4ck.board.define=
 cerebot_mx4ck.ccflags=ffff
 cerebot_mx4ck.ldscript=chipKIT-application-32MX460F512.ld
 # end of new items
+cerebot_mx4ck.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+cerebot_mx4ck.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 cerebot_mx4ck.upload.protocol=stk500v2
 cerebot_mx4ck.upload.maximum_size=520192
@@ -39,6 +41,8 @@ chipkit_pro_mx4.board.define=
 chipkit_pro_mx4.ccflags=ffff
 chipkit_pro_mx4.ldscript=chipKIT-application-32MX460F512.ld
 # end of new items
+chipkit_pro_mx4.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+chipkit_pro_mx4.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 chipkit_pro_mx4.upload.protocol=stk500v2
 chipkit_pro_mx4.upload.maximum_size=520192

diff --git a/hardware/pic32/variants/ChipKIT_Pi/Board_Data.c b/hardware/pic32/variants/ChipKIT_Pi/Board_Data.c
@@ -380,11 +380,8 @@ const uint8_t external_int_to_digital_pin_PGM[] = {
 #if	(OPT_BOARD_INIT != 0)
 
 void _board_init(void) {
-
-	//	Turn Secondary oscillator off as GPIO is needed
-	OSCCONCLR	=	_OSCCON_SOSCEN_MASK;
-
-}
+    _disableSeconaryOscillator();
+}   
 
 #endif
 

diff --git a/hardware/pic32/variants/ChipKIT_Pi/boards.txt b/hardware/pic32/variants/ChipKIT_Pi/boards.txt
@@ -10,11 +10,8 @@ chipkit_Pi.board.define=
 chipkit_Pi.ldscript=chipKIT-application-32MX250F128.ld
 # end of new items
 
-# Use a high -Gnum for devices that have less than 64K of data memory
-# For -G1024, objects 1024 bytes or smaller will be accessed by
-# gp-relative addressing
-chipkit_Pi.compiler.c.flags=-O2::-c::-mno-smart-io::-w::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
-chipkit_Pi.compiler.cpp.flags=-O2::-c::-mno-smart-io::-w::-fno-exceptions::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
+chipkit_Pi.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+chipkit_Pi.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 chipkit_Pi.upload.protocol=stk500v2
 # 128KB - 4K for EEPROM - 4K for bootloader
@@ -47,11 +44,8 @@ chipkit_Pi_USB_Serial.ccflags=-Map="map.map"
 chipkit_Pi_USB_Serial.ldscript=chipKIT-application-32MX250F128.ld
 # end of new items
 
-# Use a high -Gnum for devices that have less than 64K of data memory
-# For -G1024, objects 1024 bytes or smaller will be accessed by
-# gp-relative addressing
-chipkit_Pi_USB_Serial.compiler.c.flags=-O2::-c::-mno-smart-io::-w::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
-chipkit_Pi_USB_Serial.compiler.cpp.flags=-O2::-c::-mno-smart-io::-w::-fno-exceptions::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
+chipkit_Pi_USB_Serial.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+chipkit_Pi_USB_Serial.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 chipkit_Pi_USB_Serial.upload.protocol=stk500v2
 # 128KB - 4K for EEPROM - 4K for bootloader

diff --git a/hardware/pic32/variants/Cmod/boards.txt b/hardware/pic32/variants/Cmod/boards.txt
@@ -13,8 +13,8 @@ cmod.ldscript=chipKIT-application-32MX150F128.ld
 # Use a high -Gnum for devices that have less than 64K of data memory
 # For -G1024, objects 1024 bytes or smaller will be accessed by
 # gp-relative addressing
-cmod.compiler.c.flags=-O2::-c::-mno-smart-io::-w::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
-cmod.compiler.cpp.flags=-O2::-c::-mno-smart-io::-w::-fno-exceptions::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
+cmod.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+cmod.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 cmod.upload.protocol=stk500v2
 # 128KB - 4K for EEPROM

diff --git a/hardware/pic32/variants/DP32/Board_Data.c b/hardware/pic32/variants/DP32/Board_Data.c
@@ -375,11 +375,8 @@ const uint8_t external_int_to_digital_pin_PGM[] = {
 #if	(OPT_BOARD_INIT != 0)
 
 void _board_init(void) {
-
-	//	Turn Secondary oscillator off as GPIO is needed
-	OSCCONCLR	=	_OSCCON_SOSCEN_MASK;
-
-}
+    _disableSeconaryOscillator();
+}   
 
 #endif
 

diff --git a/hardware/pic32/variants/DP32/boards.txt b/hardware/pic32/variants/DP32/boards.txt
@@ -10,11 +10,8 @@ chipkit_DP32.ccflags=-Map="map.map"
 chipkit_DP32.ldscript=chipKIT-application-32MX250F128.ld
 # end of new items
 
-# Use a high -Gnum for devices that have less than 64K of data memory
-# For -G1024, objects 1024 bytes or smaller will be accessed by
-# gp-relative addressing
-chipkit_DP32.compiler.c.flags=-O2::-c::-mno-smart-io::-w::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
-chipkit_DP32.compiler.cpp.flags=-O2::-c::-mno-smart-io::-w::-fno-exceptions::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
+cerebot32mx4.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+cerebot32mx4.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 chipkit_DP32.upload.protocol=stk500v2
 # 128KB - 4K for EEPROM - 4K for bootloader

diff --git a/hardware/pic32/variants/Default_100/boards.txt b/hardware/pic32/variants/Default_100/boards.txt
@@ -10,6 +10,9 @@ ubw32_mx460.ccflags=ffff
 ubw32_mx460.ldscript=chipKIT-application-32MX460F512.ld
 # end of new items
 
+cerebot32mx4.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+cerebot32mx4.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+
 ubw32_mx460.upload.protocol=stk500v2
 ubw32_mx460.upload.maximum_size=520192
 ubw32_mx460.upload.speed=115200

diff --git a/hardware/pic32/variants/Default_64/boards.txt b/hardware/pic32/variants/Default_64/boards.txt
@@ -10,6 +10,9 @@ cui32.ccflags=ffff
 cui32.ldscript=chipKIT-application-32MX440F512.ld
 # end of new items
 
+cui32.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+cui32.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+
 cui32.upload.protocol=stk500v2
 cui32.upload.maximum_size=520192
 cui32.upload.speed=115200
@@ -41,11 +44,8 @@ usbono_pic32.ldscript=chipKIT-application-32MX440F512.ld
 #chipKIT-UNO32-application-32MX320F128L.ld
 # end of new items
 
-# Use a high -Gnum for devices that have less than 64K of data memory
-# For -G1024, objects 1024 bytes or smaller will be accessed by
-# gp-relative addressing
-#usbono_pic32.compiler.c.flags=-O2::-c::-mno-smart-io::-w::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
-#usbono_pic32.compiler.cpp.flags=-O2::-c::-mno-smart-io::-w::-fno-exceptions::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
+usbono_pic32.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+usbono_pic32.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 usbono_pic32.upload.protocol=stk500v2
 usbono_pic32.upload.maximum_size=520192

diff --git a/hardware/pic32/variants/Fubarino_Mini/boards.txt b/hardware/pic32/variants/Fubarino_Mini/boards.txt
@@ -8,11 +8,8 @@ fubarino_mini_dev.board.define=-D_USE_USB_FOR_SERIAL_
 fubarino_mini_dev.ccflags=-Map="map.map"
 fubarino_mini_dev.ldscript=chipKIT-application-32MX250F128.ld
 
-# Use a high -Gnum for devices that have less than 64K of data memory
-# For -G1024, objects 1024 bytes or smaller will be accessed by
-# gp-relative addressing
-fubarino_mini_dev.compiler.c.flags=-O2::-c::-mno-smart-io::-w::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
-fubarino_mini_dev.compiler.cpp.flags=-O2::-c::-mno-smart-io::-w::-fno-exceptions::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
+fubarino_mini_dev.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+fubarino_mini_dev.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 fubarino_mini_dev.upload.protocol=stk500v2
 # 128KB - 4K for EEPROM - 4K for bootloader
@@ -45,8 +42,8 @@ fubarino_mini.ldscript=chipKIT-application-32MX250F128.ld
 # Use a high -Gnum for devices that have less than 64K of data memory
 # For -G1024, objects 1024 bytes or smaller will be accessed by
 # gp-relative addressing
-fubarino_mini.compiler.c.flags=-O2::-c::-mno-smart-io::-w::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
-fubarino_mini.compiler.cpp.flags=-O2::-c::-mno-smart-io::-w::-fno-exceptions::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
+fubarino_mini.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+fubarino_mini.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
 
 fubarino_mini.upload.protocol=stk500v2
 # 128KB - 4K for EEPROM - 4K for bootloader
@@ -65,39 +62,3 @@ fubarino_mini.build.mcu=32MX250F128D
 fubarino_mini.build.f_cpu=48000000L
 fubarino_mini.build.core=pic32
 fubarino_mini.build.variant=Fubarino_Mini
-
-############################################################
-#fubarino_mini_dbg.name=FubarinoMini Debug
-#
-## new items
-#fubarino_mini_dbg.platform=pic32
-#fubarino_mini_dbg.board=_BOARD_FUBARINO_MINI_
-#fubarino_mini_dbg.board.define=-D_USE_USB_FOR_SERIAL_
-#fubarino_mini_dbg.ccflags=-Map="map.map"
-#fubarino_mini_dbg.ldscript=chipKIT-application-32MX250F128-nobootloader.ld
-## end of new items
-#
-## Use a high -Gnum for devices that have less than 64K of data memory
-## For -G1024, objects 1024 bytes or smaller will be accessed by
-## gp-relative addressing
-#fubarino_mini_dbg.compiler.c.flags=-O0::-c::-mno-smart-io::-w::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
-#fubarino_mini_dbg.compiler.cpp.flags=-O0::-c::-mno-smart-io::-w::-fno-exceptions::-ffunction-sections::-fdata-sections::-G1024::-g::-mdebugger::-Wcast-align::-fno-short-double
-#fubarino_mini_dbg.upload.protocol=stk500v2
-## 128KB - 4K for EEPROM - 4K for bootloader
-#fubarino_mini_dbg.upload.maximum_size=122880
-#fubarino_mini_dbg.upload.speed=115200
-#
-#fubarino_mini_dbg.bootloader.low_fuses=0xff
-#fubarino_mini_dbg.bootloader.high_fuses=0xdd
-#fubarino_mini_dbg.bootloader.extended_fuses=0x00
-#fubarino_mini_dbg.bootloader.path=not-supported
-#fubarino_mini_dbg.bootloader.file=not-supported
-#fubarino_mini_dbg.bootloader.unlock_bits=0x3F
-#fubarino_mini_dbg.bootloader.lock_bits=0x0F
-#
-#fubarino_mini_dbg.build.mcu=32MX250F128D
-#fubarino_mini_dbg.build.f_cpu=40000000L
-#fubarino_mini_dbg.build.core=pic32
-#fubarino_mini_dbg.build.variant=Fubarino_Mini
-#
-############################################################
diff --git a/hardware/pic32/variants/Fubarino_SD/boards.txt b/hardware/pic32/variants/Fubarino_SD/boards.txt
@@ -12,6 +12,9 @@ fubarino_sd_seeed.upload.protocol=stk500v2
 fubarino_sd_seeed.upload.maximum_size=258048
 fubarino_sd_seeed.upload.speed=115200
 
+fubarino_sd_seeed.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+fubarino_sd_seeed.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+
 fubarino_sd_seeed.bootloader.low_fuses=0xff
 fubarino_sd_seeed.bootloader.high_fuses=0xdd
 fubarino_sd_seeed.bootloader.extended_fuses=0x00

diff --git a/hardware/pic32/variants/Olimex_PIC32_Pinguino/boards.txt b/hardware/pic32/variants/Olimex_PIC32_Pinguino/boards.txt
@@ -8,6 +8,9 @@ Olimex_Pinguino32.board.define=-D_USE_USB_FOR_SERIAL_
 Olimex_Pinguino32.ccflags=ffff
 Olimex_Pinguino32.ldscript=chipKIT-application-32MX440F256.ld
 
+Olimex_Pinguino32.compiler.c.flags=-O2 -c -mno-smart-io -w -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+Olimex_Pinguino32.compiler.cpp.flags=-O2 -c -mno-smart-io -w -fno-exceptions -ffunction-sections -fdata-sections -G1024 -g -mdebugger -Wcast-align -fno-short-double -fframe-base-loclist -ftoplevel-reorder
+
 Olimex_Pinguino32.upload.protocol=stk500v2
 Olimex_Pinguino32.upload.maximum_size=258048
 Olimex_Pinguino32.upload.speed=115200