diff --git a/RTL00_SDKV35a/component/common/api/wifi/wifi_conf.c b/RTL00_SDKV35a/component/common/api/wifi/wifi_conf.c index d8421f3..b557f3c 100644 --- a/RTL00_SDKV35a/component/common/api/wifi/wifi_conf.c +++ b/RTL00_SDKV35a/component/common/api/wifi/wifi_conf.c @@ -519,7 +519,7 @@ int wifi_connect( struct { u8 bssid[ETH_ALEN + 2]; void * p; - } bs = { 0 }; + } bs; memcpy(bs.bssid, pWifi->bssid.octet, ETH_ALEN); for(int i = 0; i < ETH_ALEN; i++) { flg += bs.bssid[i]; diff --git a/RTL00_SDKV35a/flasher.mk b/RTL00_SDKV35a/flasher.mk index 32f6848..aae3c78 100644 --- a/RTL00_SDKV35a/flasher.mk +++ b/RTL00_SDKV35a/flasher.mk @@ -30,14 +30,13 @@ OBJCOPY ?= $(CROSS_COMPILE)objcopy OBJDUMP ?= $(CROSS_COMPILE)objdump # Make bunary tools -TOOLS_PATH ?= component/soc/realtek/8195a/misc/iar_utility/common/tools/ +TOOLS_PATH ?= $(SDK_PATH)../tools/ ifneq ($(shell uname), Linux) EXE = .exe +IMAGETOOL ?= $(TOOLS_PATH)rtlaimage/rtlaimage$(EXE) +else +IMAGETOOL ?= $(TOOLS_PATH)rtlaimage/rtlaimage.py endif -PICK = $(TOOLS_PATH)pick$(EXE) -PADDING = $(TOOLS_PATH)padding$(EXE) -CHCKSUM = $(TOOLS_PATH)checksum$(EXE) -IMAGETOOL = $(TOOLS_PATH)rtlaimage$(EXE) # openocd tools OPENOCD = $(OPENOCD_PATH)openocd.exe @@ -90,7 +89,7 @@ mp: OTA_IMAGE = $(BIN_DIR)/ota_mp.bin .PHONY: genbin flashburn reset test readfullflash flashboot flashwebfs flash_OTA runram runsdram -.NOTPARALLEL: all mp genbin1 genbin23 flashburn reset test readfullflash _endgenbin flashwebfs flash_OTA +.NOTPARALLEL: all mp genbin flashburn reset test readfullflash _endgenbin flashwebfs flash_OTA all: $(ELFFILE) $(FLASH_IMAGE) _endgenbin mp: $(ELFFILE) $(FLASH_IMAGE) _endgenbin diff --git a/RTL00_SDKV35a/paths.mk b/RTL00_SDKV35a/paths.mk index f4015f3..5db8df1 100644 --- a/RTL00_SDKV35a/paths.mk +++ b/RTL00_SDKV35a/paths.mk @@ -4,16 +4,14 @@ SDK_PATH ?= ../RTL00MP3/RTL00_SDKV35a/ #GCC_PATH = d:/MCU/GNU_Tools_ARM_Embedded/6.2017-q1-update/bin/# + or set in PATH #OPENOCD_PATH = d:/MCU/OpenOCD/bin/# + or set in PATH -TOOLS_PATH ?= $(SDK_PATH)component/soc/realtek/8195a/misc/iar_utility/common/tools/ FLASHER_TYPE ?= Jlink -#FLASHER_TYPE ?= OCD FLASHER_PATH ?= $(SDK_PATH)flasher/ JLINK_PATH ?= D:/MCU/SEGGER/JLink_V612i/ JLINK_GDBSRV ?= JLinkGDBServer.exe #--------------------------- # Default #--------------------------- -# Compilation tools +# Compilation (GCC) tools CROSS_COMPILE = $(GCC_PATH)arm-none-eabi- AR = $(CROSS_COMPILE)ar CC = $(CROSS_COMPILE)gcc @@ -25,20 +23,15 @@ SIZE = $(CROSS_COMPILE)size OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump +# Binary tools +TOOLS_PATH ?= $(SDK_PATH)../tools/ + +# openocd tools +OPENOCD ?= $(OPENOCD_PATH)openocd + # TARGET dirs TARGET ?= build OBJ_DIR ?= $(TARGET)/obj BIN_DIR ?= $(TARGET)/bin ELFFILE ?= $(OBJ_DIR)/$(TARGET).axf -# Make bunary tools -ifneq ($(shell uname), Linux) -EXE = .exe -endif -PICK = $(TOOLS_PATH)pick$(EXE) -PADDING = $(TOOLS_PATH)padding$(EXE) -CHCKSUM = $(TOOLS_PATH)checksum$(EXE) - -# openocd tools -OPENOCD = $(OPENOCD_PATH)openocd - diff --git a/RTL00_SDKV35a/sdkset.mk b/RTL00_SDKV35a/sdkset.mk index 0a82017..4bf3abb 100644 --- a/RTL00_SDKV35a/sdkset.mk +++ b/RTL00_SDKV35a/sdkset.mk @@ -47,7 +47,7 @@ mp: LIBS +=_rtsp _usbh _usbd endif # m c nosys gcc -PATHLIBS = sdk/component/soc/realtek/8195a/misc/bsp/lib/common/gcc +PATHLIBS = sdk/component/soc/realtek/8195a/misc/bsp/lib/common/GCC ifdef USE_SDRAM CFLAGS += -DUSE_SDRAM=1 LDFILE ?= rlx8195A-symbol-v04-img3.ld diff --git a/build/bin/ota.bin b/build/bin/ota.bin index d3f2766..1bb7cfe 100644 Binary files a/build/bin/ota.bin and b/build/bin/ota.bin differ diff --git a/build/bin/ram_1.p.bin b/build/bin/ram_1.p.bin deleted file mode 100644 index aa70b60..0000000 Binary files a/build/bin/ram_1.p.bin and /dev/null differ diff --git a/build/bin/ram_2.bin b/build/bin/ram_2.bin index b1bd152..6ef476d 100644 Binary files a/build/bin/ram_2.bin and b/build/bin/ram_2.bin differ diff --git a/build/bin/ram_2.p.bin b/build/bin/ram_2.p.bin index e8ce12c..8684ced 100644 Binary files a/build/bin/ram_2.p.bin and b/build/bin/ram_2.p.bin differ diff --git a/build/bin/ram_all.bin b/build/bin/ram_all.bin index 58cb310..2fe853c 100644 Binary files a/build/bin/ram_all.bin and b/build/bin/ram_all.bin differ diff --git a/project.mk b/project.mk index bad3745..4e5805d 100644 --- a/project.mk +++ b/project.mk @@ -51,5 +51,3 @@ ADD_SRC_C += project/src/driver/i2s_freertos.c #include INCLUDES += project/inc/mad - - diff --git a/tools/rtlaimage/make_windows_exe.bat b/tools/rtlaimage/make_windows_exe.bat index bd67152..e4b4b55 100644 --- a/tools/rtlaimage/make_windows_exe.bat +++ b/tools/rtlaimage/make_windows_exe.bat @@ -1,6 +1,7 @@ rem pip install wheel rem pip install pyinstaller pyinstaller -c --onedir --onefile -n rtlaimage rtlaimage.py -copy /b dist\rtlaimage.exe ..\..\RTL00_SDKV35a\component\soc\realtek\8195a\misc\iar_utility\common\tools\rtlaimage.exe +rem copy /b dist\rtlaimage.exe ..\..\RTL00_SDKV35a\component\soc\realtek\8195a\misc\iar_utility\common\tools\rtlaimage.exe +copy /b dist\rtlaimage.exe .\ del /Q rtlaimage.spec rm -rf dist build diff --git a/userset.mk b/userset.mk index 5960ab6..d4fc45c 100644 --- a/userset.mk +++ b/userset.mk @@ -5,7 +5,7 @@ SDK_PATH = RTL00_SDKV35a/ #GCC_PATH = d:/MCU/GNU_Tools_ARM_Embedded/6.2017-q1-update/bin/# + or set in PATH #OPENOCD_PATH = D:/MCU/OpenOCD/bin/# + or set in PATH -TOOLS_PATH ?= $(SDK_PATH)component/soc/realtek/8195a/misc/iar_utility/common/tools/ +#TOOLS_PATH ?= $(SDK_PATH)component/soc/realtek/8195a/misc/iar_utility/common/tools/ FLASHER_TYPE = Jlink #FLASHER_TYPE = cmsis-dap FLASHER_SPEED = 3500