diff options
| author | Stefan Roese <sr@denx.de> | 2007-03-02 06:58:53 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-03-02 06:58:53 +0100 |
| commit | 87ed3bfb4214c4b39a5a642bcd851f60b3898af2 (patch) | |
| tree | a0017423e9d07a9e05c07a8a1a6601a2a4d00177 /include/configs | |
| parent | 621a7873ef205c4325fc07c646bd1d509763b22f (diff) | |
| parent | fdd1d6dcc97c595bd9d598ed3b22a7038781272c (diff) | |
| download | u-boot-imx-87ed3bfb4214c4b39a5a642bcd851f60b3898af2.zip u-boot-imx-87ed3bfb4214c4b39a5a642bcd851f60b3898af2.tar.gz u-boot-imx-87ed3bfb4214c4b39a5a642bcd851f60b3898af2.tar.bz2 | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/katmai.h | 21 | ||||
| -rw-r--r-- | include/configs/sc3.h | 2 |
2 files changed, 18 insertions, 5 deletions
diff --git a/include/configs/katmai.h b/include/configs/katmai.h index c750e14..f350155 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -107,11 +107,8 @@ * DDR SDRAM *----------------------------------------------------------------------*/ #define CONFIG_SPD_EEPROM 1 /* Use SPD EEPROM for setup */ -#define SPD_EEPROM_ADDRESS {0x51, 0x52} /* SPD i2c spd addresses */ -#define IIC0_DIMM0_ADDR 0x51 -#define IIC0_DIMM1_ADDR 0x52 +#define SPD_EEPROM_ADDRESS {0x51, 0x52} /* SPD i2c spd addresses*/ #undef CONFIG_STRESS -#undef ENABLE_ECC /*----------------------------------------------------------------------- * I2C @@ -384,6 +381,22 @@ EBC_CFG_PME_DISABLE | \ EBC_CFG_PR_16) +/*----------------------------------------------------------------------- + * GPIO Setup + *----------------------------------------------------------------------*/ +#define CFG_GPIO_PCIE_PRESENT0 17 +#define CFG_GPIO_PCIE_PRESENT1 21 +#define CFG_GPIO_PCIE_PRESENT2 23 +#define CFG_GPIO_RS232_FORCEOFF 30 + +#define CFG_PFC0 (GPIO_VAL(CFG_GPIO_PCIE_PRESENT0) | \ + GPIO_VAL(CFG_GPIO_PCIE_PRESENT1) | \ + GPIO_VAL(CFG_GPIO_PCIE_PRESENT2) | \ + GPIO_VAL(CFG_GPIO_RS232_FORCEOFF)) +#define CFG_GPIO_OR GPIO_VAL(CFG_GPIO_RS232_FORCEOFF) +#define CFG_GPIO_TCR GPIO_VAL(CFG_GPIO_RS232_FORCEOFF) +#define CFG_GPIO_ODR 0 + /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is diff --git a/include/configs/sc3.h b/include/configs/sc3.h index b767449..f2f0598 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -115,7 +115,7 @@ ":${hostname}:${netdev}:off panic=1\0" \ "flash_nfs=run nfsargs addip;" \ "bootm ${kernel_addr}\0" \ - "flash_nand=nand_args addip addcon;bootm ${kernel_addr}\0" \ + "flash_nand=run nand_args addip addcon;bootm ${kernel_addr}\0" \ "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0" \ "rootpath=/opt/eldk/ppc_4xx\0" \ "bootfile=/tftpboot/sc3/uImage\0" \ |