From: Grzegorz Bernacki Date: Tue, 17 Mar 2009 09:06:39 +0000 (+0100) Subject: mpc52xx: Get rid of board-specific #ifdef's in cpu/mpc5xxx/ide.c X-Git-Tag: v2009.03~7 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6a397ef0e6c58caab8bf427d447714bc9b3bb9d4;p=u-boot mpc52xx: Get rid of board-specific #ifdef's in cpu/mpc5xxx/ide.c Total5200 and digsy MTC use I2C port 2 pins as a ATA chip select. To avoid adding board-specific ifdefs to cpu/mpc5xxx/ide.c new define CONFIG_SYS_ATA_CS_ON_I2C2 was introduced. It is used by Total5200 and will be used by digsy MTC and other boards with ATA CS on I2C pins. Signed-off-by: Grzegorz Bernacki --- diff --git a/cpu/mpc5xxx/ide.c b/cpu/mpc5xxx/ide.c index df5b4acd0e..9e8f29b289 100644 --- a/cpu/mpc5xxx/ide.c +++ b/cpu/mpc5xxx/ide.c @@ -42,7 +42,7 @@ int ide_preinit (void) struct mpc5xxx_sdma *psdma = (struct mpc5xxx_sdma *) MPC5XXX_SDMA; reg = *(vu_long *) MPC5XXX_GPS_PORT_CONFIG; -#if defined(CONFIG_TOTAL5200) +#if defined(CONFIG_SYS_ATA_CS_ON_I2C2) /* ATA cs0/1 on i2c2 clk/io */ reg = (reg & ~0x03000000ul) | 0x02000000ul; #else diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h index 9a75848079..1daa5746ee 100644 --- a/include/configs/Total5200.h +++ b/include/configs/Total5200.h @@ -397,6 +397,7 @@ #define CONFIG_IDE_RESET /* reset for ide supported */ #define CONFIG_IDE_PREINIT +#define CONFIG_SYS_ATA_CS_ON_I2C2 #define CONFIG_SYS_IDE_MAXBUS 1 /* max. 1 IDE bus */ #define CONFIG_SYS_IDE_MAXDEVICE 1 /* max. 1 drive per IDE bus */