[U-Boot] [PATCH 11/11] at91cap9adk: make compilable again

Alexander Stein
2010-11-01T08:29:55Z

Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
---
board/atmel/at91cap9adk/at91cap9adk.c | 6 +++---
include/configs/at91cap9adk.h | 15 +++++++++++----
2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/board/atmel/at91cap9adk/at91cap9adk.c b/board/atmel/at91cap9adk/at91cap9adk.c
index 2ab8bc2..ce77a13 100644
--- a/board/atmel/at91cap9adk/at91cap9adk.c
+++ b/board/atmel/at91cap9adk/at91cap9adk.c
@@ -306,7 +306,7 @@ int board_init(void)
/* arch number of AT91CAP9ADK-Board */
gd->bd->bi_arch_number = MACH_TYPE_AT91CAP9ADK;
/* adress of boot parameters */
- gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;

at91_serial_hw_init();
at91cap9_slowclock_hw_init();
@@ -331,8 +331,8 @@ int board_init(void)

int dram_init(void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = CONFIG_SYS_SDRAM_SIZE;
return 0;
}

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index 49c923f..8768c53 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -27,6 +27,8 @@
#ifndef __CONFIG_H
#define __CONFIG_H

+#include <asm/sizes.h>
+
#define CONFIG_AT91_LEGACY

/* ARM asynchronous clock */
@@ -36,6 +38,7 @@
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
#define CONFIG_AT91CAP9 1 /* It's an Atmel AT91CAP9 SoC */
#define CONFIG_AT91CAP9ADK 1 /* on an AT91CAP9ADK Board */
+#define CONFIG_AT91FAMILY
#define CONFIG_ARCH_CPU_INIT
#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */

@@ -100,8 +103,8 @@

/* SDRAM: Careful: this supposes an AT91CAP-MEM33 expansion card */
#define CONFIG_NR_DRAM_BANKS 1
-#define PHYS_SDRAM 0x70000000
-#define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */
+#define CONFIG_SYS_SDRAM_BASE 0x70000000
+#define CONFIG_SYS_SDRAM_SIZE SZ_64M /* 64 megs */

/* DataFlash */
#define CONFIG_ATMEL_DATAFLASH_SPI
@@ -155,7 +158,7 @@

#define CONFIG_SYS_LOAD_ADDR 0x72000000 /* load address */

-#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM
+#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
#define CONFIG_SYS_MEMTEST_END 0x73e00000

#define CONFIG_SYS_USE_DATAFLASH 1
@@ -208,8 +211,12 @@
* Size of malloc() pool
*/
#define CONFIG_SYS_MALLOC_LEN ROUND(CONFIG_ENV_SIZE + 128*1024, 0x1000)
+/* size in bytes reserved for initial data */
+
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_4K \
+ - GENERATED_GBL_DATA_SIZE)

-#define CONFIG_STACKSIZE (32*1024) /* regular stack */
+#define CONFIG_STACKSIZE (SZ_32K) /* regular stack */

#ifdef CONFIG_USE_IRQ
#error CONFIG_USE_IRQ not supported
--
1.7.2.2