Change build order for post_config and post_rules

This changes the order so that the they are processed Keyboard > User > keymap, to maintain proper generic to specific flow.  This also properly includes post_rules.mk support for userspace

build_keyboard.mk

@@ -112,6 +112,15 @@ MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
 INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_rules.mk)
 include $(INFO_RULES_MK)
 
+# Userspace setup and definitions
+ifeq ("$(USER_NAME)","")
+    USER_NAME := $(KEYMAP)
+endif
+USER_PATH := users/$(USER_NAME)
+
+# Pull in user level rules.mk between keyboard and keymap level
+-include $(USER_PATH)/rules.mk
+
 # Check for keymap.json first, so we can regenerate keymap.c
 include build_json.mk
 
@@ -340,17 +349,12 @@ generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/def
 
 .INTERMEDIATE : generated-files
 
-# Userspace setup and definitions
-ifeq ("$(USER_NAME)","")
-    USER_NAME := $(KEYMAP)
-endif
-USER_PATH := users/$(USER_NAME)
-
-# Pull in user level rules.mk
--include $(USER_PATH)/rules.mk
+# Pull in Userspace config
 ifneq ("$(wildcard $(USER_PATH)/config.h)","")
     CONFIG_H += $(USER_PATH)/config.h
 endif
+
+# Pull in Userspace post_config
 ifneq ("$(wildcard $(USER_PATH)/post_config.h)","")
     POST_CONFIG_H += $(USER_PATH)/post_config.h
 endif
@@ -375,6 +379,10 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_rules.mk)","")
     include $(KEYBOARD_PATH_5)/post_rules.mk
 endif
 
+ifneq ("$(wildcard $(USER_PATH)/post_rules.mk)","")
+    include $(USER_PATH)/post_rules.mk
+endif
+
 ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
     CONFIG_H += $(KEYMAP_PATH)/config.h
 endif

docs/hardware_keyboard_guidelines.md

@@ -88,12 +88,14 @@ The `config.h` files can also be placed in sub-folders, and the order in which t
       * `keyboards/top_folder/sub_1/sub_2/sub_3/config.h`
         * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/config.h`
           * `users/a_user_folder/config.h`
-          * `keyboards/top_folder/keymaps/a_keymap/config.h`
-        * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/post_config.h`
-      * `keyboards/top_folder/sub_1/sub_2/sub_3/post_config.h`
-    * `keyboards/top_folder/sub_1/sub_2/post_config.h`
-  * `keyboards/top_folder/sub_1/post_config.h`
-* `keyboards/top_folder/post_config.h`
+            * `keyboards/top_folder/keymaps/a_keymap/config.h`
+          * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/post_config.h`
+        * `keyboards/top_folder/sub_1/sub_2/sub_3/post_config.h`
+      * `keyboards/top_folder/sub_1/sub_2/post_config.h`
+    * `keyboards/top_folder/sub_1/post_config.h`
+  * `keyboards/top_folder/post_config.h`
+* `users/a_user_folder/post_config.h`
+
 
 The `post_config.h` file can be used for additional post-processing, depending on what is specified in the `config.h` file. For example, if you define the `IOS_DEVICE_ENABLE` macro in your keymap-level `config.h` file as follows, you can configure more detailed settings accordingly in the `post_config.h` file:
 
@@ -142,13 +144,14 @@ The `rules.mk` file can also be placed in a sub-folder, and its reading order is
     * `keyboards/top_folder/sub_1/sub_2/rules.mk`
       * `keyboards/top_folder/sub_1/sub_2/sub_3/rules.mk`
         * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/rules.mk`
-          * `keyboards/top_folder/keymaps/a_keymap/rules.mk`
           * `users/a_user_folder/rules.mk`
-        * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/post_rules.mk`
-      * `keyboards/top_folder/sub_1/sub_2/sub_3/post_rules.mk`
-    * `keyboards/top_folder/sub_1/sub_2/post_rules.mk`
-  * `keyboards/top_folder/sub_1/post_rules.mk`
-* `keyboards/top_folder/post_rules.mk`
+            * `keyboards/top_folder/keymaps/a_keymap/rules.mk`
+          * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/post_rules.mk`
+        * `keyboards/top_folder/sub_1/sub_2/sub_3/post_rules.mk`
+      * `keyboards/top_folder/sub_1/sub_2/post_rules.mk`
+    * `keyboards/top_folder/sub_1/post_rules.mk`
+  * `keyboards/top_folder/post_rules.mk`
+* `users/a_user_folder/post_rules.mk`
 * `common_features.mk`
 
 Many of the settings written in the `rules.mk` file are interpreted by `common_features.mk`, which sets the necessary source files and compiler options.