projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with /home/sr/git/u-boot/4xx-sdram
[oweals/u-boot.git]
/
board
/
smdk2410
/
smdk2410.c
diff --git
a/board/smdk2410/smdk2410.c
b/board/smdk2410/smdk2410.c
index 207cd448ff7742a74b71cecf81e01d8ad20ac85f..802348d23693f8ef25a4fe1299f3908848eb2df3 100644
(file)
--- a/
board/smdk2410/smdk2410.c
+++ b/
board/smdk2410/smdk2410.c
@@
-28,7
+28,7
@@
#include <common.h>
#include <s3c2410.h>
#include <common.h>
#include <s3c2410.h>
-/* ------------------------------------------------------------------------- */
+DECLARE_GLOBAL_DATA_PTR;
#define FCLK_SPEED 1
#define FCLK_SPEED 1
@@
-67,7
+67,6
@@
static inline void delay (unsigned long loops)
int board_init (void)
{
int board_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
@@
-104,7
+103,7
@@
int board_init (void)
gpio->GPHUP = 0x000007FF;
/* arch number of SMDK2410-Board */
gpio->GPHUP = 0x000007FF;
/* arch number of SMDK2410-Board */
- gd->bd->bi_arch_number =
193
;
+ gd->bd->bi_arch_number =
MACH_TYPE_SMDK2410
;
/* adress of boot parameters */
gd->bd->bi_boot_params = 0x30000100;
/* adress of boot parameters */
gd->bd->bi_boot_params = 0x30000100;
@@
-117,8
+116,6
@@
int board_init (void)
int dram_init (void)
{
int dram_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;