[U-Boot] [PATCH v2] TI: OMAP3: Remove SZ_xx references
Paulraj, Sandeep
s-paulraj at ti.com
Wed Oct 7 04:39:32 CEST 2009
Nishanth,
I was referring to this patch I sent some time back.
And one comment about your patch; I could not see you actually removing the asm/sizes.h header file. I think that is important as Wolfgang has told us that he is going to remove that header file.
Thanks,
Sandeep
> Subject: [PATCH v2] TI: OMAP3: Remove SZ_xx references
>
> From: Sandeep Paulraj <s-paulraj at ti.com>
>
> This patch removes dependency on the sizes.h header file
> and removes all references to SZ_xx.
>
> Signed-off-by: Sandeep Paulraj <s-paulraj at ti.com>
> ---
> Changes since the initial version include fixing an error noticed by
> Wolfgang
> and using shift operators in ARM CORTEX A8 code.
> cpu/arm_cortexa8/omap3/mem.c | 6 +++---
> cpu/arm_cortexa8/omap3/sys_info.c | 2 +-
> include/configs/devkit8000.h | 15 +++++++--------
> include/configs/omap3_beagle.h | 15 +++++++--------
> include/configs/omap3_evm.h | 15 +++++++--------
> include/configs/omap3_overo.h | 15 +++++++--------
> include/configs/omap3_pandora.h | 15 +++++++--------
> include/configs/omap3_zoom1.h | 15 +++++++--------
> include/configs/omap3_zoom2.h | 15 +++++++--------
> 9 files changed, 53 insertions(+), 60 deletions(-)
>
> diff --git a/cpu/arm_cortexa8/omap3/mem.c b/cpu/arm_cortexa8/omap3/mem.c
> index 079c848..b4dec39 100644
> --- a/cpu/arm_cortexa8/omap3/mem.c
> +++ b/cpu/arm_cortexa8/omap3/mem.c
> @@ -92,7 +92,7 @@ void make_cs1_contiguous(void)
> u32 size, a_add_low, a_add_high;
>
> size = get_sdr_cs_size(CS0);
> - size /= SZ_32M; /* find size to offset CS1 */
> + size >>= 25; /* divide by 32 MiB to find size to offset CS1 */
> a_add_high = (size & 3) << 8; /* set up low field */
> a_add_low = (size & 0x3C) >> 2; /* set up high field */
> writel((a_add_high | a_add_low), &sdrc_base->cs_cfg);
> @@ -249,7 +249,7 @@ void gpmc_init(void)
> enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[0], base, size);
> #if defined(CONFIG_ENV_IS_IN_NAND)
> f_off = SMNAND_ENV_OFFSET;
> - f_sec = SZ_128K;
> + f_sec = (128 << 10); /* 128 KiB */
> /* env setup */
> boot_flash_base = base;
> boot_flash_off = f_off;
> @@ -265,7 +265,7 @@ void gpmc_init(void)
> enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[0], base, size);
> #if defined(CONFIG_ENV_IS_IN_ONENAND)
> f_off = ONENAND_ENV_OFFSET;
> - f_sec = SZ_128K;
> + f_sec = (128 << 10); /* 128 KiB */
> /* env setup */
> boot_flash_base = base;
> boot_flash_off = f_off;
> diff --git a/cpu/arm_cortexa8/omap3/sys_info.c
> b/cpu/arm_cortexa8/omap3/sys_info.c
> index 765aaf2..31b2003 100644
> --- a/cpu/arm_cortexa8/omap3/sys_info.c
> +++ b/cpu/arm_cortexa8/omap3/sys_info.c
> @@ -124,7 +124,7 @@ u32 get_sdr_cs_size(u32 cs)
> /* get ram size field */
> size = readl(&sdrc_base->cs[cs].mcfg) >> 8;
> size &= 0x3FF; /* remove unwanted bits */
> - size *= SZ_2M; /* find size in MB */
> + size <<= 21; /* multiply by 2 MiB to find size in MB */
> return size;
> }
>
> diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
> index cd40da6..d2cfd8f 100644
> --- a/include/configs/devkit8000.h
> +++ b/include/configs/devkit8000.h
> @@ -30,7 +30,6 @@
>
> #ifndef __CONFIG_H
> #define __CONFIG_H
> -#include <asm/sizes.h>
>
> /* High Level Configuration Options */
> #define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */
> @@ -59,9 +58,9 @@
> #define CONFIG_REVISION_TAG 1
>
> /* Size of malloc() pool */
> -#define CONFIG_ENV_SIZE SZ_128K /* Total Size
> Environment */
> +#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
> /* Sector */
> -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K)
> +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10))
> #define CONFIG_SYS_GBL_DATA_SIZE 128 /* bytes reserved for */
> /* initial data */
>
> @@ -270,16 +269,16 @@
> #define CONFIG_SYS_HZ 1000
>
> /* The stack sizes are set up in start.S using the settings below */
> -#define CONFIG_STACKSIZE SZ_128K /* regular stack */
> +#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */
> #ifdef CONFIG_USE_IRQ
> -#define CONFIG_STACKSIZE_IRQ SZ_4K /* IRQ stack */
> -#define CONFIG_STACKSIZE_FIQ SZ_4K /* FIQ stack */
> +#define CONFIG_STACKSIZE_IRQ (4 << 10) /* IRQ stack 4 KiB */
> +#define CONFIG_STACKSIZE_FIQ (4 << 10) /* FIQ stack 4 KiB */
> #endif
>
> /* Physical Memory Map */
> #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated
> */
> #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0
> -#define PHYS_SDRAM_1_SIZE SZ_128M /* at least 128 meg */
> +#define PHYS_SDRAM_1_SIZE (128 << 20) /* at least 128 MiB */
> #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1
>
> /* SDRAM Bank Allocation method */
> @@ -288,7 +287,7 @@
> /* NAND and environment organization */
> #define PISMO1_NAND_SIZE GPMC_SIZE_128M
>
> -#define CONFIG_SYS_MONITOR_LEN SZ_256K /* Reserve 2 sectors
> */
> +#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors
> */
>
> #define CONFIG_ENV_IS_IN_NAND 1
> #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
> diff --git a/include/configs/omap3_beagle.h
> b/include/configs/omap3_beagle.h
> index 61629f8..e94fbd7 100644
> --- a/include/configs/omap3_beagle.h
> +++ b/include/configs/omap3_beagle.h
> @@ -27,7 +27,6 @@
>
> #ifndef __CONFIG_H
> #define __CONFIG_H
> -#include <asm/sizes.h>
>
> /*
> * High Level Configuration Options
> @@ -62,9 +61,9 @@
> /*
> * Size of malloc() pool
> */
> -#define CONFIG_ENV_SIZE SZ_128K /* Total Size
> Environment */
> +#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
> /* Sector */
> -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K)
> +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10))
> #define CONFIG_SYS_GBL_DATA_SIZE 128 /* bytes reserved for */
> /* initial data */
>
> @@ -238,10 +237,10 @@
> *
> * The stack sizes are set up in start.S using the settings below
> */
> -#define CONFIG_STACKSIZE SZ_128K /* regular stack */
> +#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */
> #ifdef CONFIG_USE_IRQ
> -#define CONFIG_STACKSIZE_IRQ SZ_4K /* IRQ stack */
> -#define CONFIG_STACKSIZE_FIQ SZ_4K /* FIQ stack */
> +#define CONFIG_STACKSIZE_IRQ (4 << 10) /* IRQ stack 4 KiB */
> +#define CONFIG_STACKSIZE_FIQ (4 << 10) /* FIQ stack 4 KiB */
> #endif
>
> /*-----------------------------------------------------------------------
> @@ -249,7 +248,7 @@
> */
> #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
> #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0
> -#define PHYS_SDRAM_1_SIZE SZ_32M /* at least 32 meg */
> +#define PHYS_SDRAM_1_SIZE (32 << 20) /* at least 32 MiB */
> #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1
>
> /* SDRAM Bank Allocation method */
> @@ -268,7 +267,7 @@
> #define CONFIG_SYS_MAX_FLASH_SECT 520 /* max number of sectors on */
> /* one chip */
> #define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */
> -#define CONFIG_SYS_MONITOR_LEN SZ_256K /* Reserve 2 sectors
> */
> +#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors
> */
>
> #define CONFIG_SYS_FLASH_BASE boot_flash_base
>
> diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
> index 9f0f34b..ee424f7 100644
> --- a/include/configs/omap3_evm.h
> +++ b/include/configs/omap3_evm.h
> @@ -32,7 +32,6 @@
>
> #ifndef __CONFIG_H
> #define __CONFIG_H
> -#include <asm/sizes.h>
>
> /*
> * High Level Configuration Options
> @@ -67,9 +66,9 @@
> /*
> * Size of malloc() pool
> */
> -#define CONFIG_ENV_SIZE SZ_128K /* Total Size
> Environment */
> +#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
> /* Sector */
> -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K)
> +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10))
> #define CONFIG_SYS_GBL_DATA_SIZE 128 /* bytes reserved for */
> /* initial data */
> /*
> @@ -230,10 +229,10 @@
> *
> * The stack sizes are set up in start.S using the settings below
> */
> -#define CONFIG_STACKSIZE SZ_128K /* regular stack */
> +#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */
> #ifdef CONFIG_USE_IRQ
> -#define CONFIG_STACKSIZE_IRQ SZ_4K /* IRQ stack */
> -#define CONFIG_STACKSIZE_FIQ SZ_4K /* FIQ stack */
> +#define CONFIG_STACKSIZE_IRQ (4 << 10) /* IRQ stack 4 KiB */
> +#define CONFIG_STACKSIZE_FIQ (4 << 10) /* FIQ stack 4 KiB */
> #endif
>
> /*-----------------------------------------------------------------------
> @@ -241,7 +240,7 @@
> */
> #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
> #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0
> -#define PHYS_SDRAM_1_SIZE SZ_32M /* at least 32 meg */
> +#define PHYS_SDRAM_1_SIZE (32 << 20) /* at least 32 MiB */
> #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1
>
> /* SDRAM Bank Allocation method */
> @@ -260,7 +259,7 @@
> #define CONFIG_SYS_MAX_FLASH_SECT 520 /* max number of sectors */
> /* on one chip */
> #define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */
> -#define CONFIG_SYS_MONITOR_LEN SZ_256K /* Reserve 2 sectors
> */
> +#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors
> */
>
> #define CONFIG_SYS_FLASH_BASE boot_flash_base
>
> diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
> index 07a031b..20450f0 100644
> --- a/include/configs/omap3_overo.h
> +++ b/include/configs/omap3_overo.h
> @@ -19,7 +19,6 @@
>
> #ifndef __CONFIG_H
> #define __CONFIG_H
> -#include <asm/sizes.h>
>
> /*
> * High Level Configuration Options
> @@ -54,9 +53,9 @@
> /*
> * Size of malloc() pool
> */
> -#define CONFIG_ENV_SIZE SZ_128K /* Total Size
> Environment */
> +#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
> /* Sector */
> -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K)
> +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10))
> #define CONFIG_SYS_GBL_DATA_SIZE 128 /* bytes reserved for */
> /* initial data */
>
> @@ -223,10 +222,10 @@
> *
> * The stack sizes are set up in start.S using the settings below
> */
> -#define CONFIG_STACKSIZE SZ_128K /* regular stack */
> +#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */
> #ifdef CONFIG_USE_IRQ
> -#define CONFIG_STACKSIZE_IRQ SZ_4K /* IRQ stack */
> -#define CONFIG_STACKSIZE_FIQ SZ_4K /* FIQ stack */
> +#define CONFIG_STACKSIZE_IRQ (4 << 10) /* IRQ stack 4 KiB */
> +#define CONFIG_STACKSIZE_FIQ (4 << 10) /* FIQ stack 4 KiB */
> #endif
>
> /*-----------------------------------------------------------------------
> @@ -234,7 +233,7 @@
> */
> #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
> #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0
> -#define PHYS_SDRAM_1_SIZE SZ_32M /* at least 32 meg */
> +#define PHYS_SDRAM_1_SIZE (32 << 20) /* at least 32 MiB */
> #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1
>
> /* SDRAM Bank Allocation method */
> @@ -253,7 +252,7 @@
> #define CONFIG_SYS_MAX_FLASH_SECT 520 /* max number of sectors on */
> /* one chip */
> #define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */
> -#define CONFIG_SYS_MONITOR_LEN SZ_256K /* Reserve 2 sectors
> */
> +#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors
> */
>
> #define CONFIG_SYS_FLASH_BASE boot_flash_base
>
> diff --git a/include/configs/omap3_pandora.h
> b/include/configs/omap3_pandora.h
> index 1cfd7e9..c71baa2 100644
> --- a/include/configs/omap3_pandora.h
> +++ b/include/configs/omap3_pandora.h
> @@ -22,7 +22,6 @@
>
> #ifndef __CONFIG_H
> #define __CONFIG_H
> -#include <asm/sizes.h>
>
> /*
> * High Level Configuration Options
> @@ -57,9 +56,9 @@
> /*
> * Size of malloc() pool
> */
> -#define CONFIG_ENV_SIZE SZ_128K /* Total Size
> Environment */
> +#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
> /* Sector */
> -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K)
> +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10))
> #define CONFIG_SYS_GBL_DATA_SIZE 128 /* bytes reserved for */
> /* initial data */
>
> @@ -227,10 +226,10 @@
> *
> * The stack sizes are set up in start.S using the settings below
> */
> -#define CONFIG_STACKSIZE SZ_128K /* regular stack */
> +#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */
> #ifdef CONFIG_USE_IRQ
> -#define CONFIG_STACKSIZE_IRQ SZ_4K /* IRQ stack */
> -#define CONFIG_STACKSIZE_FIQ SZ_4K /* FIQ stack */
> +#define CONFIG_STACKSIZE_IRQ (4 << 10) /* IRQ stack 4 KiB */
> +#define CONFIG_STACKSIZE_FIQ (4 << 10) /* FIQ stack 4 KiB */
> #endif
>
> /*-----------------------------------------------------------------------
> @@ -238,7 +237,7 @@
> */
> #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
> #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0
> -#define PHYS_SDRAM_1_SIZE SZ_32M /* at least 32 meg */
> +#define PHYS_SDRAM_1_SIZE (32 << 20) /* at least 32 MiB */
> #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1
>
> /* SDRAM Bank Allocation method */
> @@ -257,7 +256,7 @@
> #define CONFIG_SYS_MAX_FLASH_SECT 520 /* max number of sectors on */
> /* one chip */
> #define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */
> -#define CONFIG_SYS_MONITOR_LEN SZ_256K /* Reserve 2 sectors
> */
> +#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors
> */
>
> #define CONFIG_SYS_FLASH_BASE boot_flash_base
>
> diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
> index 61a41e7..97fe989 100644
> --- a/include/configs/omap3_zoom1.h
> +++ b/include/configs/omap3_zoom1.h
> @@ -28,7 +28,6 @@
>
> #ifndef __CONFIG_H
> #define __CONFIG_H
> -#include <asm/sizes.h>
>
> /*
> * High Level Configuration Options
> @@ -63,9 +62,9 @@
> /*
> * Size of malloc() pool
> */
> -#define CONFIG_ENV_SIZE SZ_128K /* Total Size
> Environment */
> +#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
> /* Sector */
> -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K)
> +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10))
> #define CONFIG_SYS_GBL_DATA_SIZE 128 /* bytes reserved for */
> /* initial data */
>
> @@ -235,10 +234,10 @@
> *
> * The stack sizes are set up in start.S using the settings below
> */
> -#define CONFIG_STACKSIZE SZ_128K /* regular stack */
> +#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */
> #ifdef CONFIG_USE_IRQ
> -#define CONFIG_STACKSIZE_IRQ SZ_4K /* IRQ stack */
> -#define CONFIG_STACKSIZE_FIQ SZ_4K /* FIQ stack */
> +#define CONFIG_STACKSIZE_IRQ (4 << 10) /* IRQ stack 4 KiB */
> +#define CONFIG_STACKSIZE_FIQ (4 << 10) /* FIQ stack 4 KiB */
> #endif
>
> /*-----------------------------------------------------------------------
> @@ -246,7 +245,7 @@
> */
> #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
> #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0
> -#define PHYS_SDRAM_1_SIZE SZ_32M /* at least 32 meg */
> +#define PHYS_SDRAM_1_SIZE (32 << 20) /* at least 32 MiB */
> #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1
>
> /* SDRAM Bank Allocation method */
> @@ -265,7 +264,7 @@
> #define CONFIG_SYS_MAX_FLASH_SECT 520 /* max number of sectors on */
> /* one chip */
> #define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */
> -#define CONFIG_SYS_MONITOR_LEN SZ_256K /* Reserve 2 sectors
> */
> +#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors
> */
>
> #define CONFIG_SYS_FLASH_BASE boot_flash_base
>
> diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
> index 03f92f5..e8086ef 100644
> --- a/include/configs/omap3_zoom2.h
> +++ b/include/configs/omap3_zoom2.h
> @@ -29,7 +29,6 @@
>
> #ifndef __CONFIG_H
> #define __CONFIG_H
> -#include <asm/sizes.h>
>
> /*
> * High Level Configuration Options
> @@ -64,9 +63,9 @@
> /*
> * Size of malloc() pool
> */
> -#define CONFIG_ENV_SIZE SZ_128K /* Total Size
> Environment */
> +#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
> /* Sector */
> -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K)
> +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10))
> #define CONFIG_SYS_GBL_DATA_SIZE 128 /* bytes reserved for */
> /* initial data */
> /*
> @@ -200,10 +199,10 @@
> *
> * The stack sizes are set up in start.S using these settings
> */
> -#define CONFIG_STACKSIZE SZ_128K
> +#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */
> #ifdef CONFIG_USE_IRQ
> -#define CONFIG_STACKSIZE_IRQ SZ_4K
> -#define CONFIG_STACKSIZE_FIQ SZ_4K
> +#define CONFIG_STACKSIZE_IRQ (4 << 10) /* IRQ stack 4 KiB */
> +#define CONFIG_STACKSIZE_FIQ (4 << 10) /* FIQ stack 4 KiB */
> #endif
>
> /*-----------------------------------------------------------------------
> @@ -211,7 +210,7 @@
> */
> #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
> #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0
> -#define PHYS_SDRAM_1_SIZE SZ_32M /* at least 32 meg */
> +#define PHYS_SDRAM_1_SIZE (32 << 20) /* at least 32 MiB */
> #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1
>
> /* SDRAM Bank Allocation method */
> @@ -230,7 +229,7 @@
> #define CONFIG_SYS_MAX_FLASH_SECT 520 /* max number of sectors on */
> /* one chip */
> #define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */
> -#define CONFIG_SYS_MONITOR_LEN SZ_256K /* Reserve 2 sectors
> */
> +#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors
> */
>
> #define CONFIG_SYS_FLASH_BASE boot_flash_base
>
> --
> 1.6.0.4
More information about the U-Boot
mailing list