Blackfin: convert specific pre/post config headers to common method
The Blackfin port was using asm/blackfin-config-{pre,post}.h to setup
common Blackfin board defines. The common method now is to use config.h,
so convert blackfin-config-post.h to that. Rename the still Blackfin
specific blackfin-config-pre.h to config-pre.h so the naming conventions
at least line up.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 06f2765..590ebba 100644
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_BF518F_EZBRD_H__
#define __CONFIG_BF518F_EZBRD_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -143,6 +143,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index afd9bb2..db68a7b 100644
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_BF526_EZBRD_H__
#define __CONFIG_BF526_EZBRD_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -185,6 +185,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index 0fe5fa5..f481c79 100644
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_BF527_EZKIT_H__
#define __CONFIG_BF527_EZKIT_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -167,6 +167,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index eb08890..f896cb0 100644
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_BF533_EZKIT_H__
#define __CONFIG_BF533_EZKIT_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -152,6 +152,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index d8e1ffc..242bf5a 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_BF533_STAMP_H__
#define __CONFIG_BF533_STAMP_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -241,6 +241,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 351aebb..b01197b 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -18,7 +18,7 @@
#ifndef __CONFIG_BF537_MINOTAUR_H__
#define __CONFIG_BF537_MINOTAUR_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -198,7 +198,4 @@
"ramargs=setenv bootargs " CONFIG_BOOTARGS "\0" \
BOOT_ENV_SETTINGS
-
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 11baec8..c8a59ab 100644
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_BF537_PNAV_H__
#define __CONFIG_BF537_PNAV_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -167,6 +167,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index 1d0b694..c1bff3e 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -18,7 +18,7 @@
#ifndef __CONFIG_BF537_SRV1_H__
#define __CONFIG_BF537_SRV1_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -198,7 +198,4 @@
"ramargs=setenv bootargs " CONFIG_BOOTARGS "\0" \
BOOT_ENV_SETTINGS
-
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 3e5862d..a8c5b91 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_BF537_STAMP_H__
#define __CONFIG_BF537_STAMP_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -257,6 +257,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index a7fb92e..f719acc 100644
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_BF538F_EZKIT_H__
#define __CONFIG_BF538F_EZKIT_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -134,6 +134,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index ae9fb36..4e2ee62 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_BF548_EZKIT_H__
#define __CONFIG_BF548_EZKIT_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -206,6 +206,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index ef2019f..e7cfc8a 100644
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_BF561_EZKIT_H__
#define __CONFIG_BF561_EZKIT_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -149,6 +149,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
-#endif /* __CONFIG_EZKIT561_H__ */
+#endif
diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index f61e5b7..9cbc17a 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -8,7 +8,7 @@
#ifndef __CONFIG_BLACKSTAMP_H__
#define __CONFIG_BLACKSTAMP_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
* Debugging: Set these options if you're having problems
@@ -270,6 +270,4 @@
#undef CONFIG_CMD_JFFS2
#undef CONFIG_CMD_FLASH
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index fea0873..79d06fb 100644
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_CM_BF527_H__
#define __CONFIG_CM_BF527_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -132,6 +132,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/cm-bf533.h b/include/configs/cm-bf533.h
index d07d71f..ea548e9 100644
--- a/include/configs/cm-bf533.h
+++ b/include/configs/cm-bf533.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_CM_BF533_H__
#define __CONFIG_CM_BF533_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -99,6 +99,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 798e773..65604ed 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_CM_BF537E_H__
#define __CONFIG_CM_BF537E_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -119,6 +119,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h
index b08b770..93c2239 100644
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_CM_BF548_H__
#define __CONFIG_CM_BF548_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -136,6 +136,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h
index ef4466c..53a2580 100644
--- a/include/configs/cm-bf561.h
+++ b/include/configs/cm-bf561.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_CM_BF561_H__
#define __CONFIG_CM_BF561_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -99,6 +99,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
#endif
diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index 6d03c4c..7738742 100644
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_IBF_DSP561__H__
#define __CONFIG_IBF_DSP561__H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -125,6 +125,4 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
-
-#endif /* __CONFIG_IBF_DSP561__H__ */
+#endif
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index eefc450..31fe61a 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -5,7 +5,7 @@
#ifndef __CONFIG_TCM_BF537_H__
#define __CONFIG_TCM_BF537_H__
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
/*
@@ -120,6 +120,5 @@
*/
#include <configs/bfin_adi_common.h>
-#include <asm/blackfin-config-post.h>
#endif