diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-09-15 00:01:53 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-09-15 00:01:53 +0200 |
| commit | 329ff3c93862bbee281cc601db786ce35026ca4a (patch) | |
| tree | 58d8a5198e09b2f9cd26eaca38cabc49d1db4dbe /include | |
| parent | d45963854eff39d575124d859419bb4953ce2c87 (diff) | |
| parent | 38ad82da0c1180ecdeb212a8f4245e945bcc546e (diff) | |
Merge ../u-boot
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/stxssa.h | 2 | ||||
| -rw-r--r-- | include/image.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h index f32ff67d9f..b41dafaf98 100644 --- a/include/configs/stxssa.h +++ b/include/configs/stxssa.h @@ -230,7 +230,7 @@ #define CFG_PCI2_IO_SIZE 0x01000000 /* 16M */ #if defined(CONFIG_PCI) /* PCI Ethernet card */ - +#define CONFIG_MPC85XX_PCI2 1 #define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ diff --git a/include/image.h b/include/image.h index 2f575fd2d7..432fa22393 100644 --- a/include/image.h +++ b/include/image.h @@ -77,6 +77,7 @@ #define IH_CPU_NIOS2 15 /* Nios-II */ #define IH_CPU_BLACKFIN 16 /* Blackfin */ #define IH_CPU_AVR32 17 /* AVR32 */ +#define IH_CPU_ST200 18 /* STMicroelectronics ST200 */ /* * Image Types |