diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-11 16:50:16 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-11 16:50:16 +0000 |
| commit | 88da8a5b4f042532c0b980510b0d90b77158eff4 (patch) | |
| tree | 7549e64438eb97eda761a8274c9e00fa92870b20 /nuttx/configs/fire-stm32v2/src/fire-internal.h | |
| parent | 9f572dff87614ce1d025e8d98fac36db13bcfd71 (diff) | |
| download | px4-nuttx-88da8a5b4f042532c0b980510b0d90b77158eff4.tar.gz px4-nuttx-88da8a5b4f042532c0b980510b0d90b77158eff4.tar.bz2 px4-nuttx-88da8a5b4f042532c0b980510b0d90b77158eff4.zip | |
Updates/fixes related to ENC28J60, Kconfigs, and fire-stm32v2
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5128 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/fire-stm32v2/src/fire-internal.h')
| -rw-r--r-- | nuttx/configs/fire-stm32v2/src/fire-internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/configs/fire-stm32v2/src/fire-internal.h b/nuttx/configs/fire-stm32v2/src/fire-internal.h index 125e030b7..ee3c3486f 100644 --- a/nuttx/configs/fire-stm32v2/src/fire-internal.h +++ b/nuttx/configs/fire-stm32v2/src/fire-internal.h @@ -191,7 +191,7 @@ * 32 PA7 PA7-SPI1-MOSI 2.4" TFT + Touchscreen, 10Mbit ENC28J60, SPI 2M FLASH */ -#ifndef CONFIG_NET_ENC28J60 +#ifndef CONFIG_ENC28J60 # define GPIO_ENC28J60_CS (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|\ GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN4) #endif @@ -210,11 +210,11 @@ * 4 PE5 (no name) 10Mbps ENC28J60 Interrupt */ -#if defined(CONFIG_STM32_FSMC) && defined(CONFIG_NET_ENC28J60) +#if defined(CONFIG_STM32_FSMC) && defined(CONFIG_ENC28J60) # warning "TFT LCD and ENCJ2860 shared PE1" #endif -#ifdef CONFIG_NET_ENC28J60 +#ifdef CONFIG_ENC28J60 # define GPIO_ENC28J60_CS (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|\ GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN4) # define GPIO_ENC28J60_RESET (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|\ |