AT91: factor out ROUND() macro

A large number of boards (all AT91 based) duplicated the ROUND()
macro in their board specific config files. Add the definition to
include/common.h and clean up the board config files.

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/include/common.h b/include/common.h
index a6c7c07692bb57240ffc48d50cc57ccc91114450..6e689b23371274ad85fab59177b8c8c6bf2f2171 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -697,6 +697,7 @@ void show_boot_progress(int val);
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
+#define ROUND(a,b)             (((a) + (b)) & ~((b) - 1))
 #define DIV_ROUND(n,d)         (((n) + ((d)/2)) / (d))
 #define DIV_ROUND_UP(n,d)      (((n) + (d) - 1) / (d))
 #define roundup(x, y)          ((((x) + ((y) - 1)) / (y)) * (y))

diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index 8a1c4f592e5d662129ffdd5428fb54d3eb4b34ab..74677d87545b733bc03489a7c43374eac8b57690 100644 (file)
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -161,7 +161,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index df7366120b96a14c8b5cf65285dc459116d7c6a6..0ef3554216dba8cca9f2cfbb9c0c56787fe11ae1 100644 (file)
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -203,7 +203,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */

diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index c898c730467d3c928065a5447d13a42ce813ef41..58ec94a848d2ed9043dd33c98d32e8b0890008ed 100644 (file)
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -311,7 +311,6 @@ struct bd_info_ext {
  */
 #define CONFIG_SYS_HZ_CLOCK (AT91C_MASTER_CLOCK / 2)
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 7eef9a38ef509066a4550085fce8000f836f7ae7..6cee59368ceb194c55a9ff0c56463c86f7f2037f 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -207,7 +207,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 028a04f32361539636280aea7f7a863158403844..3d108ab6265b96384565f5e9a6013efbc96eb163 100644 (file)
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -225,7 +225,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */

diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 9539d18f6f44f1724910e7a03171112960341158..32f3f62c1dd9a4d9a65db73c68c1ad52e77318c8 100644 (file)
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -335,7 +335,6 @@
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */

diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index af97afe2b1c2ed0305275e3ffd425814ecd818f3..4b46c31dbd5c8639b55acc0ed6f977965f7d19ce 100644 (file)
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -212,7 +212,6 @@
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */

diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index bc2a32bed9c647339288c6463bae7028ad93c46a..916730454f1f2fb7656945952f5c8460514a24b3 100644 (file)
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -170,7 +170,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */

diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 315d7f8779181b2a396adbe112eaf9e8cc0ed0f0..203a14c8d06187c7a9e9ed6c0c5640b14617bf0b 100644 (file)
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -368,7 +368,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */

diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index f8197b1f84b3cef47dbf7132575a52fedad3a6d6..a6ff28c39670de78eaca37d9a2ab90e6aa5317b1 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -397,7 +397,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING         1
 
-#define ROUND(A, B)                    (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */