summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2009-09-21 17:44:51 -0400
committerKim Phillips <kim.phillips@freescale.com>2009-09-25 18:27:54 -0500
commit00ec0ff549b8cb6fb6d40e275aeb5a460642a3bd (patch)
treebc7e007fc7efee4260a40a84c4ca0154e9fabc30
parentda6eea0f48c24a318e6de69d6bca0bb5ab70572b (diff)
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. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
-rw-r--r--Makefile15
-rw-r--r--include/configs/sbc8349.h15
2 files changed, 16 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 9c5b2a5c9a3..8ab864d0cb2 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index e961bb3929f..6f574ca6bf4 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -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 */