diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /post/lib_ppc/fpu | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'post/lib_ppc/fpu')
| -rw-r--r-- | post/lib_ppc/fpu/20001122-1.c | 4 | ||||
| -rw-r--r-- | post/lib_ppc/fpu/20010114-2.c | 4 | ||||
| -rw-r--r-- | post/lib_ppc/fpu/20010226-1.c | 4 | ||||
| -rw-r--r-- | post/lib_ppc/fpu/980619-1.c | 4 | ||||
| -rw-r--r-- | post/lib_ppc/fpu/acc1.c | 4 | ||||
| -rw-r--r-- | post/lib_ppc/fpu/compare-fp-1.c | 4 | ||||
| -rw-r--r-- | post/lib_ppc/fpu/fpu.c | 4 | ||||
| -rw-r--r-- | post/lib_ppc/fpu/mul-subnormal-single-1.c | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/post/lib_ppc/fpu/20001122-1.c b/post/lib_ppc/fpu/20001122-1.c index dece614..a8537fa 100644 --- a/post/lib_ppc/fpu/20001122-1.c +++ b/post/lib_ppc/fpu/20001122-1.c @@ -28,7 +28,7 @@ #include <post.h> -#if CONFIG_POST & CFG_POST_FPU +#if CONFIG_POST & CONFIG_SYS_POST_FPU int fpu_post_test_math1 (void) { @@ -56,4 +56,4 @@ int fpu_post_test_math1 (void) return 0; } -#endif /* CONFIG_POST & CFG_POST_FPU */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */ diff --git a/post/lib_ppc/fpu/20010114-2.c b/post/lib_ppc/fpu/20010114-2.c index 8a17217..91e3631 100644 --- a/post/lib_ppc/fpu/20010114-2.c +++ b/post/lib_ppc/fpu/20010114-2.c @@ -28,7 +28,7 @@ #include <post.h> -#if CONFIG_POST & CFG_POST_FPU +#if CONFIG_POST & CONFIG_SYS_POST_FPU static float rintf (float x) { @@ -60,4 +60,4 @@ int fpu_post_test_math2 (void) return 0; } -#endif /* CONFIG_POST & CFG_POST_FPU */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */ diff --git a/post/lib_ppc/fpu/20010226-1.c b/post/lib_ppc/fpu/20010226-1.c index f366252..b00386b 100644 --- a/post/lib_ppc/fpu/20010226-1.c +++ b/post/lib_ppc/fpu/20010226-1.c @@ -28,7 +28,7 @@ #include <post.h> -#if CONFIG_POST & CFG_POST_FPU +#if CONFIG_POST & CONFIG_SYS_POST_FPU int fpu_post_test_math3 (void) { @@ -48,4 +48,4 @@ int fpu_post_test_math3 (void) return 0; } -#endif /* CONFIG_POST & CFG_POST_FPU */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */ diff --git a/post/lib_ppc/fpu/980619-1.c b/post/lib_ppc/fpu/980619-1.c index 7f26482..ceb2b76 100644 --- a/post/lib_ppc/fpu/980619-1.c +++ b/post/lib_ppc/fpu/980619-1.c @@ -28,7 +28,7 @@ #include <post.h> -#if CONFIG_POST & CFG_POST_FPU +#if CONFIG_POST & CONFIG_SYS_POST_FPU int fpu_post_test_math4 (void) { @@ -54,4 +54,4 @@ int fpu_post_test_math4 (void) return 0; } -#endif /* CONFIG_POST & CFG_POST_FPU */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */ diff --git a/post/lib_ppc/fpu/acc1.c b/post/lib_ppc/fpu/acc1.c index 921282e..8a65193 100644 --- a/post/lib_ppc/fpu/acc1.c +++ b/post/lib_ppc/fpu/acc1.c @@ -28,7 +28,7 @@ #include <post.h> -#if CONFIG_POST & CFG_POST_FPU +#if CONFIG_POST & CONFIG_SYS_POST_FPU static double func (const double *array) { @@ -51,4 +51,4 @@ int fpu_post_test_math5 (void) return 0; } -#endif /* CONFIG_POST & CFG_POST_FPU */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */ diff --git a/post/lib_ppc/fpu/compare-fp-1.c b/post/lib_ppc/fpu/compare-fp-1.c index be8f620..ab47657 100644 --- a/post/lib_ppc/fpu/compare-fp-1.c +++ b/post/lib_ppc/fpu/compare-fp-1.c @@ -30,7 +30,7 @@ #include <post.h> -#if CONFIG_POST & CFG_POST_FPU +#if CONFIG_POST & CONFIG_SYS_POST_FPU static int failed; @@ -219,4 +219,4 @@ int fpu_post_test_math6 (void) return 0; } -#endif /* CONFIG_POST & CFG_POST_FPU */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */ diff --git a/post/lib_ppc/fpu/fpu.c b/post/lib_ppc/fpu/fpu.c index 9ddb67a..846b76d 100644 --- a/post/lib_ppc/fpu/fpu.c +++ b/post/lib_ppc/fpu/fpu.c @@ -36,7 +36,7 @@ #include <post.h> -#if CONFIG_POST & CFG_POST_FPU +#if CONFIG_POST & CONFIG_SYS_POST_FPU #include <watchdog.h> @@ -86,4 +86,4 @@ int fpu_post_test (int flags) return ret; } -#endif /* CONFIG_POST & CFG_POST_FPU */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */ diff --git a/post/lib_ppc/fpu/mul-subnormal-single-1.c b/post/lib_ppc/fpu/mul-subnormal-single-1.c index 7e6fe87..9c514e1 100644 --- a/post/lib_ppc/fpu/mul-subnormal-single-1.c +++ b/post/lib_ppc/fpu/mul-subnormal-single-1.c @@ -30,7 +30,7 @@ #include <post.h> -#if CONFIG_POST & CFG_POST_FPU +#if CONFIG_POST & CONFIG_SYS_POST_FPU union uf { @@ -97,4 +97,4 @@ int fpu_post_test_math7 (void) return 0; } -#endif /* CONFIG_POST & CFG_POST_FPU */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */ |