sizes.h - consolidate for all architectures
Subsystems (9)
PATCH 1/1 sizes.h - consolidate for all architectures
Copied from Linux sources "include/linux/sizes.h" commit 413541dd66d51f791a0b169d9b9014e4f56be13c
--- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 2 +- arch/arm/cpu/armv7/omap4/hwinit.c | 2 +- arch/arm/cpu/armv7/omap5/hwinit.c | 2 +- arch/arm/cpu/at91-common/phy.c | 2 +- arch/arm/include/asm/arch-davinci/hardware.h | 2 +- arch/arm/include/asm/arch-mb86r0x/hardware.h | 2 +- arch/arm/include/asm/arch-tnetv107x/hardware.h | 2 +- arch/arm/include/asm/sizes.h | 39 --------------------- board/BuS/vl_ma2sc/vl_ma2sc.c | 2 +- board/atmel/at91sam9263ek/at91sam9263ek.c | 2 +- board/compulab/cm_t335/spl.c | 2 +- board/freescale/mx6slevk/mx6slevk.c | 2 +- board/highbank/highbank.c | 2 +- board/ronetix/pm9261/pm9261.c | 2 +- board/ronetix/pm9263/pm9263.c | 2 +- board/ronetix/pm9g45/pm9g45.c | 2 +- board/samsung/common/misc.c | 2 +- board/wandboard/wandboard.c | 2 +- drivers/fpga/zynqpl.c | 2 +- drivers/gpio/at91_gpio.c | 2 +- drivers/pci/pcie_imx.c | 2 +- drivers/usb/gadget/f_thor.h | 2 +- include/configs/at91rm9200ek.h | 2 +- include/configs/beaver.h | 2 +- include/configs/cardhu.h | 2 +- include/configs/cpuat91.h | 2 +- include/configs/dalmore.h | 2 +- include/configs/devkit3250.h | 2 +- include/configs/harmony.h | 2 +- include/configs/hummingboard.h | 2 +- include/configs/mx6sabre_common.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/omap1510.h | 2 +- include/configs/omap3_sdp3430.h | 2 +- include/configs/paz00.h | 2 +- include/configs/rpi_b.h | 2 +- include/configs/sbc35_a9g20.h | 2 +- include/configs/seaboard.h | 2 +- include/configs/snapper9260.h | 2 +- include/configs/tegra-common.h | 2 +- include/configs/tnetv107x_evm.h | 2 +- include/configs/trats.h | 2 +- include/configs/trats2.h | 2 +- include/configs/trimslice.h | 2 +- include/configs/udoo.h | 2 +- include/configs/venice2.h | 2 +- include/configs/ventana.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/whistler.h | 2 +- include/linux/sizes.h | 47 ++++++++++++++++++++++++++ include/usb/s3c_udc.h | 2 +- 51 files changed, 96 insertions(+), 88 deletions(-) delete mode 100644 arch/arm/include/asm/sizes.h create mode 100644 include/linux/sizes.h
arch/arm/cpu/armv7/omap-common/hwinit-common.c +1 -1
@@ -14,7 +14,7 @@#include <common.h> #include <spl.h> #include <asm/arch/sys_proto.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/emif.h> #include <asm/omap_common.h> #include <linux/compiler.h>
arch/arm/cpu/armv7/omap4/hwinit.c +1 -1
@@ -15,7 +15,7 @@#include <asm/armv7.h> #include <asm/arch/cpu.h> #include <asm/arch/sys_proto.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/emif.h> #include <asm/arch/gpio.h> #include <asm/omap_common.h>
arch/arm/cpu/armv7/omap5/hwinit.c +1 -1
@@ -17,7 +17,7 @@#include <asm/arch/cpu.h> #include <asm/arch/sys_proto.h> #include <asm/arch/clock.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/utils.h> #include <asm/arch/gpio.h> #include <asm/emif.h>
arch/arm/cpu/at91-common/phy.c +1 -1
@@ -14,7 +14,7 @@#include <common.h> #include <asm/io.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> #include <watchdog.h>
arch/arm/include/asm/arch-davinci/hardware.h +1 -1
@@ -15,7 +15,7 @@#define __ASM_ARCH_HARDWARE_H#include <config.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #define REG (addr) (*(volatile unsigned int *)(addr))#define REG_P (addr) ((volatile unsigned int *)(addr))
arch/arm/include/asm/arch-mb86r0x/hardware.h +1 -1
@@ -9,7 +9,7 @@#ifndef __ASM_ARCH_HARDWARE_H#define __ASM_ARCH_HARDWARE_H -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/arch/mb86r0x.h> #endif
arch/arm/include/asm/arch-tnetv107x/hardware.h +1 -1
@@ -9,7 +9,7 @@#ifndef __ASSEMBLY__ -#include <asm/sizes.h> +#include <linux/sizes.h> #define ASYNC_EMIF_NUM_CS 4#define ASYNC_EMIF_MODE_NOR 0
arch/arm/include/asm/sizes.h deleted +0 -39
@@ -1,39 +0,0 @@ -/* -* SPDX-License-Identifier: GPL-2.0+ -*/ -/* Size defintions -* Copyright (C) ARM Limited 1998. All rights reserved. -*/ - -#ifndef __sizes_h -#define __sizes_h 1 - -/* handy sizes */ -#define SZ_1K 0x00000400 -#define SZ_4K 0x00001000 -#define SZ_8K 0x00002000 -#define SZ_16K 0x00004000 -#define SZ_32K 0x00008000 -#define SZ_64K 0x00010000 -#define SZ_128K 0x00020000 -#define SZ_256K 0x00040000 -#define SZ_512K 0x00080000 - -#define SZ_1M 0x00100000 -#define SZ_2M 0x00200000 -#define SZ_4M 0x00400000 -#define SZ_8M 0x00800000 -#define SZ_16M 0x01000000 -#define SZ_31M 0x01F00000 -#define SZ_32M 0x02000000 -#define SZ_64M 0x04000000 -#define SZ_128M 0x08000000 -#define SZ_256M 0x10000000 -#define SZ_512M 0x20000000 - -#define SZ_1G 0x40000000 -#define SZ_2G 0x80000000 - -#endif - -/* END */
board/BuS/vl_ma2sc/vl_ma2sc.c +1 -1
@@ -8,7 +8,7 @@#include <config.h> #include <common.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/hardware.h>
board/atmel/at91sam9263ek/at91sam9263ek.c +1 -1
@@ -7,7 +7,7 @@*/ #include <common.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/arch/at91sam9263.h> #include <asm/arch/at91sam9_smc.h> #include <asm/arch/at91_common.h>
board/compulab/cm_t335/spl.c +1 -1
@@ -18,7 +18,7 @@#include <asm/arch/clocks_am33xx.h> #include <asm/arch/sys_proto.h> #include <asm/arch/hardware_am33xx.h> -#include <asm/sizes.h> +#include <linux/sizes.h> const struct ctrl_ioregs ioregs = { .cm0ioctl =MT41J128MJT125_IOCTRL_VALUE ,
board/freescale/mx6slevk/mx6slevk.c +1 -1
@@ -14,7 +14,7 @@#include <asm/gpio.h> #include <asm/imx-common/iomux-v3.h> #include <asm/io.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <common.h> #include <fsl_esdhc.h> #include <mmc.h>
board/highbank/highbank.c +1 -1
@@ -9,7 +9,7 @@#include <netdev.h> #include <scsi.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/io.h> #define HB_AHCI_BASE 0xffe08000
board/ronetix/pm9261/pm9261.c +1 -1
@@ -9,7 +9,7 @@*/ #include <common.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/at91sam9_smc.h>
board/ronetix/pm9263/pm9263.c +1 -1
@@ -9,7 +9,7 @@*/ #include <common.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/at91sam9_smc.h>
board/ronetix/pm9g45/pm9g45.c +1 -1
@@ -12,7 +12,7 @@*/ #include <common.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/at91sam9_smc.h>
board/samsung/common/misc.c +1 -1
@@ -11,7 +11,7 @@#include <samsung/misc.h> #include <errno.h> #include <version.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/arch/cpu.h> #include <asm/arch/gpio.h> #include <asm/gpio.h>
board/wandboard/wandboard.c +1 -1
@@ -17,7 +17,7 @@#include <asm/imx-common/iomux-v3.h> #include <asm/imx-common/boot_mode.h> #include <asm/io.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <common.h> #include <fsl_esdhc.h> #include <ipu_pixfmt.h>
drivers/fpga/zynqpl.c +1 -1
@@ -10,7 +10,7 @@#include <common.h> #include <asm/io.h> #include <zynqpl.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h>
drivers/gpio/at91_gpio.c +1 -1
@@ -11,7 +11,7 @@#include <config.h> #include <common.h> #include <asm/io.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_pio.h> #include <asm/arch/gpio.h>
drivers/pci/pcie_imx.c +1 -1
@@ -17,7 +17,7 @@#include <asm/arch/crm_regs.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <errno.h> #define PCI_ACCESS_READ 0
drivers/usb/gadget/f_thor.h +1 -1
@@ -11,7 +11,7 @@#define _USB_THOR_H_#include <linux/compiler.h> -#include <asm/sizes.h> +#include <linux/sizes.h> /* THOR Composite Gadget */ #define STRING_MANUFACTURER_IDX 0
include/configs/at91rm9200ek.h +1 -1
@@ -14,7 +14,7 @@#ifndef __AT91RM9200EK_CONFIG_H__#define __AT91RM9200EK_CONFIG_H__ -#include <asm/sizes.h> +#include <linux/sizes.h> /* * set some initial configurations depending on configure target
include/configs/beaver.h +1 -1
@@ -17,7 +17,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/sizes.h> +#include <linux/sizes.h> #include "tegra30-common.h"
include/configs/cardhu.h +1 -1
@@ -17,7 +17,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/sizes.h> +#include <linux/sizes.h> #include "tegra30-common.h"
include/configs/cpuat91.h +1 -1
@@ -10,7 +10,7 @@#ifndef _CONFIG_CPUAT91_H#define _CONFIG_CPUAT91_H -#include <asm/sizes.h> +#include <linux/sizes.h> #ifdef CONFIG_RAMBOOT #define CONFIG_SKIP_LOWLEVEL_INIT
include/configs/dalmore.h +1 -1
@@ -17,7 +17,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/sizes.h> +#include <linux/sizes.h> #include "tegra114-common.h"
include/configs/devkit3250.h +1 -1
@@ -10,7 +10,7 @@#define __CONFIG_DEVKIT3250_H__/* SoC and board defines */ -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/arch/cpu.h> /*
include/configs/harmony.h +1 -1
@@ -8,7 +8,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/sizes.h> +#include <linux/sizes.h> #include "tegra20-common.h" /* Enable fdt support for Harmony. Flash the image in u-boot-dtb.bin */
include/configs/hummingboard.h +1 -1
@@ -14,7 +14,7 @@#include "mx6_common.h" #include <asm/arch/imx-regs.h> #include <asm/imx-common/gpio.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO
include/configs/mx6sabre_common.h +1 -1
@@ -12,7 +12,7 @@#define CONFIG_MX6 #include "mx6_common.h" -#include <asm/sizes.h> +#include <linux/sizes.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
include/configs/mx6slevk.h +1 -1
@@ -10,7 +10,7 @@#define __CONFIG_H#include <asm/arch/imx-regs.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include "mx6_common.h" #define CONFIG_MX6
include/configs/omap1510.h +1 -1
@@ -10,7 +10,7 @@* SPDX-License-Identifier: GPL-2.0+ */ -#include <asm/sizes.h> +#include <linux/sizes.h> /* There are 2 sets of general I/O -->
include/configs/omap3_sdp3430.h +1 -1
@@ -16,7 +16,7 @@/* TODO: REMOVE THE FOLLOWING * Retained the following till size.h is removed in u-boot */ -#include <asm/sizes.h> +#include <linux/sizes.h> /* * High Level Configuration Options */
include/configs/paz00.h +1 -1
@@ -17,7 +17,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/sizes.h> +#include <linux/sizes.h> #include "tegra20-common.h" /* Enable fdt support for Paz00. Flash the image in u-boot-dtb.bin */
include/configs/rpi_b.h +1 -1
@@ -17,7 +17,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/sizes.h> +#include <linux/sizes.h> /* Architecture, CPU, etc.*/ #define CONFIG_ARM1176
include/configs/sbc35_a9g20.h +1 -1
@@ -12,7 +12,7 @@/* SoC type is defined in boards.cfg */ #include <asm/hardware.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #if defined(CONFIG_SYS_USE_NANDFLASH )#define CONFIG_ENV_IS_IN_NAND
include/configs/seaboard.h +1 -1
@@ -8,7 +8,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/sizes.h> +#include <linux/sizes.h> /* LP0 suspend / resume */ #define CONFIG_TEGRA_LP0
include/configs/snapper9260.h +1 -1
@@ -13,7 +13,7 @@/* SoC type is defined in boards.cfg */ #include <asm/hardware.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #define CONFIG_SYS_TEXT_BASE 0x20000000
include/configs/tegra-common.h +1 -1
@@ -7,7 +7,7 @@#ifndef _TEGRA_COMMON_H_#define _TEGRA_COMMON_H_ -#include <asm/sizes.h> +#include <linux/sizes.h> #include <linux/stringify.h> /*
include/configs/tnetv107x_evm.h +1 -1
@@ -11,7 +11,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/sizes.h> +#include <linux/sizes.h> #include <asm/arch/hardware.h> #include <asm/arch/clock.h>
include/configs/trats.h +1 -1
@@ -51,7 +51,7 @@#define MACH_TYPE_TRATS 3928#define CONFIG_MACH_TYPE MACH_TYPE_TRATS -#include <asm/sizes.h> +#include <linux/sizes.h> /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 * SZ_1M))
include/configs/trats2.h +1 -1
@@ -64,7 +64,7 @@#define CONFIG_DISPLAY_CPUINFO -#include <asm/sizes.h> +#include <linux/sizes.h> /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 * SZ_1M))
include/configs/trimslice.h +1 -1
@@ -8,7 +8,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/sizes.h> +#include <linux/sizes.h> #include "tegra20-common.h" /* Enable fdt support for TrimSlice. Flash the image in u-boot-dtb.bin */
include/configs/udoo.h +1 -1
@@ -12,7 +12,7 @@#include "mx6_common.h" #include <asm/arch/imx-regs.h> #include <asm/imx-common/gpio.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO
include/configs/venice2.h +1 -1
@@ -8,7 +8,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/sizes.h> +#include <linux/sizes.h> #include "tegra124-common.h"
include/configs/ventana.h +1 -1
@@ -8,7 +8,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/sizes.h> +#include <linux/sizes.h> #include "tegra20-common.h" /* Enable fdt support for Ventana. Flash the image in u-boot-dtb.bin */
include/configs/wandboard.h +1 -1
@@ -12,7 +12,7 @@#include "mx6_common.h" #include <asm/arch/imx-regs.h> #include <asm/imx-common/gpio.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO
include/configs/whistler.h +1 -1
@@ -8,7 +8,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/sizes.h> +#include <linux/sizes.h> #include "tegra20-common.h" /* Enable fdt support for Whistler. Flash the image in u-boot-dtb.bin */
include/linux/sizes.h new file +47 -0
47 lines not on this page · raw message
include/usb/s3c_udc.h +1 -1
@@ -10,7 +10,7 @@#define __S3C_USB_GADGET#include <asm/errno.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/list.h>
Signature · 1 line
1.8.5.3
PATCH 1/1 sizes.h - consolidate for all architectures
Quoted 9 lines · Alexey Brodkin
Copied from Linux sources "
include/linux/sizes.h" commit413541dd66d51f791a0b169d9b9014e4f56be13cSigned-off-by Alexey Brodkin <[email protected]>Cc Vineet Gupta <[email protected]>Cc Tom Rini <[email protected]>Cc Stefan Roese <[email protected]>Cc Albert Aribaud <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140226/a266b29f/attachment.pgp>
PATCH 1/1 sizes.h - consolidate for all architectures
In reply to Alexey BrodkinQuoted 9 lines · Alexey Brodkin
Copied from Linux sources "
include/linux/sizes.h" commit413541dd66d51f791a0b169d9b9014e4f56be13cSigned-off-by Alexey Brodkin <[email protected]>Cc Vineet Gupta <[email protected]>Cc Tom Rini <[email protected]>Cc Stefan Roese <[email protected]>Cc Albert Aribaud <[email protected]>
Even though that I know that Wolfgang is against the usage of those SZ_xxx macros, this is still better that before. So:
Thanks,
Stefan
Quoted 11 lines · Alexey Brodkin
Copied from Linux sources "
include/linux/sizes.h" commit413541dd66d51f791a0b169d9b9014e4f56be13cSigned-off-by Alexey Brodkin <[email protected]>Cc Vineet Gupta <[email protected]>Cc Tom Rini <[email protected]>Cc Stefan Roese <[email protected]>Cc Albert Aribaud <[email protected]>Acked-by Tom Rini <[email protected]>Acked-by Stefan Roese <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140304/d3a2cd93/attachment.pgp>