diff --git a/flight/targets/boards/oplinkmini/board-info.mk b/flight/targets/boards/oplinkmini/board-info.mk
index d106c63f1..b275d535e 100644
--- a/flight/targets/boards/oplinkmini/board-info.mk
+++ b/flight/targets/boards/oplinkmini/board-info.mk
@@ -14,13 +14,13 @@ OPENOCD_CONFIG      := stm32f1x.stlink.cfg
 
 # Flash memory map for OPLM:
 # Sector	start			size	use
-# 0			0x0800 0000		1k		BL
-# 1			0x0800 0400		1k		BL
-# ..								..
+# 0		0x0800 0000		1k		BL
+# 1		0x0800 0400		1k		BL
+# ..		..
 # 10		0x0800 2C00		1k		BL
 # 11		0x0800 3000		1k		FW
 # 12		0x0800 1000		1k		FW
-# ..								..
+# ..		..
 # 125 		0x0801 F400		1k		FW
 # 126 		0x0801 F800		1k		EE
 # 127 		0x0801 FC00		1k		EE
diff --git a/flight/targets/boards/oplinkmini/firmware/Makefile b/flight/targets/boards/oplinkmini/firmware/Makefile
index 78fe7efb7..ffbbe8213 100644
--- a/flight/targets/boards/oplinkmini/firmware/Makefile
+++ b/flight/targets/boards/oplinkmini/firmware/Makefile
@@ -56,9 +56,6 @@ else
     SRC += $(OPTESTS)/$(TESTAPP).c
 endif
 
-CDEFS += -DEE_BANK_BASE=$(EE_BANK_BASE)
-CDEFS += -DEE_BANK_SIZE=$(EE_BANK_SIZE)
-
 # Optional component libraries
 include $(FLIGHTLIB)/rscode/library.mk
 
diff --git a/flight/targets/boards/osd/board-info.mk b/flight/targets/boards/osd/board-info.mk
index ddd93d3cf..8b9bd4e9d 100644
--- a/flight/targets/boards/osd/board-info.mk
+++ b/flight/targets/boards/osd/board-info.mk
@@ -14,19 +14,19 @@ OPENOCD_CONFIG      := stm32f4xx.stlink.cfg
 #OPENOCD_CONFIG      := stm32f4xx.cfg
 
 # Flash memory map for OSD:
-# Sector	start			size	use
-# 0			0x0800 0000		16k		BL
-# 1			0x0800 4000		16k		BL
-# 2			0x0800 8000		16k		EE
-# 3			0x0800 C000		16k		EE
-# 4			0x0801 0000		64k		Unused
-# 5			0x0802 0000		128k	FW
-# 6			0x0804 0000		128k	FW
-# 7 		0x0806 0000		128k	FW
-# 8 		0x0808 0000		128k	Unused
-# 9			0x080A 0000		128k	Unused
-# 10		0x080C 0000		128k	Unused						..
-# 11		0x080E 0000		128k   	Unused
+# Sector	start		size	use
+# 0		0x0800 0000	16k	BL
+# 1		0x0800 4000	16k	BL
+# 2		0x0800 8000	16k	EE
+# 3		0x0800 C000	16k	EE
+# 4		0x0801 0000	64k	Unused
+# 5		0x0802 0000	128k	FW
+# 6		0x0804 0000	128k	FW
+# 7 		0x0806 0000	128k	FW
+# 8 		0x0808 0000	128k	Unused
+# 9		0x080A 0000	128k	Unused
+# 10		0x080C 0000	128k	Unused						..
+# 11		0x080E 0000	128k	Unused
 
 # Note: These must match the values in link_$(BOARD)_memory.ld
 BL_BANK_BASE        := 0x08000000  # Start of bootloader flash
diff --git a/flight/targets/boards/osd/firmware/Makefile b/flight/targets/boards/osd/firmware/Makefile
index 211fd65c8..77f7f22ae 100644
--- a/flight/targets/boards/osd/firmware/Makefile
+++ b/flight/targets/boards/osd/firmware/Makefile
@@ -99,8 +99,6 @@ else
     SRC += $(OPTESTS)/test_common.c
     SRC += $(OPTESTS)/$(TESTAPP).c
 endif
-
-
 	
 # Optional component libraries
 include $(PIOS)/common/libraries/dosfs/library.mk
diff --git a/flight/targets/boards/revolution/board-info.mk b/flight/targets/boards/revolution/board-info.mk
index 049a8a4f8..f59f4e90f 100644
--- a/flight/targets/boards/revolution/board-info.mk
+++ b/flight/targets/boards/revolution/board-info.mk
@@ -13,19 +13,19 @@ OPENOCD_JTAG_CONFIG := stlink-v2.cfg
 OPENOCD_CONFIG      := stm32f4xx.stlink.cfg
 
 # Flash memory map for Revolution:
-# Sector	start			size	use
-# 0			0x0800 0000		16k		BL
-# 1			0x0800 4000		16k		BL
-# 2			0x0800 8000		16k		EE
-# 3			0x0800 C000		16k		EE
-# 4			0x0801 0000		64k		Unused
-# 5			0x0802 0000		128k	FW
-# 6			0x0804 0000		128k	FW
-# 7 		0x0806 0000		128k	FW
-# 8 		0x0808 0000		128k	Unused
-# 9			0x080A 0000		128k	Unused
-# 10		0x080C 0000		128k	Unused						..
-# 11		0x080E 0000		128k   	Unused
+# Sector	start		size	use
+# 0		0x0800 0000	16k	BL
+# 1		0x0800 4000	16k	BL
+# 2		0x0800 8000	16k	EE
+# 3		0x0800 C000	16k	EE
+# 4		0x0801 0000	64k	Unused
+# 5		0x0802 0000	128k	FW
+# 6		0x0804 0000	128k	FW
+# 7 		0x0806 0000	128k	FW
+# 8 		0x0808 0000	128k	Unused
+# 9		0x080A 0000	128k	Unused
+# 10		0x080C 0000	128k	Unused						..
+# 11		0x080E 0000	128k   	Unused
 
 # Note: These must match the values in link_$(BOARD)_memory.ld
 BL_BANK_BASE        := 0x08000000  # Start of bootloader flash
diff --git a/make/common-defs.mk b/make/common-defs.mk
index 4b136efff..80746d8cf 100644
--- a/make/common-defs.mk
+++ b/make/common-defs.mk
@@ -136,9 +136,10 @@ BOARD_CDEFS += -DFW_DESC_SIZE=$(FW_DESC_SIZE)
 BOARD_CDEFS += -DBL_BANK_BASE=$(BL_BANK_BASE)
 BOARD_CDEFS += -DBL_BANK_SIZE=$(BL_BANK_SIZE)
 BOARD_CDEFS += -DBL_DESC_SIZE=$(BL_DESC_SIZE)
-
+ifdef EE_BANK_BASE
 BOARD_CDEFS += -DEE_BANK_BASE=$(EE_BANK_BASE)
 BOARD_CDEFS += -DEE_BANK_SIZE=$(EE_BANK_SIZE)
+endif
 CDEFS += $(BOARD_CDEFS)
 
 ifeq ($(DEBUG), YES)