SPDX: Convert all of our single license tags to Linux Kernel style

[u-boot] / common / spl / spl_fat.c

diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index a14acceebb3d3a84b95885c0473a353fc8239b47..87dd5532103a455a7614c6fc305b89096dfb3042 100644 (file)
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2014
  * Texas Instruments, <www.ti.com>
  *
  * Dan Murphy <dmurphy@ti.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * FAT Image Functions copied from spl_mmc.c
  */
 
@@ -15,11 +14,10 @@
 #include <fat.h>
 #include <errno.h>
 #include <image.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 
 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;
@@ -114,7 +112,7 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image,
                return err;
 
 #if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT)
-       file = getenv("falcon_args_file");
+       file = env_get("falcon_args_file");
        if (file) {
                err = file_fat_read(file, (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
                if (err <= 0) {
@@ -122,7 +120,7 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image,
                               file, err);
                        goto defaults;
                }
-               file = getenv("falcon_image_file");
+               file = env_get("falcon_image_file");
                if (file) {
                        err = spl_load_image_fat(spl_image, block_dev,
                                                 partition, file);
@@ -160,4 +158,3 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image,
        return -ENOSYS;
 }
 #endif
-#endif