diff options
| author | Stefan Roese <sr@denx.de> | 2008-07-07 09:51:25 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-07-07 09:51:25 +0200 |
| commit | 7c6237b3e2f2ee0098897da39b79aff4642b8946 (patch) | |
| tree | d768b7851bb688f543da0a3ed50c927a2bde2804 /include/common.h | |
| parent | dd1c5523d6f44e842e69f2fcb50788c6060eab86 (diff) | |
| parent | c956717ab25c962ef49d49064dfc73f4edcba1fb (diff) | |
| download | u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.zip u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.tar.gz u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index fd5adb3..10b997e 100644 --- a/include/common.h +++ b/include/common.h @@ -243,9 +243,9 @@ char *getenv (char *); int getenv_r (char *name, char *buf, unsigned len); int saveenv (void); #ifdef CONFIG_PPC /* ARM version to be fixed! */ -void inline setenv (char *, char *); +int inline setenv (char *, char *); #else -void setenv (char *, char *); +int setenv (char *, char *); #ifdef CONFIG_HAS_UID void forceenv (char *, char *); #endif @@ -682,6 +682,9 @@ void __attribute__((weak)) show_boot_progress (int val); #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) +#define ALIGN(x,a) __ALIGN_MASK((x),(typeof(x))(a)-1) +#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) + /* Multicore arch functions */ #ifdef CONFIG_MP int cpu_status(int nr); |