Audit <flash.h> inclusion
A large number of files include <flash.h> as it used to be how various SPI flash related functions were found, or for other reasons entirely. In order to migrate some further CONFIG symbols to Kconfig we need to not include flash.h in cases where we don't have a NOR flash of some sort enabled. Furthermore, in cases where we are in common code and it doesn't make sense to try and further refactor the code itself in to new files we need to guard this inclusion. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
2
env/flash.c
vendored
2
env/flash.c
vendored
@@ -13,7 +13,6 @@
|
||||
#include <command.h>
|
||||
#include <env.h>
|
||||
#include <env_internal.h>
|
||||
#include <flash.h>
|
||||
#include <log.h>
|
||||
#include <asm/global_data.h>
|
||||
#include <linux/stddef.h>
|
||||
@@ -26,6 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
# if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
|
||||
# include <flash.h>
|
||||
# define CMD_SAVEENV
|
||||
# elif defined(CONFIG_ENV_ADDR_REDUND)
|
||||
# error CONFIG_ENV_ADDR_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH
|
||||
|
||||
Reference in New Issue
Block a user