Merge remote-tracking branch 'origin/master' into develop

2 files changed, 2 insertions, 34 deletions

diff --git a/build_keyboard.mk b/build_keyboard.mk
index c12aa0fce0..6473e3e473 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -425,8 +425,7 @@ OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
 $(KEYMAP_OUTPUT)_SRC := $(SRC)
 $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) \
 -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" \
--DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
--DQMK_SUBPROJECT -DQMK_SUBPROJECT_H -DQMK_SUBPROJECT_CONFIG_H
+-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\"
 $(KEYMAP_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS)
 $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)
 $(KEYBOARD_OUTPUT)_SRC := $(PLATFORM_SRC)
diff --git a/keyboards/readme.md b/keyboards/readme.md
index a23d0845b2..856be49093 100644
--- a/keyboards/readme.md
+++ b/keyboards/readme.md
@@ -32,35 +32,4 @@ Designed and built in Felton, CA, Clueboards keyboard emphasize quality and loca
 
 These keyboards are part of the QMK repository, but their manufacturers are not official maintainers of the repository.
 
-* [9key](/keyboards/9key) — A 9-key minipad sold by Bishop Keyboards.
-* [Alps64](/keyboards/alps64) — A 60% keyboard for Alps keyswitches.
-* [AMJ60](/keyboards/amj60) — DIY/Assembled compact 60% keyboard.
-* [Arrow Pad](/keyboards/handwired/arrow_pad) — A custom creation by IBNobody.
-* [Atreus](/keyboards/atreus) — Made by Technomancy.
-* [Bantam44](/keyboards/bantam44) — It is a 44-key 40% staggered keyboard.
-* [DataHand](/keyboards/handwired/datahand) — DataHand keyboard converted to use a Teensy board.
-* [Ergodox Infinity](/keyboards/ergodox_infinity) - Ergonomic Split Keyboard by Input Club.
-* [GH60](/keyboards/gh60) — A 60% Geekhack community-driven project.
-* [GON NerD](/keyboards/gonnerd) — Korean custom 60% PCB
-* [Happy Hacking Keyboard](/keyboards/hhkb) — The Happy Hacking keyboard can be hacked with a custom controller to run QMK.
-* [Infinity 60%](/keyboards/infinity60) - — Compact community keyboard by Input Club.
-* [JD45](/keyboards/jd45) — Another Geekhack community project, designed by jdcarpe.
-* [JJ40](/keyboards/jj40) — ps2avrGB based ortholinear sold by KPrepublic
-* [JJ50](/keyboards/jj50) — A compact 50% (5x12) ortholinear keyboard sold by KPrepublic.
-* [KBD75](/keyboards/kbd75) — A 75% keyboard made by made by KBDFans.
-* [KC60](/keyboards/kc60) — A programmable Chinese-made keyboard, lost in the mists of time.
-* [Kinesis Advantage](/keyboards/kinesis) — Contoured ergonomic keyboard by Kinesis Computer Ergonomics.
-* [KMAC](/keyboards/kmac) — Korean custom keyboard.
-* [The Kitten Paw](/keyboards/kitten_paw) — A replacement controller (2016 revision) for the Filco Majestouch by [Bathroom Epiphanies](https://github.com/BathroomEpiphanies).
-* [Lets Split](/keyboards/lets_split) - Split ortholinear 40% keyboard.
-* [Phantom](/keyboards/phantom) — A tenkeyless kit by Teel, also from Geekhack.
-* [Retro Refit](/keyboards/handwired/retro_refit) — Another creation by IBNobody.
-* [S60-x](/keyboards/s60_x) — DIY compact keyboard designed by VinnyCordeiro for Sentraq.
-* [Satan](/keyboards/satan) — A GH60 variant.
-* [SixKeyBoard](/keyboards/sixkeyboard) — A 6-key keyboard made by TechKeys.
-* [TheVan 44](/keyboards/tv44) — A 44-key staggered keybard by Evangs.
-* [WhiteFox](/keyboards/whitefox) — A 65% keyboard designed as a partnership by matt3o, Massdrop and Input Club
-* [Vision Division](/keyboards/vision_division) — Full Size / Split Linear Keyboard by IBNobody.
-* [XD004](/keyboards/xd004) — 1x4 macro keyboard sold by KPrepublic.
-* [XD75](/keyboards/xd75) — 15x5 ortholinear keyboard by XIUDI.
-* [YMDK NP21](/keyboards/ymdk_np21) — ps2avrGB based number pad (numpad) sold by YMDK on Aliexpress.
+Since there are too many to list here and keep updated, please see the folder listing instead.