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 /disk | |
| 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 'disk')
| -rw-r--r-- | disk/part.c | 14 | ||||
| -rw-r--r-- | disk/part_amiga.c | 2 | ||||
| -rw-r--r-- | disk/part_dos.c | 2 | ||||
| -rw-r--r-- | disk/part_efi.c | 2 | ||||
| -rw-r--r-- | disk/part_iso.c | 2 | ||||
| -rw-r--r-- | disk/part_mac.c | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/disk/part.c b/disk/part.c index 66b8101f98..e9e18a0910 100644 --- a/disk/part.c +++ b/disk/part.c @@ -26,7 +26,7 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef HAVE_BLOCK_DEVICE +#ifdef CONFIG_HAVE_BLOCK_DEVICE static struct part_driver *part_driver_lookup_type(int part_type) { struct part_driver *drv = @@ -80,7 +80,7 @@ struct blk_desc *blk_get_dev(const char *ifname, int dev) } #endif -#ifdef HAVE_BLOCK_DEVICE +#ifdef CONFIG_HAVE_BLOCK_DEVICE /* ------------------------------------------------------------------------- */ /* @@ -212,7 +212,7 @@ void dev_print (struct blk_desc *dev_desc) } #endif -#ifdef HAVE_BLOCK_DEVICE +#ifdef CONFIG_HAVE_BLOCK_DEVICE void part_init(struct blk_desc *dev_desc) { @@ -298,12 +298,12 @@ void part_print(struct blk_desc *dev_desc) drv->print(dev_desc); } -#endif /* HAVE_BLOCK_DEVICE */ +#endif /* CONFIG_HAVE_BLOCK_DEVICE */ int part_get_info(struct blk_desc *dev_desc, int part, disk_partition_t *info) { -#ifdef HAVE_BLOCK_DEVICE +#ifdef CONFIG_HAVE_BLOCK_DEVICE struct part_driver *drv; #if CONFIG_IS_ENABLED(PARTITION_UUIDS) @@ -329,7 +329,7 @@ int part_get_info(struct blk_desc *dev_desc, int part, PRINTF("## Valid %s partition found ##\n", drv->name); return 0; } -#endif /* HAVE_BLOCK_DEVICE */ +#endif /* CONFIG_HAVE_BLOCK_DEVICE */ return -1; } @@ -396,7 +396,7 @@ int blk_get_device_by_str(const char *ifname, const char *dev_hwpart_str, goto cleanup; } -#ifdef HAVE_BLOCK_DEVICE +#ifdef CONFIG_HAVE_BLOCK_DEVICE /* * Updates the partition table for the specified hw partition. * Does not need to be done for hwpart 0 since it is default and diff --git a/disk/part_amiga.c b/disk/part_amiga.c index f8dae008d7..1b7d915138 100644 --- a/disk/part_amiga.c +++ b/disk/part_amiga.c @@ -10,7 +10,7 @@ #include <ide.h> #include "part_amiga.h" -#ifdef HAVE_BLOCK_DEVICE +#ifdef CONFIG_HAVE_BLOCK_DEVICE #undef AMIGA_DEBUG diff --git a/disk/part_dos.c b/disk/part_dos.c index 9dd086d3db..84e672b47b 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -20,7 +20,7 @@ #include <memalign.h> #include "part_dos.h" -#ifdef HAVE_BLOCK_DEVICE +#ifdef CONFIG_HAVE_BLOCK_DEVICE #define DOS_PART_DEFAULT_SECTOR 512 diff --git a/disk/part_efi.c b/disk/part_efi.c index bea8b20bbd..fb221eec09 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -24,7 +24,7 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef HAVE_BLOCK_DEVICE +#ifdef CONFIG_HAVE_BLOCK_DEVICE /** * efi_crc32() - EFI version of crc32 function * @buf: buffer to calculate crc32 of diff --git a/disk/part_iso.c b/disk/part_iso.c index 4036b00b25..ef582de7a1 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -10,7 +10,7 @@ #include <asm/unaligned.h> #include "part_iso.h" -#ifdef HAVE_BLOCK_DEVICE +#ifdef CONFIG_HAVE_BLOCK_DEVICE /* #define ISO_PART_DEBUG */ diff --git a/disk/part_mac.c b/disk/part_mac.c index e31bc9060c..e65930d8e7 100644 --- a/disk/part_mac.c +++ b/disk/part_mac.c @@ -19,7 +19,7 @@ #include <ide.h> #include "part_mac.h" -#ifdef HAVE_BLOCK_DEVICE +#ifdef CONFIG_HAVE_BLOCK_DEVICE /* stdlib.h causes some compatibility problems; should fixe these! -- wd */ #ifndef __ldiv_t_defined |