global: Migrate CONFIG_SH_ETHER_ALIGNE_SIZE to CFG

Perform a simple rename of CONFIG_SH_ETHER_ALIGNE_SIZE to CFG_SH_ETHER_ALIGNE_SIZE

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 0c584a23b97e7d6d2d25268b272f42b471fca808..90e47d93aada4fb1391837bf6ef56deaf2a053e4 100644 (file)
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -41,7 +41,7 @@
        !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 #define flush_cache_wback(addr, len)    \
                flush_dcache_range((unsigned long)addr, \
-               (unsigned long)(addr + ALIGN(len, CONFIG_SH_ETHER_ALIGNE_SIZE)))
+               (unsigned long)(addr + ALIGN(len, CFG_SH_ETHER_ALIGNE_SIZE)))
 #else
 #define flush_cache_wback(...)
 #endif
@@ -49,7 +49,7 @@
 #if defined(CONFIG_SH_ETHER_CACHE_INVALIDATE) && defined(CONFIG_ARM)
 #define invalidate_cache(addr, len)            \
        {       \
-               unsigned long line_size = CONFIG_SH_ETHER_ALIGNE_SIZE;  \
+               unsigned long line_size = CFG_SH_ETHER_ALIGNE_SIZE;     \
                unsigned long start, end;       \
                \
                start = (unsigned long)addr;    \

diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
index 520f7f7325746484cf4c19936ea1202485de5fd0..1c07610e1ac79df05b87b8074eb71ad4ac2e78a0 100644 (file)
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
@@ -29,8 +29,8 @@
 #endif /* defined(CONFIG_SH) */
 
 /* base padding size is 16 */
-#ifndef CONFIG_SH_ETHER_ALIGNE_SIZE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE 16
+#ifndef CFG_SH_ETHER_ALIGNE_SIZE
+#define CFG_SH_ETHER_ALIGNE_SIZE 16
 #endif
 
 /* Number of supported ports */
@@ -47,7 +47,7 @@
 
 /* The size of the tx descriptor is determined by how much padding is used.
    4, 20, or 52 bytes of padding can be used */
-#define TX_DESC_PADDING        (CONFIG_SH_ETHER_ALIGNE_SIZE - 12)
+#define TX_DESC_PADDING        (CFG_SH_ETHER_ALIGNE_SIZE - 12)
 
 /* Tx descriptor. We always use 3 bytes of padding */
 struct tx_desc_s {
@@ -62,9 +62,9 @@ struct tx_desc_s {
 
 /* The size of the rx descriptor is determined by how much padding is used.
    4, 20, or 52 bytes of padding can be used */
-#define RX_DESC_PADDING        (CONFIG_SH_ETHER_ALIGNE_SIZE - 12)
+#define RX_DESC_PADDING        (CFG_SH_ETHER_ALIGNE_SIZE - 12)
 /* aligned cache line size */
-#define RX_BUF_ALIGNE_SIZE     (CONFIG_SH_ETHER_ALIGNE_SIZE > 32 ? 64 : 32)
+#define RX_BUF_ALIGNE_SIZE     (CFG_SH_ETHER_ALIGNE_SIZE > 32 ? 64 : 32)
 
 /* Rx descriptor. We always use 4 bytes of padding */
 struct rx_desc_s {
@@ -388,11 +388,11 @@ enum DMAC_M_BIT {
 #endif
 };
 
-#if CONFIG_SH_ETHER_ALIGNE_SIZE == 64
+#if CFG_SH_ETHER_ALIGNE_SIZE == 64
 # define EMDR_DESC EDMR_DL1
-#elif CONFIG_SH_ETHER_ALIGNE_SIZE == 32
+#elif CFG_SH_ETHER_ALIGNE_SIZE == 32
 # define EMDR_DESC EDMR_DL0
-#elif CONFIG_SH_ETHER_ALIGNE_SIZE == 16 /* Default */
+#elif CFG_SH_ETHER_ALIGNE_SIZE == 16 /* Default */
 # define EMDR_DESC 0
 #endif
 

diff --git a/include/configs/alt.h b/include/configs/alt.h
index 29f4d06b7f834a8770567d5accc19be65c3857bb..f06ceed47f0c01c88f0d6bc2ce0d2b6b438dbf02 100644 (file)
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -26,7 +26,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE    64
+#define CFG_SH_ETHER_ALIGNE_SIZE       64
 
 /* Board Clock */
 

diff --git a/include/configs/condor.h b/include/configs/condor.h
index 819184996e696d835a9a3d4eec5747f9df785078..6d7c788163d3d5427210ececa504add1c58fa67d 100644 (file)
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -19,7 +19,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE    64
+#define CFG_SH_ETHER_ALIGNE_SIZE       64
 
 /* Board Clock */
 /* XTAL_CLK : 33.33MHz */

diff --git a/include/configs/gose.h b/include/configs/gose.h
index 45f0ec6f6a0ea10fb7eda77462cdccb1539b584a..93157de470bd425782681b4320178923d9999a93 100644 (file)
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -25,7 +25,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE    64
+#define CFG_SH_ETHER_ALIGNE_SIZE       64
 
 /* Board Clock */
 

diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index dd6b22de7bac4ad2fcc87eace4af580da480a26f..5b91e6ff039b904562b3fe26b9d61405f7ddf11c 100644 (file)
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -22,6 +22,6 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE    64
+#define CFG_SH_ETHER_ALIGNE_SIZE       64
 
 #endif /* __GRPEACH_H */

diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 61ff80d2c983f44a28b2f3ce62dc7dd1e8c2ba76..ff02a875013c2859c814088240e71a48634ff1cf 100644 (file)
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -25,7 +25,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE    64
+#define CFG_SH_ETHER_ALIGNE_SIZE       64
 
 /* Board Clock */
 

diff --git a/include/configs/lager.h b/include/configs/lager.h
index 777d5b94d1cd52f3998c0ee96af260eba3dca321..83e8705dfe76aa018fbebb6c94d2099efef6eb19 100644 (file)
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -26,7 +26,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE    64
+#define CFG_SH_ETHER_ALIGNE_SIZE       64
 
 /* Board Clock */
 

diff --git a/include/configs/porter.h b/include/configs/porter.h
index 202bd914d506dc4f4838fc3ddf7db11411dc7918..8f834f2c7ebad31280ebfda68c141512386d9b59 100644 (file)
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -27,7 +27,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE    64
+#define CFG_SH_ETHER_ALIGNE_SIZE       64
 
 /* Board Clock */
 

diff --git a/include/configs/silk.h b/include/configs/silk.h
index 9114a0575828b38de5c2454b2524456507ac1198..80fce05b399995a15546720f9e0a3ff65388422b 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -27,7 +27,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE    64
+#define CFG_SH_ETHER_ALIGNE_SIZE       64
 
 /* Board Clock */
 

diff --git a/include/configs/stout.h b/include/configs/stout.h
index ea5828b950b1ac053969475856e52a072ef7a78f..d8f0fb18563041f2dc917ff100bf21fdc23b4444 100644 (file)
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -31,7 +31,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE    64
+#define CFG_SH_ETHER_ALIGNE_SIZE       64
 
 /* Board Clock */