mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
env: remove value from boolean defines
Several boolean defines have a value assigned. Remove the value as defining the symbol is enough. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Acked-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
parent
914c9ee971
commit
6f403bad80
|
@ -22,7 +22,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _ENVIRONMENT_H_
|
#ifndef _ENVIRONMENT_H_
|
||||||
#define _ENVIRONMENT_H_ 1
|
#define _ENVIRONMENT_H_
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
*
|
*
|
||||||
|
@ -64,10 +64,10 @@
|
||||||
# if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \
|
# if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \
|
||||||
(CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= \
|
(CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= \
|
||||||
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
|
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
|
||||||
# define ENV_IS_EMBEDDED 1
|
# define ENV_IS_EMBEDDED
|
||||||
# endif
|
# endif
|
||||||
# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
|
# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
|
||||||
# define CONFIG_SYS_REDUNDAND_ENVIRONMENT 1
|
# define CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
||||||
# endif
|
# endif
|
||||||
# ifdef CONFIG_ENV_IS_EMBEDDED
|
# ifdef CONFIG_ENV_IS_EMBEDDED
|
||||||
# error "do not define CONFIG_ENV_IS_EMBEDDED in your board config"
|
# error "do not define CONFIG_ENV_IS_EMBEDDED in your board config"
|
||||||
|
@ -120,7 +120,7 @@ extern unsigned long nand_env_oob_offset;
|
||||||
* calculated automatically (i.e. NAND), take the board opt-in.
|
* calculated automatically (i.e. NAND), take the board opt-in.
|
||||||
*/
|
*/
|
||||||
#if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED)
|
#if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED)
|
||||||
# define ENV_IS_EMBEDDED 1
|
# define ENV_IS_EMBEDDED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The build system likes to know if the env is embedded */
|
/* The build system likes to know if the env is embedded */
|
||||||
|
|
|
@ -53,15 +53,15 @@
|
||||||
# endif
|
# endif
|
||||||
# if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \
|
# if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \
|
||||||
((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN))
|
((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN))
|
||||||
# define ENV_IS_EMBEDDED 1
|
# define ENV_IS_EMBEDDED
|
||||||
# endif
|
# endif
|
||||||
# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
|
# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
|
||||||
# define CONFIG_SYS_REDUNDAND_ENVIRONMENT 1
|
# define CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
||||||
# endif
|
# endif
|
||||||
#endif /* CONFIG_ENV_IS_IN_FLASH */
|
#endif /* CONFIG_ENV_IS_IN_FLASH */
|
||||||
|
|
||||||
#if defined(ENV_IS_EMBEDDED) && !defined(CONFIG_BUILD_ENVCRC)
|
#if defined(ENV_IS_EMBEDDED) && !defined(CONFIG_BUILD_ENVCRC)
|
||||||
# define CONFIG_BUILD_ENVCRC 1
|
# define CONFIG_BUILD_ENVCRC
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
||||||
|
|
Loading…
Reference in New Issue
Block a user