From f832d8a1432da791b94b820ccf2c7864708c5631 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Thu, 10 Jun 2004 21:55:33 +0000
Subject: * Patch by Paul Ruhland, 10 Jun 2004:   fix support for Logic
 SDK-LH7A404 board and clean up the   LH7A404 register macros.

* Patch by Matthew McClintock, 10 Jun 2004:
  Modify code to select correct serial clock on Sandpoint8245
---
 board/lpd7a40x/lpd7a40x.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'board/lpd7a40x')

diff --git a/board/lpd7a40x/lpd7a40x.c b/board/lpd7a40x/lpd7a40x.c
index 8492df3d2b..4c373eead5 100644
--- a/board/lpd7a40x/lpd7a40x.c
+++ b/board/lpd7a40x/lpd7a40x.c
@@ -28,13 +28,14 @@
 #include <common.h>
 #if defined(CONFIG_LH7A400)
 #include <lh7a400.h>
-#include <lpd7a400_cpld.h>
 #elif defined(CONFIG_LH7A404)
 #include <lh7a404.h>
-#include <lpd7a404_cpld.h>
 #else
 #error "No CPU defined!"
 #endif
+#include <asm/mach-types.h>
+
+#include <lpd7a400_cpld.h>
 
 /*
  * Miscellaneous platform dependent initialisations
@@ -46,8 +47,6 @@ int board_init (void)
 
 	/* set up the I/O ports */
 
-#if defined(CONFIG_LH7A400)
-
 	/* enable flash programming */
 	*(LPD7A400_CPLD_REGPTR(LPD7A400_CPLD_FLASH_REG)) |= FLASH_FPEN;
 
@@ -59,10 +58,12 @@ int board_init (void)
 	*(LPD7A400_CPLD_REGPTR(LPD7A400_CPLD_EXTGPIO_REG)) =
 		(EXTGPIO_STATUS1|EXTGPIO_GPIO1) & ~(EXTGPIO_STATUS2);
 
+#if defined(CONFIG_LH7A400)
 	/* arch number of Logic-Board - MACH_TYPE_LPD7A400 */
 	gd->bd->bi_arch_number = MACH_TYPE_LPD7A400;
-
 #elif defined(CONFIG_LH7A404)
+	/* arch number of Logic-Board - MACH_TYPE_LPD7A400 */
+	gd->bd->bi_arch_number = MACH_TYPE_LPD7A404;
 #endif
 
 	/* adress of boot parameters */
-- 
cgit v1.2.1