diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-09 11:30:08 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-09 11:30:08 -0500 |
| commit | cebdfc22da6eb81793b616e855bc4d6d89c1c7a6 (patch) | |
| tree | 44eaafcbe4866712d361304882e7d56ca0ef1682 /post/post.c | |
| parent | 62e2ad1ceafbfdf2c44d3dc1b6efc81e768a96b9 (diff) | |
| parent | fe33066d246462551f385f204690a11018336ac8 (diff) | |
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'post/post.c')
| -rw-r--r-- | post/post.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/post/post.c b/post/post.c index b81425d8cf8..4db862c0dbb 100644 --- a/post/post.c +++ b/post/post.c @@ -16,7 +16,7 @@ #include <post.h> #include <asm/global_data.h> -#ifdef CONFIG_SYS_POST_HOTKEYS_GPIO +#ifdef CFG_SYS_POST_HOTKEYS_GPIO #include <asm/gpio.h> #endif @@ -55,9 +55,9 @@ int post_init_f(void) */ __weak int post_hotkeys_pressed(void) { -#ifdef CONFIG_SYS_POST_HOTKEYS_GPIO +#ifdef CFG_SYS_POST_HOTKEYS_GPIO int ret; - unsigned gpio = CONFIG_SYS_POST_HOTKEYS_GPIO; + unsigned gpio = CFG_SYS_POST_HOTKEYS_GPIO; ret = gpio_request(gpio, "hotkeys"); if (ret) { @@ -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 |