all: Update Makefiles and others to build with new ports/ dir layout.

Also renames "stmhal" to "stm32" in documentation and everywhere else.

13 files changed, 17 insertions, 17 deletions

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 58a0a7c7a..913f0913e 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -8,7 +8,7 @@ endif
 # If the build directory is not given, make it reflect the board name.
 BUILD ?= build-$(BOARD)
 
-include ../py/mkenv.mk
+include ../../py/mkenv.mk
 -include mpconfigport.mk
 include boards/$(BOARD)/mpconfigboard.mk
 
@@ -206,7 +206,7 @@ SRC_C = \
 	timer.c \
 	led.c \
 	pin.c \
-	pin_defs_stmhal.c \
+	pin_defs_stm32.c \
 	pin_named_pins.c \
 	bufhelper.c \
 	dma.c \
diff --git a/ports/stm32/README.md b/ports/stm32/README.md
index 32b6d4176..bb184e8db 100644
--- a/ports/stm32/README.md
+++ b/ports/stm32/README.md
@@ -24,7 +24,7 @@ bytecode.  The cross-compiler is built and run on the host machine, using:
 $ make -C mpy-cross
 ```
 This command should be executed from the root directory of this repository.
-All other commands below should be executed from the stmhal/ directory.
+All other commands below should be executed from the ports/stm32/ directory.
 
 An ARM compiler is required for the build, along with the associated binary
 utilities.  The default compiler is `arm-none-eabi-gcc`, which is available for
@@ -71,7 +71,7 @@ Or using `dfu-util` directly:
 
 ST Discovery or Nucleo boards have a builtin programmer called ST-LINK. With
 these boards and using Linux or OS X, you have the option to upload the
-`stmhal` firmware using the `st-flash` utility from the
+`stm32` firmware using the `st-flash` utility from the
 [stlink](https://github.com/texane/stlink) project. To do so, connect the board
 with a mini USB cable to its ST-LINK USB port and then use the make target
 `deploy-stlink`. For example, if you have the STM32F4DISCOVERY board, you can
@@ -101,7 +101,7 @@ a mini USB cable to its ST-LINK USB port and then use the make target
     $ make BOARD=STM32F4DISC deploy-openocd
 
 The `openocd` program, which writes the firmware to the target board's flash,
-is configured via the file `stmhal/boards/openocd_stm32f4.cfg`. This
+is configured via the file `ports/stm32/boards/openocd_stm32f4.cfg`. This
 configuration should work for all boards based on a STM32F4xx MCU with a
 ST-LINKv2 interface. You can override the path to this configuration by setting
 `OPENOCD_CONFIG` in your Makefile or on the command line.
diff --git a/ports/stm32/boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h
index c20421f0f..a1fd2e083 100644
--- a/ports/stm32/boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h
@@ -46,7 +46,7 @@
 /* Exported types ------------------------------------------------------------*/

 /* Exported constants --------------------------------------------------------*/

 

-// This board doesn't really have USB, but the stmhal codebase doesn't build

+// This board doesn't really have USB, but the stm32 codebase doesn't build

 // without some USB defined, so we leave this on for now.

 #define USE_USB_FS

 

diff --git a/ports/stm32/boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h
index e16fba155..0c424888f 100644
--- a/ports/stm32/boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h
@@ -46,7 +46,7 @@
 /* Exported types ------------------------------------------------------------*/
 /* Exported constants --------------------------------------------------------*/
 
-// This board doesn't really have USB, but the stmhal codebase doesn't build
+// This board doesn't really have USB, but the stm32 codebase doesn't build
 // without some USB defined, so we leave this on for now.
 #define USE_USB_FS
 
diff --git a/ports/stm32/boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h
index 3d0ce926b..487ca009f 100644
--- a/ports/stm32/boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h
@@ -46,7 +46,7 @@
 /* Exported types ------------------------------------------------------------*/
 /* Exported constants --------------------------------------------------------*/
 
-// This board doesn't really have USB, but the stmhal codebase doesn't build
+// This board doesn't really have USB, but the stm32 codebase doesn't build
 // without some USB defined, so we leave this on for now.
 #define USE_USB_FS
 
diff --git a/ports/stm32/help.c b/ports/stm32/help.c
index 87b2af526..ea0b6921b 100644
--- a/ports/stm32/help.c
+++ b/ports/stm32/help.c
@@ -26,7 +26,7 @@
 
 #include "py/builtin.h"
 
-const char *stmhal_help_text =
+const char *stm32_help_text =
 "Welcome to MicroPython!\n"
 "\n"
 "For online help please visit http://micropython.org/help/.\n"
diff --git a/ports/stm32/modules/lcd160cr.py b/ports/stm32/modules/lcd160cr.py
index c0e180714..9e63f1d23 120000
--- a/ports/stm32/modules/lcd160cr.py
+++ b/ports/stm32/modules/lcd160cr.py
@@ -1 +1 @@
-../../drivers/display/lcd160cr.py
\ No newline at end of file
+../../../drivers/display/lcd160cr.py
\ No newline at end of file
diff --git a/ports/stm32/modules/lcd160cr_test.py b/ports/stm32/modules/lcd160cr_test.py
index 56f091351..5f5bcc128 120000
--- a/ports/stm32/modules/lcd160cr_test.py
+++ b/ports/stm32/modules/lcd160cr_test.py
@@ -1 +1 @@
-../../drivers/display/lcd160cr_test.py
\ No newline at end of file
+../../../drivers/display/lcd160cr_test.py
\ No newline at end of file
diff --git a/ports/stm32/modules/onewire.py b/ports/stm32/modules/onewire.py
index f6ec745e8..33f30e84f 120000
--- a/ports/stm32/modules/onewire.py
+++ b/ports/stm32/modules/onewire.py
@@ -1 +1 @@
-../../drivers/onewire/onewire.py
\ No newline at end of file
+../../../drivers/onewire/onewire.py
\ No newline at end of file
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 326aa2c20..21142c17b 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -92,7 +92,7 @@
 #define MICROPY_PY_BUILTINS_INPUT   (1)
 #define MICROPY_PY_BUILTINS_POW3    (1)
 #define MICROPY_PY_BUILTINS_HELP    (1)
-#define MICROPY_PY_BUILTINS_HELP_TEXT stmhal_help_text
+#define MICROPY_PY_BUILTINS_HELP_TEXT stm32_help_text
 #define MICROPY_PY_BUILTINS_HELP_MODULES (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
@@ -345,4 +345,4 @@ static inline mp_uint_t disable_irq(void) {
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
 
-#define MICROPY_PIN_DEFS_PORT_H "pin_defs_stmhal.h"
+#define MICROPY_PIN_DEFS_PORT_H "pin_defs_stm32.h"
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 8dd95c470..939df0b3d 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -27,7 +27,7 @@ void mp_hal_set_interrupt_char(int c); // -1 to disable
 
 // timing functions
 
-#include "stmhal/irq.h"
+#include "irq.h"
 
 #define mp_hal_quiet_timing_enter() raise_irq_pri(1)
 #define mp_hal_quiet_timing_exit(irq_state) restore_irq_pri(irq_state)
@@ -44,7 +44,7 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
 
 // C-level pin HAL
 
-#include "stmhal/pin.h"
+#include "pin.h"
 
 #define MP_HAL_PIN_FMT                  "%q"
 #define MP_HAL_PIN_MODE_INPUT           (0)
diff --git a/ports/stm32/pin_defs_stmhal.c b/ports/stm32/pin_defs_stm32.c
index 0aef5f95f..0aef5f95f 100644
--- a/ports/stm32/pin_defs_stmhal.c
+++ b/ports/stm32/pin_defs_stm32.c
diff --git a/ports/stm32/pin_defs_stmhal.h b/ports/stm32/pin_defs_stm32.h
index 6cf3b1b83..c5b286283 100644
--- a/ports/stm32/pin_defs_stmhal.h
+++ b/ports/stm32/pin_defs_stm32.h
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-// This file contains pin definitions that are specific to the stmhal port.
+// This file contains pin definitions that are specific to the stm32 port.
 // This file should only ever be #included by pin.h and not directly.
 
 enum {