diff options
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/Kconfig | 2 | ||||
| -rw-r--r-- | common/spl/spl_fat.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_fit.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_nand.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_net.c | 6 | ||||
| -rw-r--r-- | common/spl/spl_ram.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_ymodem.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index f58163ce53..9609fceea5 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -680,7 +680,7 @@ config SPL_USB_GADGET_SUPPORT if SPL_USB_GADGET_SUPPORT -config SPL_USBETH_SUPPORT +config SPL_USB_ETHER bool "Support USB Ethernet drivers" help Enable access to the USB network subsystem and associated diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 60b85f082d..59a85a986a 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -15,7 +15,7 @@ #include <fat.h> #include <errno.h> #include <image.h> -#include <libfdt.h> +#include <linux/libfdt.h> static int fat_registered; diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index cc07fbc8a0..b705d030e7 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -8,7 +8,7 @@ #include <common.h> #include <errno.h> #include <image.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <spl.h> #ifndef CONFIG_SYS_BOOTM_LEN diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index cd39f9be9d..d075985374 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -9,7 +9,7 @@ #include <spl.h> #include <asm/io.h> #include <nand.h> -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #include <fdt.h> #if defined(CONFIG_SPL_NAND_RAW_ONLY) diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index 88831097fa..50d02478d5 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -11,11 +11,11 @@ #include <errno.h> #include <spl.h> #include <net.h> -#include <libfdt.h> +#include <linux/libfdt.h> DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER) static ulong spl_net_load_read(struct spl_load_info *load, ulong sector, ulong count, void *buf) { @@ -83,7 +83,7 @@ SPL_LOAD_IMAGE_METHOD("eth device", 0, BOOT_DEVICE_CPGMAC, spl_net_load_image_cpgmac); #endif -#ifdef CONFIG_SPL_USBETH_SUPPORT +#ifdef CONFIG_SPL_USB_ETHER int spl_net_load_image_usb(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index fa8c768773..d9db9f3a40 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -14,7 +14,7 @@ #include <binman_sym.h> #include <mapmem.h> #include <spl.h> -#include <libfdt.h> +#include <linux/libfdt.h> #ifndef CONFIG_SPL_LOAD_FIT_ADDRESS # define CONFIG_SPL_LOAD_FIT_ADDRESS 0 diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c index ff8085b795..4ab3dcd624 100644 --- a/common/spl/spl_ymodem.c +++ b/common/spl/spl_ymodem.c @@ -14,7 +14,7 @@ #include <xyzModem.h> #include <asm/u-boot.h> #include <asm/utils.h> -#include <libfdt.h> +#include <linux/libfdt.h> #define BUF_SIZE 1024 |