diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-07-31 15:15:41 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-07-31 15:15:41 +0200 |
| commit | 6192788170adf63701a710851d6664b189dcb889 (patch) | |
| tree | ef738b7dd2657186a1fdf8864d0e88d0c0072b4d | |
| parent | ecfac0f3025d7e35d791f72475b4547a04743eb0 (diff) | |
| parent | 0852e7d538a39b8b825d9bb7ba8dfaacbe35f3c0 (diff) | |
| download | barebox-6192788170adf63701a710851d6664b189dcb889.tar.gz barebox-6192788170adf63701a710851d6664b189dcb889.tar.xz | |
Merge branch 'small_a9m24x0_fixes' of octopus:/home/jbe/work/u-boot-v2 into jbe
| -rw-r--r-- | board/a9m2410/a9m2410.c | 7 | ||||
| -rw-r--r-- | board/a9m2440/a9m2440.c | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/board/a9m2410/a9m2410.c b/board/a9m2410/a9m2410.c index 8d41291b9c..01e202190c 100644 --- a/board/a9m2410/a9m2410.c +++ b/board/a9m2410/a9m2410.c @@ -180,12 +180,7 @@ static int a9m2410_devices_init(void) #endif armlinux_set_bootparams((void *)sdram_dev.map_base + 0x100); -/* - * Kernel uses: - * 2.6.29: SMDK2410 = 193 - * 2.6.11: A9M2410 = 697 - */ - armlinux_set_architecture(193/*697*/); /* A9M2410 */ + armlinux_set_architecture(MACH_TYPE_A9M2410); return 0; } diff --git a/board/a9m2440/a9m2440.c b/board/a9m2440/a9m2440.c index 4f52a85b26..a6c267dc7d 100644 --- a/board/a9m2440/a9m2440.c +++ b/board/a9m2440/a9m2440.c @@ -166,7 +166,7 @@ static int a9m2440_devices_init(void) #endif armlinux_set_bootparams((void *)sdram_dev.map_base + 0x100); - armlinux_set_architecture(698); /* A9M2440 */ + armlinux_set_architecture(MACH_TYPE_A9M2440); return 0; } @@ -220,7 +220,7 @@ This CPU card is based on a Samsung S3C2440 CPU. The card is shipped with: - I2C interface, 100KHz and 400KHz - Real Time Clock - Dallas DS1337 - - address 0xD0 + - address 0x68 - LCD interface - Touch Screen interface - Camera interface |