From: Sandeep Paulraj s-paulraj@ti.com

This patch does the following 1) The config no longer uses the asm/sizes.h header file 2) Replaces references of SZ_xx with the equivalent values 3) Enables Bootdelay 4) We now have a safe place to save the environment variables

Signed-off-by: Sandeep Paulraj s-paulraj@ti.com --- The "sizes.h" still has the "All rights reserved" phrase so it might not be part of the repository in the near future and Wolfgang also does not like the "SZ_xx" references. So just getting rid of this dependency. include/configs/davinci_dm355evm.h | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h index c35f5c9..baa2704 100644 --- a/include/configs/davinci_dm355evm.h +++ b/include/configs/davinci_dm355evm.h @@ -19,7 +19,6 @@

#ifndef __CONFIG_H #define __CONFIG_H -#include <asm/sizes.h>

/* Spectrum Digital TMS320DM355 EVM board */ #define DAVINCI_DM355EVM @@ -40,7 +39,7 @@ /* Memory Info */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0x80000000 -#define PHYS_SDRAM_1_SIZE SZ_128M +#define PHYS_SDRAM_1_SIZE 0x08000000

/* Serial Driver info: UART0 for console */ #define CONFIG_SYS_NS16550 @@ -66,9 +65,11 @@ #define CONFIG_SYS_I2C_SLAVE 0x10 /* SMBus host address */

/* NAND: socketed, two chipselects, normally 2 GBytes */ -/* NYET -- #define CONFIG_NAND_DAVINCI */ +#define CONFIG_NAND_DAVINCI #define CONFIG_SYS_NAND_HW_ECC #define CONFIG_SYS_NAND_USE_FLASH_BBT +#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST +#define CONFIG_SYS_NAND_PAGE_2K

#define CONFIG_SYS_NAND_LARGEPAGE #define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, } @@ -96,15 +97,12 @@ #ifdef CONFIG_NAND_DAVINCI #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_PARTITIONS +#define CONFIG_MTD_DEVICE #define CONFIG_CMD_NAND #define CONFIG_CMD_UBI #define CONFIG_RBTREE #endif

-/* TEMPORARY -- no safe place to save env, yet */ -#define CONFIG_ENV_IS_NOWHERE -#undef CONFIG_CMD_SAVEENV - #ifdef CONFIG_USB_DAVINCI #define CONFIG_MUSB_HCD #define CONFIG_CMD_USB @@ -130,9 +128,14 @@ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_LONGHELP

-#define CONFIG_ENV_SIZE SZ_16K +#ifdef CONFIG_NAND_DAVINCI +#define CONFIG_ENV_SIZE 0x00040000 +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x3C0000 +#undef CONFIG_ENV_IS_IN_FLASH +#endif

-/* NYET -- #define CONFIG_BOOTDELAY 5 */ +#define CONFIG_BOOTDELAY 5 #define CONFIG_BOOTCOMMAND \ "dhcp;bootm" #define CONFIG_BOOTARGS \ @@ -146,8 +149,8 @@ #define CONFIG_NET_RETRY_COUNT 10

/* U-Boot memory configuration */ -#define CONFIG_STACKSIZE SZ_256K /* regular stack */ -#define CONFIG_SYS_MALLOC_LEN SZ_512K /* malloc() arena */ +#define CONFIG_STACKSIZE 0x00040000 /* regular stack */ +#define CONFIG_SYS_MALLOC_LEN 0x00080000 /* malloc() arena */ #define CONFIG_SYS_GBL_DATA_SIZE 128 /* for initial data */ #define CONFIG_SYS_MEMTEST_START 0x87000000 /* physical address */ #define CONFIG_SYS_MEMTEST_END 0x88000000 /* test 16MB RAM */