Fixed the error in port/quectel direct compilation

trickkkkkkkk · trickkkkkkkk · commit fea0effb23ee · 2025-04-09T15:01:07.000+08:00
diff --git a/ports/quectel/Makefile b/ports/quectel/Makefile
@@ -5,15 +5,7 @@ include ../../py/mkenv.mk
 include mpconfigport.mk
 include quectel.mk
 
-CROSS = 1
-
-ifeq ($(CROSS), 1)
 CFLAGS = $(INC) $(QUEC_MOD_CFLAGS) $(PLAT_CFLAGS) $(PLAT_DFLAGS) $(COPT)
-else
-LD = gcc
-CFLAGS = $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 $(COPT)
-LDFLAGS = -Wl,-Map=$@.map,--cref -Wl,--gc-sections
-endif
 
 CSUPEROPT = -Os # save some code space
 
@@ -36,11 +28,8 @@ endif
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
-ifeq ($(CROSS), 1)
 CROSS_COMPILE ?= arm-none-eabi-
-endif
 
-GIT_SUBMODULES += lib/micropython-lib
 
 INC += -I.
 INC += -I$(TOP)
@@ -103,11 +92,7 @@ SRC_QSTR += $(SRC_MOD) $(SRC_MOD_CXX) $(SHARED_SRC_C) $(EXTMOD_SRC_C)
 OBJ += $(PY_CORE_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 
-ifeq ($(CROSS), 1)
 all: $(BUILD)/firmware.a
-else
-all: $(BUILD)/firmware.elf
-endif
 
 $(BUILD)/_frozen_mpy.c: frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
 	$(ECHO) "MISC freezing bytecode"
diff --git a/ports/quectel/README.md b/ports/quectel/README.md
@@ -81,10 +81,8 @@ $ make submodules
 $ make
 ```
 
-This will produce a combined `firmware.a` image in the `build/`
-subdirectory(The compiled MicroPython library will be used by HeliosSDK to build a complete firmware package).
-
-To flash the firmware, you need to fully build the entire firmware package through heliossdk.
+This will produce a combined `firmware.a` lib in the `build/`
+subdirectory directly.The compiled MicroPython library will be used by HeliosSDK to build a complete firmware package. Of course, you can also build the entire firmware directly using the following method.
 
 *Check the usage of the helios compilation commands*
 
@@ -107,16 +105,16 @@ These are common commands used in various situations:
 
 *Compile the firmware*
 
-Taking the EC200UEU_AB module as an example, type the following command in the command line and press  "**Enter**":
+Taking the EG915UEC_AC module as an example, type the following command in the command line and press  "**Enter**":
 ```
-helios make services/micropython @EC200UEU_AB EC200UEUABR03A01M08
+helios make services/micropython @EG915UEC_AC EG915UECACR03A01M08
 ```
 
 - `helios`: Trigger the compilation process.
 - `make`: Compile the firmware.
 - `services/micropython`: Application entry address (relative to the SDK root directory, according to the requirements of the host system, the Win32 platform is \ and the Linux platform is /). It can be adjusted according to the specific location of MicroPython.
-- `@EC200UEU_AB`: Specify the target module model. You need to modify it according to your actual model.
-- `EC200UEUABR03A01M08`: Firmware version name, which can be omitted. You need to modify it according to your actual model.
+- `@EG915UEC_AC`: Specify the target module model. You need to modify it according to your actual model.
+- `EG915UECACR03A01M08`: Firmware version name, which can be omitted. You need to modify it according to your actual model.
 
 *Check the compilation target*
 
diff --git a/ports/quectel/mpconfigport.h b/ports/quectel/mpconfigport.h
@@ -1,5 +1,6 @@
 #include <stdint.h>
 
+#include "mpconfigboard.h"
 
 /****************************** user define ************************************/
 // python grammar
@@ -132,18 +133,12 @@
 
 // type definitions for the specific machine
 
-//typedef intptr_t mp_int_t; // must be pointer size
-//typedef uintptr_t mp_uint_t; // must be pointer size
-//typedef long mp_off_t;
+typedef intptr_t mp_int_t; // must be pointer size
+typedef uintptr_t mp_uint_t; // must be pointer size
+typedef long mp_off_t;
 #define UINT_FMT "%lu"
 #define INT_FMT "%ld"
 
-typedef int32_t mp_int_t; // must be pointer size
-typedef uint32_t mp_uint_t; // must be pointer size
-typedef long mp_off_t;
-//#define mp_type_fileio                      mp_type_vfs_lfs1_fileio
-//#define mp_type_textio                      mp_type_vfs_lfs1_textio
-
 
 #if MICROPY_ENABLE_GC
 #ifndef MICROPY_QPY_GC_HEAP_SIZE
diff --git a/ports/quectel/mpconfigport.h.bak b/ports/quectel/mpconfigport.h.bak
diff --git a/ports/quectel/mphalport.c b/ports/quectel/mphalport.c
@@ -240,22 +240,22 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len)
     return len;
 }
 
-uint32_t mp_hal_ticks_ms(void) 
+mp_uint_t mp_hal_ticks_ms(void) 
 {
-	return (uint32_t)Helios_RTC_TicksToMs();
+	return (mp_uint_t)Helios_RTC_TicksToMs();
 }
 
-uint32_t mp_hal_ticks_us(void) 
+mp_uint_t mp_hal_ticks_us(void) 
 {
-	return (uint32_t)Helios_RTC_TicksToUs();
+	return (mp_uint_t)Helios_RTC_TicksToUs();
 }
 
 uint64_t mp_hal_time_ns(void)
 {
     return 0;
 }
 
-void mp_hal_delay_ms(uint32_t ms) {
+void mp_hal_delay_ms(mp_uint_t ms) {
 	mp_uint_t dt = 0;
 	mp_uint_t t0 = 0,t1 = 0;
 	Helios_Thread_t taskid = 0;
@@ -293,8 +293,8 @@ void mp_hal_delay_ms(uint32_t ms) {
 	}
 }
 
-void mp_hal_delay_us(uint32_t us) {
-	uint32_t ms = us / 1000;
+void mp_hal_delay_us(mp_uint_t us) {
+	mp_uint_t ms = us / 1000;
     ms = ms ? ms : 1;
 	mp_hal_delay_ms(ms);
 }
diff --git a/ports/quectel/mphalport.h b/ports/quectel/mphalport.h
@@ -42,10 +42,6 @@ typedef struct Input_ListNode
 
 void _add_list_node();
 void _delete_list_node();
-void mp_hal_delay_ms(uint32_t ms);
-void mp_hal_delay_us(uint32_t us);
-uint32_t mp_hal_ticks_ms(void);
-uint32_t mp_hal_ticks_us(void);
 mp_uint_t mp_hal_ticks_cpu(void);
 
 void mp_mthread_sleep_deal_init(void);
@@ -58,7 +54,6 @@ int mp_hal_stdio_init(void);
 
 int mp_hal_stdin_rx_chr(void);
 
-void mp_hal_delay_ms(uint32_t ms);
 void mp_hal_port_open(uint8_t state);
 
 void mp_hal_set_interrupt_char(int c);
diff --git a/ports/quectel/plat.mk b/ports/quectel/plat.mk
@@ -12,5 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ifeq ($(strip $(PLAT)),)
+export PLAT = Unisoc
+export BOARD = EG915UEC_AC
 
+DFLAGS = PLAT_$(strip $(PLAT)) BOARD_$(strip $(BOARD)) BOARD=$(strip $(BOARD))
+endif
 
diff --git a/ports/quectel/quectel.mk b/ports/quectel/quectel.mk
@@ -1,3 +1,4 @@
+include plat.mk
 
 PLAT_DFLAGS = $(addprefix -D,$(DFLAGS))
 PLAT_CFLAGS = $(QUEC_CFLAGS)
diff --git a/ports/quectel/tools/mpy-cross b/ports/quectel/tools/mpy-cross

Original file line number	Diff line number	Diff line change
`@@ -240,22 +240,22 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len)`
`240`	`240`	`return len;`
`241`	`241`	`}`
`242`	`242`
`243`		`-uint32_t mp_hal_ticks_ms(void)`
	`243`	`+mp_uint_t mp_hal_ticks_ms(void)`
`244`	`244`	`{`
`245`		`- return (uint32_t)Helios_RTC_TicksToMs();`
	`245`	`+ return (mp_uint_t)Helios_RTC_TicksToMs();`
`246`	`246`	`}`
`247`	`247`
`248`		`-uint32_t mp_hal_ticks_us(void)`
	`248`	`+mp_uint_t mp_hal_ticks_us(void)`
`249`	`249`	`{`
`250`		`- return (uint32_t)Helios_RTC_TicksToUs();`
	`250`	`+ return (mp_uint_t)Helios_RTC_TicksToUs();`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`uint64_t mp_hal_time_ns(void)`
`254`	`254`	`{`
`255`	`255`	`return 0;`
`256`	`256`	`}`
`257`	`257`
`258`		`-void mp_hal_delay_ms(uint32_t ms) {`
	`258`	`+void mp_hal_delay_ms(mp_uint_t ms) {`
`259`	`259`	`mp_uint_t dt = 0;`
`260`	`260`	`mp_uint_t t0 = 0,t1 = 0;`
`261`	`261`	`Helios_Thread_t taskid = 0;`
`@@ -293,8 +293,8 @@ void mp_hal_delay_ms(uint32_t ms) {`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`
`296`		`-void mp_hal_delay_us(uint32_t us) {`
`297`		`- uint32_t ms = us / 1000;`
	`296`	`+void mp_hal_delay_us(mp_uint_t us) {`
	`297`	`+ mp_uint_t ms = us / 1000;`
`298`	`298`	`ms = ms ? ms : 1;`
`299`	`299`	`mp_hal_delay_ms(ms);`
`300`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+include plat.mk`
`1`	`2`
`2`	`3`	`PLAT_DFLAGS = $(addprefix -D,$(DFLAGS))`
`3`	`4`	`PLAT_CFLAGS = $(QUEC_CFLAGS)`