Skip to contentSkip to conversation

sbc8349: tidy up Makefile to use new configuration script.

PATCH New Paul Gortmaker 2 participants 2 messages Sep 21, 2009 – Sep 25, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sbc8349: tidy up Makefile to use new configuration script.

Commit 804d83a5 allows us to move all the configuration variation tweaks out of the top level Makefile and down into the board config header. This takes advantage of that for the sbc8349 board.

---
 Makefile                  |   15 +--------------
 include/configs/sbc8349.h |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 14 deletions(-)
Makefile +1 -14
index 0b61d05..b90be69 100644
@@ -2403,20 +2403,7 @@ MVBLM7_config: unconfig
 sbc8349_config \
 sbc8349_PCI_33_config \
 sbc8349_PCI_66_config: unconfig
-	@mkdir -p $(obj)include
-	@if [ "$(findstring _PCI_,$@)" ] ; then \
-		$(XECHO) -n "... PCI HOST at " ; \
-		echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
-	fi ; \
-	if [ "$(findstring _33_,$@)" ] ; then \
-		$(XECHO) -n "33MHz... " ; \
-		echo "#define PCI_33M" >>$(obj)include/config.h ; \
-	fi ; \
-	if [ "$(findstring _66_,$@)" ] ; then \
-		$(XECHO) -n "66MHz... " ; \
-		echo "#define PCI_66M" >>$(obj)include/config.h ; \
-	fi ;
-	@$(MKCONFIG) -a sbc8349 ppc mpc83xx sbc8349
+	@$(MKCONFIG) -t $(@:_config=) sbc8349 ppc mpc83xx sbc8349
 
 SIMPC8313_LP_config \
 SIMPC8313_SP_config: unconfig
include/configs/sbc8349.h +15 -0
index e961bb3..6f574ca 100644
@@ -32,6 +32,21 @@
 #define __CONFIG_H
 
 /*
+ * Top level Makefile configuration choices
+ */
+#ifdef CONFIG_MK_PCI
+#define CONFIG_PCI
+#endif
+
+#ifdef CONFIG_MK_66
+#define PCI_66M
+#endif
+
+#ifdef CONFIG_MK_33
+#define PCI_33M
+#endif
+
+/*
  * High Level Configuration Options
  */
 #define CONFIG_E300		1	/* E300 Family */
Signature · 1 line
1.6.4.1
Applied
#1 lore raw

PATCH 1/1 sbc8349: tidy up Makefile to use new configuration script.

Quoted 7 lines · On Mon, 21 Sep 2009 17:44:51 -0400 Paul Gortmaker…

Commit 804d83a5 allows us to move all the configuration variation tweaks out of the top level Makefile and down into the board config header. This takes advantage of that for the sbc8349 board.

---

applied.

Thanks,

Kim