| Message ID | 20170106193545.27832-2-afd@ti.com |
|---|---|
| State | Accepted |
| Commit | 5d28b930f237540382a111b6b990a1738b2f3483 |
| Delegated to: | Tom Rini |
| Headers | show |
On Fri, Jan 06, 2017 at 01:35:45PM -0600, Andrew F. Davis wrote: > These files are only included for build by the make system > when CONFIG_SPL_{EXT,FAT}_SUPPORT is enabled, remove the unneed > checks for these in the source files. > > Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
On 11 January 2017 at 09:28, Tom Rini <trini@konsulko.com> wrote: > On Fri, Jan 06, 2017 at 01:35:45PM -0600, Andrew F. Davis wrote: > >> These files are only included for build by the make system >> when CONFIG_SPL_{EXT,FAT}_SUPPORT is enabled, remove the unneed >> checks for these in the source files. >> >> Signed-off-by: Andrew F. Davis <afd@ti.com> > > Reviewed-by: Tom Rini <trini@konsulko.com> > > -- > Tom Reviewed-by: Simon Glass <sjg@chromium.org>
On Fri, Jan 06, 2017 at 01:35:45PM -0600, Andrew F. Davis wrote: > These files are only included for build by the make system > when CONFIG_SPL_{EXT,FAT}_SUPPORT is enabled, remove the unneed > checks for these in the source files. > > Signed-off-by: Andrew F. Davis <afd@ti.com> > Reviewed-by: Tom Rini <trini@konsulko.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index 6165f88d2b..a58f7ef3fe 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -9,7 +9,6 @@ #include <errno.h> #include <image.h> -#ifdef CONFIG_SPL_EXT_SUPPORT int spl_load_image_ext(struct spl_image_info *spl_image, struct blk_desc *block_dev, int partition, const char *filename) @@ -138,4 +137,3 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, return -ENOSYS; } #endif -#endif diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index aa5a39e4f7..66917ffa4f 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -19,7 +19,6 @@ static int fat_registered; -#ifdef CONFIG_SPL_FAT_SUPPORT static int spl_register_fat_device(struct blk_desc *block_dev, int partition) { int err = 0; @@ -154,4 +153,3 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image, return -ENOSYS; } #endif -#endif
These files are only included for build by the make system when CONFIG_SPL_{EXT,FAT}_SUPPORT is enabled, remove the unneed checks for these in the source files. Signed-off-by: Andrew F. Davis <afd@ti.com> --- common/spl/spl_ext.c | 2 -- common/spl/spl_fat.c | 2 -- 2 files changed, 4 deletions(-)