[U-Boot-Users] [PATCH] POST: preparations for moving CONFIG_POST to Makefiles

Wolfgang Denk
2008-04-22T14:24:50Z

From: Yuri Tikhonov <yur@emcraft.com>

Remove CONFIG_POST ifdefs from the post/ source files.

Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
---
post/board/lwmon/sysmon.c | 3 ---
post/board/lwmon5/dsp.c | 5 -----
post/board/lwmon5/dspic.c | 4 ----
post/board/lwmon5/fpga.c | 4 ----
post/board/lwmon5/gdc.c | 4 ----
post/board/lwmon5/sysmon.c | 3 ---
post/board/lwmon5/watchdog.c | 4 ----
post/board/netta/codec.c | 3 ---
post/board/netta/dsp.c | 3 ---
post/cpu/mpc8xx/cache.c | 3 ---
post/cpu/mpc8xx/cache_8xx.S | 2 --
post/cpu/mpc8xx/ether.c | 4 ----
post/cpu/mpc8xx/spr.c | 3 ---
post/cpu/mpc8xx/uart.c | 4 ----
post/cpu/mpc8xx/usb.c | 4 ----
post/cpu/mpc8xx/watchdog.c | 3 ---
post/cpu/ppc4xx/cache.c | 3 ---
post/cpu/ppc4xx/cache_4xx.S | 3 ---
post/cpu/ppc4xx/denali_ecc.c | 4 ++--
post/cpu/ppc4xx/ether.c | 3 ---
post/cpu/ppc4xx/fpu.c | 2 --
post/cpu/ppc4xx/spr.c | 3 ---
post/cpu/ppc4xx/uart.c | 3 ---
post/cpu/ppc4xx/watchdog.c | 3 ---
post/drivers/i2c.c | 3 ---
post/drivers/memory.c | 3 ---
post/drivers/rtc.c | 3 ---
post/lib_ppc/andi.c | 3 ---
post/lib_ppc/asm.S | 3 ---
post/lib_ppc/b.c | 3 ---
post/lib_ppc/cmp.c | 3 ---
post/lib_ppc/cmpi.c | 3 ---
post/lib_ppc/complex.c | 3 ---
post/lib_ppc/cpu.c | 3 ---
post/lib_ppc/cr.c | 3 ---
post/lib_ppc/fpu/20001122-1.c | 3 ---
post/lib_ppc/fpu/20010114-2.c | 3 ---
post/lib_ppc/fpu/20010226-1.c | 3 ---
post/lib_ppc/fpu/980619-1.c | 3 ---
post/lib_ppc/fpu/acc1.c | 3 ---
post/lib_ppc/fpu/compare-fp-1.c | 3 ---
post/lib_ppc/fpu/fpu.c | 3 ---
post/lib_ppc/fpu/mul-subnormal-single-1.c | 3 ---
post/lib_ppc/load.c | 3 ---
post/lib_ppc/multi.c | 3 ---
post/lib_ppc/rlwimi.c | 3 ---
post/lib_ppc/rlwinm.c | 3 ---
post/lib_ppc/rlwnm.c | 3 ---
post/lib_ppc/srawi.c | 3 ---
post/lib_ppc/store.c | 3 ---
post/lib_ppc/string.c | 3 ---
post/lib_ppc/three.c | 3 ---
post/lib_ppc/threei.c | 3 ---
post/lib_ppc/threex.c | 3 ---
post/lib_ppc/two.c | 3 ---
post/lib_ppc/twox.c | 3 ---
post/post.c | 4 ----
post/tests.c | 4 ----
58 files changed, 2 insertions(+), 182 deletions(-)

diff --git a/post/board/lwmon/sysmon.c b/post/board/lwmon/sysmon.c
index f61d598..ea8b5a9 100644
--- a/post/board/lwmon/sysmon.c
+++ b/post/board/lwmon/sysmon.c
@@ -24,8 +24,6 @@
#include <post.h>
#include <common.h>

-#ifdef CONFIG_POST
-
/*
* SYSMON test
*
@@ -328,4 +326,3 @@ int sysmon_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_SYSMON */
-#endif /* CONFIG_POST */
diff --git a/post/board/lwmon5/dsp.c b/post/board/lwmon5/dsp.c
index 7b53af9..a96ac7d 100644
--- a/post/board/lwmon5/dsp.c
+++ b/post/board/lwmon5/dsp.c
@@ -24,11 +24,8 @@

#include <common.h>

-#ifdef CONFIG_POST
-
#include <post.h>

-
#if CONFIG_POST & CFG_POST_DSP
#include <asm/io.h>

@@ -54,5 +51,3 @@ int dsp_post_test(int flags)
}

#endif /* CONFIG_POST & CFG_POST_DSP */
-#endif /* CONFIG_POST */
-
diff --git a/post/board/lwmon5/dspic.c b/post/board/lwmon5/dspic.c
index f1c9c15..eb1c31c 100644
--- a/post/board/lwmon5/dspic.c
+++ b/post/board/lwmon5/dspic.c
@@ -24,8 +24,6 @@

#include <common.h>

-#ifdef CONFIG_POST
-
/* There are two tests for dsPIC currently implemented:
* 1. dsPIC ready test. Done in board_early_init_f(). Only result verified here.
* 2. dsPIC POST result test. This test gets dsPIC POST codes and version.
@@ -105,5 +103,3 @@ int dspic_post_test(int flags)
}

#endif /* CONFIG_POST & CFG_POST_BSPEC2 */
-#endif /* CONFIG_POST */
-
diff --git a/post/board/lwmon5/fpga.c b/post/board/lwmon5/fpga.c
index 162174c..b48390b 100644
--- a/post/board/lwmon5/fpga.c
+++ b/post/board/lwmon5/fpga.c
@@ -23,8 +23,6 @@
*/
#include <common.h>

-#ifdef CONFIG_POST
-
/* This test performs testing of FPGA SCRATCH register,
* gets FPGA version and run get_ram_size() on FPGA memory
*/
@@ -94,5 +92,3 @@ int fpga_post_test(int flags)
}

#endif /* CONFIG_POST & CFG_POST_BSPEC3 */
-#endif /* CONFIG_POST */
-
diff --git a/post/board/lwmon5/gdc.c b/post/board/lwmon5/gdc.c
index aa1eee0..bc16685 100644
--- a/post/board/lwmon5/gdc.c
+++ b/post/board/lwmon5/gdc.c
@@ -23,8 +23,6 @@
*/
#include <common.h>

-#ifdef CONFIG_POST
-
/* This test attempts to verify board GDC. A scratch register tested, then
* simple memory test (get_ram_size()) run over GDC memory.
*/
@@ -96,5 +94,3 @@ int gdc_post_test(int flags)
return ret;
}
#endif /* CONFIG_POST & CFG_POST_BSPEC4 */
-#endif /* CONFIG_POST */
-
diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c
index f7e51a3..15661e3 100644
--- a/post/board/lwmon5/sysmon.c
+++ b/post/board/lwmon5/sysmon.c
@@ -25,8 +25,6 @@
#include <post.h>
#include <common.h>

-#ifdef CONFIG_POST
-
/*
* SYSMON test
*
@@ -245,4 +243,3 @@ int sysmon_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_SYSMON */
-#endif /* CONFIG_POST */
diff --git a/post/board/lwmon5/watchdog.c b/post/board/lwmon5/watchdog.c
index ad9e6f3..699266b 100644
--- a/post/board/lwmon5/watchdog.c
+++ b/post/board/lwmon5/watchdog.c
@@ -29,8 +29,6 @@
* trigger watchdog reset.
*/

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_WATCHDOG
@@ -128,5 +126,3 @@ int lwmon5_watchdog_post_test(int flags)

#endif /* CONFIG_POST & CFG_POST_WATCHDOG */
-#endif /* CONFIG_POST */
-
diff --git a/post/board/netta/codec.c b/post/board/netta/codec.c
index e881752..115e331 100644
--- a/post/board/netta/codec.c
+++ b/post/board/netta/codec.c
@@ -31,8 +31,6 @@
* in the board specific function.
*/

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_CODEC
@@ -45,4 +43,3 @@ int codec_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_CODEC */
-#endif /* CONFIG_POST */
diff --git a/post/board/netta/dsp.c b/post/board/netta/dsp.c
index 63531a2..dcef4e8 100644
--- a/post/board/netta/dsp.c
+++ b/post/board/netta/dsp.c
@@ -31,8 +31,6 @@
* in the board specific function.
*/

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_DSP
@@ -45,4 +43,3 @@ int dsp_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_DSP */
-#endif /* CONFIG_POST */
diff --git a/post/cpu/mpc8xx/cache.c b/post/cpu/mpc8xx/cache.c
index 501465c..36965a1 100644
--- a/post/cpu/mpc8xx/cache.c
+++ b/post/cpu/mpc8xx/cache.c
@@ -29,8 +29,6 @@
* several test scenarios.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include <watchdog.h>

@@ -78,4 +76,3 @@ int cache_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_CACHE */
-#endif /* CONFIG_POST */
diff --git a/post/cpu/mpc8xx/cache_8xx.S b/post/cpu/mpc8xx/cache_8xx.S
index 2d41b55..a3fc39b 100644
--- a/post/cpu/mpc8xx/cache_8xx.S
+++ b/post/cpu/mpc8xx/cache_8xx.S
@@ -22,7 +22,6 @@

#include <config.h>

-#ifdef CONFIG_POST
#if defined(CONFIG_MPC823) || \
defined(CONFIG_MPC850) || \
defined(CONFIG_MPC855) || \
@@ -492,4 +491,3 @@ cache_post_test6_data:

#endif /* CONFIG_MPC823 || MPC850 || MPC855 || MPC860 */
#endif /* CONFIG_POST & CFG_POST_CACHE */
-#endif /* CONFIG_POST */
diff --git a/post/cpu/mpc8xx/ether.c b/post/cpu/mpc8xx/ether.c
index 8c87b59..2fa5cf4 100644
--- a/post/cpu/mpc8xx/ether.c
+++ b/post/cpu/mpc8xx/ether.c
@@ -35,8 +35,6 @@
* TEST_NUM - number of tests
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#if CONFIG_POST & CFG_POST_ETHER
#if defined(CONFIG_8xx)
@@ -627,5 +625,3 @@ int ether_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_ETHER */
-
-#endif /* CONFIG_POST */
diff --git a/post/cpu/mpc8xx/spr.c b/post/cpu/mpc8xx/spr.c
index 330b977..83f04da 100644
--- a/post/cpu/mpc8xx/spr.c
+++ b/post/cpu/mpc8xx/spr.c
@@ -33,8 +33,6 @@
* corresponding table value.
*/

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_SPR
@@ -149,4 +147,3 @@ int spr_post_test (int flags)
return ret;
}
#endif /* CONFIG_POST & CFG_POST_SPR */
-#endif /* CONFIG_POST */
diff --git a/post/cpu/mpc8xx/uart.c b/post/cpu/mpc8xx/uart.c
index fd97e38..635debe 100644
--- a/post/cpu/mpc8xx/uart.c
+++ b/post/cpu/mpc8xx/uart.c
@@ -36,8 +36,6 @@
* TEST_NUM - number of tests
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#if CONFIG_POST & CFG_POST_UART
#if defined(CONFIG_8xx)
@@ -556,5 +554,3 @@ int uart_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_UART */
-
-#endif /* CONFIG_POST */
diff --git a/post/cpu/mpc8xx/usb.c b/post/cpu/mpc8xx/usb.c
index 0c74cfa..5877981 100644
--- a/post/cpu/mpc8xx/usb.c
+++ b/post/cpu/mpc8xx/usb.c
@@ -34,8 +34,6 @@
* Initialization Example.
*/

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_USB
@@ -265,5 +263,3 @@ int usb_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_USB */
-
-#endif /* CONFIG_POST */
diff --git a/post/cpu/mpc8xx/watchdog.c b/post/cpu/mpc8xx/watchdog.c
index 48c4282..f94158a 100644
--- a/post/cpu/mpc8xx/watchdog.c
+++ b/post/cpu/mpc8xx/watchdog.c
@@ -33,8 +33,6 @@
* reboots, on the second iteration the test routine reports a success.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include <watchdog.h>

@@ -75,4 +73,3 @@ int watchdog_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_WATCHDOG */
-#endif /* CONFIG_POST */
diff --git a/post/cpu/ppc4xx/cache.c b/post/cpu/ppc4xx/cache.c
index 466ca92..be6a2bf 100644
--- a/post/cpu/ppc4xx/cache.c
+++ b/post/cpu/ppc4xx/cache.c
@@ -31,8 +31,6 @@
* several test scenarios.
*/

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_CACHE
@@ -122,4 +120,3 @@ int cache_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_CACHE */
-#endif /* CONFIG_POST */
diff --git a/post/cpu/ppc4xx/cache_4xx.S b/post/cpu/ppc4xx/cache_4xx.S
index d5cb075..455ffa0 100644
--- a/post/cpu/ppc4xx/cache_4xx.S
+++ b/post/cpu/ppc4xx/cache_4xx.S
@@ -25,8 +25,6 @@

#include <config.h>

-#ifdef CONFIG_POST
-
#include <post.h>
#include <ppc_asm.tmpl>
#include <ppc_defs.h>
@@ -489,4 +487,3 @@ cache_post_test_inst:
blr

#endif /* CONFIG_POST & CFG_POST_CACHE */
-#endif /* CONFIG_POST */
diff --git a/post/cpu/ppc4xx/denali_ecc.c b/post/cpu/ppc4xx/denali_ecc.c
index 439f80d..12a1bbf 100644
--- a/post/cpu/ppc4xx/denali_ecc.c
+++ b/post/cpu/ppc4xx/denali_ecc.c
@@ -31,7 +31,7 @@
#include <common.h>
#include <watchdog.h>

-#if defined(CONFIG_POST) && (defined(CONFIG_440EPX) || defined(CONFIG_440GRX))
+#if defined(CONFIG_440EPX) || defined(CONFIG_440GRX)

#include <post.h>

@@ -268,4 +268,4 @@ int ecc_post_test(int flags)
return ret;
}
#endif /* CONFIG_POST & CFG_POST_ECC */
-#endif /* defined(CONFIG_POST) && ... */
+#endif /* defined(CONFIG_440EPX) || defined(CONFIG_440GRX) */
diff --git a/post/cpu/ppc4xx/ether.c b/post/cpu/ppc4xx/ether.c
index 4ac7491..ccbfcf9 100644
--- a/post/cpu/ppc4xx/ether.c
+++ b/post/cpu/ppc4xx/ether.c
@@ -37,8 +37,6 @@
* TEST_NUM - number of tests
*/

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_ETHER
@@ -430,4 +428,3 @@ out_free:
}

#endif /* CONFIG_POST & CFG_POST_ETHER */
-#endif /* CONFIG_POST */
diff --git a/post/cpu/ppc4xx/fpu.c b/post/cpu/ppc4xx/fpu.c
index 0c26fe0..fff4169 100644
--- a/post/cpu/ppc4xx/fpu.c
+++ b/post/cpu/ppc4xx/fpu.c
@@ -25,7 +25,6 @@

#include <config.h>

-#ifdef CONFIG_POST
#if defined(CONFIG_440EP) || \
defined(CONFIG_440EPX)

@@ -56,4 +55,3 @@ void fpu_enable(void)
}

#endif
-#endif /* CONFIG_POST */
diff --git a/post/cpu/ppc4xx/spr.c b/post/cpu/ppc4xx/spr.c
index 37c9559..6152eb2 100644
--- a/post/cpu/ppc4xx/spr.c
+++ b/post/cpu/ppc4xx/spr.c
@@ -35,8 +35,6 @@
* corresponding table value.
*/

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_SPR
@@ -199,4 +197,3 @@ int spr_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_SPR */
-#endif /* CONFIG_POST */
diff --git a/post/cpu/ppc4xx/uart.c b/post/cpu/ppc4xx/uart.c
index f47b48e..27cfb91 100644
--- a/post/cpu/ppc4xx/uart.c
+++ b/post/cpu/ppc4xx/uart.c
@@ -32,8 +32,6 @@
* characters are transmitted.
*/

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_UART
@@ -389,4 +387,3 @@ int uart_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_UART */
-#endif /* CONFIG_POST */
diff --git a/post/cpu/ppc4xx/watchdog.c b/post/cpu/ppc4xx/watchdog.c
index bd4f4c9..7fdecb4 100644
--- a/post/cpu/ppc4xx/watchdog.c
+++ b/post/cpu/ppc4xx/watchdog.c
@@ -35,8 +35,6 @@
* reboots, on the second iteration the test routine reports a success.
*/

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_WATCHDOG
@@ -68,4 +66,3 @@ int watchdog_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_WATCHDOG */
-#endif /* CONFIG_POST */
diff --git a/post/drivers/i2c.c b/post/drivers/i2c.c
index 1b2e644..f54fe99 100644
--- a/post/drivers/i2c.c
+++ b/post/drivers/i2c.c
@@ -23,8 +23,6 @@

#include <common.h>

-#ifdef CONFIG_POST
-
/*
* I2C test
*
@@ -91,4 +89,3 @@ int i2c_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_I2C */
-#endif /* CONFIG_POST */
diff --git a/post/drivers/memory.c b/post/drivers/memory.c
index fb96985..e94d92c 100644
--- a/post/drivers/memory.c
+++ b/post/drivers/memory.c
@@ -150,8 +150,6 @@
* the whole RAM.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include <watchdog.h>

@@ -483,4 +481,3 @@ int memory_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_MEMORY */
-#endif /* CONFIG_POST */
diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c
index 7d4f9b8..4afe8e6 100644
--- a/post/drivers/rtc.c
+++ b/post/drivers/rtc.c
@@ -38,8 +38,6 @@
* nonleap-years.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include <rtc.h>

@@ -180,4 +178,3 @@ int rtc_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_RTC */
-#endif /* CONFIG_POST */
diff --git a/post/lib_ppc/andi.c b/post/lib_ppc/andi.c
index 7ddf2ab..e3315bf 100644
--- a/post/lib_ppc/andi.c
+++ b/post/lib_ppc/andi.c
@@ -32,8 +32,6 @@
* different sets of operand registers and result registers.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -120,4 +118,3 @@ int cpu_post_test_andi (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/asm.S b/post/lib_ppc/asm.S
index 1279176..6220ed2 100644
--- a/post/lib_ppc/asm.S
+++ b/post/lib_ppc/asm.S
@@ -22,8 +22,6 @@

#include <config.h>

-#ifdef CONFIG_POST
-
#include <post.h>
#include <ppc_asm.tmpl>
#include <ppc_defs.h>
@@ -358,4 +356,3 @@ cpu_post_complex_2_loop:
blr

#endif
-#endif
diff --git a/post/lib_ppc/b.c b/post/lib_ppc/b.c
index 6e276c4..45b9ff2 100644
--- a/post/lib_ppc/b.c
+++ b/post/lib_ppc/b.c
@@ -37,8 +37,6 @@
* linked in U-Boot at build time.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -194,4 +192,3 @@ int cpu_post_test_b (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/cmp.c b/post/lib_ppc/cmp.c
index 789a24c..89f754a 100644
--- a/post/lib_ppc/cmp.c
+++ b/post/lib_ppc/cmp.c
@@ -36,8 +36,6 @@
* the result in and the expected result.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -130,4 +128,3 @@ int cpu_post_test_cmp (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/cmpi.c b/post/lib_ppc/cmpi.c
index e0c2aaf..0afdd71 100644
--- a/post/lib_ppc/cmpi.c
+++ b/post/lib_ppc/cmpi.c
@@ -36,8 +36,6 @@
* the result in and the expected result.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -130,4 +128,3 @@ int cpu_post_test_cmpi (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/complex.c b/post/lib_ppc/complex.c
index 033584b..271392a 100644
--- a/post/lib_ppc/complex.c
+++ b/post/lib_ppc/complex.c
@@ -31,8 +31,6 @@
* calculations, but probably under different timing conditions, etc.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -123,4 +121,3 @@ int cpu_post_test_complex (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/cpu.c b/post/lib_ppc/cpu.c
index 4ab6d2d..5c7f761 100644
--- a/post/lib_ppc/cpu.c
+++ b/post/lib_ppc/cpu.c
@@ -32,8 +32,6 @@
* For more details refer to post/cpu/ *.c files.
*/

-#ifdef CONFIG_POST
-
#include <watchdog.h>
#include <post.h>
#include <asm/mmu.h>
@@ -147,4 +145,3 @@ int cpu_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_CPU */
-#endif /* CONFIG_POST */
diff --git a/post/lib_ppc/cr.c b/post/lib_ppc/cr.c
index da6ef37..0bd9e74 100644
--- a/post/lib_ppc/cr.c
+++ b/post/lib_ppc/cr.c
@@ -46,8 +46,6 @@
* expected one.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -353,4 +351,3 @@ int cpu_post_test_cr (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/fpu/20001122-1.c b/post/lib_ppc/fpu/20001122-1.c
index f689b82..dece614 100644
--- a/post/lib_ppc/fpu/20001122-1.c
+++ b/post/lib_ppc/fpu/20001122-1.c
@@ -26,8 +26,6 @@

#include <common.h>

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_FPU
@@ -59,4 +57,3 @@ int fpu_post_test_math1 (void)
}

#endif /* CONFIG_POST & CFG_POST_FPU */
-#endif /* CONFIG_POST */
diff --git a/post/lib_ppc/fpu/20010114-2.c b/post/lib_ppc/fpu/20010114-2.c
index 6e60507..8a17217 100644
--- a/post/lib_ppc/fpu/20010114-2.c
+++ b/post/lib_ppc/fpu/20010114-2.c
@@ -26,8 +26,6 @@

#include <common.h>

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_FPU
@@ -63,4 +61,3 @@ int fpu_post_test_math2 (void)
}

#endif /* CONFIG_POST & CFG_POST_FPU */
-#endif /* CONFIG_POST */
diff --git a/post/lib_ppc/fpu/20010226-1.c b/post/lib_ppc/fpu/20010226-1.c
index b2c47e3..f366252 100644
--- a/post/lib_ppc/fpu/20010226-1.c
+++ b/post/lib_ppc/fpu/20010226-1.c
@@ -26,8 +26,6 @@

#include <common.h>

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_FPU
@@ -51,4 +49,3 @@ int fpu_post_test_math3 (void)
}

#endif /* CONFIG_POST & CFG_POST_FPU */
-#endif /* CONFIG_POST */
diff --git a/post/lib_ppc/fpu/980619-1.c b/post/lib_ppc/fpu/980619-1.c
index 990aa0c..7f26482 100644
--- a/post/lib_ppc/fpu/980619-1.c
+++ b/post/lib_ppc/fpu/980619-1.c
@@ -26,8 +26,6 @@

#include <common.h>

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_FPU
@@ -57,4 +55,3 @@ int fpu_post_test_math4 (void)
}

#endif /* CONFIG_POST & CFG_POST_FPU */
-#endif /* CONFIG_POST */
diff --git a/post/lib_ppc/fpu/acc1.c b/post/lib_ppc/fpu/acc1.c
index 4cecbf6..921282e 100644
--- a/post/lib_ppc/fpu/acc1.c
+++ b/post/lib_ppc/fpu/acc1.c
@@ -26,8 +26,6 @@

#include <common.h>

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_FPU
@@ -54,4 +52,3 @@ int fpu_post_test_math5 (void)
}

#endif /* CONFIG_POST & CFG_POST_FPU */
-#endif /* CONFIG_POST */
diff --git a/post/lib_ppc/fpu/compare-fp-1.c b/post/lib_ppc/fpu/compare-fp-1.c
index d866ad5..be8f620 100644
--- a/post/lib_ppc/fpu/compare-fp-1.c
+++ b/post/lib_ppc/fpu/compare-fp-1.c
@@ -28,8 +28,6 @@

#include <common.h>

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_FPU
@@ -222,4 +220,3 @@ int fpu_post_test_math6 (void)
}

#endif /* CONFIG_POST & CFG_POST_FPU */
-#endif /* CONFIG_POST */
diff --git a/post/lib_ppc/fpu/fpu.c b/post/lib_ppc/fpu/fpu.c
index 07dcba8..9ddb67a 100644
--- a/post/lib_ppc/fpu/fpu.c
+++ b/post/lib_ppc/fpu/fpu.c
@@ -34,8 +34,6 @@
* For more details refer to post/cpu/ *.c files.
*/

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_FPU
@@ -89,4 +87,3 @@ int fpu_post_test (int flags)
}

#endif /* CONFIG_POST & CFG_POST_FPU */
-#endif /* CONFIG_POST */
diff --git a/post/lib_ppc/fpu/mul-subnormal-single-1.c b/post/lib_ppc/fpu/mul-subnormal-single-1.c
index 67f48da..7e6fe87 100644
--- a/post/lib_ppc/fpu/mul-subnormal-single-1.c
+++ b/post/lib_ppc/fpu/mul-subnormal-single-1.c
@@ -28,8 +28,6 @@

#include <common.h>

-#ifdef CONFIG_POST
-
#include <post.h>

#if CONFIG_POST & CFG_POST_FPU
@@ -100,4 +98,3 @@ int fpu_post_test_math7 (void)
}

#endif /* CONFIG_POST & CFG_POST_FPU */
-#endif /* CONFIG_POST */
diff --git a/post/lib_ppc/load.c b/post/lib_ppc/load.c
index 393c568..86bc223 100644
--- a/post/lib_ppc/load.c
+++ b/post/lib_ppc/load.c
@@ -41,8 +41,6 @@
* register (it must change for "load with update" instructions).
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -252,4 +250,3 @@ int cpu_post_test_load (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/multi.c b/post/lib_ppc/multi.c
index 8724384..5d3f584 100644
--- a/post/lib_ppc/multi.c
+++ b/post/lib_ppc/multi.c
@@ -33,8 +33,6 @@
* of the source and target buffers are then compared.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -78,4 +76,3 @@ int cpu_post_test_multi (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/rlwimi.c b/post/lib_ppc/rlwimi.c
index f65f79a..1d8e61e 100644
--- a/post/lib_ppc/rlwimi.c
+++ b/post/lib_ppc/rlwimi.c
@@ -32,8 +32,6 @@
* different sets of operand registers and result registers.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -159,4 +157,3 @@ int cpu_post_test_rlwimi (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/rlwinm.c b/post/lib_ppc/rlwinm.c
index e240c41..113e79d 100644
--- a/post/lib_ppc/rlwinm.c
+++ b/post/lib_ppc/rlwinm.c
@@ -32,8 +32,6 @@
* different sets of operand registers and result registers.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -152,4 +150,3 @@ int cpu_post_test_rlwinm (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/rlwnm.c b/post/lib_ppc/rlwnm.c
index 523cf4d..a6684bf 100644
--- a/post/lib_ppc/rlwnm.c
+++ b/post/lib_ppc/rlwnm.c
@@ -32,8 +32,6 @@
* different sets of operand registers and result registers.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -162,4 +160,3 @@ int cpu_post_test_rlwnm (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/srawi.c b/post/lib_ppc/srawi.c
index 91c82c9..8c70007 100644
--- a/post/lib_ppc/srawi.c
+++ b/post/lib_ppc/srawi.c
@@ -32,8 +32,6 @@
* different sets of operand registers and result registers.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -153,4 +151,3 @@ int cpu_post_test_srawi (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/store.c b/post/lib_ppc/store.c
index f495bf2..09ec485 100644
--- a/post/lib_ppc/store.c
+++ b/post/lib_ppc/store.c
@@ -41,8 +41,6 @@
* with update" instructions).
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -232,4 +230,3 @@ int cpu_post_test_store (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/string.c b/post/lib_ppc/string.c
index bd83bd1..b2daa88 100644
--- a/post/lib_ppc/string.c
+++ b/post/lib_ppc/string.c
@@ -33,8 +33,6 @@
* of the source and target buffers are then compared.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -103,4 +101,3 @@ int cpu_post_test_string (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/three.c b/post/lib_ppc/three.c
index c2d7476..a7f1a86 100644
--- a/post/lib_ppc/three.c
+++ b/post/lib_ppc/three.c
@@ -35,8 +35,6 @@
* different sets of operand registers and result registers.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -256,4 +254,3 @@ int cpu_post_test_three (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/threei.c b/post/lib_ppc/threei.c
index 79f0178..bbb4f50 100644
--- a/post/lib_ppc/threei.c
+++ b/post/lib_ppc/threei.c
@@ -34,8 +34,6 @@
* different sets of operand registers and result registers.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -134,4 +132,3 @@ int cpu_post_test_threei (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/threex.c b/post/lib_ppc/threex.c
index 2c72063..6aac937 100644
--- a/post/lib_ppc/threex.c
+++ b/post/lib_ppc/threex.c
@@ -35,8 +35,6 @@
* different sets of operand registers and result registers.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -226,4 +224,3 @@ int cpu_post_test_threex (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/two.c b/post/lib_ppc/two.c
index cfbac5e..3d6b3c0 100644
--- a/post/lib_ppc/two.c
+++ b/post/lib_ppc/two.c
@@ -35,8 +35,6 @@
* different sets of operand registers and result registers.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -173,4 +171,3 @@ int cpu_post_test_two (void)
}

#endif
-#endif
diff --git a/post/lib_ppc/twox.c b/post/lib_ppc/twox.c
index 48d9954..7417a36 100644
--- a/post/lib_ppc/twox.c
+++ b/post/lib_ppc/twox.c
@@ -35,8 +35,6 @@
* different sets of operand registers and result registers.
*/

-#ifdef CONFIG_POST
-
#include <post.h>
#include "cpu_asm.h"

@@ -173,4 +171,3 @@ int cpu_post_test_twox (void)
}

#endif
-#endif
diff --git a/post/post.c b/post/post.c
index 1df0657..c016c3a 100644
--- a/post/post.c
+++ b/post/post.c
@@ -30,8 +30,6 @@
#include <logbuff.h>
#endif

-#ifdef CONFIG_POST
-
DECLARE_GLOBAL_DATA_PTR;

#define POST_MAX_NUMBER 32
@@ -442,5 +440,3 @@ unsigned long post_time_ms (unsigned long base)
return 0; /* Not implemented yet */
#endif
}
-
-#endif /* CONFIG_POST */
diff --git a/post/tests.c b/post/tests.c
index 53d01e3..36473e3 100644
--- a/post/tests.c
+++ b/post/tests.c
@@ -27,8 +27,6 @@

#include <common.h>

-#ifdef CONFIG_POST
-
#include <post.h>

extern int cache_post_test (int flags);
@@ -278,5 +276,3 @@ struct post_test post_list[] =
};

unsigned int post_list_size = sizeof (post_list) / sizeof (struct post_test);
-
-#endif /* CONFIG_POST */
--
1.5.4.2