diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-02-27 17:22:03 (GMT) |
|---|---|---|
| committer | Jagan Teki <jagan@amarulasolutions.com> | 2017-04-07 05:53:45 (GMT) |
| commit | fb1c43cc37ae45c6c0576d976a53b9222819691c (patch) | |
| tree | 2f55124ffd08e8c7d0fa432f4f6d730910a9973a /include/configs/sunxi-common.h | |
| parent | 594b4cc732f8f45d855ff435ef68fa4afc153844 (diff) | |
| download | u-boot-fb1c43cc37ae45c6c0576d976a53b9222819691c.tar.xz | |
common: Move environment choice to Kconfig
The environment location is something that might change per board
(depending on what storage options are availaible there) or depending on
the user choice (when we have several options).
Instead of hardcoding it in our configuration header, create a Kconfig
choice with the options we use for now, and the symbols that depend on it.
Once done, also remove the irrelevant sunxi defines.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Diffstat (limited to 'include/configs/sunxi-common.h')
| -rw-r--r-- | include/configs/sunxi-common.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 377ae00..bebbe94 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -134,7 +134,9 @@ /* mmc config */ #ifdef CONFIG_MMC #define CONFIG_MMC_SUNXI_SLOT 0 -#define CONFIG_ENV_IS_IN_MMC +#endif + +#if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_SYS_MMC_ENV_DEV 0 /* first detected MMC controller */ #define CONFIG_SYS_MMC_MAX_DEVICE 4 #endif @@ -164,9 +166,6 @@ #define CONFIG_SYS_MONITOR_LEN (768 << 10) /* 768 KiB */ -#define CONFIG_ENV_OFFSET (544 << 10) /* (8 + 24 + 512) KiB */ -#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ - #define CONFIG_FAT_WRITE /* enable write access */ #define CONFIG_SPL_FRAMEWORK @@ -330,13 +329,6 @@ extern int soft_i2c_gpio_scl; #define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE #endif -#if !defined CONFIG_ENV_IS_IN_MMC && \ - !defined CONFIG_ENV_IS_IN_NAND && \ - !defined CONFIG_ENV_IS_IN_FAT && \ - !defined CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_ENV_IS_NOWHERE -#endif - #define CONFIG_MISC_INIT_R #ifndef CONFIG_SPL_BUILD |