Skip to content
Snippets Groups Projects
Commit a566466f authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

IAD210 board: fix ``"ALIGN" redefined'' warning. 


Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parent ad756314
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
board/siemens/IAD210/atm.c
+ 2
− 3
View file @ a566466f
#include <common.h> #include <common.h>
#include <mpc8xx.h> #include <mpc8xx.h>
#include <commproc.h> #include <commproc.h>
...@@ -7,7 +6,7 @@ ...@@ -7,7 +6,7 @@
#include <linux/stddef.h> #include <linux/stddef.h>
#define SYNC __asm__("sync") #define SYNC __asm__("sync")
#define ALIGN(p, a) ((char *)(((uint32)(p)+(a)-1) & ~((uint32)(a)-1))) #define MY_ALIGN(p, a) ((char *)(((uint32)(p)+(a)-1) & ~((uint32)(a)-1)))
#define FALSE 1 #define FALSE 1
#define TRUE 0 #define TRUE 0
...@@ -160,7 +159,7 @@ int atmMemInit() ...@@ -160,7 +159,7 @@ int atmMemInit()
g_atm.csram = &csram[0]; g_atm.csram = &csram[0];
memset(&(g_atm.csram), 0x00, g_atm.csram_size); memset(&(g_atm.csram), 0x00, g_atm.csram_size);
g_atm.int_reload_ptr = (uint32 *)ALIGN(g_atm.csram, 4); g_atm.int_reload_ptr = (uint32 *)MY_ALIGN(g_atm.csram, 4);
g_atm.rbd_base_ptr = (struct atm_bd_t *)(g_atm.int_reload_ptr + NUM_INT_ENTRIES); g_atm.rbd_base_ptr = (struct atm_bd_t *)(g_atm.int_reload_ptr + NUM_INT_ENTRIES);
g_atm.tbd_base_ptr = (struct atm_bd_t *)(g_atm.rbd_base_ptr + total_num_rbd); g_atm.tbd_base_ptr = (struct atm_bd_t *)(g_atm.rbd_base_ptr + total_num_rbd);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment