diff options
241 files changed, 289 insertions, 357 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index cf81c9c083..193f731e90 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -105,11 +105,9 @@ TEXT_BASE = $(CONFIG_TEXT_BASE) CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -ifndef CONFIG_MODULES # Add cleanup flags CPPFLAGS += -fdata-sections -ffunction-sections LDFLAGS_barebox += -static --gc-sections -endif ifdef CONFIG_RELOCATABLE LDFLAGS_barebox += -pie diff --git a/arch/arm/boards/a9m2410/lowlevel_init.S b/arch/arm/boards/a9m2410/lowlevel_init.S index 57d63e8de3..b772b1f7f0 100644 --- a/arch/arm/boards/a9m2410/lowlevel_init.S +++ b/arch/arm/boards/a9m2410/lowlevel_init.S @@ -3,7 +3,7 @@ */ #include <config.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/s3c-iomap.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/boards/a9m2440/lowlevel_init.S b/arch/arm/boards/a9m2440/lowlevel_init.S index 87112011bc..2c51e05806 100644 --- a/arch/arm/boards/a9m2440/lowlevel_init.S +++ b/arch/arm/boards/a9m2440/lowlevel_init.S @@ -3,7 +3,7 @@ */ #include <config.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/s3c-iomap.h> #include <mach/s3c24xx-gpio.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/boards/afi-gf/board.c b/arch/arm/boards/afi-gf/board.c index dfcb579f24..14e2603910 100644 --- a/arch/arm/boards/afi-gf/board.c +++ b/arch/arm/boards/afi-gf/board.c @@ -16,7 +16,7 @@ #include <common.h> #include <string.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <envfs.h> #include <bootsource.h> #include <asm/armlinux.h> diff --git a/arch/arm/boards/afi-gf/lowlevel.c b/arch/arm/boards/afi-gf/lowlevel.c index fdc340c057..4aaecb9e88 100644 --- a/arch/arm/boards/afi-gf/lowlevel.c +++ b/arch/arm/boards/afi-gf/lowlevel.c @@ -1,5 +1,5 @@ #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <asm/armlinux.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/boards/animeo_ip/init.c b/arch/arm/boards/animeo_ip/init.c index 495dc18df5..0fda01363c 100644 --- a/arch/arm/boards/animeo_ip/init.c +++ b/arch/arm/boards/animeo_ip/init.c @@ -17,7 +17,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <linux/clk.h> #include <mach/board.h> diff --git a/arch/arm/boards/archosg9/board.c b/arch/arm/boards/archosg9/board.c index 114c34ec24..0a3c0b9d98 100644 --- a/arch/arm/boards/archosg9/board.c +++ b/arch/arm/boards/archosg9/board.c @@ -18,7 +18,7 @@ #include <mach/omap4-silicon.h> #include <mach/omap4-devices.h> #include <mach/omap4_rom_usb.h> -#include <sizes.h> +#include <linux/sizes.h> #include <i2c/i2c.h> #include <gpio.h> #include <gpio_keys.h> diff --git a/arch/arm/boards/archosg9/lowlevel.c b/arch/arm/boards/archosg9/lowlevel.c index 6813e0d18a..c76d04b905 100644 --- a/arch/arm/boards/archosg9/lowlevel.c +++ b/arch/arm/boards/archosg9/lowlevel.c @@ -13,7 +13,7 @@ #include <common.h> #include <io.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <mach/omap4-mux.h> #include <mach/omap4-silicon.h> diff --git a/arch/arm/boards/at91rm9200ek/init.c b/arch/arm/boards/at91rm9200ek/init.c index c444669ff8..43c8b1b055 100644 --- a/arch/arm/boards/at91rm9200ek/init.c +++ b/arch/arm/boards/at91rm9200ek/init.c @@ -25,7 +25,7 @@ #include <gpio.h> #include <fcntl.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/hardware.h> #include <mach/at91_pmc.h> #include <mach/board.h> diff --git a/arch/arm/boards/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c index bc0c411d3a..422feb2098 100644 --- a/arch/arm/boards/at91sam9260ek/init.c +++ b/arch/arm/boards/at91sam9260ek/init.c @@ -19,7 +19,7 @@ #include <generated/mach-types.h> #include <nand.h> #include <linux/mtd/nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/board.h> #include <mach/at91sam9_smc.h> #include <gpio.h> diff --git a/arch/arm/boards/at91sam9261ek/init.c b/arch/arm/boards/at91sam9261ek/init.c index 7b8ce98d5d..a0b0219191 100644 --- a/arch/arm/boards/at91sam9261ek/init.c +++ b/arch/arm/boards/at91sam9261ek/init.c @@ -26,7 +26,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <mach/at91_pmc.h> #include <mach/board.h> diff --git a/arch/arm/boards/at91sam9263ek/init.c b/arch/arm/boards/at91sam9263ek/init.c index c8a9d5c005..3bb2ddafa3 100644 --- a/arch/arm/boards/at91sam9263ek/init.c +++ b/arch/arm/boards/at91sam9263ek/init.c @@ -28,7 +28,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <mach/at91_pmc.h> #include <mach/board.h> diff --git a/arch/arm/boards/at91sam9m10g45ek/init.c b/arch/arm/boards/at91sam9m10g45ek/init.c index cdd7806848..e00908bc39 100644 --- a/arch/arm/boards/at91sam9m10g45ek/init.c +++ b/arch/arm/boards/at91sam9m10g45ek/init.c @@ -30,7 +30,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <mach/at91_pmc.h> #include <mach/board.h> diff --git a/arch/arm/boards/at91sam9m10ihd/init.c b/arch/arm/boards/at91sam9m10ihd/init.c index a432e5c411..dcd93c10b3 100644 --- a/arch/arm/boards/at91sam9m10ihd/init.c +++ b/arch/arm/boards/at91sam9m10ihd/init.c @@ -17,7 +17,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <mach/board.h> #include <gpio.h> diff --git a/arch/arm/boards/at91sam9n12ek/init.c b/arch/arm/boards/at91sam9n12ek/init.c index 818a598907..26d08ae659 100644 --- a/arch/arm/boards/at91sam9n12ek/init.c +++ b/arch/arm/boards/at91sam9n12ek/init.c @@ -27,7 +27,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <mach/board.h> #include <mach/at91sam9_smc.h> diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c index 183ddc7052..e0c11a11e1 100644 --- a/arch/arm/boards/at91sam9x5ek/init.c +++ b/arch/arm/boards/at91sam9x5ek/init.c @@ -27,7 +27,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <mach/board.h> #include <mach/at91sam9_smc.h> diff --git a/arch/arm/boards/avnet-zedboard/board.c b/arch/arm/boards/avnet-zedboard/board.c index ef9a8a878c..722bda302e 100644 --- a/arch/arm/boards/avnet-zedboard/board.c +++ b/arch/arm/boards/avnet-zedboard/board.c @@ -19,7 +19,7 @@ #include <init.h> #include <mach/devices.h> #include <mach/zynq7000-regs.h> -#include <sizes.h> +#include <linux/sizes.h> static int zedboard_mem_init(void) { diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c index 4054960581..775621069c 100644 --- a/arch/arm/boards/beagle/board.c +++ b/arch/arm/boards/beagle/board.c @@ -19,7 +19,7 @@ #include <console.h> #include <init.h> #include <driver.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <ns16550.h> #include <asm/armlinux.h> diff --git a/arch/arm/boards/beagle/lowlevel.c b/arch/arm/boards/beagle/lowlevel.c index 62c98a9cec..d6e6b9f91c 100644 --- a/arch/arm/boards/beagle/lowlevel.c +++ b/arch/arm/boards/beagle/lowlevel.c @@ -1,6 +1,6 @@ #include <init.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <mach/control.h> diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c index 9b1a9ecdc2..4e0e3745bb 100644 --- a/arch/arm/boards/beaglebone/board.c +++ b/arch/arm/boards/beaglebone/board.c @@ -27,7 +27,7 @@ #include <envfs.h> #include <environment.h> #include <globalvar.h> -#include <sizes.h> +#include <linux/sizes.h> #include <net.h> #include <envfs.h> #include <bootsource.h> diff --git a/arch/arm/boards/beaglebone/lowlevel.c b/arch/arm/boards/beaglebone/lowlevel.c index a742bbf7af..05b3e5f157 100644 --- a/arch/arm/boards/beaglebone/lowlevel.c +++ b/arch/arm/boards/beaglebone/lowlevel.c @@ -1,5 +1,5 @@ #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <linux/string.h> #include <debug_ll.h> diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c b/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c index a32e29c3e4..7d859330f9 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c +++ b/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/canon-a1100/lowlevel.c b/arch/arm/boards/canon-a1100/lowlevel.c index bbae825661..5f4297ea4c 100644 --- a/arch/arm/boards/canon-a1100/lowlevel.c +++ b/arch/arm/boards/canon-a1100/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c index 0960d1ecf7..40cf76dc5a 100644 --- a/arch/arm/boards/ccxmx51/ccxmx51.c +++ b/arch/arm/boards/ccxmx51/ccxmx51.c @@ -26,7 +26,7 @@ #include <partition.h> #include <fs.h> #include <fcntl.h> -#include <sizes.h> +#include <linux/sizes.h> #include <nand.h> #include <notifier.h> #include <spi/spi.h> diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c index 2e5fca5f50..5e569bcc9a 100644 --- a/arch/arm/boards/chumby_falconwing/falconwing.c +++ b/arch/arm/boards/chumby_falconwing/falconwing.c @@ -19,7 +19,7 @@ #include <envfs.h> #include <errno.h> #include <mci.h> -#include <sizes.h> +#include <linux/sizes.h> #include <usb/ehci.h> #include <asm/armlinux.h> #include <io.h> diff --git a/arch/arm/boards/chumby_falconwing/lowlevel.c b/arch/arm/boards/chumby_falconwing/lowlevel.c index d26562c02b..bfc76cc7d4 100644 --- a/arch/arm/boards/chumby_falconwing/lowlevel.c +++ b/arch/arm/boards/chumby_falconwing/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <mach/imx23-regs.h> diff --git a/arch/arm/boards/clep7212/clep7212.c b/arch/arm/boards/clep7212/clep7212.c index e521643912..de125ea9ee 100644 --- a/arch/arm/boards/clep7212/clep7212.c +++ b/arch/arm/boards/clep7212/clep7212.c @@ -12,7 +12,7 @@ #include <init.h> #include <partition.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/armlinux.h> #include <asm/mmu.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c index e6ebe82076..1412eff4a7 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c +++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c @@ -25,7 +25,7 @@ #include <mci.h> #include <io.h> #include <net.h> -#include <sizes.h> +#include <linux/sizes.h> #include <i2c/i2c.h> #include <i2c/i2c-gpio.h> diff --git a/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c b/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c index aa3b09b2ee..3c7248ef65 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c +++ b/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <mach/imx28-regs.h> diff --git a/arch/arm/boards/datamodul-edm-qmx6/Makefile b/arch/arm/boards/datamodul-edm-qmx6/Makefile index bb6d9d848d..01c7a259e9 100644 --- a/arch/arm/boards/datamodul-edm-qmx6/Makefile +++ b/arch/arm/boards/datamodul-edm-qmx6/Makefile @@ -1,2 +1,2 @@ -obj-y += board.o lowlevel.o -pbl-y += lowlevel.o +obj-y += board.o +lwl-y += lowlevel.o diff --git a/arch/arm/boards/datamodul-edm-qmx6/board.c b/arch/arm/boards/datamodul-edm-qmx6/board.c index 25f45dfcc0..81356e61c0 100644 --- a/arch/arm/boards/datamodul-edm-qmx6/board.c +++ b/arch/arm/boards/datamodul-edm-qmx6/board.c @@ -23,7 +23,7 @@ #include <partition.h> #include <common.h> #include <envfs.h> -#include <sizes.h> +#include <linux/sizes.h> #include <init.h> #include <gpio.h> #include <fec.h> diff --git a/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c b/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c index 914c275b88..28b4aa280d 100644 --- a/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c +++ b/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c @@ -13,7 +13,7 @@ * */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <debug_ll.h> #include <asm/sections.h> diff --git a/arch/arm/boards/dfi-fs700-m60/board.c b/arch/arm/boards/dfi-fs700-m60/board.c index e0dc5b242e..bef4612d9e 100644 --- a/arch/arm/boards/dfi-fs700-m60/board.c +++ b/arch/arm/boards/dfi-fs700-m60/board.c @@ -23,7 +23,7 @@ #include <bootsource.h> #include <globalvar.h> #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <envfs.h> #include <init.h> #include <gpio.h> diff --git a/arch/arm/boards/dfi-fs700-m60/lowlevel.c b/arch/arm/boards/dfi-fs700-m60/lowlevel.c index 81b3530468..b9b498e463 100644 --- a/arch/arm/boards/dfi-fs700-m60/lowlevel.c +++ b/arch/arm/boards/dfi-fs700-m60/lowlevel.c @@ -13,7 +13,7 @@ * */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <asm/sections.h> #include <asm/mmu.h> diff --git a/arch/arm/boards/ebv-socrates/board.c b/arch/arm/boards/ebv-socrates/board.c index b2f62dc2f3..5d2d619914 100644 --- a/arch/arm/boards/ebv-socrates/board.c +++ b/arch/arm/boards/ebv-socrates/board.c @@ -5,7 +5,7 @@ #include <asm/armlinux.h> #include <linux/micrel_phy.h> #include <linux/phy.h> -#include <sizes.h> +#include <linux/sizes.h> #include <fcntl.h> #include <fs.h> #include <mach/socfpga-regs.h> diff --git a/arch/arm/boards/ebv-socrates/lowlevel.c b/arch/arm/boards/ebv-socrates/lowlevel.c index 7fc81678ef..66cb226b21 100644 --- a/arch/arm/boards/ebv-socrates/lowlevel.c +++ b/arch/arm/boards/ebv-socrates/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/embedsky-e9/board.c b/arch/arm/boards/embedsky-e9/board.c index 55b4320219..1e7e06788a 100644 --- a/arch/arm/boards/embedsky-e9/board.c +++ b/arch/arm/boards/embedsky-e9/board.c @@ -31,7 +31,7 @@ #include <asm/io.h> #include <asm/mmu.h> #include <mach/generic.h> -#include <sizes.h> +#include <linux/sizes.h> #include <net.h> #include <mach/imx6.h> #include <mach/devices-imx6.h> diff --git a/arch/arm/boards/embedsky-e9/lowlevel.c b/arch/arm/boards/embedsky-e9/lowlevel.c index fee1011700..fb1ba5f64a 100644 --- a/arch/arm/boards/embedsky-e9/lowlevel.c +++ b/arch/arm/boards/embedsky-e9/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/embest-riotboard/board.c b/arch/arm/boards/embest-riotboard/board.c index 3f5b4dec51..a885a08a70 100644 --- a/arch/arm/boards/embest-riotboard/board.c +++ b/arch/arm/boards/embest-riotboard/board.c @@ -26,7 +26,7 @@ #include <mach/imx6.h> #include <mach/bbu.h> #include <mfd/imx6q-iomuxc-gpr.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/phy.h> static int ar8035_phy_fixup(struct phy_device *dev) diff --git a/arch/arm/boards/embest-riotboard/lowlevel.c b/arch/arm/boards/embest-riotboard/lowlevel.c index c4ef28786e..fe21b9aadc 100644 --- a/arch/arm/boards/embest-riotboard/lowlevel.c +++ b/arch/arm/boards/embest-riotboard/lowlevel.c @@ -1,6 +1,6 @@ #include <debug_ll.h> #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/freescale-mx21-ads/imx21ads.c b/arch/arm/boards/freescale-mx21-ads/imx21ads.c index bd7e46e161..5f0e7bda63 100644 --- a/arch/arm/boards/freescale-mx21-ads/imx21ads.c +++ b/arch/arm/boards/freescale-mx21-ads/imx21ads.c @@ -30,7 +30,7 @@ #include <mach/weim.h> #include <partition.h> #include <fs.h> -#include <sizes.h> +#include <linux/sizes.h> #include <fcntl.h> #include <generated/mach-types.h> #include <mach/imx-nand.h> diff --git a/arch/arm/boards/freescale-mx21-ads/lowlevel_init.S b/arch/arm/boards/freescale-mx21-ads/lowlevel_init.S index 87b2f942ff..16739b5577 100644 --- a/arch/arm/boards/freescale-mx21-ads/lowlevel_init.S +++ b/arch/arm/boards/freescale-mx21-ads/lowlevel_init.S @@ -14,7 +14,7 @@ */ #include <config.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm-generic/memory_layout.h> #include <mach/imx21-regs.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/boards/freescale-mx23-evk/lowlevel.c b/arch/arm/boards/freescale-mx23-evk/lowlevel.c index 2a26a7763e..b260f3a7fa 100644 --- a/arch/arm/boards/freescale-mx23-evk/lowlevel.c +++ b/arch/arm/boards/freescale-mx23-evk/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <mach/imx23-regs.h> diff --git a/arch/arm/boards/freescale-mx28-evk/lowlevel.c b/arch/arm/boards/freescale-mx28-evk/lowlevel.c index aa3b09b2ee..3c7248ef65 100644 --- a/arch/arm/boards/freescale-mx28-evk/lowlevel.c +++ b/arch/arm/boards/freescale-mx28-evk/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <mach/imx28-regs.h> diff --git a/arch/arm/boards/freescale-mx35-3ds/3stack.c b/arch/arm/boards/freescale-mx35-3ds/3stack.c index 8f821adb73..cca0fe49eb 100644 --- a/arch/arm/boards/freescale-mx35-3ds/3stack.c +++ b/arch/arm/boards/freescale-mx35-3ds/3stack.c @@ -30,7 +30,7 @@ #include <init.h> #include <nand.h> #include <net.h> -#include <sizes.h> +#include <linux/sizes.h> #include <partition.h> #include <gpio.h> diff --git a/arch/arm/boards/freescale-mx53-qsb/board.c b/arch/arm/boards/freescale-mx53-qsb/board.c index 1128e686bc..f65b55658f 100644 --- a/arch/arm/boards/freescale-mx53-qsb/board.c +++ b/arch/arm/boards/freescale-mx53-qsb/board.c @@ -17,7 +17,7 @@ #include <environment.h> #include <partition.h> #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <init.h> #include <fs.h> diff --git a/arch/arm/boards/freescale-mx53-smd/board.c b/arch/arm/boards/freescale-mx53-smd/board.c index c81f43c158..196d20a45d 100644 --- a/arch/arm/boards/freescale-mx53-smd/board.c +++ b/arch/arm/boards/freescale-mx53-smd/board.c @@ -23,7 +23,7 @@ #include <nand.h> #include <net.h> #include <partition.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/freescale-mx53-vmx53/board.c b/arch/arm/boards/freescale-mx53-vmx53/board.c index b91bfdf5ed..1859aaca26 100644 --- a/arch/arm/boards/freescale-mx53-vmx53/board.c +++ b/arch/arm/boards/freescale-mx53-vmx53/board.c @@ -18,7 +18,7 @@ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <generated/mach-types.h> #include <mach/imx5.h> diff --git a/arch/arm/boards/freescale-mx6-arm2/board.c b/arch/arm/boards/freescale-mx6-arm2/board.c index 7a78400f2e..3d5576c065 100644 --- a/arch/arm/boards/freescale-mx6-arm2/board.c +++ b/arch/arm/boards/freescale-mx6-arm2/board.c @@ -25,7 +25,7 @@ #include <asm/io.h> #include <asm/mmu.h> #include <mach/generic.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/imx6.h> #include <mach/devices-imx6.h> #include <mach/iomux-mx6.h> diff --git a/arch/arm/boards/freescale-mx6-arm2/lowlevel.c b/arch/arm/boards/freescale-mx6-arm2/lowlevel.c index 5676711a13..f833893335 100644 --- a/arch/arm/boards/freescale-mx6-arm2/lowlevel.c +++ b/arch/arm/boards/freescale-mx6-arm2/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <mach/generic.h> diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c index 1f26548058..edf081140c 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/board.c +++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c @@ -28,7 +28,7 @@ #include <asm/io.h> #include <asm/mmu.h> #include <mach/generic.h> -#include <sizes.h> +#include <linux/sizes.h> #include <net.h> #include <linux/micrel_phy.h> #include <mach/imx6.h> diff --git a/arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c b/arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c index 1b4796571a..abfb77a157 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c +++ b/arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/freescale-mx6-sabresd/board.c b/arch/arm/boards/freescale-mx6-sabresd/board.c index 53aada7bba..734adde070 100644 --- a/arch/arm/boards/freescale-mx6-sabresd/board.c +++ b/arch/arm/boards/freescale-mx6-sabresd/board.c @@ -28,7 +28,7 @@ #include <asm/io.h> #include <asm/mmu.h> #include <mach/generic.h> -#include <sizes.h> +#include <linux/sizes.h> #include <net.h> #include <mach/imx6.h> #include <mach/devices-imx6.h> diff --git a/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c b/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c index bf1845912e..73eed1d068 100644 --- a/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c +++ b/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/freescale-mx6sx-sabresdb/board.c b/arch/arm/boards/freescale-mx6sx-sabresdb/board.c index c21b43dc56..353b460a16 100644 --- a/arch/arm/boards/freescale-mx6sx-sabresdb/board.c +++ b/arch/arm/boards/freescale-mx6sx-sabresdb/board.c @@ -16,7 +16,7 @@ #include <environment.h> #include <partition.h> #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <init.h> #include <io.h> diff --git a/arch/arm/boards/freescale-mx6sx-sabresdb/lowlevel.c b/arch/arm/boards/freescale-mx6sx-sabresdb/lowlevel.c index 33f3700288..4c5a74ea63 100644 --- a/arch/arm/boards/freescale-mx6sx-sabresdb/lowlevel.c +++ b/arch/arm/boards/freescale-mx6sx-sabresdb/lowlevel.c @@ -14,7 +14,7 @@ #include <debug_ll.h> #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S b/arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S index 858351b13d..43bf49c12c 100644 --- a/arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S +++ b/arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S @@ -3,7 +3,7 @@ */ #include <config.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/s3c-iomap.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/boards/friendlyarm-mini6410/lowlevel.c b/arch/arm/boards/friendlyarm-mini6410/lowlevel.c index a21a3f8301..665c31b324 100644 --- a/arch/arm/boards/friendlyarm-mini6410/lowlevel.c +++ b/arch/arm/boards/friendlyarm-mini6410/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/s3c-iomap.h> diff --git a/arch/arm/boards/friendlyarm-tiny210/lowlevel.c b/arch/arm/boards/friendlyarm-tiny210/lowlevel.c index 7e70851043..3ab8d66060 100644 --- a/arch/arm/boards/friendlyarm-tiny210/lowlevel.c +++ b/arch/arm/boards/friendlyarm-tiny210/lowlevel.c @@ -19,7 +19,7 @@ #include <common.h> #include <init.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <asm/sections.h> diff --git a/arch/arm/boards/friendlyarm-tiny210/tiny210.c b/arch/arm/boards/friendlyarm-tiny210/tiny210.c index a33af99aab..d84b3128ad 100644 --- a/arch/arm/boards/friendlyarm-tiny210/tiny210.c +++ b/arch/arm/boards/friendlyarm-tiny210/tiny210.c @@ -27,7 +27,7 @@ #include <common.h> #include <driver.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <generated/mach-types.h> #include <dm9000.h> #include <gpio.h> diff --git a/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c b/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c index a21a3f8301..665c31b324 100644 --- a/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c +++ b/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/s3c-iomap.h> diff --git a/arch/arm/boards/gateworks-ventana/lowlevel.c b/arch/arm/boards/gateworks-ventana/lowlevel.c index 10b2c4c780..746beb87e5 100644 --- a/arch/arm/boards/gateworks-ventana/lowlevel.c +++ b/arch/arm/boards/gateworks-ventana/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/gk802/board.c b/arch/arm/boards/gk802/board.c index 9dd22533fc..0d1b07b0e0 100644 --- a/arch/arm/boards/gk802/board.c +++ b/arch/arm/boards/gk802/board.c @@ -24,7 +24,7 @@ #include <mach/imx6-regs.h> #include <mach/imx6.h> #include <mfd/imx6q-iomuxc-gpr.h> -#include <sizes.h> +#include <linux/sizes.h> #include <of.h> #define GK802_GPIO_RECOVERY_BTN IMX_GPIO_NR(3, 16) /* recovery button */ diff --git a/arch/arm/boards/gk802/lowlevel.c b/arch/arm/boards/gk802/lowlevel.c index de744a2052..b571969884 100644 --- a/arch/arm/boards/gk802/lowlevel.c +++ b/arch/arm/boards/gk802/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/globalscale-guruplug/lowlevel.c b/arch/arm/boards/globalscale-guruplug/lowlevel.c index 508746a06f..91bc1cf565 100644 --- a/arch/arm/boards/globalscale-guruplug/lowlevel.c +++ b/arch/arm/boards/globalscale-guruplug/lowlevel.c @@ -15,7 +15,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/lowlevel.h> diff --git a/arch/arm/boards/globalscale-mirabox/lowlevel.c b/arch/arm/boards/globalscale-mirabox/lowlevel.c index 92203b768a..4f55d1acb9 100644 --- a/arch/arm/boards/globalscale-mirabox/lowlevel.c +++ b/arch/arm/boards/globalscale-mirabox/lowlevel.c @@ -15,7 +15,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/lowlevel.h> diff --git a/arch/arm/boards/guf-santaro/board.c b/arch/arm/boards/guf-santaro/board.c index 8fbfe269b0..b9a52ee258 100644 --- a/arch/arm/boards/guf-santaro/board.c +++ b/arch/arm/boards/guf-santaro/board.c @@ -20,7 +20,7 @@ #include <asm/io.h> #include <asm/mmu.h> #include <mach/generic.h> -#include <sizes.h> +#include <linux/sizes.h> #include <bootsource.h> #include <bbu.h> #include <mach/bbu.h> diff --git a/arch/arm/boards/guf-santaro/lowlevel.c b/arch/arm/boards/guf-santaro/lowlevel.c index 02de84c7b9..7753cea4e2 100644 --- a/arch/arm/boards/guf-santaro/lowlevel.c +++ b/arch/arm/boards/guf-santaro/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/guf-vincell/board.c b/arch/arm/boards/guf-vincell/board.c index bacab0bd1f..0c46ade9fc 100644 --- a/arch/arm/boards/guf-vincell/board.c +++ b/arch/arm/boards/guf-vincell/board.c @@ -23,7 +23,7 @@ #include <nand.h> #include <net.h> #include <partition.h> -#include <sizes.h> +#include <linux/sizes.h> #include <bbu.h> #include <gpio.h> #include <io.h> diff --git a/arch/arm/boards/highbank/init.c b/arch/arm/boards/highbank/init.c index 7b4f9637df..a0d4b30b48 100644 --- a/arch/arm/boards/highbank/init.c +++ b/arch/arm/boards/highbank/init.c @@ -14,7 +14,7 @@ #include <mach/sysregs.h> #include <environment.h> #include <partition.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <of.h> diff --git a/arch/arm/boards/highbank/lowlevel.c b/arch/arm/boards/highbank/lowlevel.c index c0405ed3a4..83f4c7ad15 100644 --- a/arch/arm/boards/highbank/lowlevel.c +++ b/arch/arm/boards/highbank/lowlevel.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <asm/system_info.h> diff --git a/arch/arm/boards/imx233-olinuxino/lowlevel.c b/arch/arm/boards/imx233-olinuxino/lowlevel.c index d26562c02b..bfc76cc7d4 100644 --- a/arch/arm/boards/imx233-olinuxino/lowlevel.c +++ b/arch/arm/boards/imx233-olinuxino/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <mach/imx23-regs.h> diff --git a/arch/arm/boards/karo-tx25/board.c b/arch/arm/boards/karo-tx25/board.c index 59c81b2faa..ebebd58d80 100644 --- a/arch/arm/boards/karo-tx25/board.c +++ b/arch/arm/boards/karo-tx25/board.c @@ -22,7 +22,7 @@ #include <common.h> #include <init.h> #include <driver.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <environment.h> #include <mach/imx25-regs.h> diff --git a/arch/arm/boards/karo-tx25/lowlevel.c b/arch/arm/boards/karo-tx25/lowlevel.c index 861c27b8a6..b7ff2d44c6 100644 --- a/arch/arm/boards/karo-tx25/lowlevel.c +++ b/arch/arm/boards/karo-tx25/lowlevel.c @@ -21,7 +21,7 @@ #include <mach/imx25-regs.h> #include <mach/esdctl.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/imx-nand.h> #include <mach/esdctl.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/karo-tx28/lowlevel.c b/arch/arm/boards/karo-tx28/lowlevel.c index aa3b09b2ee..3c7248ef65 100644 --- a/arch/arm/boards/karo-tx28/lowlevel.c +++ b/arch/arm/boards/karo-tx28/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <mach/imx28-regs.h> diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c index 2aaceb442e..c4c51099b4 100644 --- a/arch/arm/boards/karo-tx28/tx28-stk5.c +++ b/arch/arm/boards/karo-tx28/tx28-stk5.c @@ -19,7 +19,7 @@ #include <errno.h> #include <mci.h> #include <fec.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <net.h> #include <asm/sections.h> diff --git a/arch/arm/boards/karo-tx53/board.c b/arch/arm/boards/karo-tx53/board.c index e5c27aac93..b8164ca86e 100644 --- a/arch/arm/boards/karo-tx53/board.c +++ b/arch/arm/boards/karo-tx53/board.c @@ -22,7 +22,7 @@ #include <nand.h> #include <net.h> #include <partition.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/karo-tx6x/lowlevel.c b/arch/arm/boards/karo-tx6x/lowlevel.c index 00008d403c..cd4be5e9e7 100644 --- a/arch/arm/boards/karo-tx6x/lowlevel.c +++ b/arch/arm/boards/karo-tx6x/lowlevel.c @@ -18,7 +18,7 @@ #include <asm/barebox-arm.h> #include <image-metadata.h> #include <mach/generic.h> -#include <sizes.h> +#include <linux/sizes.h> static inline void setup_uart(void) { diff --git a/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c b/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c index 046057f56a..59eaa29a50 100644 --- a/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c +++ b/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c @@ -15,7 +15,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/lowlevel.h> diff --git a/arch/arm/boards/mioa701/lowlevel.c b/arch/arm/boards/mioa701/lowlevel.c index aa4a82e598..bfb8bad1cc 100644 --- a/arch/arm/boards/mioa701/lowlevel.c +++ b/arch/arm/boards/mioa701/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/module-mb7707/lowlevel.c b/arch/arm/boards/module-mb7707/lowlevel.c index 5f5e1d7af1..0258be6e4b 100644 --- a/arch/arm/boards/module-mb7707/lowlevel.c +++ b/arch/arm/boards/module-mb7707/lowlevel.c @@ -21,7 +21,7 @@ #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #define MB7707_SRAM_BASE 0x40000000 #define MB7707_SRAM_SIZE SZ_128M diff --git a/arch/arm/boards/netx/platform.S b/arch/arm/boards/netx/platform.S index 6c66228197..95ae46cc6d 100644 --- a/arch/arm/boards/netx/platform.S +++ b/arch/arm/boards/netx/platform.S @@ -16,7 +16,7 @@ * GNU General Public License for more details. * */ -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> .globl barebox_arm_reset_vector diff --git a/arch/arm/boards/nhk8815/lowlevel.c b/arch/arm/boards/nhk8815/lowlevel.c index ce06f45c91..33a785fee0 100644 --- a/arch/arm/boards/nhk8815/lowlevel.c +++ b/arch/arm/boards/nhk8815/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/nvidia-beaver/entry.c b/arch/arm/boards/nvidia-beaver/entry.c index 576fcb7a5b..9b7e253b4f 100644 --- a/arch/arm/boards/nvidia-beaver/entry.c +++ b/arch/arm/boards/nvidia-beaver/entry.c @@ -15,7 +15,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/lowlevel.h> diff --git a/arch/arm/boards/nvidia-jetson-tk1/entry.c b/arch/arm/boards/nvidia-jetson-tk1/entry.c index 76c95a8776..8f112a3a91 100644 --- a/arch/arm/boards/nvidia-jetson-tk1/entry.c +++ b/arch/arm/boards/nvidia-jetson-tk1/entry.c @@ -15,7 +15,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/lowlevel.h> diff --git a/arch/arm/boards/omap343xdsp/lowlevel.c b/arch/arm/boards/omap343xdsp/lowlevel.c index 18ddff3625..318bb9aeb1 100644 --- a/arch/arm/boards/omap343xdsp/lowlevel.c +++ b/arch/arm/boards/omap343xdsp/lowlevel.c @@ -1,7 +1,7 @@ #include <common.h> #include <init.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <mach/generic.h> diff --git a/arch/arm/boards/omap3evm/board.c b/arch/arm/boards/omap3evm/board.c index 2813d3d653..0fe69b61a7 100644 --- a/arch/arm/boards/omap3evm/board.c +++ b/arch/arm/boards/omap3evm/board.c @@ -43,7 +43,7 @@ #include <init.h> #include <driver.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <ns16550.h> #include <asm/armlinux.h> #include <mach/omap3-silicon.h> diff --git a/arch/arm/boards/omap3evm/lowlevel.c b/arch/arm/boards/omap3evm/lowlevel.c index 5c3e8902a0..d8a1b9f61d 100644 --- a/arch/arm/boards/omap3evm/lowlevel.c +++ b/arch/arm/boards/omap3evm/lowlevel.c @@ -1,6 +1,6 @@ #include <io.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <mach/generic.h> diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c index c63602b4c2..f7a3a0fa28 100644 --- a/arch/arm/boards/panda/board.c +++ b/arch/arm/boards/panda/board.c @@ -15,7 +15,7 @@ #include <mach/control.h> #include <usb/ehci.h> #include <linux/err.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/mmu.h> #include <envfs.h> #include <i2c/i2c.h> diff --git a/arch/arm/boards/panda/lowlevel.c b/arch/arm/boards/panda/lowlevel.c index 2679ae4690..005485ba45 100644 --- a/arch/arm/boards/panda/lowlevel.c +++ b/arch/arm/boards/panda/lowlevel.c @@ -19,7 +19,7 @@ #include <common.h> #include <init.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <mach/omap4-mux.h> #include <mach/omap4-silicon.h> diff --git a/arch/arm/boards/phytec-phycard-imx27/pca100.c b/arch/arm/boards/phytec-phycard-imx27/pca100.c index 9475bfafca..0481113c65 100644 --- a/arch/arm/boards/phytec-phycard-imx27/pca100.c +++ b/arch/arm/boards/phytec-phycard-imx27/pca100.c @@ -21,7 +21,7 @@ #include <mach/imx27-regs.h> #include <fec.h> #include <gpio.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/armlinux.h> #include <asm/sections.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/phytec-phycard-imx6/lowlevel.c b/arch/arm/boards/phytec-phycard-imx6/lowlevel.c index b31638cbb9..dc106490e7 100644 --- a/arch/arm/boards/phytec-phycard-imx6/lowlevel.c +++ b/arch/arm/boards/phytec-phycard-imx6/lowlevel.c @@ -14,7 +14,7 @@ */ #include <debug_ll.h> #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/phytec-phycard-omap3/lowlevel.c b/arch/arm/boards/phytec-phycard-omap3/lowlevel.c index 57f6389664..27b56b1e0c 100644 --- a/arch/arm/boards/phytec-phycard-omap3/lowlevel.c +++ b/arch/arm/boards/phytec-phycard-omap3/lowlevel.c @@ -1,7 +1,7 @@ #include <common.h> #include <io.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <mach/omap3-mux.h> diff --git a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c index 68a17bf0c3..1c2e7f7429 100644 --- a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c +++ b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c @@ -46,7 +46,7 @@ #include <nand.h> #include <ns16550.h> #include <partition.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/armlinux.h> #include <asm/io.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/phytec-phycard-omap4/lowlevel.c b/arch/arm/boards/phytec-phycard-omap4/lowlevel.c index 841ac4b206..170ca6896b 100644 --- a/arch/arm/boards/phytec-phycard-omap4/lowlevel.c +++ b/arch/arm/boards/phytec-phycard-omap4/lowlevel.c @@ -19,7 +19,7 @@ #include <common.h> #include <init.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <mach/omap4-mux.h> #include <mach/omap4-silicon.h> diff --git a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c index 64297224c0..78890ba5a9 100644 --- a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c +++ b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c @@ -29,7 +29,7 @@ #include <mach/syslib.h> #include <mach/control.h> #include <linux/err.h> -#include <sizes.h> +#include <linux/sizes.h> #include <partition.h> #include <nand.h> #include <asm/mmu.h> diff --git a/arch/arm/boards/phytec-phycore-am335x/board.c b/arch/arm/boards/phytec-phycore-am335x/board.c index a72cebda3f..61a11cfaa3 100644 --- a/arch/arm/boards/phytec-phycore-am335x/board.c +++ b/arch/arm/boards/phytec-phycore-am335x/board.c @@ -22,7 +22,7 @@ #include <nand.h> #include <init.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <envfs.h> #include <asm/armlinux.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/phytec-phycore-am335x/lowlevel.c b/arch/arm/boards/phytec-phycore-am335x/lowlevel.c index 5ab8b5b446..843929e945 100644 --- a/arch/arm/boards/phytec-phycore-am335x/lowlevel.c +++ b/arch/arm/boards/phytec-phycore-am335x/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <init.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/boards/phytec-phycore-imx27/pcm038.c b/arch/arm/boards/phytec-phycore-imx27/pcm038.c index a4305f6e45..01f6a55ad0 100644 --- a/arch/arm/boards/phytec-phycore-imx27/pcm038.c +++ b/arch/arm/boards/phytec-phycore-imx27/pcm038.c @@ -20,7 +20,7 @@ #include <init.h> #include <io.h> #include <notifier.h> -#include <sizes.h> +#include <linux/sizes.h> #include <envfs.h> #include <mach/devices-imx27.h> #include <mach/imx-pll.h> diff --git a/arch/arm/boards/phytec-phycore-imx27/pcm970.c b/arch/arm/boards/phytec-phycore-imx27/pcm970.c index b0c177ebbf..73df2ad2a8 100644 --- a/arch/arm/boards/phytec-phycore-imx27/pcm970.c +++ b/arch/arm/boards/phytec-phycore-imx27/pcm970.c @@ -16,7 +16,7 @@ #include <init.h> #include <io.h> #include <platform_ide.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/imx27-regs.h> #include <mach/iomux-mx27.h> diff --git a/arch/arm/boards/phytec-phycore-imx35/pcm043.c b/arch/arm/boards/phytec-phycore-imx35/pcm043.c index d1dd28fc65..e31c79d15f 100644 --- a/arch/arm/boards/phytec-phycore-imx35/pcm043.c +++ b/arch/arm/boards/phytec-phycore-imx35/pcm043.c @@ -26,7 +26,7 @@ #include <environment.h> #include <fs.h> #include <gpio.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/imx35-regs.h> #include <asm/armlinux.h> #include <io.h> diff --git a/arch/arm/boards/phytec-phycore-omap4460/board.c b/arch/arm/boards/phytec-phycore-omap4460/board.c index baf88a380c..6495a6f6ab 100644 --- a/arch/arm/boards/phytec-phycore-omap4460/board.c +++ b/arch/arm/boards/phytec-phycore-omap4460/board.c @@ -32,7 +32,7 @@ #include <mach/syslib.h> #include <mach/control.h> #include <linux/err.h> -#include <sizes.h> +#include <linux/sizes.h> #include <partition.h> #include <nand.h> #include <asm/mmu.h> diff --git a/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c b/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c index 8ea62c7f56..c0825949a8 100644 --- a/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c +++ b/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c @@ -19,7 +19,7 @@ #include <common.h> #include <init.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <mach/omap4-mux.h> #include <mach/omap4-silicon.h> diff --git a/arch/arm/boards/phytec-phycore-pxa270/board.c b/arch/arm/boards/phytec-phycore-pxa270/board.c index 509569e81e..833c4c81e4 100644 --- a/arch/arm/boards/phytec-phycore-pxa270/board.c +++ b/arch/arm/boards/phytec-phycore-pxa270/board.c @@ -24,7 +24,7 @@ #include <fs.h> #include <init.h> #include <partition.h> -#include <sizes.h> +#include <linux/sizes.h> #include <plat/gpio.h> #include <mach/mfp-pxa27x.h> diff --git a/arch/arm/boards/phytec-phycore-pxa270/lowlevel_init.S b/arch/arm/boards/phytec-phycore-pxa270/lowlevel_init.S index c7dacce30c..39af00b54b 100644 --- a/arch/arm/boards/phytec-phycore-pxa270/lowlevel_init.S +++ b/arch/arm/boards/phytec-phycore-pxa270/lowlevel_init.S @@ -24,7 +24,7 @@ */ #include <config.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/pxa-regs.h> #include <mach/regs-ost.h> #include <mach/regs-intc.h> diff --git a/arch/arm/boards/phytec-phyflex-am335x/board.c b/arch/arm/boards/phytec-phyflex-am335x/board.c index f265e52f3a..e635532d29 100644 --- a/arch/arm/boards/phytec-phyflex-am335x/board.c +++ b/arch/arm/boards/phytec-phyflex-am335x/board.c @@ -22,7 +22,7 @@ #include <nand.h> #include <init.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <envfs.h> #include <asm/armlinux.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/phytec-phyflex-am335x/lowlevel.c b/arch/arm/boards/phytec-phyflex-am335x/lowlevel.c index 4d34968a0b..a240401555 100644 --- a/arch/arm/boards/phytec-phyflex-am335x/lowlevel.c +++ b/arch/arm/boards/phytec-phyflex-am335x/lowlevel.c @@ -18,7 +18,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <init.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c index ce168b2cca..dbd264aed2 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c +++ b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c @@ -14,7 +14,7 @@ */ #include <debug_ll.h> #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <image-metadata.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/boards/plathome-openblocks-a6/lowlevel.c b/arch/arm/boards/plathome-openblocks-a6/lowlevel.c index b37a3d6002..71bf7aa2ee 100644 --- a/arch/arm/boards/plathome-openblocks-a6/lowlevel.c +++ b/arch/arm/boards/plathome-openblocks-a6/lowlevel.c @@ -12,7 +12,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/lowlevel.h> diff --git a/arch/arm/boards/plathome-openblocks-ax3/lowlevel.c b/arch/arm/boards/plathome-openblocks-ax3/lowlevel.c index 721d2de978..9030a5d0c8 100644 --- a/arch/arm/boards/plathome-openblocks-ax3/lowlevel.c +++ b/arch/arm/boards/plathome-openblocks-ax3/lowlevel.c @@ -15,7 +15,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/lowlevel.h> diff --git a/arch/arm/boards/qil-a926x/init.c b/arch/arm/boards/qil-a926x/init.c index 4f01e2d478..872743775f 100644 --- a/arch/arm/boards/qil-a926x/init.c +++ b/arch/arm/boards/qil-a926x/init.c @@ -17,7 +17,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <linux/clk.h> #include <mach/board.h> diff --git a/arch/arm/boards/radxa-rock/lowlevel.c b/arch/arm/boards/radxa-rock/lowlevel.c index 65014e6bb5..1c07bc3377 100644 --- a/arch/arm/boards/radxa-rock/lowlevel.c +++ b/arch/arm/boards/radxa-rock/lowlevel.c @@ -12,7 +12,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/raspberry-pi/lowlevel.c b/arch/arm/boards/raspberry-pi/lowlevel.c index 022b11d29f..485171a116 100644 --- a/arch/arm/boards/raspberry-pi/lowlevel.c +++ b/arch/arm/boards/raspberry-pi/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/platform.h> diff --git a/arch/arm/boards/sama5d3_xplained/init.c b/arch/arm/boards/sama5d3_xplained/init.c index 7dfebe8e89..373ab814d1 100644 --- a/arch/arm/boards/sama5d3_xplained/init.c +++ b/arch/arm/boards/sama5d3_xplained/init.c @@ -24,7 +24,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <mach/board.h> #include <mach/at91sam9_smc.h> diff --git a/arch/arm/boards/sama5d3xek/init.c b/arch/arm/boards/sama5d3xek/init.c index 49d2b371f5..57dc7b0667 100644 --- a/arch/arm/boards/sama5d3xek/init.c +++ b/arch/arm/boards/sama5d3xek/init.c @@ -26,7 +26,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <mach/board.h> #include <mach/at91sam9_smc.h> diff --git a/arch/arm/boards/sama5d4_xplained/sama5d4_xplained.c b/arch/arm/boards/sama5d4_xplained/sama5d4_xplained.c index 01262201d9..fe6876a9eb 100644 --- a/arch/arm/boards/sama5d4_xplained/sama5d4_xplained.c +++ b/arch/arm/boards/sama5d4_xplained/sama5d4_xplained.c @@ -18,7 +18,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <mach/board.h> #include <mach/at91sam9_smc.h> diff --git a/arch/arm/boards/sama5d4ek/sama5d4ek.c b/arch/arm/boards/sama5d4ek/sama5d4ek.c index 91cffa3b48..bbc53c6758 100644 --- a/arch/arm/boards/sama5d4ek/sama5d4ek.c +++ b/arch/arm/boards/sama5d4ek/sama5d4ek.c @@ -18,7 +18,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <mach/board.h> #include <mach/at91sam9_smc.h> diff --git a/arch/arm/boards/solidrun-cubox/lowlevel.c b/arch/arm/boards/solidrun-cubox/lowlevel.c index a28c2b18c5..08e31e8350 100644 --- a/arch/arm/boards/solidrun-cubox/lowlevel.c +++ b/arch/arm/boards/solidrun-cubox/lowlevel.c @@ -16,7 +16,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/lowlevel.h> diff --git a/arch/arm/boards/solidrun-microsom/board.c b/arch/arm/boards/solidrun-microsom/board.c index 4b0ea32040..783ec53c1d 100644 --- a/arch/arm/boards/solidrun-microsom/board.c +++ b/arch/arm/boards/solidrun-microsom/board.c @@ -25,7 +25,7 @@ #include <mach/imx6-regs.h> #include <mach/imx6.h> #include <mfd/imx6q-iomuxc-gpr.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/phy.h> static int ar8035_phy_fixup(struct phy_device *dev) diff --git a/arch/arm/boards/solidrun-microsom/lowlevel.c b/arch/arm/boards/solidrun-microsom/lowlevel.c index eb52838963..30f4a3f591 100644 --- a/arch/arm/boards/solidrun-microsom/lowlevel.c +++ b/arch/arm/boards/solidrun-microsom/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/terasic-sockit/board.c b/arch/arm/boards/terasic-sockit/board.c index fdff76ff84..53cd36834f 100644 --- a/arch/arm/boards/terasic-sockit/board.c +++ b/arch/arm/boards/terasic-sockit/board.c @@ -5,7 +5,7 @@ #include <asm/armlinux.h> #include <linux/micrel_phy.h> #include <linux/phy.h> -#include <sizes.h> +#include <linux/sizes.h> #include <fcntl.h> #include <fs.h> #include <mach/socfpga-regs.h> diff --git a/arch/arm/boards/terasic-sockit/lowlevel.c b/arch/arm/boards/terasic-sockit/lowlevel.c index 0683435a7b..78d5d41b04 100644 --- a/arch/arm/boards/terasic-sockit/lowlevel.c +++ b/arch/arm/boards/terasic-sockit/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/tny-a926x/init.c b/arch/arm/boards/tny-a926x/init.c index 256f8ba9bf..3ebd8aae02 100644 --- a/arch/arm/boards/tny-a926x/init.c +++ b/arch/arm/boards/tny-a926x/init.c @@ -26,7 +26,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <linux/clk.h> #include <mach/board.h> diff --git a/arch/arm/boards/toradex-colibri-t20/entry.c b/arch/arm/boards/toradex-colibri-t20/entry.c index 695862cfd3..a25958fb41 100644 --- a/arch/arm/boards/toradex-colibri-t20/entry.c +++ b/arch/arm/boards/toradex-colibri-t20/entry.c @@ -15,7 +15,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/lowlevel.h> diff --git a/arch/arm/boards/toshiba-ac100/board.c b/arch/arm/boards/toshiba-ac100/board.c index 51232ef427..0cb955c15c 100644 --- a/arch/arm/boards/toshiba-ac100/board.c +++ b/arch/arm/boards/toshiba-ac100/board.c @@ -19,7 +19,7 @@ #include <driver.h> #include <init.h> #include <asm/armlinux.h> -#include <sizes.h> +#include <linux/sizes.h> #include <usb/ehci.h> #include <mach/iomap.h> diff --git a/arch/arm/boards/toshiba-ac100/entry.c b/arch/arm/boards/toshiba-ac100/entry.c index 45fa56aa75..fb695c32d6 100644 --- a/arch/arm/boards/toshiba-ac100/entry.c +++ b/arch/arm/boards/toshiba-ac100/entry.c @@ -15,7 +15,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/lowlevel.h> diff --git a/arch/arm/boards/tqma6x/board.c b/arch/arm/boards/tqma6x/board.c index 2118fb2721..97cce60c70 100644 --- a/arch/arm/boards/tqma6x/board.c +++ b/arch/arm/boards/tqma6x/board.c @@ -23,7 +23,7 @@ #include <partition.h> #include <common.h> #include <envfs.h> -#include <sizes.h> +#include <linux/sizes.h> #include <init.h> #include <gpio.h> #include <fec.h> diff --git a/arch/arm/boards/tqma6x/lowlevel.c b/arch/arm/boards/tqma6x/lowlevel.c index d2eea16c23..23f3407c05 100644 --- a/arch/arm/boards/tqma6x/lowlevel.c +++ b/arch/arm/boards/tqma6x/lowlevel.c @@ -14,7 +14,7 @@ */ #include <debug_ll.h> #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/udoo/board.c b/arch/arm/boards/udoo/board.c index d2f558e7f4..f3668fef0b 100644 --- a/arch/arm/boards/udoo/board.c +++ b/arch/arm/boards/udoo/board.c @@ -29,7 +29,7 @@ #include <asm/io.h> #include <asm/mmu.h> #include <mach/generic.h> -#include <sizes.h> +#include <linux/sizes.h> #include <net.h> #include <linux/micrel_phy.h> #include <mach/imx6.h> diff --git a/arch/arm/boards/udoo/lowlevel.c b/arch/arm/boards/udoo/lowlevel.c index 3d9fc68cab..785ab16678 100644 --- a/arch/arm/boards/udoo/lowlevel.c +++ b/arch/arm/boards/udoo/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c index f0e1157912..958c3c3662 100644 --- a/arch/arm/boards/usb-a926x/init.c +++ b/arch/arm/boards/usb-a926x/init.c @@ -26,7 +26,7 @@ #include <io.h> #include <mach/hardware.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #include <linux/clk.h> #include <mach/board.h> diff --git a/arch/arm/boards/usi-topkick/lowlevel.c b/arch/arm/boards/usi-topkick/lowlevel.c index df661564da..ed94ee6736 100644 --- a/arch/arm/boards/usi-topkick/lowlevel.c +++ b/arch/arm/boards/usi-topkick/lowlevel.c @@ -15,7 +15,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/lowlevel.h> diff --git a/arch/arm/boards/variscite-mx6/board.c b/arch/arm/boards/variscite-mx6/board.c index de74abc838..3585debb51 100644 --- a/arch/arm/boards/variscite-mx6/board.c +++ b/arch/arm/boards/variscite-mx6/board.c @@ -34,7 +34,7 @@ #include <asm/io.h> #include <asm/mmu.h> #include <mach/generic.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/imx6.h> #include <mach/devices-imx6.h> #include <mach/iomux-mx6.h> diff --git a/arch/arm/boards/variscite-mx6/lowlevel.c b/arch/arm/boards/variscite-mx6/lowlevel.c index 74f3a779e8..22e7eae32b 100644 --- a/arch/arm/boards/variscite-mx6/lowlevel.c +++ b/arch/arm/boards/variscite-mx6/lowlevel.c @@ -16,7 +16,7 @@ */ #include <debug_ll.h> #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/versatile/lowlevel.c b/arch/arm/boards/versatile/lowlevel.c index ce06f45c91..33a785fee0 100644 --- a/arch/arm/boards/versatile/lowlevel.c +++ b/arch/arm/boards/versatile/lowlevel.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/versatile/versatilepb.c b/arch/arm/boards/versatile/versatilepb.c index 9ed114682b..3166cd4fed 100644 --- a/arch/arm/boards/versatile/versatilepb.c +++ b/arch/arm/boards/versatile/versatilepb.c @@ -28,7 +28,7 @@ #include <mach/platform.h> #include <environment.h> #include <partition.h> -#include <sizes.h> +#include <linux/sizes.h> #include <net/smc91111.h> static int vpb_console_init(void) diff --git a/arch/arm/boards/vexpress/init.c b/arch/arm/boards/vexpress/init.c index 6cda494872..5b2035bd36 100644 --- a/arch/arm/boards/vexpress/init.c +++ b/arch/arm/boards/vexpress/init.c @@ -12,7 +12,7 @@ #include <mach/devices.h> #include <environment.h> #include <partition.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <globalvar.h> #include <linux/amba/sp804.h> diff --git a/arch/arm/boards/vexpress/lowlevel.c b/arch/arm/boards/vexpress/lowlevel.c index 2ef94c59d6..204d29d8f0 100644 --- a/arch/arm/boards/vexpress/lowlevel.c +++ b/arch/arm/boards/vexpress/lowlevel.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <asm/system_info.h> diff --git a/arch/arm/boards/virt2real/lowlevel.c b/arch/arm/boards/virt2real/lowlevel.c index 731e2cae64..8ec3d04fef 100644 --- a/arch/arm/boards/virt2real/lowlevel.c +++ b/arch/arm/boards/virt2real/lowlevel.c @@ -21,7 +21,7 @@ #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #define VIRT2REAL_SRAM_BASE 0x82000000 #define VIRT2REAL_SRAM_SIZE SZ_16M diff --git a/arch/arm/cpu/common.c b/arch/arm/cpu/common.c index d5f892910f..46ce942187 100644 --- a/arch/arm/cpu/common.c +++ b/arch/arm/cpu/common.c @@ -17,7 +17,7 @@ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/system_info.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/cpu/mmu-early.c b/arch/arm/cpu/mmu-early.c index b8b30df84e..2e4d316924 100644 --- a/arch/arm/cpu/mmu-early.c +++ b/arch/arm/cpu/mmu-early.c @@ -1,7 +1,7 @@ #include <common.h> #include <asm/mmu.h> #include <errno.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/memory.h> #include <asm/system.h> #include <asm/cache.h> diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c index e4afcc8411..09fe8d592a 100644 --- a/arch/arm/cpu/mmu.c +++ b/arch/arm/cpu/mmu.c @@ -23,7 +23,7 @@ #include <init.h> #include <asm/mmu.h> #include <errno.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/memory.h> #include <asm/barebox-arm.h> #include <asm/system.h> diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c index 741060ab6c..f2490fd9ef 100644 --- a/arch/arm/cpu/start-pbl.c +++ b/arch/arm/cpu/start-pbl.c @@ -20,7 +20,7 @@ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <pbl.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c index 264420d084..f6061f4c2a 100644 --- a/arch/arm/cpu/start.c +++ b/arch/arm/cpu/start.c @@ -19,7 +19,7 @@ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <of.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c index d64706d217..ab194e187e 100644 --- a/arch/arm/cpu/uncompress.c +++ b/arch/arm/cpu/uncompress.c @@ -20,7 +20,7 @@ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <pbl.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index 66f6fe5ef6..9ad07cb77a 100644 --- a/arch/arm/include/asm/barebox-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -25,8 +25,10 @@ #ifndef _BAREBOX_ARM_H_ #define _BAREBOX_ARM_H_ -#include <sizes.h> +#include <linux/sizes.h> #include <asm-generic/memory_layout.h> +#include <linux/kernel.h> +#include <linux/types.h> /* cpu/.../cpu.c */ int cleanup_before_linux(void); diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index baf0946a47..8327c3f560 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -12,7 +12,7 @@ #include <malloc.h> #include <fcntl.h> #include <errno.h> -#include <sizes.h> +#include <linux/sizes.h> #include <libbb.h> #include <magicvar.h> #include <binfmt.h> diff --git a/arch/arm/lib/bootz.c b/arch/arm/lib/bootz.c index 377f18a3ac..5167c9d20d 100644 --- a/arch/arm/lib/bootz.c +++ b/arch/arm/lib/bootz.c @@ -5,7 +5,7 @@ #include <fcntl.h> #include <errno.h> #include <malloc.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/byteorder.h> #include <asm/armlinux.h> #include <asm/system.h> diff --git a/arch/arm/lib/pbl.lds.S b/arch/arm/lib/pbl.lds.S index 9afee2964a..73baff0ca5 100644 --- a/arch/arm/lib/pbl.lds.S +++ b/arch/arm/lib/pbl.lds.S @@ -15,7 +15,7 @@ * GNU General Public License for more details. * */ -#include <sizes.h> +#include <linux/sizes.h> #include <asm-generic/barebox.lds.h> #include <asm-generic/memory_layout.h> diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index ce0e4160b1..7b68cdac29 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -20,7 +20,7 @@ #include <mach/io.h> #include <mach/at91rm9200_mc.h> #include <i2c/i2c-gpio.h> -#include <sizes.h> +#include <linux/sizes.h> #include "generic.h" diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index ed6f9c4b96..67c4ea8601 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -11,7 +11,7 @@ */ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <asm/armlinux.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-at91/at91sam9260_lowlevel_init.c b/arch/arm/mach-at91/at91sam9260_lowlevel_init.c index f745b8de4f..7f84185ef9 100644 --- a/arch/arm/mach-at91/at91sam9260_lowlevel_init.c +++ b/arch/arm/mach-at91/at91sam9260_lowlevel_init.c @@ -21,7 +21,7 @@ #include <mach/at91_lowlevel_init.h> #include <mach/io.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> void __bare_init at91sam9260_lowlevel_init(void) { diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index ce539e97cb..620ed652dc 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -11,7 +11,7 @@ */ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <asm/armlinux.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-at91/at91sam9261_lowlevel_init.c b/arch/arm/mach-at91/at91sam9261_lowlevel_init.c index b9b4dfbb0e..0ad7f0a0c5 100644 --- a/arch/arm/mach-at91/at91sam9261_lowlevel_init.c +++ b/arch/arm/mach-at91/at91sam9261_lowlevel_init.c @@ -21,7 +21,7 @@ #include <mach/at91_lowlevel_init.h> #include <mach/io.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> void __bare_init at91sam9261_lowlevel_init(void) { diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index 1c9366a28f..a3683e53bf 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c @@ -11,7 +11,7 @@ */ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <asm/armlinux.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-at91/at91sam9263_lowlevel_init.c b/arch/arm/mach-at91/at91sam9263_lowlevel_init.c index 00d78f2375..0be84551f8 100644 --- a/arch/arm/mach-at91/at91sam9263_lowlevel_init.c +++ b/arch/arm/mach-at91/at91sam9263_lowlevel_init.c @@ -21,7 +21,7 @@ #include <mach/at91_lowlevel_init.h> #include <mach/io.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> void __bare_init at91sam9263_lowlevel_init(void) { diff --git a/arch/arm/mach-at91/at91sam926x_lowlevel_init.c b/arch/arm/mach-at91/at91sam926x_lowlevel_init.c index 6452bdd794..5dd8bc4e60 100644 --- a/arch/arm/mach-at91/at91sam926x_lowlevel_init.c +++ b/arch/arm/mach-at91/at91sam926x_lowlevel_init.c @@ -23,7 +23,7 @@ #include <mach/gpio.h> #include <mach/io.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include "gpio.h" diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 5af8761532..bad7f9c5ba 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -11,7 +11,7 @@ */ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <asm/armlinux.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-at91/at91sam9g45_lowlevel_init.c b/arch/arm/mach-at91/at91sam9g45_lowlevel_init.c index b58f101ee2..2cdb7a6a5f 100644 --- a/arch/arm/mach-at91/at91sam9g45_lowlevel_init.c +++ b/arch/arm/mach-at91/at91sam9g45_lowlevel_init.c @@ -14,7 +14,7 @@ #include <mach/io.h> #include <mach/at91sam9_ddrsdr.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> void __naked __bare_init barebox_arm_reset_vector(void) { diff --git a/arch/arm/mach-at91/at91sam9n12_devices.c b/arch/arm/mach-at91/at91sam9n12_devices.c index 2d9ea4caed..bac023f555 100644 --- a/arch/arm/mach-at91/at91sam9n12_devices.c +++ b/arch/arm/mach-at91/at91sam9n12_devices.c @@ -11,7 +11,7 @@ */ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <asm/armlinux.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-at91/at91sam9n12_lowlevel_init.c b/arch/arm/mach-at91/at91sam9n12_lowlevel_init.c index 72a092899f..2b5cb158b0 100644 --- a/arch/arm/mach-at91/at91sam9n12_lowlevel_init.c +++ b/arch/arm/mach-at91/at91sam9n12_lowlevel_init.c @@ -14,7 +14,7 @@ #include <mach/io.h> #include <mach/at91sam9_ddrsdr.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> void __naked __bare_init barebox_arm_reset_vector(void) { diff --git a/arch/arm/mach-at91/at91sam9x5_devices.c b/arch/arm/mach-at91/at91sam9x5_devices.c index 2d05e94058..34537d8cf9 100644 --- a/arch/arm/mach-at91/at91sam9x5_devices.c +++ b/arch/arm/mach-at91/at91sam9x5_devices.c @@ -10,7 +10,7 @@ * */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <asm/armlinux.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c b/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c index 7781036e3d..48e69f947d 100644 --- a/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c +++ b/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c @@ -14,7 +14,7 @@ #include <mach/io.h> #include <mach/at91sam9_ddrsdr.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> void __naked __bare_init barebox_arm_reset_vector(void) { diff --git a/arch/arm/mach-at91/bootstrap.c b/arch/arm/mach-at91/bootstrap.c index 4149304c92..2d18dd6b32 100644 --- a/arch/arm/mach-at91/bootstrap.c +++ b/arch/arm/mach-at91/bootstrap.c @@ -7,7 +7,7 @@ #include <common.h> #include <bootstrap.h> #include <mach/bootstrap.h> -#include <sizes.h> +#include <linux/sizes.h> #include <malloc.h> #include <init.h> #include <menu.h> diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h index e2307ed8e6..491b220cad 100644 --- a/arch/arm/mach-at91/include/mach/board.h +++ b/arch/arm/mach-at91/include/mach/board.h @@ -19,7 +19,7 @@ #define __ASM_ARCH_BOARD_H #include <mach/hardware.h> -#include <sizes.h> +#include <linux/sizes.h> #include <net.h> #include <i2c/i2c.h> #include <spi/spi.h> diff --git a/arch/arm/mach-at91/sama5d3_devices.c b/arch/arm/mach-at91/sama5d3_devices.c index 1938c053f9..3fdfca8c68 100644 --- a/arch/arm/mach-at91/sama5d3_devices.c +++ b/arch/arm/mach-at91/sama5d3_devices.c @@ -11,7 +11,7 @@ */ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <asm/armlinux.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-at91/sama5d3_lowlevel_init.c b/arch/arm/mach-at91/sama5d3_lowlevel_init.c index d3fcbc2625..01d28514d1 100644 --- a/arch/arm/mach-at91/sama5d3_lowlevel_init.c +++ b/arch/arm/mach-at91/sama5d3_lowlevel_init.c @@ -7,7 +7,7 @@ #define __LOWLEVEL_INIT__ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <init.h> #include <asm/system.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/mach-at91/sama5d4_devices.c b/arch/arm/mach-at91/sama5d4_devices.c index 3806971688..e1b0a64d9f 100644 --- a/arch/arm/mach-at91/sama5d4_devices.c +++ b/arch/arm/mach-at91/sama5d4_devices.c @@ -12,7 +12,7 @@ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <gpio.h> #include <asm/armlinux.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-bcm2835/core.c b/arch/arm/mach-bcm2835/core.c index 04bc89751d..7f3d7e7629 100644 --- a/arch/arm/mach-bcm2835/core.c +++ b/arch/arm/mach-bcm2835/core.c @@ -25,7 +25,7 @@ #include <io.h> #include <asm/armlinux.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/platform.h> #include <mach/wd.h> diff --git a/arch/arm/mach-clps711x/clock.c b/arch/arm/mach-clps711x/clock.c index 548b333b11..f3b4d85e55 100644 --- a/arch/arm/mach-clps711x/clock.c +++ b/arch/arm/mach-clps711x/clock.c @@ -9,7 +9,7 @@ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/io.h> #include <linux/clk.h> #include <linux/clkdev.h> diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c index e27476d90e..b6647dec26 100644 --- a/arch/arm/mach-clps711x/devices.c +++ b/arch/arm/mach-clps711x/devices.c @@ -9,7 +9,7 @@ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/io.h> #include <asm/memory.h> diff --git a/arch/arm/mach-clps711x/lowlevel.c b/arch/arm/mach-clps711x/lowlevel.c index ff23b05cce..35b8b35e87 100644 --- a/arch/arm/mach-clps711x/lowlevel.c +++ b/arch/arm/mach-clps711x/lowlevel.c @@ -9,7 +9,7 @@ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/io.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/mach-ep93xx/lowlevel_init.S b/arch/arm/mach-ep93xx/lowlevel_init.S index 56057a8bbd..707924606b 100644 --- a/arch/arm/mach-ep93xx/lowlevel_init.S +++ b/arch/arm/mach-ep93xx/lowlevel_init.S @@ -20,7 +20,7 @@ * */ -#include <sizes.h> +#include <linux/sizes.h> #include <mach/ep93xx-regs.h> #include <asm/barebox-arm-head.h> diff --git a/arch/arm/mach-highbank/devices.c b/arch/arm/mach-highbank/devices.c index 6d75864306..8f9b8e0f45 100644 --- a/arch/arm/mach-highbank/devices.c +++ b/arch/arm/mach-highbank/devices.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/amba/bus.h> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index a931de921e..9ac36e1453 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -102,13 +102,11 @@ endchoice config ARCH_IMX_EXTERNAL_BOOT_NAND bool - depends on MTD depends on ARCH_IMX25 || ARCH_IMX27 || ARCH_IMX31 || ARCH_IMX35 prompt "Support Starting barebox from NAND in external bootmode" config BAREBOX_UPDATE_IMX_EXTERNAL_NAND bool - depends on MTD depends on ARCH_IMX_EXTERNAL_BOOT_NAND depends on BAREBOX_UPDATE depends on MTD @@ -117,7 +115,6 @@ config BAREBOX_UPDATE_IMX_EXTERNAL_NAND config BAREBOX_UPDATE_IMX6_NAND bool - depends on MTD depends on ARCH_IMX6 depends on BAREBOX_UPDATE depends on MTD diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c index 433cfac1d5..c6479a0e54 100644 --- a/arch/arm/mach-imx/esdctl.c +++ b/arch/arm/mach-imx/esdctl.c @@ -19,7 +19,7 @@ #include <common.h> #include <io.h> #include <errno.h> -#include <sizes.h> +#include <linux/sizes.h> #include <init.h> #include <of.h> #include <linux/err.h> diff --git a/arch/arm/mach-imx/imx-bbu-external-nand.c b/arch/arm/mach-imx/imx-bbu-external-nand.c index 401b3248a8..0f1a028f98 100644 --- a/arch/arm/mach-imx/imx-bbu-external-nand.c +++ b/arch/arm/mach-imx/imx-bbu-external-nand.c @@ -24,7 +24,7 @@ #include <errno.h> #include <fs.h> #include <fcntl.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/mtd-abi.h> #include <linux/stat.h> #include <ioctl.h> diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c index 56369a0f94..ac90c53bb7 100644 --- a/arch/arm/mach-imx/imx-bbu-internal.c +++ b/arch/arm/mach-imx/imx-bbu-internal.c @@ -25,7 +25,7 @@ #include <errno.h> #include <fs.h> #include <fcntl.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/mtd-abi.h> #include <linux/stat.h> #include <ioctl.h> diff --git a/arch/arm/mach-imx/imx25.c b/arch/arm/mach-imx/imx25.c index 1f87787772..e87d934024 100644 --- a/arch/arm/mach-imx/imx25.c +++ b/arch/arm/mach-imx/imx25.c @@ -18,7 +18,7 @@ #include <io.h> #include <mach/weim.h> #include <mach/generic.h> -#include <sizes.h> +#include <linux/sizes.h> void imx25_setup_weimcs(size_t cs, unsigned upper, unsigned lower, unsigned additional) diff --git a/arch/arm/mach-imx/imx27.c b/arch/arm/mach-imx/imx27.c index d3eaa87ef6..b99a4eae3f 100644 --- a/arch/arm/mach-imx/imx27.c +++ b/arch/arm/mach-imx/imx27.c @@ -15,7 +15,7 @@ #include <mach/imx27-regs.h> #include <mach/weim.h> #include <mach/iomux-v1.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/revision.h> #include <mach/generic.h> #include <init.h> diff --git a/arch/arm/mach-imx/imx31.c b/arch/arm/mach-imx/imx31.c index 3013f0208f..137c77a923 100644 --- a/arch/arm/mach-imx/imx31.c +++ b/arch/arm/mach-imx/imx31.c @@ -13,7 +13,7 @@ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <mach/imx31-regs.h> #include <mach/weim.h> diff --git a/arch/arm/mach-imx/imx35.c b/arch/arm/mach-imx/imx35.c index 40f5770c8f..69d45eba66 100644 --- a/arch/arm/mach-imx/imx35.c +++ b/arch/arm/mach-imx/imx35.c @@ -12,7 +12,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <init.h> #include <io.h> #include <mach/weim.h> diff --git a/arch/arm/mach-imx/imx5.c b/arch/arm/mach-imx/imx5.c index 9ec78b2afd..96288f99e0 100644 --- a/arch/arm/mach-imx/imx5.c +++ b/arch/arm/mach-imx/imx5.c @@ -1,6 +1,6 @@ #include <common.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/imx5.h> #include <mach/clock-imx51_53.h> diff --git a/arch/arm/mach-imx/imx51.c b/arch/arm/mach-imx/imx51.c index cef302b350..70e8971965 100644 --- a/arch/arm/mach-imx/imx51.c +++ b/arch/arm/mach-imx/imx51.c @@ -13,7 +13,7 @@ #include <init.h> #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <environment.h> #include <io.h> #include <mach/imx5.h> diff --git a/arch/arm/mach-imx/imx53.c b/arch/arm/mach-imx/imx53.c index 62e65e01d4..872d293640 100644 --- a/arch/arm/mach-imx/imx53.c +++ b/arch/arm/mach-imx/imx53.c @@ -15,7 +15,7 @@ #include <common.h> #include <io.h> #include <notifier.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/imx5.h> #include <mach/imx53-regs.h> #include <mach/revision.h> diff --git a/arch/arm/mach-imx/imx6-bbu-nand.c b/arch/arm/mach-imx/imx6-bbu-nand.c index 2d0705956c..1b46e514e9 100644 --- a/arch/arm/mach-imx/imx6-bbu-nand.c +++ b/arch/arm/mach-imx/imx6-bbu-nand.c @@ -25,7 +25,7 @@ #include <errno.h> #include <fcntl.h> #include <ioctl.h> -#include <sizes.h> +#include <linux/sizes.h> #include <bbu.h> #include <fs.h> #include <mach/bbu.h> diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c index c5cae6e238..73630e7092 100644 --- a/arch/arm/mach-imx/imx6.c +++ b/arch/arm/mach-imx/imx6.c @@ -14,7 +14,7 @@ #include <init.h> #include <common.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mfd/imx6q-iomuxc-gpr.h> #include <mach/imx6.h> #include <mach/generic.h> diff --git a/arch/arm/mach-imx/include/mach/devices-imx51.h b/arch/arm/mach-imx/include/mach/devices-imx51.h index 68953293b4..cccd8f4610 100644 --- a/arch/arm/mach-imx/include/mach/devices-imx51.h +++ b/arch/arm/mach-imx/include/mach/devices-imx51.h @@ -1,5 +1,5 @@ -#include <sizes.h> +#include <linux/sizes.h> #include <mach/devices.h> #include <mach/imx51-regs.h> diff --git a/arch/arm/mach-imx/include/mach/imx31-regs.h b/arch/arm/mach-imx/include/mach/imx31-regs.h index 599f8008b5..e491328694 100644 --- a/arch/arm/mach-imx/include/mach/imx31-regs.h +++ b/arch/arm/mach-imx/include/mach/imx31-regs.h @@ -19,7 +19,7 @@ #ifndef __ASM_ARCH_MX31_REGS_H #define __ASM_ARCH_MX31_REGS_H -#include <sizes.h> +#include <linux/sizes.h> #define MX31_IRAM_BASE_ADDR 0x1fffc000 #define MX31_IRAM_SIZE 0x00004000 diff --git a/arch/arm/mach-imx/include/mach/imx35-regs.h b/arch/arm/mach-imx/include/mach/imx35-regs.h index b30037cf83..52e209b4de 100644 --- a/arch/arm/mach-imx/include/mach/imx35-regs.h +++ b/arch/arm/mach-imx/include/mach/imx35-regs.h @@ -19,7 +19,7 @@ #ifndef __ASM_ARCH_MX35_REGS_H #define __ASM_ARCH_MX35_REGS_H -#include <sizes.h> +#include <linux/sizes.h> #define MX35_IRAM_BASE_ADDR 0x10000000 /* internal ram */ #define MX35_IRAM_SIZE SZ_128K diff --git a/arch/arm/mach-mvebu/lowlevel.c b/arch/arm/mach-mvebu/lowlevel.c index 7c4facfa1c..8d0ac8453e 100644 --- a/arch/arm/mach-mvebu/lowlevel.c +++ b/arch/arm/mach-mvebu/lowlevel.c @@ -17,7 +17,7 @@ #include <common.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <mach/common.h> diff --git a/arch/arm/mach-mxs/bcb.c b/arch/arm/mach-mxs/bcb.c index c945726f53..fce607f634 100644 --- a/arch/arm/mach-mxs/bcb.c +++ b/arch/arm/mach-mxs/bcb.c @@ -15,7 +15,7 @@ #include <environment.h> #include <malloc.h> #include <nand.h> -#include <sizes.h> +#include <linux/sizes.h> #include <errno.h> #include <io.h> diff --git a/arch/arm/mach-mxs/include/mach/devices.h b/arch/arm/mach-mxs/include/mach/devices.h index 012bfc4349..5680d61c9e 100644 --- a/arch/arm/mach-mxs/include/mach/devices.h +++ b/arch/arm/mach-mxs/include/mach/devices.h @@ -2,7 +2,7 @@ #define __MACH_MXS_DEVICES_H #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <xfuncs.h> #include <driver.h> #include <mach/imx-regs.h> diff --git a/arch/arm/mach-omap/am33xx_scrm.c b/arch/arm/mach-omap/am33xx_scrm.c index 67529f8226..bb0babeceb 100644 --- a/arch/arm/mach-omap/am33xx_scrm.c +++ b/arch/arm/mach-omap/am33xx_scrm.c @@ -15,7 +15,7 @@ #include <common.h> #include <io.h> #include <errno.h> -#include <sizes.h> +#include <linux/sizes.h> #include <init.h> #include <of.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/mach-omap/include/mach/am33xx-devices.h b/arch/arm/mach-omap/include/mach/am33xx-devices.h index d2411a4fec..4790071c98 100644 --- a/arch/arm/mach-omap/include/mach/am33xx-devices.h +++ b/arch/arm/mach-omap/include/mach/am33xx-devices.h @@ -2,7 +2,7 @@ #define __MACH_OMAP3_DEVICES_H #include <driver.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/am33xx-silicon.h> #include <mach/devices.h> #include <mach/omap_hsmmc.h> diff --git a/arch/arm/mach-omap/include/mach/am33xx-silicon.h b/arch/arm/mach-omap/include/mach/am33xx-silicon.h index a44973e979..4e63b437ea 100644 --- a/arch/arm/mach-omap/include/mach/am33xx-silicon.h +++ b/arch/arm/mach-omap/include/mach/am33xx-silicon.h @@ -17,7 +17,7 @@ #ifndef __ASM_ARCH_AM33XX_H #define __ASM_ARCH_AM33XX_H -#include <sizes.h> +#include <linux/sizes.h> /** AM335x Internal Bus Base addresses */ #define AM33XX_L4_WKUP_BASE 0x44C00000 diff --git a/arch/arm/mach-omap/include/mach/omap3-devices.h b/arch/arm/mach-omap/include/mach/omap3-devices.h index 0809e95b11..8c62c99005 100644 --- a/arch/arm/mach-omap/include/mach/omap3-devices.h +++ b/arch/arm/mach-omap/include/mach/omap3-devices.h @@ -2,7 +2,7 @@ #define __MACH_OMAP3_DEVICES_H #include <driver.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/omap3-silicon.h> #include <mach/devices.h> #include <mach/mcspi.h> diff --git a/arch/arm/mach-omap/include/mach/omap3-generic.h b/arch/arm/mach-omap/include/mach/omap3-generic.h index 92bf7cabbd..7db0838a5f 100644 --- a/arch/arm/mach-omap/include/mach/omap3-generic.h +++ b/arch/arm/mach-omap/include/mach/omap3-generic.h @@ -1,7 +1,7 @@ #ifndef __MACH_OMAP3_GENERIC_H #define __MACH_OMAP3_GENERIC_H -#include <sizes.h> +#include <linux/sizes.h> #include <linux/string.h> #include <mach/generic.h> #include <mach/omap3-silicon.h> diff --git a/arch/arm/mach-omap/include/mach/omap4-devices.h b/arch/arm/mach-omap/include/mach/omap4-devices.h index 76c9789729..7ac940b2d7 100644 --- a/arch/arm/mach-omap/include/mach/omap4-devices.h +++ b/arch/arm/mach-omap/include/mach/omap4-devices.h @@ -2,7 +2,7 @@ #define __MACH_OMAP4_DEVICES_H #include <driver.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/devices.h> #include <mach/omap4-silicon.h> #include <mach/mcspi.h> diff --git a/arch/arm/mach-omap/xload.c b/arch/arm/mach-omap/xload.c index 8d9d84c85c..7c8c350114 100644 --- a/arch/arm/mach-omap/xload.c +++ b/arch/arm/mach-omap/xload.c @@ -8,7 +8,7 @@ #include <libfile.h> #include <fs.h> #include <fcntl.h> -#include <sizes.h> +#include <linux/sizes.h> #include <malloc.h> #include <filetype.h> #include <xymodem.h> diff --git a/arch/arm/mach-samsung/lowlevel-s3c24x0.S b/arch/arm/mach-samsung/lowlevel-s3c24x0.S index 52079ffc7b..626ad04187 100644 --- a/arch/arm/mach-samsung/lowlevel-s3c24x0.S +++ b/arch/arm/mach-samsung/lowlevel-s3c24x0.S @@ -15,7 +15,7 @@ */ #include <config.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/s3c-iomap.h> .section ".text_bare_init.s3c24x0_disable_wd","ax" diff --git a/arch/arm/mach-samsung/mem-s3c24x0.c b/arch/arm/mach-samsung/mem-s3c24x0.c index db61c63b64..bf65150cab 100644 --- a/arch/arm/mach-samsung/mem-s3c24x0.c +++ b/arch/arm/mach-samsung/mem-s3c24x0.c @@ -23,7 +23,7 @@ #include <init.h> #include <clock.h> #include <io.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/s3c-iomap.h> #include <mach/s3c-generic.h> #include <mach/s3c-busctl.h> diff --git a/arch/arm/mach-socfpga/xload.c b/arch/arm/mach-socfpga/xload.c index 6586ada349..3380092168 100644 --- a/arch/arm/mach-socfpga/xload.c +++ b/arch/arm/mach-socfpga/xload.c @@ -6,7 +6,7 @@ #include <malloc.h> #include <init.h> #include <envfs.h> -#include <sizes.h> +#include <linux/sizes.h> #include <fs.h> #include <io.h> diff --git a/arch/arm/mach-tegra/include/mach/iomap.h b/arch/arm/mach-tegra/include/mach/iomap.h index cdaab6ab8b..bbe6ae6be6 100644 --- a/arch/arm/mach-tegra/include/mach/iomap.h +++ b/arch/arm/mach-tegra/include/mach/iomap.h @@ -21,7 +21,7 @@ #ifndef __MACH_TEGRA_IOMAP_H #define __MACH_TEGRA_IOMAP_H -#include <sizes.h> +#include <linux/sizes.h> #define TEGRA_IRAM_BASE 0x40000000 #define TEGRA_IRAM_SIZE SZ_256K diff --git a/arch/arm/mach-tegra/include/mach/lowlevel.h b/arch/arm/mach-tegra/include/mach/lowlevel.h index 3e7e41b990..f1fea86cf6 100644 --- a/arch/arm/mach-tegra/include/mach/lowlevel.h +++ b/arch/arm/mach-tegra/include/mach/lowlevel.h @@ -25,7 +25,7 @@ #define __TEGRA_LOWLEVEL_H #include <linux/compiler.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <mach/iomap.h> diff --git a/arch/arm/mach-tegra/tegra_maincomplex_init.c b/arch/arm/mach-tegra/tegra_maincomplex_init.c index 4a362ddba3..6c6bdf6c15 100644 --- a/arch/arm/mach-tegra/tegra_maincomplex_init.c +++ b/arch/arm/mach-tegra/tegra_maincomplex_init.c @@ -15,7 +15,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <asm/errata.h> diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 84a85a4ec9..253e408db9 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -26,7 +26,7 @@ #include <init.h> #include <clock.h> #include <debug_ll.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/clkdev.h> #include <linux/clk.h> diff --git a/arch/efi/efi/efi-device.c b/arch/efi/efi/efi-device.c index 1c9553d906..788bb71533 100644 --- a/arch/efi/efi/efi-device.c +++ b/arch/efi/efi/efi-device.c @@ -23,7 +23,7 @@ #include <malloc.h> #include <memory.h> #include <string.h> -#include <sizes.h> +#include <linux/sizes.h> #include <wchar.h> #include <init.h> #include <efi.h> diff --git a/arch/efi/efi/efi-image.c b/arch/efi/efi/efi-image.c index d9edd91e4d..f7bda8dfcb 100644 --- a/arch/efi/efi/efi-image.c +++ b/arch/efi/efi/efi-image.c @@ -18,7 +18,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <memory.h> #include <command.h> #include <magicvar.h> diff --git a/arch/efi/efi/efi.c b/arch/efi/efi/efi.c index c1efe1d8ae..d351775a28 100644 --- a/arch/efi/efi/efi.c +++ b/arch/efi/efi/efi.c @@ -18,7 +18,7 @@ */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <memory.h> #include <clock.h> #include <command.h> diff --git a/arch/mips/boards/netgear-wg102/ram.c b/arch/mips/boards/netgear-wg102/ram.c index e26dc7cbd3..4cde573982 100644 --- a/arch/mips/boards/netgear-wg102/ram.c +++ b/arch/mips/boards/netgear-wg102/ram.c @@ -1,6 +1,6 @@ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/memory.h> static int mem_init(void) diff --git a/arch/mips/boards/qemu-malta/init.c b/arch/mips/boards/qemu-malta/init.c index 9d90f28651..24bfdc03ee 100644 --- a/arch/mips/boards/qemu-malta/init.c +++ b/arch/mips/boards/qemu-malta/init.c @@ -18,7 +18,7 @@ #include <common.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> static int malta_core_init(void) { diff --git a/arch/mips/boot/main_entry-pbl.c b/arch/mips/boot/main_entry-pbl.c index 3a244a0c50..e408d29445 100644 --- a/arch/mips/boot/main_entry-pbl.c +++ b/arch/mips/boot/main_entry-pbl.c @@ -19,7 +19,7 @@ #include <common.h> #include <pbl.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <string.h> #include <asm/sections.h> #include <asm-generic/memory_layout.h> diff --git a/arch/ppc/boards/pcm030/pcm030.c b/arch/ppc/boards/pcm030/pcm030.c index 0762bd4f26..a7fa21d173 100644 --- a/arch/ppc/boards/pcm030/pcm030.c +++ b/arch/ppc/boards/pcm030/pcm030.c @@ -30,7 +30,7 @@ #include <types.h> #include <partition.h> #include <memory.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/stat.h> #include <fs.h> diff --git a/common/clock.c b/common/clock.c index 2ee81da8e7..35c9e6cbb8 100644 --- a/common/clock.c +++ b/common/clock.c @@ -22,6 +22,7 @@ */ #include <common.h> +#include <init.h> #include <asm-generic/div64.h> #include <clock.h> #include <poller.h> @@ -35,6 +36,16 @@ static uint64_t time_ns; */ uint64_t time_beginning; +static int dummy_csrc_warn(void) +{ + if (!current_clock) { + pr_warn("Warning: Using dummy clocksource\n"); + } + + return 0; +} +late_initcall(dummy_csrc_warn); + /** * get_time_ns - get current timestamp in nanoseconds */ @@ -44,8 +55,13 @@ uint64_t get_time_ns(void) uint64_t cycle_now, cycle_delta; uint64_t ns_offset; - if (!cs) - return 0; + if (!cs) { + static uint64_t dummy_counter; + + dummy_counter += CONFIG_CLOCKSOURCE_DUMMY_RATE; + + return dummy_counter; + } /* read clocksource: */ cycle_now = cs->read() & cs->mask; diff --git a/common/memtest.c b/common/memtest.c index 541d008221..25a97d845c 100644 --- a/common/memtest.c +++ b/common/memtest.c @@ -24,7 +24,7 @@ #include <common.h> #include <memory.h> #include <types.h> -#include <sizes.h> +#include <linux/sizes.h> #include <errno.h> #include <memtest.h> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 645e9b5b7e..346ab98134 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -32,7 +32,7 @@ #include <disks.h> #include <asm/mmu.h> #include <ata_drive.h> -#include <sizes.h> +#include <linux/sizes.h> #include <clock.h> #include "ahci.h" diff --git a/drivers/bus/omap-gpmc.c b/drivers/bus/omap-gpmc.c index 6cc3269993..6752c42a35 100644 --- a/drivers/bus/omap-gpmc.c +++ b/drivers/bus/omap-gpmc.c @@ -11,7 +11,7 @@ #include <driver.h> #include <malloc.h> #include <init.h> -#include <sizes.h> +#include <linux/sizes.h> #include <io.h> #include <of.h> #include <of_address.h> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index fc5a389b95..598edc9a81 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -18,28 +18,21 @@ config CLOCKSOURCE_DIGIC bool depends on ARCH_DIGIC -config CLOCKSOURCE_DUMMY - bool "Enable dummy software-only clocksource" +config CLOCKSOURCE_DUMMY_RATE + int + prompt "dummy clocksource rate" + default 1000 help When porting barebox to a new SoC there might be a case of broken or absent clocksource. This causes barebox serial console to be non functional. - To solve the problem this software-only clocksource driver is used. - WARNING!!! This clocksource doesn't provide correct timing. - To adjust this clocksource please use CONFIG_CLOCKSOURCE_DUMMY_RATE. + To solve the problem barebox has built-in software-only clocksource. + The software-only clocksource is used only if no hardware clocksource + is registered. This can help if initialization order is wrong so that + the time functions are used before the real clocksource was initialized. + WARNING!!! Built-in software-only clocksource doesn't provide correct timing. + The option CONFIG_CLOCKSOURCE_DUMMY_RATE is used to adjust this clocksource. The bigger rate valuest makes clocksource "faster". - It's possible to add this clocksource unconditionally. - This clocksource starts very early (pure_initcall) so - real clocksource will take over. - This can help if initialization order is wrong so that - the time functions are used before the real clocksource - was initialized. - -config CLOCKSOURCE_DUMMY_RATE - int - prompt "dummy clocksource rate" - depends on CLOCKSOURCE_DUMMY - default 1000 config CLOCKSOURCE_MVEBU bool diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index b80df6b2c9..f5f5141a3d 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -3,7 +3,6 @@ obj-$(CONFIG_ARM_SMP_TWD) += arm_smp_twd.o obj-$(CONFIG_CLOCKSOURCE_BCM2835) += bcm2835.o obj-$(CONFIG_CLOCKSOURCE_CLPS711X) += clps711x.o obj-$(CONFIG_CLOCKSOURCE_DIGIC) += digic.o -obj-$(CONFIG_CLOCKSOURCE_DUMMY) += dummy.o obj-$(CONFIG_CLOCKSOURCE_MVEBU) += mvebu.o obj-$(CONFIG_CLOCKSOURCE_NOMADIK) += nomadik.o obj-$(CONFIG_CLOCKSOURCE_ORION) += orion.o diff --git a/drivers/clocksource/dummy.c b/drivers/clocksource/dummy.c deleted file mode 100644 index 96f9b6efca..0000000000 --- a/drivers/clocksource/dummy.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2013 Antony Pavlov <antonynpavlov@gmail.com> - * - * This file is part of barebox. - * See file CREDITS for list of people who contributed to this project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#include <common.h> -#include <init.h> -#include <clock.h> - -static uint64_t dummy_counter; - -static uint64_t dummy_cs_read(void) -{ - static int first; - - if (!first) { - pr_warn("Warning: Using dummy clocksource\n"); - first = 1; - } - - dummy_counter += CONFIG_CLOCKSOURCE_DUMMY_RATE; - - return dummy_counter; -} - -static struct clocksource dummy_cs = { - .read = dummy_cs_read, - .mask = CLOCKSOURCE_MASK(32), -}; - -static int clocksource_init(void) -{ - dummy_counter = 0; - - clocks_calc_mult_shift(&dummy_cs.mult, &dummy_cs.shift, - 100000000, NSEC_PER_SEC, 10); - - pr_debug("clocksource_init: mult=%08x, shift=%08x\n", - dummy_cs.mult, dummy_cs.shift); - - return init_clock(&dummy_cs); -} -pure_initcall(clocksource_init); diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c index 52b0da5927..dc0f8c6aa3 100644 --- a/drivers/mtd/nand/nand_ids.c +++ b/drivers/mtd/nand/nand_ids.c @@ -9,7 +9,7 @@ * */ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/mtd/nand.h> #ifdef CONFIG_NAND_INFO diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 7734cf8a44..8042e90951 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -28,7 +28,7 @@ #include <io.h> #include <net.h> #include <of_net.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/mmu.h> #include <linux/clk.h> #include <linux/err.h> diff --git a/drivers/net/orion-gbe.c b/drivers/net/orion-gbe.c index ab761ad2e0..3fbc1df893 100644 --- a/drivers/net/orion-gbe.c +++ b/drivers/net/orion-gbe.c @@ -31,7 +31,7 @@ #include <io.h> #include <net.h> #include <of_net.h> -#include <sizes.h> +#include <linux/sizes.h> #include <asm/mmu.h> #include <linux/clk.h> #include <linux/err.h> diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 5702900e49..19f5763c87 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -50,11 +50,11 @@ struct rtl8169_priv { struct pci_dev *pci_dev; int chipset; - struct bufdesc *tx_desc; + volatile struct bufdesc *tx_desc; void *tx_buf; unsigned int cur_tx; - struct bufdesc *rx_desc; + volatile struct bufdesc *rx_desc; void *rx_buf; unsigned int cur_rx; @@ -250,10 +250,6 @@ static void rtl8169_init_ring(struct rtl8169_priv *priv) priv->rx_desc[i].buf_addr = virt_to_phys(priv->rx_buf + i * PKT_BUF_SIZE); } - - dma_flush_range((unsigned long)priv->rx_desc, - (unsigned long)priv->rx_desc + - NUM_RX_DESC * sizeof(struct bufdesc)); } static void rtl8169_hw_start(struct rtl8169_priv *priv) @@ -386,14 +382,10 @@ static int rtl8169_eth_send(struct eth_device *edev, void *packet, ((packet_length > ETH_ZLEN) ? packet_length : ETH_ZLEN); } - dma_flush_range((unsigned long)&priv->tx_desc[entry], - (unsigned long)&priv->tx_desc[entry + 1]); - RTL_W8(priv, TxPoll, 0x40); - do { - dma_inv_range((unsigned long)&priv->tx_desc[entry], - (unsigned long)&priv->tx_desc[entry + 1]); - } while (priv->tx_desc[entry].status & BD_STAT_OWN); + + while (priv->tx_desc[entry].status & BD_STAT_OWN) + ; priv->cur_tx++; @@ -408,9 +400,6 @@ static int rtl8169_eth_rx(struct eth_device *edev) entry = priv->cur_rx % NUM_RX_DESC; - dma_inv_range((unsigned long)&priv->rx_desc[entry], - (unsigned long)&priv->rx_desc[entry + 1]); - if ((priv->rx_desc[entry].status & BD_STAT_OWN) == 0) { if (!(priv->rx_desc[entry].status & BD_STAT_RX_RES)) { pkt_size = (priv->rx_desc[entry].status & 0x1fff) - 4; @@ -441,9 +430,6 @@ static int rtl8169_eth_rx(struct eth_device *edev) priv->rx_desc[entry].buf_addr = virt_to_phys(priv->rx_buf + entry * PKT_BUF_SIZE); - - dma_flush_range((unsigned long)&priv->rx_desc[entry], - (unsigned long)&priv->rx_desc[entry + 1]); } else { dev_err(&edev->dev, "rx error\n"); } diff --git a/drivers/of/base.c b/drivers/of/base.c index e9f0883f47..af10fd1da3 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -24,7 +24,7 @@ #include <malloc.h> #include <init.h> #include <memory.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/ctype.h> #include <linux/amba/bus.h> #include <linux/err.h> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index d84b2037cb..dfa95c38c8 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -23,7 +23,7 @@ #include <malloc.h> #include <init.h> #include <memory.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/ctype.h> #include <linux/err.h> diff --git a/drivers/pci/pci-mvebu.c b/drivers/pci/pci-mvebu.c index a314a689c0..5e2b87a9e1 100644 --- a/drivers/pci/pci-mvebu.c +++ b/drivers/pci/pci-mvebu.c @@ -20,7 +20,7 @@ #include <of_address.h> #include <of_gpio.h> #include <of_pci.h> -#include <sizes.h> +#include <linux/sizes.h> #include "pci-mvebu.h" diff --git a/drivers/pci/pci-tegra.c b/drivers/pci/pci-tegra.c index 1ff3c0d150..1e7907e5b1 100644 --- a/drivers/pci/pci-tegra.c +++ b/drivers/pci/pci-tegra.c @@ -32,7 +32,7 @@ #include <linux/pci.h> #include <linux/phy/phy.h> #include <linux/reset.h> -#include <sizes.h> +#include <linux/sizes.h> #include <mach/tegra-powergate.h> #include <regulator.h> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 7f8ebcfe43..5b848eeb2a 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1,5 +1,5 @@ #include <common.h> -#include <sizes.h> +#include <linux/sizes.h> #include <linux/pci.h> #ifdef DEBUG diff --git a/drivers/pinctrl/mvebu/armada-370.c b/drivers/pinctrl/mvebu/armada-370.c index 4778358fad..bcfe40e6c8 100644 --- a/drivers/pinctrl/mvebu/armada-370.c +++ b/drivers/pinctrl/mvebu/armada-370.c @@ -17,7 +17,7 @@ #include <malloc.h> #include <of.h> #include <of_address.h> -#include <sizes.h> +#include <linux/sizes.h> #include "common.h" diff --git a/drivers/pinctrl/mvebu/armada-xp.c b/drivers/pinctrl/mvebu/armada-xp.c index 8c71867a7d..1745776a4d 100644 --- a/drivers/pinctrl/mvebu/armada-xp.c +++ b/drivers/pinctrl/mvebu/armada-xp.c @@ -26,7 +26,7 @@ #include <malloc.h> #include <of.h> #include <of_address.h> -#include <sizes.h> +#include <linux/sizes.h> #include "common.h" diff --git a/drivers/pinctrl/mvebu/dove.c b/drivers/pinctrl/mvebu/dove.c index bd0a632f1f..a2133a093b 100644 --- a/drivers/pinctrl/mvebu/dove.c +++ b/drivers/pinctrl/mvebu/dove.c @@ -15,7 +15,7 @@ #include <malloc.h> #include <of.h> #include <of_address.h> -#include <sizes.h> +#include <linux/sizes.h> #include "common.h" diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 92a1a218c6..76879db1f1 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -653,7 +653,8 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req) pr_err("Booting failed\n"); } -static void cb_boot(struct usb_ep *ep, struct usb_request *req, const char *opt) +static void __maybe_unused cb_boot(struct usb_ep *ep, struct usb_request *req, + const char *opt) { struct f_fastboot *f_fb = req->context; @@ -857,9 +858,11 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { }, { .cmd = "download:", .cb = cb_download, +#if defined(CONFIG_BOOTM) }, { .cmd = "boot", .cb = cb_boot, +#endif }, { .cmd = "flash:", .cb = cb_flash, diff --git a/drivers/video/imx-ipu-v3/imx-hdmi.c b/drivers/video/imx-ipu-v3/imx-hdmi.c index 4f462889a8..2da76a4b7a 100644 --- a/drivers/video/imx-ipu-v3/imx-hdmi.c +++ b/drivers/video/imx-ipu-v3/imx-hdmi.c @@ -1190,16 +1190,18 @@ static int imx_hdmi_probe(struct device_d *dev) if (ret) return ret; - ddc_node = of_parse_phandle(np, "ddc-i2c-bus", 0); - if (ddc_node) { - hdmi->ddc = of_find_i2c_adapter_by_node(ddc_node); - if (!hdmi->ddc) - dev_dbg(hdmi->dev, "failed to read ddc node\n"); - } else { - dev_dbg(hdmi->dev, "no ddc property found\n"); - } + if (IS_ENABLED(CONFIG_DRIVER_VIDEO_EDID)) { + ddc_node = of_parse_phandle(np, "ddc-i2c-bus", 0); + if (ddc_node) { + hdmi->ddc = of_find_i2c_adapter_by_node(ddc_node); + if (!hdmi->ddc) + dev_dbg(hdmi->dev, "failed to read ddc node\n"); + } else { + dev_dbg(hdmi->dev, "no ddc property found\n"); + } - ddc_node = NULL; + ddc_node = NULL; + } hdmi->regs = dev_request_mem_region(dev, 0); if (!hdmi->regs) @@ -33,7 +33,7 @@ #include <linux/stat.h> #include <linux/err.h> #include <kfifo.h> -#include <sizes.h> +#include <linux/sizes.h> #include <byteorder.h> #include "parseopt.h" @@ -31,7 +31,7 @@ #include <linux/stat.h> #include <linux/err.h> #include <kfifo.h> -#include <sizes.h> +#include <linux/sizes.h> #define TFTP_PORT 69 /* Well known TFTP port number */ diff --git a/include/linux/amba/sp804.h b/include/linux/amba/sp804.h index aba550c374..8ec58f6c18 100644 --- a/include/linux/amba/sp804.h +++ b/include/linux/amba/sp804.h @@ -8,7 +8,7 @@ #define __AMBA_SP804_H__ #include <linux/amba/bus.h> -#include <sizes.h> +#include <linux/sizes.h> #define AMBA_ARM_SP804_ID 0x00141804 #define AMBA_ARM_SP804_ID_MASK 0x00ffffff diff --git a/include/sizes.h b/include/linux/sizes.h index 6f91e9b4bd..ce3e8150c1 100644 --- a/include/sizes.h +++ b/include/linux/sizes.h @@ -1,22 +1,13 @@ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * include/linux/sizes.h * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ -/* Size defintions - * Copyright (C) ARM Limited 1998. All rights reserved. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. */ +#ifndef __LINUX_SIZES_H__ +#define __LINUX_SIZES_H__ -#ifndef __sizes_h -#define __sizes_h 1 - -/* handy sizes */ #define SZ_1 0x00000001 #define SZ_2 0x00000002 #define SZ_4 0x00000004 @@ -53,4 +44,4 @@ #define SZ_1G 0x40000000 #define SZ_2G 0x80000000 -#endif /* __sizes_h */ +#endif /* __LINUX_SIZES_H__ */ diff --git a/lib/bootstrap/devfs.c b/lib/bootstrap/devfs.c index 25d07c761c..704680a4c9 100644 --- a/lib/bootstrap/devfs.c +++ b/lib/bootstrap/devfs.c @@ -12,7 +12,7 @@ #include <linux/mtd/mtd.h> #include <fcntl.h> #include <filetype.h> -#include <sizes.h> +#include <linux/sizes.h> #include <errno.h> #include <malloc.h> #include <bootstrap.h> diff --git a/lib/bootstrap/disk.c b/lib/bootstrap/disk.c index 1e9fbd834b..ebf9ee5a98 100644 --- a/lib/bootstrap/disk.c +++ b/lib/bootstrap/disk.c @@ -8,7 +8,7 @@ #include <common.h> #include <fs.h> #include <fcntl.h> -#include <sizes.h> +#include <linux/sizes.h> #include <errno.h> #include <malloc.h> #include <libfile.h> |