diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /board/actux1 | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/actux1')
| -rw-r--r-- | board/actux1/actux1.c | 14 | ||||
| -rw-r--r-- | board/actux1/actux1_hw.h | 22 |
2 files changed, 18 insertions, 18 deletions
diff --git a/board/actux1/actux1.c b/board/actux1/actux1.c index d1d7f6c..399be23 100644 --- a/board/actux1/actux1.c +++ b/board/actux1/actux1.c @@ -49,16 +49,16 @@ int board_init (void) /* adress of boot parameters */ gd->bd->bi_boot_params = 0x00000100; - GPIO_OUTPUT_CLEAR (CFG_GPIO_IORST); - GPIO_OUTPUT_ENABLE (CFG_GPIO_IORST); + GPIO_OUTPUT_CLEAR (CONFIG_SYS_GPIO_IORST); + GPIO_OUTPUT_ENABLE (CONFIG_SYS_GPIO_IORST); /* Setup GPIO's for PCI INTA */ - GPIO_OUTPUT_DISABLE (CFG_GPIO_PCI1_INTA); - GPIO_INT_ACT_LOW_SET (CFG_GPIO_PCI1_INTA); + GPIO_OUTPUT_DISABLE (CONFIG_SYS_GPIO_PCI1_INTA); + GPIO_INT_ACT_LOW_SET (CONFIG_SYS_GPIO_PCI1_INTA); /* Setup GPIO's for 33MHz clock output */ - GPIO_OUTPUT_ENABLE (CFG_GPIO_PCI_CLK); - GPIO_OUTPUT_ENABLE (CFG_GPIO_EXTBUS_CLK); + GPIO_OUTPUT_ENABLE (CONFIG_SYS_GPIO_PCI_CLK); + GPIO_OUTPUT_ENABLE (CONFIG_SYS_GPIO_EXTBUS_CLK); *IXP425_GPIO_GPCLKR = 0x011001FF; /* CS5: Debug port */ @@ -69,7 +69,7 @@ int board_init (void) *IXP425_EXP_CS7 = 0x80900003; udelay (533); - GPIO_OUTPUT_SET (CFG_GPIO_IORST); + GPIO_OUTPUT_SET (CONFIG_SYS_GPIO_IORST); ACTUX1_LED1 (2); ACTUX1_LED2 (2); diff --git a/board/actux1/actux1_hw.h b/board/actux1/actux1_hw.h index bb3b7f9..fe454c5 100644 --- a/board/actux1/actux1_hw.h +++ b/board/actux1/actux1_hw.h @@ -42,16 +42,16 @@ #define ACTUX1_BOARDREL (readb(IXP425_EXP_BUS_CS6_BASE_PHYS) & 0x0F) /* GPIO settings */ -#define CFG_GPIO_PCI1_INTA 2 -#define CFG_GPIO_PCI2_INTA 3 -#define CFG_GPIO_I2C_SDA 4 -#define CFG_GPIO_I2C_SCL 5 -#define CFG_GPIO_DBGJUMPER 9 -#define CFG_GPIO_BUTTON1 10 -#define CFG_GPIO_DBGSENSE 11 -#define CFG_GPIO_DTR 12 -#define CFG_GPIO_IORST 13 /* Out */ -#define CFG_GPIO_PCI_CLK 14 /* Out */ -#define CFG_GPIO_EXTBUS_CLK 15 /* Out */ +#define CONFIG_SYS_GPIO_PCI1_INTA 2 +#define CONFIG_SYS_GPIO_PCI2_INTA 3 +#define CONFIG_SYS_GPIO_I2C_SDA 4 +#define CONFIG_SYS_GPIO_I2C_SCL 5 +#define CONFIG_SYS_GPIO_DBGJUMPER 9 +#define CONFIG_SYS_GPIO_BUTTON1 10 +#define CONFIG_SYS_GPIO_DBGSENSE 11 +#define CONFIG_SYS_GPIO_DTR 12 +#define CONFIG_SYS_GPIO_IORST 13 /* Out */ +#define CONFIG_SYS_GPIO_PCI_CLK 14 /* Out */ +#define CONFIG_SYS_GPIO_EXTBUS_CLK 15 /* Out */ #endif |