Merge pull request #2467 from cesanta/std

standardize naming and build options
cesanta · Nov 8, 2023 · 817115c · 817115c
2 parents 79c3341 + 7a3734e
commit 817115c
Show file tree

Hide file tree

Showing 45 changed files with 34 additions and 16 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -266,13 +266,13 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with: { fetch-depth: 2 }
-    - run: if ./test/match_changed_files.sh "^src|examples/device-dashboard|examples/ti/ek-tm4c" ; then echo GO=1 >> $GITHUB_ENV ; fi
+    - run: if ./test/match_changed_files.sh "^src|examples/device-dashboard|examples/ti/ek-tm4c.*-make" ; then echo GO=1 >> $GITHUB_ENV ; fi
     - if: ${{ env.GO == 1 }}
       run: sudo apt -y update; sudo apt -y install gcc-arm-none-eabi
     - if: ${{ env.GO == 1 }}
-      run:  make -C examples/ti/ek-tm4c1294xl-baremetal test VCON_API_KEY=${{secrets.VCON_API_KEY}}
+      run:  make -C examples/ti/ek-tm4c1294xl-make-baremetal-builtin test VCON_API_KEY=${{secrets.VCON_API_KEY}}
     - if: ${{ env.GO == 1 }}
-      run:  make -C examples/ti/ek-tm4c1294xl-freertos test VCON_API_KEY=${{secrets.VCON_API_KEY}}
+      run:  make -C examples/ti/ek-tm4c1294xl-make-freertos-builtin test VCON_API_KEY=${{secrets.VCON_API_KEY}}
 
   test_same54:
     runs-on: ubuntu-latest
@@ -369,8 +369,8 @@ jobs:
           - path: stm32/nucleo-h743zi-make-baremetal-builtin
           - path: stm32/nucleo-h743zi-make-freertos-builtin
           - path: ti/ti-ek-tm4c1294xl-http-server
-          - path: ti/ek-tm4c1294xl-baremetal
-          - path: ti/ek-tm4c1294xl-freertos
+          - path: ti/ek-tm4c1294xl-make-baremetal-builtin
+          - path: ti/ek-tm4c1294xl-make-freertos-builtin
     name: ${{ matrix.example.path }}
     steps:
       - uses: actions/checkout@v3

diff --git a/examples/ti/ek-tm4c1294xl-rndis/Makefile → ...4xl-make-baremetal-builtin-rndis/Makefile b/examples/ti/ek-tm4c1294xl-rndis/Makefile → ...4xl-make-baremetal-builtin-rndis/Makefile
@@ -2,7 +2,7 @@ CFLAGS  = -W -Wall -Wextra -Werror -Wundef -Wshadow -Wdouble-promotion
 CFLAGS += -Wformat-truncation -fno-common -Wconversion -Wno-sign-conversion
 CFLAGS += -g3 -Os -ffunction-sections -fdata-sections
 CFLAGS += -I. -Icmsis_core/CMSIS/Core/Include -Icmsis_tm4c/Device/TI/TM4C/Include
-CFLAGS += -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16
+CFLAGS += -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 $(CFLAGS_EXTRA)
 LDFLAGS ?= -Tlink.ld -nostdlib -nostartfiles --specs nano.specs -lc -lgcc -Wl,--gc-sections -Wl,-Map=$@.map
 
 SOURCES = main.c syscalls.c sysinit.c
@@ -22,10 +22,8 @@ CFLAGS += -Itinyusb/src -Itinyusb/lib/networking
 CFLAGS += -DTM4C1294NCPDT
 CFLAGS += -Wno-conversion -Wno-sign-conversion
 
-# Mongoose-specific. See https://mongoose.ws/documentation/#build-options
+# Mongoose options are defined in mongoose_custom.h
 SOURCES += mongoose.c 
-CFLAGS += -DMG_ENABLE_TCPIP=1 -DMG_ARCH=MG_ARCH_NEWLIB -DMG_ENABLE_CUSTOM_MILLIS=1
-CFLAGS += -DMG_IO_SIZE=512 $(CFLAGS_EXTRA)
 
 ifeq ($(OS),Windows_NT)
   RM = cmd /C del /Q /F /S

diff --git a/...s/ti/ek-tm4c1294xl-rndis/cmsis_tm4c.patch → ...-baremetal-builtin-rndis/cmsis_tm4c.patch b/...s/ti/ek-tm4c1294xl-rndis/cmsis_tm4c.patch → ...-baremetal-builtin-rndis/cmsis_tm4c.patch
diff --git a/examples/ti/ek-tm4c1294xl-baremetal/hal.h → ...1294xl-make-baremetal-builtin-rndis/hal.h b/examples/ti/ek-tm4c1294xl-baremetal/hal.h → ...1294xl-make-baremetal-builtin-rndis/hal.h
diff --git a/examples/ti/ek-tm4c1294xl-baremetal/link.ld → ...94xl-make-baremetal-builtin-rndis/link.ld b/examples/ti/ek-tm4c1294xl-baremetal/link.ld → ...94xl-make-baremetal-builtin-rndis/link.ld
diff --git a/examples/ti/ek-tm4c1294xl-rndis/main.c → ...294xl-make-baremetal-builtin-rndis/main.c b/examples/ti/ek-tm4c1294xl-rndis/main.c → ...294xl-make-baremetal-builtin-rndis/main.c
diff --git a/...les/ti/ek-tm4c1294xl-baremetal/mongoose.c → ...l-make-baremetal-builtin-rndis/mongoose.c b/...les/ti/ek-tm4c1294xl-baremetal/mongoose.c → ...l-make-baremetal-builtin-rndis/mongoose.c
diff --git a/...les/ti/ek-tm4c1294xl-baremetal/mongoose.h → ...l-make-baremetal-builtin-rndis/mongoose.h b/...les/ti/ek-tm4c1294xl-baremetal/mongoose.h → ...l-make-baremetal-builtin-rndis/mongoose.h
diff --git a/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/mongoose_custom.h b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/mongoose_custom.h
@@ -0,0 +1,10 @@
+#pragma once
+
+// See https://mongoose.ws/documentation/#build-options
+#define MG_ARCH MG_ARCH_NEWLIB
+
+#define MG_ENABLE_TCPIP 1
+#define MG_ENABLE_CUSTOM_MILLIS 1
+#define MG_ENABLE_PACKED_FS 1 
+#define MG_IO_SIZE 256
+#define MG_ENABLE_LINES 1
diff --git a/...s/ti/ek-tm4c1294xl-rndis/netif/ethernet.h → ...-baremetal-builtin-rndis/netif/ethernet.h b/...s/ti/ek-tm4c1294xl-rndis/netif/ethernet.h → ...-baremetal-builtin-rndis/netif/ethernet.h
diff --git a/...ples/ti/ek-tm4c1294xl-baremetal/startup.c → ...xl-make-baremetal-builtin-rndis/startup.c b/...ples/ti/ek-tm4c1294xl-baremetal/startup.c → ...xl-make-baremetal-builtin-rndis/startup.c
diff --git a/...les/ti/ek-tm4c1294xl-baremetal/syscalls.c → ...l-make-baremetal-builtin-rndis/syscalls.c b/...les/ti/ek-tm4c1294xl-baremetal/syscalls.c → ...l-make-baremetal-builtin-rndis/syscalls.c
diff --git a/...ples/ti/ek-tm4c1294xl-baremetal/sysinit.c → ...xl-make-baremetal-builtin-rndis/sysinit.c b/...ples/ti/ek-tm4c1294xl-baremetal/sysinit.c → ...xl-make-baremetal-builtin-rndis/sysinit.c
diff --git a/...ples/ti/ek-tm4c1294xl-rndis/tinyusb.patch → ...ake-baremetal-builtin-rndis/tinyusb.patch b/...ples/ti/ek-tm4c1294xl-rndis/tinyusb.patch → ...ake-baremetal-builtin-rndis/tinyusb.patch
diff --git a/...ples/ti/ek-tm4c1294xl-rndis/tusb_config.h → ...ake-baremetal-builtin-rndis/tusb_config.h b/...ples/ti/ek-tm4c1294xl-rndis/tusb_config.h → ...ake-baremetal-builtin-rndis/tusb_config.h
diff --git a/.../ti/ek-tm4c1294xl-rndis/usb_descriptors.c → ...baremetal-builtin-rndis/usb_descriptors.c b/.../ti/ek-tm4c1294xl-rndis/usb_descriptors.c → ...baremetal-builtin-rndis/usb_descriptors.c
diff --git a/examples/ti/ek-tm4c1294xl-baremetal/Makefile → ...m4c1294xl-make-baremetal-builtin/Makefile b/examples/ti/ek-tm4c1294xl-baremetal/Makefile → ...m4c1294xl-make-baremetal-builtin/Makefile
@@ -2,16 +2,14 @@ CFLAGS  = -W -Wall -Wextra -Werror -Wundef -Wshadow -Wdouble-promotion
 CFLAGS += -Wformat-truncation -fno-common -Wconversion -Wno-sign-conversion
 CFLAGS += -g3 -Os -ffunction-sections -fdata-sections
 CFLAGS += -I. -Icmsis_core/CMSIS/Core/Include -Icmsis_tm4c/Device/TI/TM4C/Include
-CFLAGS += -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16
+CFLAGS += -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 $(CFLAGS_EXTRA)
 LDFLAGS ?= -Tlink.ld -nostdlib -nostartfiles --specs nano.specs -lc -lgcc -Wl,--gc-sections -Wl,-Map=$@.map
 
 SOURCES = main.c syscalls.c sysinit.c
 SOURCES += startup.c # startup file. Compiler-dependent!
 
-# Mongoose-specific source code files and build options. See https://mongoose.ws/documentation/#build-options
+# Mongoose options are defined in mongoose_custom.h
 SOURCES += mongoose.c net.c packed_fs.c
-CFLAGS += -DMG_ENABLE_TCPIP=1 -DMG_ARCH=MG_ARCH_NEWLIB -DMG_ENABLE_CUSTOM_MILLIS=1
-CFLAGS += -DMG_ENABLE_DRIVER_TM4C=1 -DMG_ENABLE_PACKED_FS=1 $(CFLAGS_EXTRA)
 
 # Example specific build options. See README.md
 CFLAGS += -DHTTP_URL=\"http://0.0.0.0/\"

diff --git a/...ples/ti/ek-tm4c1294xl-baremetal/README.md → ...4c1294xl-make-baremetal-builtin/README.md b/...ples/ti/ek-tm4c1294xl-baremetal/README.md → ...4c1294xl-make-baremetal-builtin/README.md
diff --git a/examples/ti/ek-tm4c1294xl-rndis/hal.h → ...k-tm4c1294xl-make-baremetal-builtin/hal.h b/examples/ti/ek-tm4c1294xl-rndis/hal.h → ...k-tm4c1294xl-make-baremetal-builtin/hal.h
diff --git a/examples/ti/ek-tm4c1294xl-freertos/link.ld → ...tm4c1294xl-make-baremetal-builtin/link.ld b/examples/ti/ek-tm4c1294xl-freertos/link.ld → ...tm4c1294xl-make-baremetal-builtin/link.ld
diff --git a/examples/ti/ek-tm4c1294xl-baremetal/main.c → ...-tm4c1294xl-make-baremetal-builtin/main.c b/examples/ti/ek-tm4c1294xl-baremetal/main.c → ...-tm4c1294xl-make-baremetal-builtin/main.c
diff --git a/...ples/ti/ek-tm4c1294xl-freertos/mongoose.c → ...c1294xl-make-baremetal-builtin/mongoose.c b/...ples/ti/ek-tm4c1294xl-freertos/mongoose.c → ...c1294xl-make-baremetal-builtin/mongoose.c
diff --git a/...ples/ti/ek-tm4c1294xl-freertos/mongoose.h → ...c1294xl-make-baremetal-builtin/mongoose.h b/...ples/ti/ek-tm4c1294xl-freertos/mongoose.h → ...c1294xl-make-baremetal-builtin/mongoose.h
diff --git a/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/mongoose_custom.h b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/mongoose_custom.h
@@ -0,0 +1,11 @@
+#pragma once
+
+// See https://mongoose.ws/documentation/#build-options
+#define MG_ARCH MG_ARCH_NEWLIB
+
+#define MG_ENABLE_TCPIP 1
+#define MG_ENABLE_CUSTOM_MILLIS 1
+#define MG_IO_SIZE 256
+#define MG_ENABLE_PACKED_FS 1 
+#define MG_ENABLE_DRIVER_TM4C 1
+#define MG_ENABLE_LINES 1
diff --git a/examples/ti/ek-tm4c1294xl-baremetal/net.c → ...k-tm4c1294xl-make-baremetal-builtin/net.c b/examples/ti/ek-tm4c1294xl-baremetal/net.c → ...k-tm4c1294xl-make-baremetal-builtin/net.c
diff --git a/examples/ti/ek-tm4c1294xl-baremetal/net.h → ...k-tm4c1294xl-make-baremetal-builtin/net.h b/examples/ti/ek-tm4c1294xl-baremetal/net.h → ...k-tm4c1294xl-make-baremetal-builtin/net.h
diff --git a/...es/ti/ek-tm4c1294xl-baremetal/packed_fs.c → ...1294xl-make-baremetal-builtin/packed_fs.c b/...es/ti/ek-tm4c1294xl-baremetal/packed_fs.c → ...1294xl-make-baremetal-builtin/packed_fs.c
diff --git a/examples/ti/ek-tm4c1294xl-freertos/startup.c → ...4c1294xl-make-baremetal-builtin/startup.c b/examples/ti/ek-tm4c1294xl-freertos/startup.c → ...4c1294xl-make-baremetal-builtin/startup.c
diff --git a/examples/ti/ek-tm4c1294xl-rndis/syscalls.c → ...c1294xl-make-baremetal-builtin/syscalls.c b/examples/ti/ek-tm4c1294xl-rndis/syscalls.c → ...c1294xl-make-baremetal-builtin/syscalls.c
diff --git a/examples/ti/ek-tm4c1294xl-freertos/sysinit.c → ...4c1294xl-make-baremetal-builtin/sysinit.c b/examples/ti/ek-tm4c1294xl-freertos/sysinit.c → ...4c1294xl-make-baremetal-builtin/sysinit.c
diff --git a/...i/ek-tm4c1294xl-freertos/FreeRTOSConfig.h → ...xl-make-freertos-builtin/FreeRTOSConfig.h b/...i/ek-tm4c1294xl-freertos/FreeRTOSConfig.h → ...xl-make-freertos-builtin/FreeRTOSConfig.h
diff --git a/examples/ti/ek-tm4c1294xl-freertos/Makefile → ...tm4c1294xl-make-freertos-builtin/Makefile b/examples/ti/ek-tm4c1294xl-freertos/Makefile → ...tm4c1294xl-make-freertos-builtin/Makefile
@@ -2,7 +2,7 @@ CFLAGS  = -W -Wall -Wextra -Werror -Wundef -Wshadow -Wdouble-promotion
 CFLAGS += -Wformat-truncation -fno-common -Wconversion -Wno-sign-conversion
 CFLAGS += -g3 -Os -ffunction-sections -fdata-sections
 CFLAGS += -I. -Icmsis_core/CMSIS/Core/Include -Icmsis_tm4c/Device/TI/TM4C/Include
-CFLAGS += -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16
+CFLAGS += -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 $(CFLAGS_EXTRA)
 LDFLAGS ?= -Tlink.ld -nostdlib -nostartfiles --specs nano.specs -lc -lgcc -Wl,--gc-sections -Wl,-Map=$@.map
 
 SOURCES = main.c syscalls.c sysinit.c
@@ -14,8 +14,8 @@ SOURCES += FreeRTOS-Kernel/portable/GCC/ARM_CM4F/port.c
 CFLAGS += -IFreeRTOS-Kernel/include 
 CFLAGS += -IFreeRTOS-Kernel/portable/GCC/ARM_CM4F -Wno-conversion
 
-SOURCES += mongoose.c  net.c packed_fs.c
-CFLAGS += $(CFLAGS_EXTRA)       # Mongoose options are defined in mongoose_custom.h
+# Mongoose options are defined in mongoose_custom.h
+SOURCES += mongoose.c net.c packed_fs.c
 
 # Example specific build options. See README.md
 CFLAGS += -DHTTP_URL=\"http://0.0.0.0/\"

diff --git a/examples/ti/ek-tm4c1294xl-freertos/README.md → ...m4c1294xl-make-freertos-builtin/README.md b/examples/ti/ek-tm4c1294xl-freertos/README.md → ...m4c1294xl-make-freertos-builtin/README.md
diff --git a/examples/ti/ek-tm4c1294xl-freertos/hal.h → ...ek-tm4c1294xl-make-freertos-builtin/hal.h b/examples/ti/ek-tm4c1294xl-freertos/hal.h → ...ek-tm4c1294xl-make-freertos-builtin/hal.h
diff --git a/examples/ti/ek-tm4c1294xl-rndis/link.ld → ...-tm4c1294xl-make-freertos-builtin/link.ld b/examples/ti/ek-tm4c1294xl-rndis/link.ld → ...-tm4c1294xl-make-freertos-builtin/link.ld
diff --git a/examples/ti/ek-tm4c1294xl-freertos/main.c → ...k-tm4c1294xl-make-freertos-builtin/main.c b/examples/ti/ek-tm4c1294xl-freertos/main.c → ...k-tm4c1294xl-make-freertos-builtin/main.c
diff --git a/examples/ti/ek-tm4c1294xl-rndis/mongoose.c → ...4c1294xl-make-freertos-builtin/mongoose.c b/examples/ti/ek-tm4c1294xl-rndis/mongoose.c → ...4c1294xl-make-freertos-builtin/mongoose.c
diff --git a/examples/ti/ek-tm4c1294xl-rndis/mongoose.h → ...4c1294xl-make-freertos-builtin/mongoose.h b/examples/ti/ek-tm4c1294xl-rndis/mongoose.h → ...4c1294xl-make-freertos-builtin/mongoose.h
diff --git a/.../ek-tm4c1294xl-freertos/mongoose_custom.h → ...l-make-freertos-builtin/mongoose_custom.h b/.../ek-tm4c1294xl-freertos/mongoose_custom.h → ...l-make-freertos-builtin/mongoose_custom.h
@@ -2,6 +2,7 @@
 
 // See https://mongoose.ws/documentation/#build-options
 #define MG_ARCH MG_ARCH_FREERTOS
+
 #define MG_ENABLE_TCPIP 1
 #define MG_ENABLE_DRIVER_TM4C 1
 #define MG_IO_SIZE 256

diff --git a/examples/ti/ek-tm4c1294xl-freertos/net.c → ...ek-tm4c1294xl-make-freertos-builtin/net.c b/examples/ti/ek-tm4c1294xl-freertos/net.c → ...ek-tm4c1294xl-make-freertos-builtin/net.c
diff --git a/examples/ti/ek-tm4c1294xl-freertos/net.h → ...ek-tm4c1294xl-make-freertos-builtin/net.h b/examples/ti/ek-tm4c1294xl-freertos/net.h → ...ek-tm4c1294xl-make-freertos-builtin/net.h
diff --git a/...les/ti/ek-tm4c1294xl-freertos/packed_fs.c → ...c1294xl-make-freertos-builtin/packed_fs.c b/...les/ti/ek-tm4c1294xl-freertos/packed_fs.c → ...c1294xl-make-freertos-builtin/packed_fs.c
diff --git a/examples/ti/ek-tm4c1294xl-rndis/startup.c → ...m4c1294xl-make-freertos-builtin/startup.c b/examples/ti/ek-tm4c1294xl-rndis/startup.c → ...m4c1294xl-make-freertos-builtin/startup.c
diff --git a/...ples/ti/ek-tm4c1294xl-freertos/syscalls.c → ...4c1294xl-make-freertos-builtin/syscalls.c b/...ples/ti/ek-tm4c1294xl-freertos/syscalls.c → ...4c1294xl-make-freertos-builtin/syscalls.c
diff --git a/examples/ti/ek-tm4c1294xl-rndis/sysinit.c → ...m4c1294xl-make-freertos-builtin/sysinit.c b/examples/ti/ek-tm4c1294xl-rndis/sysinit.c → ...m4c1294xl-make-freertos-builtin/sysinit.c