freescale: ls1021atwr: Drop use of CONFIG_RESET

It is not recommended to use CONFIG_xxx defines for things which are not
Kconfig options. Rename this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 4c3be421795bccfabc6a2cee9274576e38289169..f0b441db63818ad9b34bf2eb8c8d2a351b4e780a 100644 (file)
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -41,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define VERSION_MASK           0x00FF
 #define BANK_MASK              0x0001
-#define CONFIG_RESET           0x1
+#define CFG_RESET              0x1
 #define INIT_RESET             0x1
 
 #define CPLD_SET_MUX_SERDES    0x20
@@ -283,7 +283,7 @@ static void convert_serdes_mux(int type, int need_reset)
 
        if (need_reset == 1) {
                printf("Reset board to enable configuration\n");
-               cpld_data->system_rst = CONFIG_RESET;
+               cpld_data->system_rst = CFG_RESET;
        }
 }
 
@@ -612,7 +612,7 @@ static void convert_flash_bank(char bank)
        cpld_data->vbank = bank;
 
        printf("Reset board to enable configuration.\n");
-       cpld_data->system_rst = CONFIG_RESET;
+       cpld_data->system_rst = CFG_RESET;
 }
 
 static int flash_bank_cmd(struct cmd_tbl *cmdtp, int flag, int argc,
@@ -644,7 +644,7 @@ static int cpld_reset_cmd(struct cmd_tbl *cmdtp, int flag, int argc,
        if (argc > 2)
                return CMD_RET_USAGE;
        if ((argc == 1) || (strcmp(argv[1], "conf") == 0))
-               cpld_data->system_rst = CONFIG_RESET;
+               cpld_data->system_rst = CFG_RESET;
        else if (strcmp(argv[1], "init") == 0)
                cpld_data->global_rst = INIT_RESET;
        else

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 425a7ecb899e21041afe2aaa274eb97ac1bf05de..b24fa36da0f9282d27ae662a6fa4d64b19ea46a4 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1339,7 +1339,6 @@ CONFIG_RESERVED_01_BASE
 CONFIG_RESERVED_02_BASE
 CONFIG_RESERVED_03_BASE
 CONFIG_RESERVED_04_BASE
-CONFIG_RESET
 CONFIG_RESET_PHY_R
 CONFIG_RESET_TO_RETRY
 CONFIG_RESET_VECTOR_ADDRESS