[U-Boot] [RFC PATCH 1/7] fpga: CONFIG_SYS_FPGA_PROG_FEEDBACK -> CONFIG_FPGA_PROG_FEEDBACK
Michal Simek
michal.simek at xilinx.com
Wed Nov 23 13:09:11 CET 2016
On 22.11.2016 09:48, Chris Packham wrote:
> Prepare for move to Kconfig by removing "SYS" from the existing macros.
>
> Signed-off-by: Chris Packham <judge.packham at gmail.com>
> ---
>
> README | 2 +-
> board/astro/mcf5373l/fpga.c | 4 ++--
> drivers/fpga/ACEX1K.c | 8 ++++----
> drivers/fpga/cyclon2.c | 10 +++++-----
> drivers/fpga/spartan2.c | 22 +++++++++++-----------
> drivers/fpga/spartan3.c | 20 ++++++++++----------
> drivers/fpga/virtex2.c | 18 +++++++++---------
> include/configs/M54455EVB.h | 2 +-
> include/configs/apf27.h | 2 +-
> include/configs/astro_mcf5373l.h | 2 +-
> include/configs/mt_ventoux.h | 4 ++--
> scripts/config_whitelist.txt | 2 +-
> 12 files changed, 48 insertions(+), 48 deletions(-)
>
> diff --git a/README b/README
> index 47bc215fe9c5..fdc194ab9792 100644
> --- a/README
> +++ b/README
> @@ -2536,7 +2536,7 @@ The following options need to be configured:
> Enable support for fpga loadbp command - load partial bitstream
> (Xilinx only)
>
> - CONFIG_SYS_FPGA_PROG_FEEDBACK
> + CONFIG_FPGA_PROG_FEEDBACK
>
> Enable printing of hash marks during FPGA configuration.
>
> diff --git a/board/astro/mcf5373l/fpga.c b/board/astro/mcf5373l/fpga.c
> index 53e00728c3d8..1b53fd2521e3 100644
> --- a/board/astro/mcf5373l/fpga.c
> +++ b/board/astro/mcf5373l/fpga.c
> @@ -128,7 +128,7 @@ int altera_write_fn(const void *buf, size_t len, int flush, int cookie)
> #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
> WATCHDOG_RESET();
> #endif
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> putc('.'); /* let them know we are alive */
> #endif
> #ifdef CONFIG_SYS_FPGA_CHECK_CTRLC
> @@ -347,7 +347,7 @@ int xilinx_fastwr_config_fn(void *buf, size_t len, int flush, int cookie)
> #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
> WATCHDOG_RESET();
> #endif
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> putc('.'); /* let them know we are alive */
> #endif
> #ifdef CONFIG_SYS_FPGA_CHECK_CTRLC
> diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c
> index 1627f0e6ffde..1fb60e5983c3 100644
> --- a/drivers/fpga/ACEX1K.c
> +++ b/drivers/fpga/ACEX1K.c
> @@ -112,7 +112,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
> "done:\t0x%p\n\n",
> __FUNCTION__, &fn, fn, fn->config, fn->status,
> fn->clk, fn->data, fn->done);
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> printf ("Loading FPGA Device %d...", cookie);
> #endif
>
> @@ -188,7 +188,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
> i --;
> } while (i > 0);
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (bytecount % (bsize / 40) == 0)
> putc ('.'); /* let them know we are alive */
> #endif
> @@ -196,7 +196,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
>
> CONFIG_FPGA_DELAY ();
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> putc (' '); /* terminate the dotted line */
> #endif
>
> @@ -223,7 +223,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
>
> ret_val = FPGA_SUCCESS;
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (ret_val == FPGA_SUCCESS) {
> puts ("Done.\n");
> }
> diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
> index 8ab7679b48f7..2be1c1a40a23 100644
> --- a/drivers/fpga/cyclon2.c
> +++ b/drivers/fpga/cyclon2.c
> @@ -115,7 +115,7 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
> "done:\t0x%p\n\n",
> __FUNCTION__, &fn, fn, fn->config, fn->status,
> fn->write, fn->done);
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> printf ("Loading FPGA Device %d...", cookie);
> #endif
>
> @@ -153,13 +153,13 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
> (*fn->abort) (cookie);
> return FPGA_FAIL;
> }
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> puts(" OK? ...");
> #endif
>
> CONFIG_FPGA_DELAY ();
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> putc (' '); /* terminate the dotted line */
> #endif
>
> @@ -172,13 +172,13 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
> (*fn->abort) (cookie);
> return (FPGA_FAIL);
> }
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> puts(" OK\n");
> #endif
>
> ret_val = FPGA_SUCCESS;
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (ret_val == FPGA_SUCCESS) {
> puts ("Done.\n");
> }
> diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
> index 859fb3c7787a..45e8534cdcb5 100644
> --- a/drivers/fpga/spartan2.c
> +++ b/drivers/fpga/spartan2.c
> @@ -16,7 +16,7 @@
> #endif
>
> #undef CONFIG_SYS_FPGA_CHECK_BUSY
> -#undef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#undef CONFIG_FPGA_PROG_FEEDBACK
>
> /* Note: The assumption is that we cannot possibly run fast enough to
> * overrun the device (the Slave Parallel mode can free run at 50MHz).
> @@ -135,7 +135,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
> * Continuous Data Loading in Slave Parallel Mode for
> * the Spartan-II Family.
> */
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> printf ("Loading FPGA Device %d...\n", cookie);
> #endif
> /*
> @@ -197,7 +197,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
> }
> #endif
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (bytecount % (bsize / 40) == 0)
> putc ('.'); /* let them know we are alive */
> #endif
> @@ -207,7 +207,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
> (*fn->cs) (false, true, cookie); /* Deassert the chip select */
> (*fn->wr) (false, true, cookie); /* Deassert the write pin */
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> putc ('\n'); /* terminate the dotted line */
> #endif
>
> @@ -235,7 +235,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
> if (*fn->post)
> (*fn->post) (cookie);
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (ret_val == FPGA_SUCCESS)
> puts ("Done.\n");
> else
> @@ -271,7 +271,7 @@ static int spartan2_sp_dump(xilinx_desc *desc, const void *buf, size_t bsize)
> (*fn->clk) (false, true, cookie); /* Deassert the clock pin */
> (*fn->clk) (true, true, cookie); /* Assert the clock pin */
> (*fn->rdata) (&(data[bytecount++]), cookie); /* read the data */
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (bytecount % (bsize / 40) == 0)
> putc ('.'); /* let them know we are alive */
> #endif
> @@ -281,7 +281,7 @@ static int spartan2_sp_dump(xilinx_desc *desc, const void *buf, size_t bsize)
> (*fn->clk) (false, true, cookie); /* Deassert the clock pin */
> (*fn->clk) (true, true, cookie); /* Assert the clock pin */
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> putc ('\n'); /* terminate the dotted line */
> #endif
> puts ("Done.\n");
> @@ -323,7 +323,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
> "done:\t0x%p\n\n",
> __FUNCTION__, &fn, fn, fn->pgm, fn->init,
> fn->clk, fn->wr, fn->done);
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> printf ("Loading FPGA Device %d...\n", cookie);
> #endif
>
> @@ -386,7 +386,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
> i --;
> } while (i > 0);
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (bytecount % (bsize / 40) == 0)
> putc ('.'); /* let them know we are alive */
> #endif
> @@ -394,7 +394,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
>
> CONFIG_FPGA_DELAY ();
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> putc ('\n'); /* terminate the dotted line */
> #endif
>
> @@ -426,7 +426,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
> if (*fn->post)
> (*fn->post) (cookie);
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (ret_val == FPGA_SUCCESS)
> puts ("Done.\n");
> else
> diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
> index b0213e69992b..759ad95e2afc 100644
> --- a/drivers/fpga/spartan3.c
> +++ b/drivers/fpga/spartan3.c
> @@ -139,7 +139,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
> * Continuous Data Loading in Slave Parallel Mode for
> * the Spartan-II Family.
> */
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> printf ("Loading FPGA Device %d...\n", cookie);
> #endif
> /*
> @@ -201,7 +201,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
> }
> #endif
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (bytecount % (bsize / 40) == 0)
> putc ('.'); /* let them know we are alive */
> #endif
> @@ -211,7 +211,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
> (*fn->cs) (false, true, cookie); /* Deassert the chip select */
> (*fn->wr) (false, true, cookie); /* Deassert the write pin */
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> putc ('\n'); /* terminate the dotted line */
> #endif
>
> @@ -241,7 +241,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
> if (*fn->post)
> (*fn->post) (cookie);
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (ret_val == FPGA_SUCCESS)
> puts ("Done.\n");
> else
> @@ -277,7 +277,7 @@ static int spartan3_sp_dump(xilinx_desc *desc, const void *buf, size_t bsize)
> (*fn->clk) (false, true, cookie); /* Deassert the clock pin */
> (*fn->clk) (true, true, cookie); /* Assert the clock pin */
> (*fn->rdata) (&(data[bytecount++]), cookie); /* read the data */
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (bytecount % (bsize / 40) == 0)
> putc ('.'); /* let them know we are alive */
> #endif
> @@ -287,7 +287,7 @@ static int spartan3_sp_dump(xilinx_desc *desc, const void *buf, size_t bsize)
> (*fn->clk) (false, true, cookie); /* Deassert the clock pin */
> (*fn->clk) (true, true, cookie); /* Assert the clock pin */
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> putc ('\n'); /* terminate the dotted line */
> #endif
> puts ("Done.\n");
> @@ -329,7 +329,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
> "done:\t0x%p\n\n",
> __FUNCTION__, &fn, fn, fn->pgm, fn->init,
> fn->clk, fn->wr, fn->done);
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> printf ("Loading FPGA Device %d...\n", cookie);
> #endif
>
> @@ -401,7 +401,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
> i --;
> } while (i > 0);
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (bytecount % (bsize / 40) == 0)
> putc ('.'); /* let them know we are alive */
> #endif
> @@ -410,7 +410,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
>
> CONFIG_FPGA_DELAY ();
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> putc ('\n'); /* terminate the dotted line */
> #endif
>
> @@ -444,7 +444,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
> if (*fn->post)
> (*fn->post) (cookie);
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (ret_val == FPGA_SUCCESS)
> puts ("Done.\n");
> else
> diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
> index f7cf02ab5b30..cf7723c46f64 100644
> --- a/drivers/fpga/virtex2.c
> +++ b/drivers/fpga/virtex2.c
> @@ -39,8 +39,8 @@
> #define CONFIG_FPGA_DELAY()
> #endif
>
> -#ifndef CONFIG_SYS_FPGA_PROG_FEEDBACK
> -#define CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifndef CONFIG_FPGA_PROG_FEEDBACK
> +#define CONFIG_FPGA_PROG_FEEDBACK
> #endif
>
> /*
> @@ -190,7 +190,7 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
> fn->clk, fn->cs, fn->wr, fn->rdata, fn->wdata,
> fn->busy, fn->abort, fn->post);
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> printf ("Initializing FPGA Device %d...\n", cookie);
> #endif
> /*
> @@ -294,7 +294,7 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
> }
> #endif
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (bytecount % (bsize / 40) == 0)
> putc ('.');
> #endif
> @@ -307,7 +307,7 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
> (*fn->cs) (false, true, cookie);
> (*fn->wr) (false, true, cookie);
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> putc ('\n');
> #endif
>
> @@ -329,7 +329,7 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
> }
>
> if (ret_val == FPGA_SUCCESS) {
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> printf ("Initialization of FPGA device %d complete\n", cookie);
> #endif
> /*
> @@ -339,7 +339,7 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
> (*fn->post) (cookie);
> }
> } else {
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> printf ("** Initialization of FPGA device %d FAILED\n",
> cookie);
> #endif
> @@ -382,7 +382,7 @@ static int virtex2_ssm_dump(xilinx_desc *desc, const void *buf, size_t bsize)
> (*fn->clk) (false, true, cookie);
> (*fn->clk) (true, true, cookie);
> (*fn->rdata) (&(data[bytecount++]), cookie);
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> if (bytecount % (bsize / 40) == 0)
> putc ('.');
> #endif
> @@ -395,7 +395,7 @@ static int virtex2_ssm_dump(xilinx_desc *desc, const void *buf, size_t bsize)
> (*fn->clk) (false, true, cookie);
> (*fn->clk) (true, true, cookie);
>
> -#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#ifdef CONFIG_FPGA_PROG_FEEDBACK
> putc ('\n');
> #endif
> puts ("Done.\n");
> diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
> index abec3737a498..d80521664611 100644
> --- a/include/configs/M54455EVB.h
> +++ b/include/configs/M54455EVB.h
> @@ -193,7 +193,7 @@
> /* experiment
> #define CONFIG_FPGA
> #define CONFIG_FPGA_COUNT 1
> -#define CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#define CONFIG_FPGA_PROG_FEEDBACK
> #define CONFIG_SYS_FPGA_CHECK_CTRLC
> */
>
> diff --git a/include/configs/apf27.h b/include/configs/apf27.h
> index b903ba53d1dc..a97ba9f39c50 100644
> --- a/include/configs/apf27.h
> +++ b/include/configs/apf27.h
> @@ -267,7 +267,7 @@
> #define CONFIG_FPGA_XILINX
> #define CONFIG_FPGA_SPARTAN3
> #define CONFIG_SYS_FPGA_WAIT 250 /* 250 ms */
> -#define CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#define CONFIG_FPGA_PROG_FEEDBACK
> #define CONFIG_SYS_FPGA_CHECK_CTRLC
> #define CONFIG_SYS_FPGA_CHECK_ERROR
>
> diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
> index e8dca0b2ccdc..0af356bcb49d 100644
> --- a/include/configs/astro_mcf5373l.h
> +++ b/include/configs/astro_mcf5373l.h
> @@ -209,7 +209,7 @@
> #define CONFIG_FPGA_SPARTAN3
> #define CONFIG_FPGA_ALTERA
> #define CONFIG_FPGA_CYCLON2
> -#define CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#define CONFIG_FPGA_PROG_FEEDBACK
> #define CONFIG_SYS_FPGA_WAIT 1000
>
> /* End of user parameters to be customized */
> diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
> index 2420612800fb..1353b11b1250 100644
> --- a/include/configs/mt_ventoux.h
> +++ b/include/configs/mt_ventoux.h
> @@ -45,11 +45,11 @@
> #define CONFIG_FPGA
> #define CONFIG_FPGA_XILINX
> #define CONFIG_FPGA_SPARTAN3
> -#define CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#define CONFIG_FPGA_PROG_FEEDBACK
> #define CONFIG_SYS_FPGA_WAIT 10000
> #define CONFIG_MAX_FPGA_DEVICES 1
> #define CONFIG_FPGA_DELAY() udelay(1)
> -#define CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#define CONFIG_FPGA_PROG_FEEDBACK
>
> #define CONFIG_SPLASH_SCREEN
> #define CONFIG_VIDEO_BMP_RLE8
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index fc2a08a85661..4a2e894367a6 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -5314,7 +5314,7 @@ CONFIG_SYS_FPGA_PHY0_INT
> CONFIG_SYS_FPGA_PHY1_INT
> CONFIG_SYS_FPGA_PRG
> CONFIG_SYS_FPGA_PROG
> -CONFIG_SYS_FPGA_PROG_FEEDBACK
> +CONFIG_FPGA_PROG_FEEDBACK
> CONFIG_SYS_FPGA_PROG_TIME
> CONFIG_SYS_FPGA_PTR
> CONFIG_SYS_FPGA_REG_BASE
>
This is breaking buildman. You should introduce Kconfig option in first
patch and than this one.
[u-boot]$ ./tools/buildman/buildman apf27 -c 2
boards.cfg is up to date. Nothing to do.
Building current source for 1 boards (1 thread, 8 jobs per thread)
arm: + apf27 )
+comm: file 2 is not in sorted order
+Error: You must add new CONFIG options using Kconfig
+The following new ad-hoc CONFIG options were detected:
+CONFIG_FPGA_PROG_FEEDBACK
+
+Please add these via Kconfig instead. Find a suitable Kconfig
+file and add a 'config' or 'menuconfig' option.
+make[1]: *** [all] Error 1
+make: *** [sub-make] Error 2
0 0 1 /1 apf27
Thanks,
Michal
More information about the U-Boot
mailing list