Patch set updated for coreboot: 69d9d86 Align: Make sure 1 is treated as unsigned long instead of int

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/820

-gerrit

commit 69d9d86b4a64ddc01d3bd3956b5984afeb7e2f7a
Author: Stefan Reinauer 
Date:   Fri Mar 30 13:00:46 2012 -0700

Align: Make sure 1 is treated as unsigned long instead of int

... and drop duplicate definition in via/epia-n code.

Change-Id: Id79daaaa35c4d412c8c1f621a3638d129681d331
    Signed-off-by: Stefan Reinauer 
---
 src/include/stdlib.h                   |    2 +-
 src/mainboard/via/epia-n/acpi_tables.c |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/include/stdlib.h b/src/include/stdlib.h
index 45420d7..5465c14 100644
--- a/src/include/stdlib.h
+++ b/src/include/stdlib.h
@@ -5,7 +5,7 @@

#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))

-#define ALIGN(x,a)              __ALIGN_MASK(x,(typeof(x))(a)-1)
+#define ALIGN(x,a)              __ALIGN_MASK(x,(typeof(x))(a)-1UL)
 #define __ALIGN_MASK(x,mask)    (((x)+(mask))&~(mask))

#define MIN(a,b) ((a) < (b) ? (a) : (b))
diff --git a/src/mainboard/via/epia-n/acpi_tables.c b/src/mainboard/via/epia-n/acpi_tables.c
index 589e14c..b4966bb 100644
--- a/src/mainboard/via/epia-n/acpi_tables.c
+++ b/src/mainboard/via/epia-n/acpi_tables.c
@@ -118,10 +118,6 @@ unsigned long acpi_fill_srat(unsigned long current)
    return current;
 }

-#define ALIGN(x,a)              __ALIGN_MASK(x,(typeof(x))(a)-1)
-#define __ALIGN_MASK(x,mask)    (((x)+(mask))&~(mask))
-#define ALIGN_CURRENT current = ((current + 0x0f) & -0x10)
-
 unsigned long write_acpi_tables(unsigned long start)
 {
    unsigned long current;