From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sascha Hauer Date: Mon, 26 Mar 2007 11:09:21 +0200 Subject: [U-Boot-Users] [patch 01/10] consolidate sizes.h In-Reply-To: <20070315101827.942045000@localhost.localdomain> References: <20070315100450.994797000@localhost.localdomain> <20070315101827.942045000@localhost.localdomain> Message-ID: <20070326090921.GA5008@localhost.localdomain> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de This patch removes all occurrences of SZ_* macros and the several sizes.h files. Signed-off-by: Sascha Hauer --- board/netstar/flash.c | 2 - board/netstar/setup.S | 2 - board/omap2420h4/flash.c | 11 ++---- board/omap2420h4/mem.c | 2 - include/asm-arm/arch-arm1136/omap2420.h | 2 - include/asm-arm/arch-arm1136/sizes.h | 49 --------------------------- include/asm-arm/arch-arm925t/sizes.h | 50 --------------------------- include/asm-arm/arch-arm926ejs/sizes.h | 51 ---------------------------- include/asm-arm/arch-at91rm9200/hardware.h | 2 - include/asm-arm/arch-omap/sizes.h | 52 ----------------------------- include/asm-arm/sizes.h | 52 ----------------------------- include/configs/h2_p2_dbg_board.h | 2 - include/configs/netstar.h | 18 +++++----- include/configs/omap1510.h | 8 +--- include/configs/omap2420h4.h | 26 +++++++------- include/configs/omap730.h | 2 - include/configs/voiceblue.h | 18 +++++----- 17 files changed, 42 insertions(+), 307 deletions(-) diff --git a/board/netstar/flash.c b/board/netstar/flash.c index 692c416..c77ae0a 100644 --- a/board/netstar/flash.c +++ b/board/netstar/flash.c @@ -29,7 +29,7 @@ #include /*#if 0 */ -#if (PHYS_SDRAM_1_SIZE != SZ_32M) +#if (PHYS_SDRAM_1_SIZE != 32 * 1024 * 1024) #include "crcek.h" diff --git a/board/netstar/setup.S b/board/netstar/setup.S index 5dacc9c..dfb364f 100644 --- a/board/netstar/setup.S +++ b/board/netstar/setup.S @@ -52,7 +52,7 @@ VAL_EMIFS_DYN_WAIT: .word 0x00000000 /* autorefresh counter 0x246 ((64000000/13.4)-400)/8192) */ /* SLRF SD_RET ARE SDRAM_TYPE ARCV SDRAM_FREQUENCY PWD CLK */ -#if (PHYS_SDRAM_1_SIZE == SZ_32M) +#if (PHYS_SDRAM_1_SIZE == 32 * 1024 * 1024) VAL_EMIFF_SDRAM_CONFIG: .word ((0 << 0) | (0 << 1) | (3 << 2) | (0xf << 4) | (0x246 << 8) | (0 << 24) | (0 << 26) | (0 << 27)) #else VAL_EMIFF_SDRAM_CONFIG: .word ((0 << 0) | (0 << 1) | (3 << 2) | (0xd << 4) | (0x246 << 8) | (0 << 24) | (0 << 26) | (0 << 27)) diff --git a/board/omap2420h4/flash.c b/board/omap2420h4/flash.c index d5e106a..6d46c5a 100644 --- a/board/omap2420h4/flash.c +++ b/board/omap2420h4/flash.c @@ -29,10 +29,9 @@ */ #include -#include #include -#define PHYS_FLASH_SECT_SIZE SZ_128K +#define PHYS_FLASH_SECT_SIZE (128 * 1024) flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ /* Board support for 1 or 2 flash devices */ @@ -64,8 +63,8 @@ typedef struct OrgDef { /* Flash Organizations */ OrgDef OrgIntel_28F256L18T[] = { - {4, SZ_32K}, /* 4 * 32kBytes sectors */ - {255, SZ_128K}, /* 255 * 128kBytes sectors */ + {4, 32 * 1024}, /* 4 * 32kBytes sectors */ + {255, 128 * 1024}, /* 255 * 128kBytes sectors */ }; @@ -170,7 +169,7 @@ static void flash_get_offsets (ulong base, flash_info_t * info) for (i = 0; i < info->sector_count; i++) { if (i > 254) { /* 255,256,257,258 */ r=i; - info->start[i] = base + (((r-(int)255) * SZ_32K) + (255*PHYS_FLASH_SECT_SIZE)); + info->start[i] = base + (((r-(int)255) * 32 * 1024) + (255*PHYS_FLASH_SECT_SIZE)); info->protect[i] = 0; } else { info->start[i] = base + (i * PHYS_FLASH_SECT_SIZE); @@ -260,7 +259,7 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info) case (FPW) (INTEL_ID_28F256L18T): /* 880D */ info->flash_id += FLASH_28F256L18T; info->sector_count = 259; /*0-258*/ - info->size = SZ_32M; + info->size = 32 * 1024 * 1024; break; /* => 32 MB */ default: diff --git a/board/omap2420h4/mem.c b/board/omap2420h4/mem.c index 62eb6e3..7290e30 100644 --- a/board/omap2420h4/mem.c +++ b/board/omap2420h4/mem.c @@ -106,7 +106,7 @@ void make_cs1_contiguous(void) u32 size, a_add_low, a_add_high; size = get_sdr_cs_size(SDRC_CS0_OSET); - size /= SZ_32M; /* find size to offset CS1 */ + size /= (32 * 1024 * 1024); /* 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 */ __raw_writel((a_add_high|a_add_low),SDRC_CS_CFG); diff --git a/include/asm-arm/arch-arm1136/omap2420.h b/include/asm-arm/arch-arm1136/omap2420.h index d833035..e87736d 100644 --- a/include/asm-arm/arch-arm1136/omap2420.h +++ b/include/asm-arm/arch-arm1136/omap2420.h @@ -25,8 +25,6 @@ #ifndef _OMAP2420_SYS_H_ #define _OMAP2420_SYS_H_ -#include - /* * 2420 specific Section */ diff --git a/include/asm-arm/arch-arm1136/sizes.h b/include/asm-arm/arch-arm1136/sizes.h deleted file mode 100644 index aaba18f..0000000 --- a/include/asm-arm/arch-arm1136/sizes.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/* 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 /* __sizes_h */ diff --git a/include/asm-arm/arch-arm925t/sizes.h b/include/asm-arm/arch-arm925t/sizes.h deleted file mode 100644 index 7319bd9..0000000 --- a/include/asm-arm/arch-arm925t/sizes.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/* DO NOT EDIT!! - this file automatically generated - * from .s file by awk -f s2h.awk - */ -/* 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_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_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 /* __sizes_h */ diff --git a/include/asm-arm/arch-arm926ejs/sizes.h b/include/asm-arm/arch-arm926ejs/sizes.h deleted file mode 100644 index ef0b99b..0000000 --- a/include/asm-arm/arch-arm926ejs/sizes.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA0 2111-1307 - * USA - */ -/* DO NOT EDIT!! - this file automatically generated - * from .s file by awk -f s2h.awk - */ -/* 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_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_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 /* __sizes_h */ diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/include/asm-arm/arch-at91rm9200/hardware.h index 8bb0c47..71e4321 100644 --- a/include/asm-arm/arch-at91rm9200/hardware.h +++ b/include/asm-arm/arch-at91rm9200/hardware.h @@ -20,8 +20,6 @@ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H -#include - #ifndef __ASSEMBLY__ #include "AT91RM9200.h" #else diff --git a/include/asm-arm/arch-omap/sizes.h b/include/asm-arm/arch-omap/sizes.h deleted file mode 100644 index f8d92ca..0000000 --- a/include/asm-arm/arch-omap/sizes.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/* DO NOT EDIT!! - this file automatically generated - * from .s file by awk -f s2h.awk - */ -/* 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_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_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 */ diff --git a/include/asm-arm/sizes.h b/include/asm-arm/sizes.h deleted file mode 100644 index f8d92ca..0000000 --- a/include/asm-arm/sizes.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/* DO NOT EDIT!! - this file automatically generated - * from .s file by awk -f s2h.awk - */ -/* 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_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_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 */ diff --git a/include/configs/h2_p2_dbg_board.h b/include/configs/h2_p2_dbg_board.h index e0d823f..de929b1 100644 --- a/include/configs/h2_p2_dbg_board.h +++ b/include/configs/h2_p2_dbg_board.h @@ -31,8 +31,6 @@ #ifndef __INCLUDED_H2_P2_DBH_BOARD_H #define __INCLUDED_H2_P2_DBH_BOARD_H -#include - /* * The Debug board is designed to function with the P2 Sample, H2 * Sample and 1610 Innovator boards. The main difference AFAICT is diff --git a/include/configs/netstar.h b/include/configs/netstar.h index 697796a..7936664 100644 --- a/include/configs/netstar.h +++ b/include/configs/netstar.h @@ -63,21 +63,21 @@ */ #define CFG_FLASH_BASE PHYS_FLASH_1 #define CFG_MAX_FLASH_BANKS 1 -#if (PHYS_SDRAM_1_SIZE == SZ_32M) +#if (PHYS_SDRAM_1_SIZE == 32 * 1024 * 1024) /*#if 1*/ #define CFG_FLASH_CFI /* Flash is CFI conformant */ #define CFG_FLASH_CFI_DRIVER /* Use the common driver */ #define CFG_FLASH_EMPTY_INFO #define CFG_MAX_FLASH_SECT 128 #else -#define PHYS_FLASH_1_SIZE SZ_1M +#define PHYS_FLASH_1_SIZE (1024 * 1024) #define CFG_MAX_FLASH_SECT 19 #define CFG_FLASH_ERASE_TOUT (5*CFG_HZ) /* in ticks */ #define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) #endif #define CFG_MONITOR_BASE PHYS_FLASH_1 -#define CFG_MONITOR_LEN SZ_256K +#define CFG_MONITOR_LEN (256 * 1024) /* * Environment settings @@ -85,8 +85,8 @@ #define CFG_ENV_IS_IN_FLASH #define ENV_IS_SOLITARY #define CFG_ENV_ADDR 0x4000 -#define CFG_ENV_SIZE SZ_8K -#define CFG_ENV_SECT_SIZE SZ_8K +#define CFG_ENV_SIZE (8 * 1024) +#define CFG_ENV_SECT_SIZE (8 * 1024) #define CFG_ENV_ADDR_REDUND 0x6000 #define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE #define CONFIG_ENV_OVERWRITE @@ -95,14 +95,14 @@ * Size of malloc() pool */ #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ -/* XXX #define CFG_MALLOC_LEN (SZ_64K - CFG_GBL_DATA_SIZE)*/ -#define CFG_MALLOC_LEN SZ_4M +/* XXX #define CFG_MALLOC_LEN (64 * 1024 - CFG_GBL_DATA_SIZE)*/ +#define CFG_MALLOC_LEN (4 * 1024 * 1024) /* * The stack size is set up in start.S using the settings below */ -/* XXX #define CONFIG_STACKSIZE SZ_8K /XXX* regular stack */ -#define CONFIG_STACKSIZE SZ_1M /* regular stack */ +/* XXX #define CONFIG_STACKSIZE (8 * 1024) /XXX* regular stack */ +#define CONFIG_STACKSIZE (1024 * 1024) /* regular stack */ /* * Hardware drivers diff --git a/include/configs/omap1510.h b/include/configs/omap1510.h index 6787b19..9bb1550 100644 --- a/include/configs/omap1510.h +++ b/include/configs/omap1510.h @@ -28,8 +28,6 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include - /* There are 2 sets of general I/O --> 1. GPIO (shared between ARM & DSP, configured by ARM) @@ -55,16 +53,16 @@ */ #define OMAP1510_GPIO_BASE 0xfffce000 #define OMAP1510_GPIO_START OMAP1510_GPIO_BASE -#define OMAP1510_GPIO_SIZE SZ_4K +#define OMAP1510_GPIO_SIZE 4096 #define OMAP1510_MCBSP1_BASE 0xE1011000 -#define OMAP1510_MCBSP1_SIZE SZ_4K +#define OMAP1510_MCBSP1_SIZE 4096 #define OMAP1510_MCBSP1_START 0xE1011000 #define OMAP1510_MCBSP2_BASE 0xFFFB1000 #define OMAP1510_MCBSP3_BASE 0xE1017000 -#define OMAP1510_MCBSP3_SIZE SZ_4K +#define OMAP1510_MCBSP3_SIZE 4096 #define OMAP1510_MCBSP3_START 0xE1017000 /* diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h index 5837461..5e6c3ed 100644 --- a/include/configs/omap2420h4.h +++ b/include/configs/omap2420h4.h @@ -70,8 +70,8 @@ /* * Size of malloc() pool */ -#define CFG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + SZ_128K) +#define CFG_ENV_SIZE (128 * 1024) /* Total Size of Environment Sector */ +#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128 * 1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -196,7 +196,7 @@ #define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ #define CFG_MEMTEST_START (OMAP2420_SDRC_CS0) /* memtest works on */ -#define CFG_MEMTEST_END (OMAP2420_SDRC_CS0+SZ_31M) +#define CFG_MEMTEST_END (OMAP2420_SDRC_CS0 + 31 * 1024 * 1024) #undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */ @@ -220,10 +220,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 * 1024) /* regular stack */ #ifdef CONFIG_USE_IRQ -#define CONFIG_STACKSIZE_IRQ SZ_4K /* IRQ stack */ -#define CONFIG_STACKSIZE_FIQ SZ_4K /* FIQ stack */ +#define CONFIG_STACKSIZE_IRQ 4096 /* IRQ stack */ +#define CONFIG_STACKSIZE_FIQ 4096 /* FIQ stack */ #endif /*----------------------------------------------------------------------- @@ -231,14 +231,14 @@ */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #define PHYS_SDRAM_1 OMAP2420_SDRC_CS0 -#define PHYS_SDRAM_1_SIZE SZ_32M /* at least 32 meg */ +#define PHYS_SDRAM_1_SIZE (32 * 1024 * 1024) /* at least 32 meg */ #define PHYS_SDRAM_2 OMAP2420_SDRC_CS1 -#define PHYS_FLASH_SECT_SIZE SZ_128K +#define PHYS_FLASH_SECT_SIZE (128 * 1024) #define PHYS_FLASH_1 H4_CS0_BASE /* Flash Bank #1 */ -#define PHYS_FLASH_SIZE_1 SZ_32M -#define PHYS_FLASH_2 (H4_CS0_BASE+SZ_32M) /* same cs, 2 chips in series */ -#define PHYS_FLASH_SIZE_2 SZ_32M +#define PHYS_FLASH_SIZE_1 (32 * 1024 * 1024) +#define PHYS_FLASH_2 (H4_CS0_BASE + 32 * 1024 * 1024) /* same cs, 2 chips in series */ +#define PHYS_FLASH_SIZE_2 (32 * 1024 * 1024) /*----------------------------------------------------------------------- * FLASH and environment organization @@ -247,14 +247,14 @@ #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT (259) /* max number of sectors on one chip */ #define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */ -#define CFG_MONITOR_LEN SZ_128K /* Reserve 1 sector */ +#define CFG_MONITOR_LEN (128 * 1024) /* Reserve 1 sector */ #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE_1 } #ifdef CFG_NAND_BOOT #define CFG_ENV_IS_IN_NAND 1 #define CFG_ENV_OFFSET 0x80000 /* environment starts here */ #else -#define CFG_ENV_ADDR (CFG_FLASH_BASE + SZ_128K) +#define CFG_ENV_ADDR (CFG_FLASH_BASE + 128 * 1024) #define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE #define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */ diff --git a/include/configs/omap730.h b/include/configs/omap730.h index 03abcb3..0ba8242 100644 --- a/include/configs/omap730.h +++ b/include/configs/omap730.h @@ -31,8 +31,6 @@ #ifndef __INCLUDED_OMAP730_H #define __INCLUDED_OMAP730_H -#include - /*************************************************************************** * OMAP730 Configuration Registers **************************************************************************/ diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h index 4e97b01..5399a92 100644 --- a/include/configs/voiceblue.h +++ b/include/configs/voiceblue.h @@ -54,7 +54,7 @@ */ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ #define PHYS_SDRAM_1 0x10000000 /* SDRAM Bank #1 */ -#define PHYS_SDRAM_1_SIZE SZ_64M +#define PHYS_SDRAM_1_SIZE (64 * 1024 * 1024) #define PHYS_FLASH_1 0x00000000 /* Flash Bank #1 */ #define PHYS_FLASH_2 0x0c000000 @@ -78,19 +78,19 @@ #define CFG_MAX_FLASH_SECT 512 /* max # of sectors on one chip */ #define CFG_MONITOR_BASE PHYS_FLASH_1 -#define CFG_MONITOR_LEN SZ_128K +#define CFG_MONITOR_LEN (128 * 1024) /* * Environment settings */ #ifdef VOICEBLUE_SMALL_FLASH #define CFG_ENV_IS_NOWHERE -#define CFG_ENV_SIZE SZ_1K +#define CFG_ENV_SIZE 1024 #else #define CFG_ENV_IS_IN_FLASH #define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN) -#define CFG_ENV_SIZE SZ_8K -#define CFG_ENV_SECT_SIZE SZ_64K +#define CFG_ENV_SIZE (8 * 1024) +#define CFG_ENV_SECT_SIZE (64 * 1024) #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE @@ -103,12 +103,12 @@ */ #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #ifdef VOICEBLUE_SMALL_FLASH -#define CFG_MALLOC_LEN (SZ_64K - CFG_GBL_DATA_SIZE) -#define CONFIG_STACKSIZE SZ_8K +#define CFG_MALLOC_LEN (64 * 1024 - CFG_GBL_DATA_SIZE) +#define CONFIG_STACKSIZE (8 * 1024) #define PHYS_SDRAM_1_RESERVED 0 #else -#define CFG_MALLOC_LEN SZ_4M -#define CONFIG_STACKSIZE SZ_1M +#define CFG_MALLOC_LEN (4 * 1024 * 1024) +#define CONFIG_STACKSIZE (1024 * 1024) #define PHYS_SDRAM_1_RESERVED (CFG_MONITOR_LEN + CFG_MALLOC_LEN + CONFIG_STACKSIZE) #endif