diff options
| author | Tom Rini <trini@konsulko.com> | 2022-12-23 22:19:39 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-12-23 22:19:39 -0500 |
| commit | 3e4cbe184a0f6537abb457d6afa61224396c4e46 (patch) | |
| tree | d6e95e03385c33f5d99775cc44710fc6f540b094 /post/drivers/flash.c | |
| parent | 52d91e1c20b399ddab276e2c03e5788ed5e5fdd2 (diff) | |
| parent | 90c7888c9d6b3223c32f068668f3bc5a81010f8e (diff) | |
Merge branch '2022-12-23-complete-phase1-CONFIG-migration' into next
- Bring in the final series to complete the main portion of migrating
CONFIG symbols to either Kconfig or CFG namespace (or removing /
renaming entirely). With this, we have stricter CI tests as well now.
Diffstat (limited to 'post/drivers/flash.c')
| -rw-r--r-- | post/drivers/flash.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/post/drivers/flash.c b/post/drivers/flash.c index e157d369110..a1fcf1f135d 100644 --- a/post/drivers/flash.c +++ b/post/drivers/flash.c @@ -6,7 +6,7 @@ * Licensed under the GPL-2 or later. */ -#if CFG_POST & CONFIG_SYS_POST_FLASH +#if CFG_POST & CFG_SYS_POST_FLASH #include <common.h> #include <malloc.h> #include <post.h> @@ -23,10 +23,10 @@ * - better seed pattern than 0x00..0xff */ -#ifndef CONFIG_SYS_POST_FLASH_NUM -# define CONFIG_SYS_POST_FLASH_NUM 0 +#ifndef CFG_SYS_POST_FLASH_NUM +# define CFG_SYS_POST_FLASH_NUM 0 #endif -#if CONFIG_SYS_POST_FLASH_START >= CONFIG_SYS_POST_FLASH_END +#if CFG_SYS_POST_FLASH_START >= CFG_SYS_POST_FLASH_END # error "invalid flash block start/end" #endif @@ -59,9 +59,9 @@ int flash_post_test(int flags) len = 0; src = NULL; - info = &flash_info[CONFIG_SYS_POST_FLASH_NUM]; - n_start = CONFIG_SYS_POST_FLASH_START; - n_end = CONFIG_SYS_POST_FLASH_END; + info = &flash_info[CFG_SYS_POST_FLASH_NUM]; + n_start = CFG_SYS_POST_FLASH_START; + n_end = CFG_SYS_POST_FLASH_END; for (n = n_start; n < n_end; ++n) { ulong s_start, s_len, s_off; |