diff --git a/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs
index ca6f547707..a62d050a2d 100755
--- a/arch/arm/src/stm32/Make.defs
+++ b/arch/arm/src/stm32/Make.defs
@@ -46,10 +46,5 @@ CMN_CSRCS	= up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
 
 CHIP_ASRCS	= 
 CHIP_CSRCS	= stm32_start.c
-#		  stm32_syscontrol.c stm32_irq.c \
-#		  stm32_gpio.c stm32_gpioirq.c stm32_timerisr.c stm32_lowputc.c \
-#		  stm32_serial.c stm32_ssi.c stm32_dumpgpio.c
-
-ifdef CONFIG_NET
-CHIP_CSRCS	+= stm32_ethernet.c
-endif
+#		  stm32_irq.c stm32_gpio.c stm32_timerisr.c stm32_lowputc.c \
+#		  stm32_serial.c stm32_spi.c stm32_dumpgpio.c
diff --git a/arch/arm/src/stm32/chip.h b/arch/arm/src/stm32/chip.h
index bedc96592b..c80ea97c20 100755
--- a/arch/arm/src/stm32/chip.h
+++ b/arch/arm/src/stm32/chip.h
@@ -49,7 +49,7 @@
 
 /* Get customizations for each supported chip (only the STM32F103Z right now) */
 
-#ifdef CONFIG_CHIP_STM32F103ZET6
+#ifdef CONFIG_ARCH_CHIP_STM32F103ZET6
 #  undef CONFIG_STM32_LOWDENSITY            /* STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
 #  undef  CONFIG_STM32_MEDIUMDENSITY        /* STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
 #  define CONFIG_STM32_HIGHDENSITY      1   /* STM32F101x  and STM32F103x w/ 256/512 Kbytes */
@@ -68,7 +68,7 @@
 #  define STM32_NCRC                    0   /* No CRC */
 #  define STM32_NTHERNET                0   /* No ethernet */
 #else
-#  error "Unsupported STM32 chip */
+#  error "Unsupported STM32 chip"
 #endif
 
 /* Include only the memory map.  Other chip hardware files should then include this