diff options
author | wdenk <wdenk> | 2004-06-10 21:55:33 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2004-06-10 21:55:33 +0000 |
commit | f832d8a1432da791b94b820ccf2c7864708c5631 (patch) | |
tree | 6521bd856efe4951d6a17288ae02ab3c3ed6e7a4 /board/lpd7a40x | |
parent | b54d32b40d95d399dd1f53f24c93b0cf5c42460d (diff) | |
download | u-boot-imx-f832d8a1432da791b94b820ccf2c7864708c5631.zip u-boot-imx-f832d8a1432da791b94b820ccf2c7864708c5631.tar.gz u-boot-imx-f832d8a1432da791b94b820ccf2c7864708c5631.tar.bz2 |
* 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
Diffstat (limited to 'board/lpd7a40x')
-rw-r--r-- | board/lpd7a40x/lpd7a40x.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/board/lpd7a40x/lpd7a40x.c b/board/lpd7a40x/lpd7a40x.c index 8492df3..4c373ee 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 */ |