From 62eed0e4a3a6ea13ec130ac7acd25d935917344f Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 21 Nov 2017 21:26:29 -0500 Subject: [PATCH] Update config_options.md --- docs/config_options.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/config_options.md b/docs/config_options.md index a3a918be7f4..d971f1b69b6 100644 --- a/docs/config_options.md +++ b/docs/config_options.md @@ -27,7 +27,9 @@ This level contains all of the options for that particular keymap. If you wish t # The `config.h` file -This is a C header file that is one of the first things included, and will persist over the whole project (if included). Lots of variables can be set here and accessed elsewhere. +This is a C header file that is one of the first things included, and will persist over the whole project (if included). Lots of variables can be set here and accessed elsewhere. The `config.h` file shouldn't be including other `config.h` files, or anything besides this: + + #include "config_common.h" ## `config.h` Options @@ -179,7 +181,13 @@ This is a [make](https://www.gnu.org/software/make/manual/make.html) file that i * `ARCH = AVR8` * `F_USB = $(F_CPU)` * `OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT` -* `OPT_DEFS += -DBOOTLOADER_SIZE=4096` +* `BOOTLOADER = atmel-dfu` with the following options: + * `atmel-dfu` + * `lufa-dfu` + * `qmk-dfu` + * `halfkay` + * `caterina` + * `bootloadHID` ### Feature Options