diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-05-09 11:37:56 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-05-09 11:37:56 +0100 |
| commit | b0d8f5bf0d215adc9424cb228b2484dbf07f7761 (patch) | |
| tree | ddb50f27491089e4e270833cd4d9d33c55ced861 /include | |
| parent | 29f3be0caf0799ca6b89dfd9824c15619a50000f (diff) | |
| download | blackbird-obmc-uboot-b0d8f5bf0d215adc9424cb228b2484dbf07f7761.tar.gz blackbird-obmc-uboot-b0d8f5bf0d215adc9424cb228b2484dbf07f7761.zip | |
New board SMN42 branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-arm720t/hardware.h | 2 | ||||
| -rw-r--r-- | include/configs/lpc2292sodimm.h | 14 |
2 files changed, 6 insertions, 10 deletions
diff --git a/include/asm-arm/arch-arm720t/hardware.h b/include/asm-arm/arch-arm720t/hardware.h index 1e9cd41169..3056ca7f67 100644 --- a/include/asm-arm/arch-arm720t/hardware.h +++ b/include/asm-arm/arch-arm720t/hardware.h @@ -36,8 +36,6 @@ /* include armadillo specific hardware file if there was one */ #elif defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR) /* include IntegratorCP/CM720T specific hardware file if there was one */ -#elif defined(CONFIG_LPC2292) -#include <asm-arm/arch-arm720t/lpc2292_registers.h> #else #error No hardware file defined for this configuration #endif diff --git a/include/configs/lpc2292sodimm.h b/include/configs/lpc2292sodimm.h index 7e515230a3..d817ea8d73 100644 --- a/include/configs/lpc2292sodimm.h +++ b/include/configs/lpc2292sodimm.h @@ -1,12 +1,8 @@ /* - * (C) Copyright 2000 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger <mgroeger@sysgo.de> + * (C) Copyright 2007 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * Configuation settings for the EP7312 board. - * - * Modified to work on Armadillo HT1070 ARM720T board - * (C) Copyright 2005 Rowel Atienza rowel@diwalabs.com + * Configuation settings for the LPC2292SODIMM board from Embedded Artists. * * See file CREDITS for list of people who contributed to this * project. @@ -31,7 +27,7 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram + * If we are developing, we might want to start u-boot from ram * so we MUST NOT initialize critical regs like mem-timing ... */ #undef CONFIG_INIT_CRITICAL /* undef for developing */ @@ -154,5 +150,7 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_MMC 1 +/* we use this ethernet chip */ +#define CONFIG_ENC28J60 #endif /* __CONFIG_H */ |
