projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
include
/
configs
/
sbc35_a9g20.h
diff --git
a/include/configs/sbc35_a9g20.h
b/include/configs/sbc35_a9g20.h
index
7a2dcd8
..
b9f27cc
100644
(file)
--- a/
include/configs/sbc35_a9g20.h
+++ b/
include/configs/sbc35_a9g20.h
@@
-26,6
+26,8
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
+#define CONFIG_AT91_LEGACY
+
#if defined(CONFIG_SBC35_A9G20_NANDFLASH) || defined(CONFIG_SBC35_A9G20_EEPROM)
#define CONFIG_SBC35_A9G20
#endif
#if defined(CONFIG_SBC35_A9G20_NANDFLASH) || defined(CONFIG_SBC35_A9G20_EEPROM)
#define CONFIG_SBC35_A9G20
#endif
@@
-39,7
+41,7
@@
#endif
/* ARM asynchronous clock */
#endif
/* ARM asynchronous clock */
-#define
AT91_MAIN_CLOCK
12000000 /* 12.000 MHz crystal */
+#define
CONFIG_SYS_AT91_MAIN_CLOCK
12000000 /* 12.000 MHz crystal */
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
@@
-57,6
+59,7
@@
/*
* Hardware drivers
*/
/*
* Hardware drivers
*/
+#define CONFIG_AT91_GPIO 1
#define CONFIG_ATMEL_USART
#define CONFIG_USART0
#undef CONFIG_USART1
#define CONFIG_ATMEL_USART
#define CONFIG_USART0
#undef CONFIG_USART1
@@
-161,7
+164,6
@@
#define CONFIG_ENV_OFFSET 0x60000
#define CONFIG_ENV_OFFSET_REDUND 0x80000
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_OFFSET 0x60000
#define CONFIG_ENV_OFFSET_REDUND 0x80000
#define CONFIG_ENV_SIZE 0x20000
-#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif
#define CONFIG_BOOTCOMMAND "nboot 0x21000000 0 400000"
#endif
#define CONFIG_BOOTCOMMAND "nboot 0x21000000 0 400000"