fixed merging

1 files changed, 37 insertions, 1 deletions

diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
index 5271c27957..992679f472 100644
--- a/keyboard/planck/Makefile
+++ b/keyboard/planck/Makefile
@@ -38,6 +38,27 @@
 # To rebuild project do "make clean" then "make all".
 #----------------------------------------------------------------------------
 
+# Build Options
+#   change to "no" to disable the options, or define them in the makefile.mk in 
+#   the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = yes        # Console for debug(+400)
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # USB Nkey Rollover - if this doesn't work, see here: 
+                            # https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = no           # Audio output on port C6
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+
 # Target file name (without extension).
 TARGET = planck
 
@@ -62,17 +83,28 @@ ifneq ("$(wildcard keymaps/$(KEYMAP).c)","")
 else
 ifneq ("$(wildcard keymaps/$(KEYMAP)/keymap.c)","")
 	KEYMAP_FILE = keymaps/$(KEYMAP)/keymap.c
+ifneq ("$(wildcard keymaps/$(KEYMAP)/makefile.mk)","")
+	include keymaps/$(KEYMAP)/makefile.mk
+endif
 else
 $(error Keymap file does not exist)
+endif 
 endif
-endif
+
 else
+
 ifneq ("$(wildcard keymaps/default.c)","")
 	KEYMAP_FILE = keymaps/default.c
 else
 	KEYMAP_FILE = keymaps/default/keymap.c
 endif
+
+ifneq ("$(wildcard keymaps/default/makefile.mk)","")
+	include keymaps/default/makefile.mk
+endif
+
 endif
+
 SRC := $(KEYMAP_FILE) $(SRC)
 
 CONFIG_H = config.h
@@ -127,6 +159,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 
+<<<<<<< HEAD
 # Build Options
 #   comment out to disable the options.
 #
@@ -148,6 +181,9 @@ NKRO_ENABLE = yes           # USB Nkey Rollover - if this doesn't work, see here
 
 
 ifdef BACKLIGHT_ENABLE
+=======
+ifeq ($(BACKLIGHT_ENABLE), yes)
+>>>>>>> master
 	SRC += backlight.c
 endif