Index: boot/Makefile
===================================================================
--- boot/Makefile	(revision 48c3d504fc31a177cd3f40efea0b99148bde9b18)
+++ boot/Makefile	(revision 6c1f763345792a110b75308039d34e7caceeef1d)
@@ -31,4 +31,5 @@
 
 -include ../Makefile.config
+-include ../config.defs
 
 ## Paths
@@ -39,21 +40,9 @@
 USPACEDIR = $(BASE)/uspace
 
-ifeq ($(CONFIG_DEBUG),y)
-	DEFS += -DCONFIG_DEBUG
-endif
-
-ifeq ($(CONFIG_BAT),y)
-	DEFS += -DCONFIG_BAT
-endif
-
-ifeq ($(CONFIG_AP),y)
-	DEFS += -DCONFIG_AP
-endif
-
 .PHONY: all build clean generic_clean
 
-all: ../Makefile.config build
+all: ../Makefile.config ../config.h ../config.defs build
 
--include arch/$(ARCH)/Makefile.inc
+-include arch/$(BARCH)/Makefile.inc
 
 generic_clean: