From: Sandeep Paulraj s-paulraj@ti.com
The patch does the following 1) Gets rid of dependency on asm/sizes.h and replaces references to "SZ_xx" with their equivalent values 2) Disables EMAC as the EMAC is broken due to recent changes that have been added to the net driver. Board does not compile with this enabled Patch to add EMAC will be sent to u-boot-net soon.
Signed-off-by: Sandeep Paulraj s-paulraj@ti.com --- board/davinci/dm365evm/dm365evm.c | 2 +- include/configs/davinci_dm365evm.h | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/board/davinci/dm365evm/dm365evm.c b/board/davinci/dm365evm/dm365evm.c index e30184b..1c88b30 100644 --- a/board/davinci/dm365evm/dm365evm.c +++ b/board/davinci/dm365evm/dm365evm.c @@ -17,7 +17,7 @@
#include <common.h> #include <nand.h> -#include <linux/io.h> +#include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/emif_defs.h> #include <asm/arch/nand_defs.h> diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h index 47cb554..e74f27a 100644 --- a/include/configs/davinci_dm365evm.h +++ b/include/configs/davinci_dm365evm.h @@ -18,7 +18,6 @@
#ifndef __CONFIG_H #define __CONFIG_H -#include <asm/sizes.h>
/* Spectrum Digital TMS320DM365 EVM board */ #define DAVINCI_DM365EVM @@ -38,7 +37,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 @@ -57,7 +56,7 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 20
/* Network Configuration */ -#define CONFIG_DRIVER_TI_EMAC +/* NYET: #define CONFIG_DRIVER_TI_EMAC */ #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS @@ -74,7 +73,6 @@
/* NAND: socketed, two chipselects, normally 2 GBytes */ #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 @@ -125,7 +123,7 @@ #define CONFIG_SYS_LONGHELP
#ifdef CONFIG_NAND_DAVINCI -#define CONFIG_ENV_SIZE SZ_256K +#define CONFIG_ENV_SIZE 0x00040000 #define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x3C0000 #undef CONFIG_ENV_IS_IN_FLASH @@ -143,8 +141,8 @@ #define CONFIG_TIMESTAMP
/* U-Boot memory configuration */ -#define CONFIG_STACKSIZE SZ_256K /* regular stack */ -#define CONFIG_SYS_MALLOC_LEN SZ_1M /* 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 */