From 7a3734e54dfee2c07fe48e462c8a7df5157ae4c3 Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Wed, 8 Nov 2023 13:50:17 -0300 Subject: [PATCH] standardize naming and build options --- .github/workflows/test.yml | 10 +++++----- .../Makefile | 6 ++---- .../cmsis_tm4c.patch | 0 .../hal.h | 0 .../link.ld | 0 .../main.c | 0 .../mongoose.c | 0 .../mongoose.h | 0 .../mongoose_custom.h | 10 ++++++++++ .../netif/ethernet.h | 0 .../startup.c | 0 .../syscalls.c | 0 .../sysinit.c | 0 .../tinyusb.patch | 0 .../tusb_config.h | 0 .../usb_descriptors.c | 0 .../Makefile | 6 ++---- .../README.md | 0 .../hal.h | 0 .../link.ld | 0 .../main.c | 0 .../mongoose.c | 0 .../mongoose.h | 0 .../mongoose_custom.h | 11 +++++++++++ .../net.c | 0 .../net.h | 0 .../packed_fs.c | 0 .../startup.c | 0 .../syscalls.c | 0 .../sysinit.c | 0 .../FreeRTOSConfig.h | 0 .../Makefile | 6 +++--- .../README.md | 0 .../hal.h | 0 .../link.ld | 0 .../main.c | 0 .../mongoose.c | 0 .../mongoose.h | 0 .../mongoose_custom.h | 1 + .../net.c | 0 .../net.h | 0 .../packed_fs.c | 0 .../startup.c | 0 .../syscalls.c | 0 .../sysinit.c | 0 45 files changed, 34 insertions(+), 16 deletions(-) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-baremetal-builtin-rndis}/Makefile (91%) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-baremetal-builtin-rndis}/cmsis_tm4c.patch (100%) rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin-rndis}/hal.h (100%) rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin-rndis}/link.ld (100%) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-baremetal-builtin-rndis}/main.c (100%) rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin-rndis}/mongoose.c (100%) rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin-rndis}/mongoose.h (100%) create mode 100644 examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/mongoose_custom.h rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-baremetal-builtin-rndis}/netif/ethernet.h (100%) rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin-rndis}/startup.c (100%) rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin-rndis}/syscalls.c (100%) rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin-rndis}/sysinit.c (100%) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-baremetal-builtin-rndis}/tinyusb.patch (100%) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-baremetal-builtin-rndis}/tusb_config.h (100%) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-baremetal-builtin-rndis}/usb_descriptors.c (100%) rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin}/Makefile (87%) rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin}/README.md (100%) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-baremetal-builtin}/hal.h (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-baremetal-builtin}/link.ld (100%) rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin}/main.c (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-baremetal-builtin}/mongoose.c (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-baremetal-builtin}/mongoose.h (100%) create mode 100644 examples/ti/ek-tm4c1294xl-make-baremetal-builtin/mongoose_custom.h rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin}/net.c (100%) rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin}/net.h (100%) rename examples/ti/{ek-tm4c1294xl-baremetal => ek-tm4c1294xl-make-baremetal-builtin}/packed_fs.c (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-baremetal-builtin}/startup.c (100%) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-baremetal-builtin}/syscalls.c (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-baremetal-builtin}/sysinit.c (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-freertos-builtin}/FreeRTOSConfig.h (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-freertos-builtin}/Makefile (94%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-freertos-builtin}/README.md (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-freertos-builtin}/hal.h (100%) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-freertos-builtin}/link.ld (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-freertos-builtin}/main.c (100%) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-freertos-builtin}/mongoose.c (100%) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-freertos-builtin}/mongoose.h (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-freertos-builtin}/mongoose_custom.h (99%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-freertos-builtin}/net.c (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-freertos-builtin}/net.h (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-freertos-builtin}/packed_fs.c (100%) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-freertos-builtin}/startup.c (100%) rename examples/ti/{ek-tm4c1294xl-freertos => ek-tm4c1294xl-make-freertos-builtin}/syscalls.c (100%) rename examples/ti/{ek-tm4c1294xl-rndis => ek-tm4c1294xl-make-freertos-builtin}/sysinit.c (100%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 45f3a2fb..8e6da1a8 100644 --- 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 b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/Makefile similarity index 91% rename from examples/ti/ek-tm4c1294xl-rndis/Makefile rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/Makefile index feca304a..c3367ebf 100644 --- a/examples/ti/ek-tm4c1294xl-rndis/Makefile +++ b/examples/ti/ek-tm4c1294xl-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/examples/ti/ek-tm4c1294xl-rndis/cmsis_tm4c.patch b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/cmsis_tm4c.patch similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/cmsis_tm4c.patch rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/cmsis_tm4c.patch diff --git a/examples/ti/ek-tm4c1294xl-baremetal/hal.h b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/hal.h similarity index 100% rename from examples/ti/ek-tm4c1294xl-baremetal/hal.h rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/hal.h diff --git a/examples/ti/ek-tm4c1294xl-baremetal/link.ld b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/link.ld similarity index 100% rename from examples/ti/ek-tm4c1294xl-baremetal/link.ld rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/link.ld diff --git a/examples/ti/ek-tm4c1294xl-rndis/main.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/main.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/main.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/main.c diff --git a/examples/ti/ek-tm4c1294xl-baremetal/mongoose.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/mongoose.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-baremetal/mongoose.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/mongoose.c diff --git a/examples/ti/ek-tm4c1294xl-baremetal/mongoose.h b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/mongoose.h similarity index 100% rename from examples/ti/ek-tm4c1294xl-baremetal/mongoose.h rename to examples/ti/ek-tm4c1294xl-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 new file mode 100644 index 00000000..2accd1c2 --- /dev/null +++ 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/examples/ti/ek-tm4c1294xl-rndis/netif/ethernet.h b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/netif/ethernet.h similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/netif/ethernet.h rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/netif/ethernet.h diff --git a/examples/ti/ek-tm4c1294xl-baremetal/startup.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/startup.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-baremetal/startup.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/startup.c diff --git a/examples/ti/ek-tm4c1294xl-baremetal/syscalls.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/syscalls.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-baremetal/syscalls.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/syscalls.c diff --git a/examples/ti/ek-tm4c1294xl-baremetal/sysinit.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/sysinit.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-baremetal/sysinit.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/sysinit.c diff --git a/examples/ti/ek-tm4c1294xl-rndis/tinyusb.patch b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/tinyusb.patch similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/tinyusb.patch rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/tinyusb.patch diff --git a/examples/ti/ek-tm4c1294xl-rndis/tusb_config.h b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/tusb_config.h similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/tusb_config.h rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/tusb_config.h diff --git a/examples/ti/ek-tm4c1294xl-rndis/usb_descriptors.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/usb_descriptors.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/usb_descriptors.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/usb_descriptors.c diff --git a/examples/ti/ek-tm4c1294xl-baremetal/Makefile b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/Makefile similarity index 87% rename from examples/ti/ek-tm4c1294xl-baremetal/Makefile rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin/Makefile index 63bcf40d..e268db9a 100644 --- a/examples/ti/ek-tm4c1294xl-baremetal/Makefile +++ b/examples/ti/ek-tm4c1294xl-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/examples/ti/ek-tm4c1294xl-baremetal/README.md b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/README.md similarity index 100% rename from examples/ti/ek-tm4c1294xl-baremetal/README.md rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin/README.md diff --git a/examples/ti/ek-tm4c1294xl-rndis/hal.h b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/hal.h similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/hal.h rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin/hal.h diff --git a/examples/ti/ek-tm4c1294xl-freertos/link.ld b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/link.ld similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/link.ld rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin/link.ld diff --git a/examples/ti/ek-tm4c1294xl-baremetal/main.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/main.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-baremetal/main.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin/main.c diff --git a/examples/ti/ek-tm4c1294xl-freertos/mongoose.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/mongoose.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/mongoose.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin/mongoose.c diff --git a/examples/ti/ek-tm4c1294xl-freertos/mongoose.h b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/mongoose.h similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/mongoose.h rename to examples/ti/ek-tm4c1294xl-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 new file mode 100644 index 00000000..522311f1 --- /dev/null +++ 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 b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/net.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-baremetal/net.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin/net.c diff --git a/examples/ti/ek-tm4c1294xl-baremetal/net.h b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/net.h similarity index 100% rename from examples/ti/ek-tm4c1294xl-baremetal/net.h rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin/net.h diff --git a/examples/ti/ek-tm4c1294xl-baremetal/packed_fs.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/packed_fs.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-baremetal/packed_fs.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin/packed_fs.c diff --git a/examples/ti/ek-tm4c1294xl-freertos/startup.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/startup.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/startup.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin/startup.c diff --git a/examples/ti/ek-tm4c1294xl-rndis/syscalls.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/syscalls.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/syscalls.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin/syscalls.c diff --git a/examples/ti/ek-tm4c1294xl-freertos/sysinit.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin/sysinit.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/sysinit.c rename to examples/ti/ek-tm4c1294xl-make-baremetal-builtin/sysinit.c diff --git a/examples/ti/ek-tm4c1294xl-freertos/FreeRTOSConfig.h b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/FreeRTOSConfig.h similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/FreeRTOSConfig.h rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/FreeRTOSConfig.h diff --git a/examples/ti/ek-tm4c1294xl-freertos/Makefile b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/Makefile similarity index 94% rename from examples/ti/ek-tm4c1294xl-freertos/Makefile rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/Makefile index 3971bdca..0fbd8aeb 100644 --- a/examples/ti/ek-tm4c1294xl-freertos/Makefile +++ b/examples/ti/ek-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 b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/README.md similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/README.md rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/README.md diff --git a/examples/ti/ek-tm4c1294xl-freertos/hal.h b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/hal.h similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/hal.h rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/hal.h diff --git a/examples/ti/ek-tm4c1294xl-rndis/link.ld b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/link.ld similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/link.ld rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/link.ld diff --git a/examples/ti/ek-tm4c1294xl-freertos/main.c b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/main.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/main.c rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/main.c diff --git a/examples/ti/ek-tm4c1294xl-rndis/mongoose.c b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/mongoose.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/mongoose.c rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/mongoose.c diff --git a/examples/ti/ek-tm4c1294xl-rndis/mongoose.h b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/mongoose.h similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/mongoose.h rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/mongoose.h diff --git a/examples/ti/ek-tm4c1294xl-freertos/mongoose_custom.h b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/mongoose_custom.h similarity index 99% rename from examples/ti/ek-tm4c1294xl-freertos/mongoose_custom.h rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/mongoose_custom.h index 4b2bdf97..c6b9afb6 100644 --- a/examples/ti/ek-tm4c1294xl-freertos/mongoose_custom.h +++ b/examples/ti/ek-tm4c1294xl-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 b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/net.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/net.c rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/net.c diff --git a/examples/ti/ek-tm4c1294xl-freertos/net.h b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/net.h similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/net.h rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/net.h diff --git a/examples/ti/ek-tm4c1294xl-freertos/packed_fs.c b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/packed_fs.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/packed_fs.c rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/packed_fs.c diff --git a/examples/ti/ek-tm4c1294xl-rndis/startup.c b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/startup.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/startup.c rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/startup.c diff --git a/examples/ti/ek-tm4c1294xl-freertos/syscalls.c b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/syscalls.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-freertos/syscalls.c rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/syscalls.c diff --git a/examples/ti/ek-tm4c1294xl-rndis/sysinit.c b/examples/ti/ek-tm4c1294xl-make-freertos-builtin/sysinit.c similarity index 100% rename from examples/ti/ek-tm4c1294xl-rndis/sysinit.c rename to examples/ti/ek-tm4c1294xl-make-freertos-builtin/sysinit.c