Browse Source

freescale: Tweak various Makefiles to remove redundancy, fix aesthetics

No intended functional change, just remove redundancies in some
Makefiles, and make whitespace aesthetics uniform.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Reviewed-by: York Sun <york.sun@nxp.com>
Robert P. J. Day 9 years ago
parent
commit
23d4e5ba49

+ 3 - 3
board/freescale/b4860qds/Makefile

@@ -5,11 +5,11 @@
 #
 #
 
 
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y	+= spl.o
 else
 else
 obj-y	+= b4860qds.o
 obj-y	+= b4860qds.o
-obj-$(CONFIG_B4860QDS)+= eth_b4860qds.o
-obj-$(CONFIG_PCI)      += pci.o
+obj-$(CONFIG_B4860QDS)	+= eth_b4860qds.o
+obj-$(CONFIG_PCI)	+= pci.o
 endif
 endif
 
 
 obj-y	+= ddr.o
 obj-y	+= ddr.o

+ 6 - 10
board/freescale/bsc9131rdb/Makefile

@@ -13,15 +13,11 @@ endif
 endif
 endif
 
 
 ifdef MINIMAL
 ifdef MINIMAL
-
-obj-y	+= spl_minimal.o tlb.o law.o
-
+obj-y	+= spl_minimal.o
 else
 else
-
-obj-y        += bsc9131rdb.o
-obj-y        += ddr.o
-obj-y        += law.o
-obj-y        += tlb.o
-#obj-y		+= bsc9131rdb_mux.o
-
+obj-y	+= bsc9131rdb.o
+obj-y	+= ddr.o
 endif
 endif
+
+obj-y	+= law.o
+obj-y	+= tlb.o

+ 3 - 6
board/freescale/bsc9132qds/Makefile

@@ -13,14 +13,11 @@ endif
 endif
 endif
 
 
 ifdef MINIMAL
 ifdef MINIMAL
-
-obj-y	+= spl_minimal.o tlb.o law.o
-
+obj-y	+= spl_minimal.o
 else
 else
-
 obj-y	+= bsc9132qds.o
 obj-y	+= bsc9132qds.o
 obj-y	+= ddr.o
 obj-y	+= ddr.o
+endif
+
 obj-y	+= law.o
 obj-y	+= law.o
 obj-y	+= tlb.o
 obj-y	+= tlb.o
-
-endif

+ 3 - 3
board/freescale/c29xpcie/Makefile

@@ -11,15 +11,15 @@ endif
 endif
 endif
 
 
 ifdef MINIMAL
 ifdef MINIMAL
-obj-y	+= spl_minimal.o tlb.o law.o
+obj-y	+= spl_minimal.o
 else
 else
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_BUILD
 obj-y	+= spl.o
 obj-y	+= spl.o
 endif
 endif
-
 obj-y	+= c29xpcie.o
 obj-y	+= c29xpcie.o
 obj-y	+= cpld.o
 obj-y	+= cpld.o
 obj-y	+= ddr.o
 obj-y	+= ddr.o
+endif
+
 obj-y	+= law.o
 obj-y	+= law.o
 obj-y	+= tlb.o
 obj-y	+= tlb.o
-endif

+ 4 - 8
board/freescale/p1010rdb/Makefile

@@ -13,18 +13,14 @@ endif
 endif
 endif
 
 
 ifdef MINIMAL
 ifdef MINIMAL
-
-obj-y	+= spl_minimal.o tlb.o law.o
-
+obj-y	+= spl_minimal.o
 else
 else
-
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y	+= spl.o
 endif
 endif
-
 obj-y	+= p1010rdb.o
 obj-y	+= p1010rdb.o
 obj-y	+= ddr.o
 obj-y	+= ddr.o
+endif
+
 obj-y	+= law.o
 obj-y	+= law.o
 obj-y	+= tlb.o
 obj-y	+= tlb.o
-
-endif

+ 5 - 7
board/freescale/p1022ds/Makefile

@@ -13,17 +13,15 @@ endif
 endif
 endif
 
 
 ifdef MINIMAL
 ifdef MINIMAL
-
-obj-y        += spl_minimal.o tlb.o law.o
-
+obj-y	+= spl_minimal.o
 else
 else
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y	+= spl.o
 endif
 endif
 obj-y	+= p1022ds.o
 obj-y	+= p1022ds.o
 obj-y	+= ddr.o
 obj-y	+= ddr.o
-obj-y	+= law.o
-obj-y	+= tlb.o
-
 obj-$(CONFIG_FSL_DIU_FB) += diu.o
 obj-$(CONFIG_FSL_DIU_FB) += diu.o
 endif
 endif
+
+obj-y	+= law.o
+obj-y	+= tlb.o

+ 7 - 10
board/freescale/p1_p2_rdb_pc/Makefile

@@ -13,17 +13,14 @@ endif
 endif
 endif
 
 
 ifdef MINIMAL
 ifdef MINIMAL
-
-obj-y	+= spl_minimal.o tlb.o law.o
-
+obj-y	+= spl_minimal.o
 else
 else
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y	+= spl.o
 endif
 endif
-
-obj-y        += p1_p2_rdb_pc.o
-obj-y        += ddr.o
-obj-y        += law.o
-obj-y        += tlb.o
-
+obj-y	+= p1_p2_rdb_pc.o
+obj-y	+= ddr.o
 endif
 endif
+
+obj-y	+= law.o
+obj-y	+= tlb.o

+ 1 - 1
board/freescale/p2041rdb/Makefile

@@ -7,6 +7,6 @@
 #
 #
 
 
 obj-y	+= p2041rdb.o
 obj-y	+= p2041rdb.o
-obj-y += cpld.o
+obj-y	+= cpld.o
 obj-y	+= ddr.o
 obj-y	+= ddr.o
 obj-y	+= eth.o
 obj-y	+= eth.o

+ 1 - 1
board/freescale/t102xqds/Makefile

@@ -5,7 +5,7 @@
 #
 #
 
 
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y	+= spl.o
 else
 else
 obj-y	+= t102xqds.o
 obj-y	+= t102xqds.o
 obj-y	+= eth_t102xqds.o
 obj-y	+= eth_t102xqds.o

+ 1 - 1
board/freescale/t102xrdb/Makefile

@@ -5,7 +5,7 @@
 #
 #
 
 
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y	+= spl.o
 else
 else
 obj-y   += t102xrdb.o
 obj-y   += t102xrdb.o
 obj-$(CONFIG_T1024RDB)   += cpld.o
 obj-$(CONFIG_T1024RDB)   += cpld.o

+ 2 - 4
board/freescale/t208xqds/Makefile

@@ -7,10 +7,8 @@
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_BUILD
 obj-y += spl.o
 obj-y += spl.o
 else
 else
-obj-$(CONFIG_T2080QDS) += t208xqds.o
-obj-$(CONFIG_T2080QDS) += eth_t208xqds.o
-obj-$(CONFIG_T2081QDS) += t208xqds.o
-obj-$(CONFIG_T2081QDS) += eth_t208xqds.o
+obj-$(CONFIG_T2080QDS) += t208xqds.o eth_t208xqds.o
+obj-$(CONFIG_T2081QDS) += t208xqds.o eth_t208xqds.o
 obj-$(CONFIG_PCI)      += pci.o
 obj-$(CONFIG_PCI)      += pci.o
 endif
 endif
 
 

+ 2 - 4
board/freescale/t208xrdb/Makefile

@@ -5,11 +5,9 @@
 #
 #
 
 
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y	+= spl.o
 else
 else
-obj-$(CONFIG_T2080RDB) += t208xrdb.o
-obj-$(CONFIG_T2080RDB) += eth_t208xrdb.o
-obj-$(CONFIG_T2080RDB) += cpld.o
+obj-$(CONFIG_T2080RDB) += t208xrdb.o eth_t208xrdb.o cpld.o
 obj-$(CONFIG_PCI)      += pci.o
 obj-$(CONFIG_PCI)      += pci.o
 endif
 endif
 
 

+ 3 - 3
board/freescale/t4qds/Makefile

@@ -5,12 +5,12 @@
 #
 #
 
 
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y	+= spl.o
 else
 else
-obj-$(CONFIG_T4240QDS) += t4240qds.o
-obj-$(CONFIG_T4240QDS)+= eth.o
+obj-$(CONFIG_T4240QDS)	+= t4240qds.o eth.o
 obj-$(CONFIG_PCI)	+= pci.o
 obj-$(CONFIG_PCI)	+= pci.o
 endif
 endif
+
 obj-y	+= ddr.o
 obj-y	+= ddr.o
 obj-y	+= law.o
 obj-y	+= law.o
 obj-y	+= tlb.o
 obj-y	+= tlb.o

+ 5 - 4
board/freescale/t4rdb/Makefile

@@ -5,13 +5,14 @@
 #
 #
 
 
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y	+= spl.o
 else
 else
-obj-$(CONFIG_T4240RDB) += t4240rdb.o
-obj-y	+= cpld.o
-obj-y	+= eth.o
+obj-$(CONFIG_T4240RDB)	+= t4240rdb.o
+obj-y			+= cpld.o
+obj-y			+= eth.o
 obj-$(CONFIG_PCI)	+= pci.o
 obj-$(CONFIG_PCI)	+= pci.o
 endif
 endif
+
 obj-y	+= ddr.o
 obj-y	+= ddr.o
 obj-y	+= law.o
 obj-y	+= law.o
 obj-y	+= tlb.o
 obj-y	+= tlb.o