diff options
| author | Simon Glass <sjg@chromium.org> | 2020-02-03 07:36:17 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-02-05 21:48:22 -0700 |
| commit | f217651575f30256955f22a1691115a70e7f5934 (patch) | |
| tree | 422f580407bce71672737bd358723f47be495a22 | |
| parent | 336d4615f8fa774557d14f9b3245daa9e5fe3dbc (diff) | |
| download | u-boot-f217651575f30256955f22a1691115a70e7f5934.tar.gz | |
dm: core: Drop the inclusion of linux/compat.h in dm.h
Most files don't need this header and it pulls in quite of lots of stuff,
malloc() in particular. Drop it.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | board/hisilicon/poplar/poplar.c | 2 | ||||
| -rw-r--r-- | drivers/ram/imxrt_sdram.c | 1 | ||||
| -rw-r--r-- | drivers/spi/nxp_fspi.c | 1 | ||||
| -rw-r--r-- | include/dm/device.h | 1 | ||||
| -rw-r--r-- | include/linux/compat.h | 3 | ||||
| -rw-r--r-- | include/phy.h | 1 |
6 files changed, 7 insertions, 2 deletions
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c index 36999bdcea..4937dc374c 100644 --- a/board/hisilicon/poplar/poplar.c +++ b/board/hisilicon/poplar/poplar.c @@ -4,9 +4,9 @@ * Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> */ +#include <common.h> #include <cpu_func.h> #include <dm.h> -#include <common.h> #include <init.h> #include <asm/io.h> #include <dm/platform_data/serial_pl01x.h> diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c index af7400be82..ac15e94f00 100644 --- a/drivers/ram/imxrt_sdram.c +++ b/drivers/ram/imxrt_sdram.c @@ -9,6 +9,7 @@ #include <dm.h> #include <ram.h> #include <asm/io.h> +#include <linux/err.h> /* SDRAM Command Code */ #define SD_CC_ARD 0x0 /* Master Bus (AXI) command - Read */ diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c index a2fab7ad0a..0e6c7be785 100644 --- a/drivers/spi/nxp_fspi.c +++ b/drivers/spi/nxp_fspi.c @@ -44,6 +44,7 @@ #include <linux/sizes.h> #include <linux/iopoll.h> #include <linux/bug.h> +#include <linux/err.h> /* * The driver only uses one single LUT entry, that is updated on diff --git a/include/dm/device.h b/include/dm/device.h index 544da27e61..ab806d0b7e 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -14,7 +14,6 @@ #include <dm/uclass-id.h> #include <fdtdec.h> #include <linker_lists.h> -#include <linux/compat.h> #include <linux/kernel.h> #include <linux/list.h> #include <linux/printk.h> diff --git a/include/linux/compat.h b/include/linux/compat.h index d0f51baab4..171188a76f 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -123,7 +123,10 @@ static inline void kmem_cache_destroy(struct kmem_cache *cachep) #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) +/* This is also defined in ARMv8's mmu.h */ +#ifndef PAGE_SIZE #define PAGE_SIZE 4096 +#endif /* drivers/char/random.c */ #define get_random_bytes(...) diff --git a/include/phy.h b/include/phy.h index 6ace9b3a0c..42cfc59ec0 100644 --- a/include/phy.h +++ b/include/phy.h @@ -10,6 +10,7 @@ #define _PHY_H #include <dm.h> +#include <linux/errno.h> #include <linux/list.h> #include <linux/mii.h> #include <linux/ethtool.h> |