post: Migrate to Kconfig

We move the existing CONFIG_POST_* functionality over to CFG_POST and
then introduce CONFIG_POST to Kconfig.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Tom Rini
2022-11-19 18:45:44 -05:00
parent d948c8988c
commit 9cebc4ad8e
58 changed files with 114 additions and 99 deletions

View File

@@ -17,7 +17,7 @@
#include <asm/io.h>
#include <post.h>
#if CONFIG_POST & CONFIG_SYS_POST_ECC
#if CFG_POST & CONFIG_SYS_POST_ECC
/*
* We use the RAW I/O accessors where possible in order to
* achieve performance goal, since the test's execution time

View File

@@ -6,7 +6,7 @@
* Licensed under the GPL-2 or later.
*/
#if CONFIG_POST & CONFIG_SYS_POST_FLASH
#if CFG_POST & CONFIG_SYS_POST_FLASH
#include <common.h>
#include <malloc.h>
#include <post.h>

View File

@@ -26,7 +26,7 @@
#include <post.h>
#include <i2c.h>
#if CONFIG_POST & CONFIG_SYS_POST_I2C
#if CFG_POST & CONFIG_SYS_POST_I2C
static int i2c_ignore_device(unsigned int chip)
{
@@ -94,4 +94,4 @@ int i2c_post_test (int flags)
#endif
}
#endif /* CONFIG_POST & CONFIG_SYS_POST_I2C */
#endif /* CFG_POST & CONFIG_SYS_POST_I2C */

View File

@@ -138,7 +138,7 @@
#include <post.h>
#include <watchdog.h>
#if CONFIG_POST & (CFG_SYS_POST_MEMORY | CFG_SYS_POST_MEM_REGIONS)
#if CFG_POST & (CFG_SYS_POST_MEMORY | CFG_SYS_POST_MEM_REGIONS)
DECLARE_GLOBAL_DATA_PTR;
@@ -535,4 +535,4 @@ int memory_post_test(int flags)
return ret;
}
#endif /* CONFIG_POST&(CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS) */
#endif /* CFG_POST&(CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS) */

View File

@@ -26,7 +26,7 @@
#include <post.h>
#include <rtc.h>
#if CONFIG_POST & CONFIG_SYS_POST_RTC
#if CFG_POST & CONFIG_SYS_POST_RTC
static int rtc_post_skip (ulong * diff)
{
@@ -189,4 +189,4 @@ int rtc_post_test (int flags)
return 0;
}
#endif /* CONFIG_POST & CONFIG_SYS_POST_RTC */
#endif /* CFG_POST & CONFIG_SYS_POST_RTC */

View File

@@ -19,7 +19,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op);
extern ulong cpu_post_makecr (long v);

View File

@@ -10,7 +10,7 @@
#include <ppc_defs.h>
#include <asm/cache.h>
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
/* void cpu_post_exec_02 (ulong *code, ulong op1, ulong op2); */
.global cpu_post_exec_02

View File

@@ -24,7 +24,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);
extern void cpu_post_exec_31 (ulong *code, ulong *ctr, ulong *lr, ulong *jump,

View File

@@ -23,7 +23,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_12 (ulong *code, ulong *res, ulong op1, ulong op2);

View File

@@ -23,7 +23,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);

View File

@@ -18,7 +18,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern int cpu_post_complex_1_asm (int a1, int a2, int a3, int a4, int n);
extern int cpu_post_complex_2_asm (int x, int n);

View File

@@ -20,7 +20,7 @@
#include <post.h>
#include <asm/mmu.h>
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern int cpu_post_test_cmp (void);
extern int cpu_post_test_cmpi (void);
@@ -118,4 +118,4 @@ int cpu_post_test (int flags)
return ret;
}
#endif /* CONFIG_POST & CONFIG_SYS_POST_CPU */
#endif /* CFG_POST & CONFIG_SYS_POST_CPU */

View File

@@ -33,7 +33,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);
extern void cpu_post_exec_21x (ulong *code, ulong *op1, ulong *op2, ulong op3);

View File

@@ -13,7 +13,7 @@
GNU_FPOST_ATTR
#if CONFIG_POST & CONFIG_SYS_POST_FPU
#if CFG_POST & CONFIG_SYS_POST_FPU
int fpu_post_test_math1 (void)
{
@@ -40,4 +40,4 @@ int fpu_post_test_math1 (void)
return 0;
}
#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
#endif /* CFG_POST & CONFIG_SYS_POST_FPU */

View File

@@ -13,7 +13,7 @@
GNU_FPOST_ATTR
#if CONFIG_POST & CONFIG_SYS_POST_FPU
#if CFG_POST & CONFIG_SYS_POST_FPU
static float rintf (float x)
{
@@ -45,4 +45,4 @@ int fpu_post_test_math2 (void)
return 0;
}
#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
#endif /* CFG_POST & CONFIG_SYS_POST_FPU */

View File

@@ -13,7 +13,7 @@
GNU_FPOST_ATTR
#if CONFIG_POST & CONFIG_SYS_POST_FPU
#if CFG_POST & CONFIG_SYS_POST_FPU
int fpu_post_test_math3 (void)
{
@@ -33,4 +33,4 @@ int fpu_post_test_math3 (void)
return 0;
}
#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
#endif /* CFG_POST & CONFIG_SYS_POST_FPU */

View File

@@ -13,7 +13,7 @@
GNU_FPOST_ATTR
#if CONFIG_POST & CONFIG_SYS_POST_FPU
#if CFG_POST & CONFIG_SYS_POST_FPU
int fpu_post_test_math4 (void)
{
@@ -39,4 +39,4 @@ int fpu_post_test_math4 (void)
return 0;
}
#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
#endif /* CFG_POST & CONFIG_SYS_POST_FPU */

View File

@@ -13,7 +13,7 @@
GNU_FPOST_ATTR
#if CONFIG_POST & CONFIG_SYS_POST_FPU
#if CFG_POST & CONFIG_SYS_POST_FPU
static double func (const double *array)
{
@@ -36,4 +36,4 @@ int fpu_post_test_math5 (void)
return 0;
}
#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
#endif /* CFG_POST & CONFIG_SYS_POST_FPU */

View File

@@ -15,7 +15,7 @@
GNU_FPOST_ATTR
#if CONFIG_POST & CONFIG_SYS_POST_FPU
#if CFG_POST & CONFIG_SYS_POST_FPU
static int failed;
@@ -204,4 +204,4 @@ int fpu_post_test_math6 (void)
return 0;
}
#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
#endif /* CFG_POST & CONFIG_SYS_POST_FPU */

View File

@@ -21,7 +21,7 @@
GNU_FPOST_ATTR
#if CONFIG_POST & CONFIG_SYS_POST_FPU
#if CFG_POST & CONFIG_SYS_POST_FPU
#include <watchdog.h>
@@ -71,4 +71,4 @@ int fpu_post_test (int flags)
return ret;
}
#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
#endif /* CFG_POST & CONFIG_SYS_POST_FPU */

View File

@@ -15,7 +15,7 @@
GNU_FPOST_ATTR
#if CONFIG_POST & CONFIG_SYS_POST_FPU
#if CFG_POST & CONFIG_SYS_POST_FPU
union uf
{
@@ -82,4 +82,4 @@ int fpu_post_test_math7 (void)
return 0;
}
#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
#endif /* CFG_POST & CONFIG_SYS_POST_FPU */

View File

@@ -28,7 +28,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_22w (ulong *code, ulong *op1, ulong op2, ulong *op3);
extern void cpu_post_exec_21w (ulong *code, ulong *op1, ulong *op2);

View File

@@ -21,7 +21,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_02(ulong *code, ulong op1, ulong op2);

View File

@@ -19,7 +19,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
ulong op2);

View File

@@ -19,7 +19,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op1);
extern ulong cpu_post_makecr (long v);

View File

@@ -19,7 +19,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
ulong op2);

View File

@@ -19,7 +19,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op);
extern ulong cpu_post_makecr (long v);

View File

@@ -28,7 +28,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_12w (ulong *code, ulong *op1, ulong op2, ulong op3);
extern void cpu_post_exec_11w (ulong *code, ulong *op1, ulong op2);

View File

@@ -20,7 +20,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_02 (ulong *code, ulong op1, ulong op2);
extern void cpu_post_exec_04 (ulong *code, ulong op1, ulong op2, ulong op3,

View File

@@ -22,7 +22,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
ulong op2);

View File

@@ -21,7 +21,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op);
extern ulong cpu_post_makecr (long v);

View File

@@ -22,7 +22,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
ulong op2);

View File

@@ -22,7 +22,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op1);
extern ulong cpu_post_makecr (long v);

View File

@@ -22,7 +22,7 @@
#include <post.h>
#include "cpu_asm.h"
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op1);
extern ulong cpu_post_makecr (long v);

View File

@@ -168,7 +168,7 @@ static void post_bootmode_test_off(void)
post_word_store(word);
}
#ifndef CONFIG_POST_SKIP_ENV_FLAGS
#ifndef CFG_POST_SKIP_ENV_FLAGS
static void post_get_env_flags(int *test_flags)
{
int flag[] = { POST_POWERON, POST_NORMAL, POST_SLOWTEST,
@@ -227,7 +227,7 @@ static void post_get_flags(int *test_flags)
for (j = 0; j < post_list_size; j++)
test_flags[j] = post_list[j].flags;
#ifndef CONFIG_POST_SKIP_ENV_FLAGS
#ifndef CFG_POST_SKIP_ENV_FLAGS
post_get_env_flags(test_flags);
#endif

View File

@@ -45,7 +45,7 @@ extern void sysmon_reloc (void);
struct post_test post_list[] =
{
#if CONFIG_POST & CONFIG_SYS_POST_OCM
#if CFG_POST & CONFIG_SYS_POST_OCM
{
"OCM test",
"ocm",
@@ -57,7 +57,7 @@ struct post_test post_list[] =
CONFIG_SYS_POST_OCM
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_CACHE
#if CFG_POST & CONFIG_SYS_POST_CACHE
{
"Cache test",
"cache",
@@ -69,9 +69,9 @@ struct post_test post_list[] =
CONFIG_SYS_POST_CACHE
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_WATCHDOG
#if defined(CONFIG_POST_WATCHDOG)
CONFIG_POST_WATCHDOG,
#if CFG_POST & CONFIG_SYS_POST_WATCHDOG
#if defined(CFG_POST_WATCHDOG)
CFG_POST_WATCHDOG,
#else
{
"Watchdog timer test",
@@ -85,7 +85,7 @@ struct post_test post_list[] =
},
#endif
#endif
#if CONFIG_POST & CONFIG_SYS_POST_I2C
#if CFG_POST & CONFIG_SYS_POST_I2C
{
"I2C test",
"i2c",
@@ -97,7 +97,7 @@ struct post_test post_list[] =
CONFIG_SYS_POST_I2C
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_RTC
#if CFG_POST & CONFIG_SYS_POST_RTC
{
"RTC test",
"rtc",
@@ -109,7 +109,7 @@ struct post_test post_list[] =
CONFIG_SYS_POST_RTC
},
#endif
#if CONFIG_POST & CFG_SYS_POST_MEMORY
#if CFG_POST & CFG_SYS_POST_MEMORY
{
"Memory test",
"memory",
@@ -121,7 +121,7 @@ struct post_test post_list[] =
CFG_SYS_POST_MEMORY
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_CPU
#if CFG_POST & CONFIG_SYS_POST_CPU
{
"CPU test",
"cpu",
@@ -134,7 +134,7 @@ struct post_test post_list[] =
CONFIG_SYS_POST_CPU
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_FPU
#if CFG_POST & CONFIG_SYS_POST_FPU
{
"FPU test",
"fpu",
@@ -147,9 +147,9 @@ struct post_test post_list[] =
CONFIG_SYS_POST_FPU
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_UART
#if defined(CONFIG_POST_UART)
CONFIG_POST_UART,
#if CFG_POST & CONFIG_SYS_POST_UART
#if defined(CFG_POST_UART)
CFG_POST_UART,
#else
{
"UART test",
@@ -161,9 +161,9 @@ struct post_test post_list[] =
NULL,
CONFIG_SYS_POST_UART
},
#endif /* CONFIG_POST_UART */
#endif /* CFG_POST_UART */
#endif
#if CONFIG_POST & CONFIG_SYS_POST_ETHER
#if CFG_POST & CONFIG_SYS_POST_ETHER
{
"ETHERNET test",
"ethernet",
@@ -175,7 +175,7 @@ struct post_test post_list[] =
CONFIG_SYS_POST_ETHER
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_USB
#if CFG_POST & CONFIG_SYS_POST_USB
{
"USB test",
"usb",
@@ -187,7 +187,7 @@ struct post_test post_list[] =
CONFIG_SYS_POST_USB
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_SPR
#if CFG_POST & CONFIG_SYS_POST_SPR
{
"SPR test",
"spr",
@@ -199,7 +199,7 @@ struct post_test post_list[] =
CONFIG_SYS_POST_SPR
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_SYSMON
#if CFG_POST & CONFIG_SYS_POST_SYSMON
{
"SYSMON test",
"sysmon",
@@ -211,7 +211,7 @@ struct post_test post_list[] =
CONFIG_SYS_POST_SYSMON
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_DSP
#if CFG_POST & CONFIG_SYS_POST_DSP
{
"DSP test",
"dsp",
@@ -223,7 +223,7 @@ struct post_test post_list[] =
CONFIG_SYS_POST_DSP
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_CODEC
#if CFG_POST & CONFIG_SYS_POST_CODEC
{
"CODEC test",
"codec",
@@ -235,7 +235,7 @@ struct post_test post_list[] =
CONFIG_SYS_POST_CODEC
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_ECC
#if CFG_POST & CONFIG_SYS_POST_ECC
{
"ECC test",
"ecc",
@@ -247,22 +247,22 @@ struct post_test post_list[] =
CONFIG_SYS_POST_ECC
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_BSPEC1
CONFIG_POST_BSPEC1,
#if CFG_POST & CONFIG_SYS_POST_BSPEC1
CFG_POST_BSPEC1,
#endif
#if CONFIG_POST & CONFIG_SYS_POST_BSPEC2
CONFIG_POST_BSPEC2,
#if CFG_POST & CONFIG_SYS_POST_BSPEC2
CFG_POST_BSPEC2,
#endif
#if CONFIG_POST & CONFIG_SYS_POST_BSPEC3
CONFIG_POST_BSPEC3,
#if CFG_POST & CONFIG_SYS_POST_BSPEC3
CFG_POST_BSPEC3,
#endif
#if CONFIG_POST & CONFIG_SYS_POST_BSPEC4
CONFIG_POST_BSPEC4,
#if CFG_POST & CONFIG_SYS_POST_BSPEC4
CFG_POST_BSPEC4,
#endif
#if CONFIG_POST & CONFIG_SYS_POST_BSPEC5
CONFIG_POST_BSPEC5,
#if CFG_POST & CONFIG_SYS_POST_BSPEC5
CFG_POST_BSPEC5,
#endif
#if CONFIG_POST & CONFIG_SYS_POST_COPROC
#if CFG_POST & CONFIG_SYS_POST_COPROC
{
"Coprocessors communication test",
"coproc_com",
@@ -274,7 +274,7 @@ struct post_test post_list[] =
CONFIG_SYS_POST_COPROC
},
#endif
#if CONFIG_POST & CONFIG_SYS_POST_FLASH
#if CFG_POST & CONFIG_SYS_POST_FLASH
{
"Parallel NOR flash test",
"flash",
@@ -286,7 +286,7 @@ struct post_test post_list[] =
CONFIG_SYS_POST_FLASH
},
#endif
#if CONFIG_POST & CFG_SYS_POST_MEM_REGIONS
#if CFG_POST & CFG_SYS_POST_MEM_REGIONS
{
"Memory regions test",
"mem_regions",