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>

diff --git a/board/freescale/b4860qds/Makefile b/board/freescale/b4860qds/Makefile
index 0acd2a9aa4a02e3ad2b495ecb80e61610f644aff..673d2ea56ae5a1e62bb296982f4c4ff1f1cf2f5a 100644 (file)
--- a/board/freescale/b4860qds/Makefile
+++ b/board/freescale/b4860qds/Makefile
@@ -5,11 +5,11 @@
 #
 
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y  += spl.o
 else
 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
 
 obj-y  += ddr.o

diff --git a/board/freescale/bsc9131rdb/Makefile b/board/freescale/bsc9131rdb/Makefile
index b26d3a1e63d62a24d10d3a855fab685ecdfb50fe..8027750efbda1470e6ad3141a4bfbe0db80c9e65 100644 (file)
--- a/board/freescale/bsc9131rdb/Makefile
+++ b/board/freescale/bsc9131rdb/Makefile
@@ -13,15 +13,11 @@ endif
 endif
 
 ifdef MINIMAL
-
-obj-y  += spl_minimal.o tlb.o law.o
-
+obj-y  += spl_minimal.o
 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
+
+obj-y  += law.o
+obj-y  += tlb.o

diff --git a/board/freescale/bsc9132qds/Makefile b/board/freescale/bsc9132qds/Makefile
index 2e4170f512f667b464259db351163f0206af5e54..54193350afd36b74fe1ea14075d0249e3c78c28a 100644 (file)
--- a/board/freescale/bsc9132qds/Makefile
+++ b/board/freescale/bsc9132qds/Makefile
@@ -13,14 +13,11 @@ endif
 endif
 
 ifdef MINIMAL
-
-obj-y  += spl_minimal.o tlb.o law.o
-
+obj-y  += spl_minimal.o
 else
-
 obj-y  += bsc9132qds.o
 obj-y  += ddr.o
+endif
+
 obj-y  += law.o
 obj-y  += tlb.o
-
-endif

diff --git a/board/freescale/c29xpcie/Makefile b/board/freescale/c29xpcie/Makefile
index 818484a57dc8ca49b1887340b8e7504054ef0a70..93b3cba03181dd4a098b0d723523a5abce247a43 100644 (file)
--- a/board/freescale/c29xpcie/Makefile
+++ b/board/freescale/c29xpcie/Makefile
@@ -11,15 +11,15 @@ endif
 endif
 
 ifdef MINIMAL
-obj-y  += spl_minimal.o tlb.o law.o
+obj-y  += spl_minimal.o
 else
 ifdef CONFIG_SPL_BUILD
 obj-y  += spl.o
 endif
-
 obj-y  += c29xpcie.o
 obj-y  += cpld.o
 obj-y  += ddr.o
+endif
+
 obj-y  += law.o
 obj-y  += tlb.o
-endif

diff --git a/board/freescale/p1010rdb/Makefile b/board/freescale/p1010rdb/Makefile
index 660d1bbc2aaf7671b72bbca2dc50070c937aae55..86eb6946dd12744fcb74deef9b0208fe11327d6e 100644 (file)
--- a/board/freescale/p1010rdb/Makefile
+++ b/board/freescale/p1010rdb/Makefile
@@ -13,18 +13,14 @@ endif
 endif
 
 ifdef MINIMAL
-
-obj-y  += spl_minimal.o tlb.o law.o
-
+obj-y  += spl_minimal.o
 else
-
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y  += spl.o
 endif
-
 obj-y  += p1010rdb.o
 obj-y  += ddr.o
+endif
+
 obj-y  += law.o
 obj-y  += tlb.o
-
-endif

diff --git a/board/freescale/p1022ds/Makefile b/board/freescale/p1022ds/Makefile
index a5821277ef7be0536cf6b16ba81c5063ed373235..9793853463c67f5b6d210f2bdd69dbfef52027a9 100644 (file)
--- a/board/freescale/p1022ds/Makefile
+++ b/board/freescale/p1022ds/Makefile
@@ -13,17 +13,15 @@ endif
 endif
 
 ifdef MINIMAL
-
-obj-y        += spl_minimal.o tlb.o law.o
-
+obj-y  += spl_minimal.o
 else
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y  += spl.o
 endif
 obj-y  += p1022ds.o
 obj-y  += ddr.o
-obj-y  += law.o
-obj-y  += tlb.o
-
 obj-$(CONFIG_FSL_DIU_FB) += diu.o
 endif
+
+obj-y  += law.o
+obj-y  += tlb.o

diff --git a/board/freescale/p1_p2_rdb_pc/Makefile b/board/freescale/p1_p2_rdb_pc/Makefile
index a2a1f92ce86adf2165677c0bd58538a6ac405f11..045d4093aecd0e307da0c2eada300946fa4a2d80 100644 (file)
--- a/board/freescale/p1_p2_rdb_pc/Makefile
+++ b/board/freescale/p1_p2_rdb_pc/Makefile
@@ -13,17 +13,14 @@ endif
 endif
 
 ifdef MINIMAL
-
-obj-y  += spl_minimal.o tlb.o law.o
-
+obj-y  += spl_minimal.o
 else
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y  += spl.o
 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
+
+obj-y  += law.o
+obj-y  += tlb.o

diff --git a/board/freescale/p2041rdb/Makefile b/board/freescale/p2041rdb/Makefile
index c74f4c62f86142db60c880bfd4b0099dd7339fc1..a335ec65fafed89a9c68d5fc720a8463d53bb4bb 100644 (file)
--- a/board/freescale/p2041rdb/Makefile
+++ b/board/freescale/p2041rdb/Makefile
@@ -7,6 +7,6 @@
 #
 
 obj-y  += p2041rdb.o
-obj-y += cpld.o
+obj-y  += cpld.o
 obj-y  += ddr.o
 obj-y  += eth.o

diff --git a/board/freescale/t102xqds/Makefile b/board/freescale/t102xqds/Makefile
index d94f2307d9b50802b080155317c6748b34c206ce..afbc9146ed805d153826ef83b1b1867589870116 100644 (file)
--- a/board/freescale/t102xqds/Makefile
+++ b/board/freescale/t102xqds/Makefile
@@ -5,7 +5,7 @@
 #
 
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y  += spl.o
 else
 obj-y  += t102xqds.o
 obj-y  += eth_t102xqds.o

diff --git a/board/freescale/t102xrdb/Makefile b/board/freescale/t102xrdb/Makefile
index 052006610e6d3b211d317a517930bef02bd9e9a7..64528656aca8bd821093ebec25c93370682532f7 100644 (file)
--- a/board/freescale/t102xrdb/Makefile
+++ b/board/freescale/t102xrdb/Makefile
@@ -5,7 +5,7 @@
 #
 
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y  += spl.o
 else
 obj-y   += t102xrdb.o
 obj-$(CONFIG_T1024RDB)   += cpld.o

diff --git a/board/freescale/t208xqds/Makefile b/board/freescale/t208xqds/Makefile
index 6cb72c9fd5dce24158f1930079ba692002a7192e..ef04a26463f9f6ff07d7beedc66559659ca0f031 100644 (file)
--- a/board/freescale/t208xqds/Makefile
+++ b/board/freescale/t208xqds/Makefile
@@ -7,10 +7,8 @@
 ifdef CONFIG_SPL_BUILD
 obj-y += spl.o
 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
 endif
 

diff --git a/board/freescale/t208xrdb/Makefile b/board/freescale/t208xrdb/Makefile
index 9605f8b606c5e27927befe14b2b25c4ce2922ba6..cd8fe096d82426d48f1aa7eb9b9bebbf9cc62a1e 100644 (file)
--- a/board/freescale/t208xrdb/Makefile
+++ b/board/freescale/t208xrdb/Makefile
@@ -5,11 +5,9 @@
 #
 
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y  += spl.o
 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
 endif
 

diff --git a/board/freescale/t4qds/Makefile b/board/freescale/t4qds/Makefile
index bd2c1f16222a1bd0a226cbed457b690936bfa4e8..731ccb0b295c1fcc255b38408f6b982f04391bd8 100644 (file)
--- a/board/freescale/t4qds/Makefile
+++ b/board/freescale/t4qds/Makefile
@@ -5,12 +5,12 @@
 #
 
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y  += spl.o
 else
-obj-$(CONFIG_T4240QDS) += t4240qds.o
-obj-$(CONFIG_T4240QDS)+= eth.o
+obj-$(CONFIG_T4240QDS) += t4240qds.o eth.o
 obj-$(CONFIG_PCI)      += pci.o
 endif
+
 obj-y  += ddr.o
 obj-y  += law.o
 obj-y  += tlb.o

diff --git a/board/freescale/t4rdb/Makefile b/board/freescale/t4rdb/Makefile
index 83b55ee193460f4ad2bce1a6640ad05a312e7ece..4f29eea0f45985da2f263ae5bdb74183347dd980 100644 (file)
--- a/board/freescale/t4rdb/Makefile
+++ b/board/freescale/t4rdb/Makefile
@@ -5,13 +5,14 @@
 #
 
 ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y  += spl.o
 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
 endif
+
 obj-y  += ddr.o
 obj-y  += law.o
 obj-y  += tlb.o