diff options
author | Adam Ford <aford173@gmail.com> | 2018-02-06 12:43:56 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-02-08 19:09:03 -0500 |
commit | 1811a928c6c7604d6d05a84b4d552a7c31b4994e (patch) | |
tree | 7290cbb48a592acd901b0fab235dd08efb54b8ee /include | |
parent | 560eeee8c2953badfe2a12737ff8e66fefad7944 (diff) |
Move most CONFIG_HAVE_BLOCK_DEVICE to Kconfig
config_fallbacks.h has some logic that sets HAVE_BLOCK_DEVICE
based on a list of enabled options. Moving HAVE_BLOCK_DEVICE to
Kconfig allows us to drastically shrink the logic in
config_fallbacks.h
Signed-off-by: Adam Ford <aford173@gmail.com>
[trini: Rename HAVE_BLOCK_DEVICE to CONFIG_BLOCK_DEVICE]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/config_fallbacks.h | 15 | ||||
-rwxr-xr-x | include/configs/blanche.h | 1 | ||||
-rw-r--r-- | include/configs/dragonboard410c.h | 3 | ||||
-rw-r--r-- | include/configs/dragonboard820c.h | 3 |
4 files changed, 0 insertions, 22 deletions
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index 70013fe1d0..3d68d9fe31 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -29,21 +29,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #endif -/* Rather than repeat this expression each time, add a define for it */ -#if defined(CONFIG_IDE) || \ - defined(CONFIG_SATA) || \ - defined(CONFIG_SCSI) || \ - defined(CONFIG_CMD_USB) || \ - defined(CONFIG_CMD_PART) || \ - defined(CONFIG_CMD_GPT) || \ - defined(CONFIG_MMC) || \ - defined(CONFIG_NVME) || \ - defined(CONFIG_SYSTEMACE) || \ - (defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD)) || \ - defined(CONFIG_SANDBOX) -#define HAVE_BLOCK_DEVICE -#endif - /* Console I/O Buffer Size */ #ifndef CONFIG_SYS_CBSIZE #if defined(CONFIG_CMD_KGDB) diff --git a/include/configs/blanche.h b/include/configs/blanche.h index 4948bbb063..74f669525d 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -98,6 +98,5 @@ /* SDHI */ #define CONFIG_SH_SDHI_FREQ 97500000 -#define HAVE_BLOCK_DEVICE #endif /* __BLANCHE_H */ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 530d667da8..d19e60a6be 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -43,9 +43,6 @@ /* Disabled by default as some sub-commands can brick eMMC */ /*#define CONFIG_SUPPORT_EMMC_BOOT */ -/* Partition table support */ -#define HAVE_BLOCK_DEVICE /* Needed for partition commands */ - #include <config_distro_defaults.h> /* BOOTP options */ diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h index e28a956e92..c07be34d1b 100644 --- a/include/configs/dragonboard820c.h +++ b/include/configs/dragonboard820c.h @@ -33,9 +33,6 @@ /* Generic Timer Definitions */ #define COUNTER_FREQUENCY 19000000 -/* Partition table support */ -#define HAVE_BLOCK_DEVICE - /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE |