diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /board/actux2/actux2_hw.h | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | talos-obmc-uboot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.gz talos-obmc-uboot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'board/actux2/actux2_hw.h')
| -rw-r--r-- | board/actux2/actux2_hw.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/board/actux2/actux2_hw.h b/board/actux2/actux2_hw.h index 8ffb82a813..0f5ebcbf99 100644 --- a/board/actux2/actux2_hw.h +++ b/board/actux2/actux2_hw.h @@ -39,21 +39,21 @@ /* * GPIO settings */ -#define CFG_GPIO_DBGINT 0 -#define CFG_GPIO_ETHINT 1 -#define CFG_GPIO_ETHRST 2 /* Out */ -#define CFG_GPIO_LED5_GN 3 /* Out */ -#define CFG_GPIO_UNUSED4 4 -#define CFG_GPIO_UNUSED5 5 -#define CFG_GPIO_DSR 6 /* Out */ -#define CFG_GPIO_DCD 7 /* Out */ -#define CFG_GPIO_IPAC_INT 8 -#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_DBGINT 0 +#define CONFIG_SYS_GPIO_ETHINT 1 +#define CONFIG_SYS_GPIO_ETHRST 2 /* Out */ +#define CONFIG_SYS_GPIO_LED5_GN 3 /* Out */ +#define CONFIG_SYS_GPIO_UNUSED4 4 +#define CONFIG_SYS_GPIO_UNUSED5 5 +#define CONFIG_SYS_GPIO_DSR 6 /* Out */ +#define CONFIG_SYS_GPIO_DCD 7 /* Out */ +#define CONFIG_SYS_GPIO_IPAC_INT 8 +#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 |
