From 53efa1f1acacacb76fa9a21b09b3294783a11c03 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Thu, 6 Aug 2009 18:28:34 -0500
Subject: [PATCH] 85xx: Remove redudant PLATFORM_CPPFLAGS

For historic reasons we had defined some additional PLATFORM_CPPFLAGS
like:

PLATFORM_CPPFLAGS += -DCONFIG_E500=1
PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
PLATFORM_CPPFLAGS += -DCONFIG_MPC8548=1

However these are all captured in the config.h and thus redudant.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 board/atum8548/config.mk             | 4 ----
 board/freescale/mpc8536ds/config.mk  | 4 ----
 board/freescale/mpc8540ads/config.mk | 4 ----
 board/freescale/mpc8541cds/config.mk | 4 ----
 board/freescale/mpc8544ds/config.mk  | 4 ----
 board/freescale/mpc8548cds/config.mk | 4 ----
 board/freescale/mpc8555cds/config.mk | 4 ----
 board/freescale/mpc8560ads/config.mk | 3 ---
 board/freescale/mpc8568mds/config.mk | 4 ----
 board/freescale/mpc8569mds/config.mk | 4 ----
 board/freescale/mpc8572ds/config.mk  | 4 ----
 board/freescale/p2020ds/config.mk    | 4 ----
 board/mpc8540eval/config.mk          | 5 -----
 board/pm854/config.mk                | 4 ----
 board/pm856/config.mk                | 4 ----
 board/sbc8548/config.mk              | 4 ----
 board/sbc8560/config.mk              | 3 ---
 board/stxgp3/config.mk               | 3 ---
 board/stxssa/config.mk               | 3 ---
 board/xes/xpedite5200/config.mk      | 3 ---
 board/xes/xpedite5370/config.mk      | 4 ----
 cpu/mpc85xx/config.mk                | 3 +--
 22 files changed, 1 insertion(+), 82 deletions(-)

diff --git a/board/atum8548/config.mk b/board/atum8548/config.mk
index 90658172f2..a13f52d380 100644
--- a/board/atum8548/config.mk
+++ b/board/atum8548/config.mk
@@ -27,7 +27,3 @@
 ifndef TEXT_BASE
 TEXT_BASE = 0xfff80000
 endif
-
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8548=1
diff --git a/board/freescale/mpc8536ds/config.mk b/board/freescale/mpc8536ds/config.mk
index 9775ff4508..f03087620a 100644
--- a/board/freescale/mpc8536ds/config.mk
+++ b/board/freescale/mpc8536ds/config.mk
@@ -26,7 +26,3 @@
 ifndef TEXT_BASE
 TEXT_BASE = 0xeff80000
 endif
-
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8536=1
diff --git a/board/freescale/mpc8540ads/config.mk b/board/freescale/mpc8540ads/config.mk
index 92f8931979..7ae5e61d90 100644
--- a/board/freescale/mpc8540ads/config.mk
+++ b/board/freescale/mpc8540ads/config.mk
@@ -27,7 +27,3 @@
 # assume U-Boot is less than 0.5MB
 #
 TEXT_BASE = 0xfff80000
-
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8540=1
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
diff --git a/board/freescale/mpc8541cds/config.mk b/board/freescale/mpc8541cds/config.mk
index 17cc8bce9c..e7a0b347b2 100644
--- a/board/freescale/mpc8541cds/config.mk
+++ b/board/freescale/mpc8541cds/config.mk
@@ -24,7 +24,3 @@
 # mpc8541cds board
 #
 TEXT_BASE = 0xfff80000
-
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8541=1
diff --git a/board/freescale/mpc8544ds/config.mk b/board/freescale/mpc8544ds/config.mk
index 85663ef02b..a09dac189a 100644
--- a/board/freescale/mpc8544ds/config.mk
+++ b/board/freescale/mpc8544ds/config.mk
@@ -26,7 +26,3 @@
 ifndef TEXT_BASE
 TEXT_BASE = 0xfff80000
 endif
-
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8544=1
diff --git a/board/freescale/mpc8548cds/config.mk b/board/freescale/mpc8548cds/config.mk
index b23bc8737d..81c8737a9d 100644
--- a/board/freescale/mpc8548cds/config.mk
+++ b/board/freescale/mpc8548cds/config.mk
@@ -26,7 +26,3 @@
 ifndef TEXT_BASE
 TEXT_BASE = 0xfff80000
 endif
-
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8548=1
diff --git a/board/freescale/mpc8555cds/config.mk b/board/freescale/mpc8555cds/config.mk
index 5dcaa774db..798be39759 100644
--- a/board/freescale/mpc8555cds/config.mk
+++ b/board/freescale/mpc8555cds/config.mk
@@ -24,7 +24,3 @@
 # mpc8555cds board
 #
 TEXT_BASE = 0xfff80000
-
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8555=1
diff --git a/board/freescale/mpc8560ads/config.mk b/board/freescale/mpc8560ads/config.mk
index 9aef2bb163..37dc7a1655 100644
--- a/board/freescale/mpc8560ads/config.mk
+++ b/board/freescale/mpc8560ads/config.mk
@@ -27,6 +27,3 @@
 # assume U-Boot is less than 0.5MB
 #
 TEXT_BASE = 0xfff80000
-
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
diff --git a/board/freescale/mpc8568mds/config.mk b/board/freescale/mpc8568mds/config.mk
index 021522cafc..ed4b10167f 100644
--- a/board/freescale/mpc8568mds/config.mk
+++ b/board/freescale/mpc8568mds/config.mk
@@ -24,7 +24,3 @@
 # mpc8568mds board
 #
 TEXT_BASE = 0xfff80000
-
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8568=1
diff --git a/board/freescale/mpc8569mds/config.mk b/board/freescale/mpc8569mds/config.mk
index 8895cdac7e..962f79b747 100644
--- a/board/freescale/mpc8569mds/config.mk
+++ b/board/freescale/mpc8569mds/config.mk
@@ -24,7 +24,3 @@
 # mpc8569mds board
 #
 TEXT_BASE = 0xfff80000
-
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8569=1
diff --git a/board/freescale/mpc8572ds/config.mk b/board/freescale/mpc8572ds/config.mk
index 5b321860c1..08b61f09ab 100644
--- a/board/freescale/mpc8572ds/config.mk
+++ b/board/freescale/mpc8572ds/config.mk
@@ -26,7 +26,3 @@
 ifndef TEXT_BASE
 TEXT_BASE = 0xeff80000
 endif
-
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8572=1
diff --git a/board/freescale/p2020ds/config.mk b/board/freescale/p2020ds/config.mk
index 18bdc86ca7..439fa8fca6 100644
--- a/board/freescale/p2020ds/config.mk
+++ b/board/freescale/p2020ds/config.mk
@@ -26,7 +26,3 @@
 ifndef TEXT_BASE
 TEXT_BASE = 0xeff80000
 endif
-
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_P2020=1
diff --git a/board/mpc8540eval/config.mk b/board/mpc8540eval/config.mk
index 68271bd700..20b8681752 100644
--- a/board/mpc8540eval/config.mk
+++ b/board/mpc8540eval/config.mk
@@ -27,8 +27,3 @@
 #
 #TEXT_BASE = 0x1000000
 TEXT_BASE = 0xfff80000
-
-
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8540=1
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
diff --git a/board/pm854/config.mk b/board/pm854/config.mk
index 7d58d6ec85..0b28f4efd5 100644
--- a/board/pm854/config.mk
+++ b/board/pm854/config.mk
@@ -27,7 +27,3 @@
 # assume U-Boot is less than 0.5MB
 #
 TEXT_BASE = 0xfff80000
-
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8540=1
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
diff --git a/board/pm856/config.mk b/board/pm856/config.mk
index 1f98b3379c..8229305846 100644
--- a/board/pm856/config.mk
+++ b/board/pm856/config.mk
@@ -27,7 +27,3 @@
 # assume U-Boot is less than 0.5MB
 #
 TEXT_BASE = 0xfff80000
-
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8560=1
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
diff --git a/board/sbc8548/config.mk b/board/sbc8548/config.mk
index c9fa3ad6fb..440d6502ab 100644
--- a/board/sbc8548/config.mk
+++ b/board/sbc8548/config.mk
@@ -26,7 +26,3 @@
 ifndef TEXT_BASE
 TEXT_BASE = 0xfff80000
 endif
-
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8548=1
diff --git a/board/sbc8560/config.mk b/board/sbc8560/config.mk
index 6d9ae45126..995dadaff4 100644
--- a/board/sbc8560/config.mk
+++ b/board/sbc8560/config.mk
@@ -28,6 +28,3 @@
 # assume U-Boot is less than 256K
 #
 TEXT_BASE = 0xfffc0000
-
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
diff --git a/board/stxgp3/config.mk b/board/stxgp3/config.mk
index 2427818e0a..47e44aa089 100644
--- a/board/stxgp3/config.mk
+++ b/board/stxgp3/config.mk
@@ -27,6 +27,3 @@
 # assume U-Boot is less than 0.5MB
 #
 TEXT_BASE = 0xfff80000
-
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
diff --git a/board/stxssa/config.mk b/board/stxssa/config.mk
index 5f4fc7403e..57fe5d621e 100644
--- a/board/stxssa/config.mk
+++ b/board/stxssa/config.mk
@@ -28,6 +28,3 @@
 # it further up into the flash
 #
 TEXT_BASE = 0xFFFC0000
-
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
diff --git a/board/xes/xpedite5200/config.mk b/board/xes/xpedite5200/config.mk
index be5a5c32c0..fbfbc2b5a7 100644
--- a/board/xes/xpedite5200/config.mk
+++ b/board/xes/xpedite5200/config.mk
@@ -28,7 +28,4 @@ ifndef TEXT_BASE
 TEXT_BASE = 0xfff80000
 endif
 
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8548=1
 PLATFORM_CPPFLAGS += -mrelocatable
diff --git a/board/xes/xpedite5370/config.mk b/board/xes/xpedite5370/config.mk
index 39469b22c8..7b8d06b157 100644
--- a/board/xes/xpedite5370/config.mk
+++ b/board/xes/xpedite5370/config.mk
@@ -29,7 +29,3 @@ TEXT_BASE = 0xfff80000
 endif
 
 PLATFORM_RELFLAGS += -mrelocatable
-
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8572=1
diff --git a/cpu/mpc85xx/config.mk b/cpu/mpc85xx/config.mk
index 9e574a20d0..2da4d53b6d 100644
--- a/cpu/mpc85xx/config.mk
+++ b/cpu/mpc85xx/config.mk
@@ -23,6 +23,5 @@
 
 PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
 
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx -DCONFIG_E500 -ffixed-r2 \
-			-Wa,-me500 -msoft-float -mno-string
+PLATFORM_CPPFLAGS += -ffixed-r2 -Wa,-me500 -msoft-float -mno-string
 PLATFORM_CPPFLAGS +=$(call cc-option,-mno-spe)
-- 
2.39.5