March 2025 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ccid-firmware[master]: fix some warnings and add some warning flags

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39448?usp=email ) Change subject: fix some warnings and add some warning flags ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I55e1de7fe8428a5c6cdf741cdc0ae7c47aa7c8d8 Gerrit-Change-Number: 39448 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Mar 2025 15:02:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

[S] Change in osmo-ccid-firmware[master]: add ext power detect & dev reset

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39447?usp=email ) Change subject: add ext power detect & dev reset ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39447?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ied62450670dba2227daa96cbcd162cfe8414445a Gerrit-Change-Number: 39447 Gerrit-PatchSet: 11 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Mar 2025 15:02:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

[M] Change in osmo-ccid-firmware[master]: fix usb usb reset handling by delayed soft reset

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39445?usp=email ) Change subject: fix usb usb reset handling by delayed soft reset ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I0939930a42f3009abf7e670561a123963bbd3845 Gerrit-Change-Number: 39445 Gerrit-PatchSet: 7 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Mar 2025 15:02:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

[M] Change in osmo-asf4-dfu[master]: contrib: add nvm urow parser ipynb

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39436?usp=email ) ( 7 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: contrib: add nvm urow parser ipynb ...................................................................... contrib: add nvm urow parser ipynb Useful when dealing with the urow bits for wdt, bootprot, .. Change-Id: I588838d7c33be24636e00cec65c3b485a486f747 --- A contrib/same54_urow.ipynb 1 file changed, 135 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/same54_urow.ipynb b/contrib/same54_urow.ipynb new file mode 100644 index 0000000..3069475 --- /dev/null +++ b/contrib/same54_urow.ipynb @@ -0,0 +1,135 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 5, + "metadata": {}, + "outputs": [], + "source": [ + "# Memory dump from GDB\n", + "# (gdb) x/512xb 0x00804000\n", + "memory_dump = \"\"\"\n", + "0x804000: 0x39 0x92 0x9a 0xfe 0x80 0xff 0xc0 0xee\n", + "0x804008: 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff\n", + "0x804010: 0x10 0x40 0x80 0x00 0xff 0xff 0xff 0xff\n", + "0x804018: 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff\n", + "0x804020: 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff\n", + "0x804028: 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff\n", + "0x804030: 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff\n", + "0x804038: 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff\n", + "\"\"\"" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "import struct\n", + "\n", + "DEFAULTS = {\n", + "\t'BOD33 Disable': 0x1,\n", + "\t'BOD33 Level': 0x1C,\n", + "\t'BOD33 Action': 0x1,\n", + "\t'BOD33 Hysteresis': 0x2,\n", + "\t'NVM BOOTPROT': 0xF,\n", + "\t'SBLK': 0x0,\n", + "\t'PSZ': 0x0,\n", + "\t'RAM ECCDIS': 0x1,\n", + "\t'WDT Enable': 0x0,\n", + "\t'WDT Always-On': 0x0,\n", + "\t'WDT Period': 0xB,\n", + "\t'WDT Window': 0xB,\n", + "\t'WDT EWOFFSET': 0xB,\n", + "\t'WDT WEN': 0x0,\n", + "\t'NVM LOCKS': 0xFFFFFFFF\n", + "}\n", + "\n", + "# def extract_bits(value, offset, mask):\n", + "# \treturn (value >> offset) & mask\n", + "\n", + "def extract_bits(value, start, end):\n", + "\tmask = (1 << (end - start + 1)) - 1\n", + "\treturn (value >> start) & mask\n", + "\n", + "\n", + "def decode_user_row(memory_dump):\n", + "\t# Extract only the hexadecimal values from the memory dump\n", + "\thex_values = ''.join(line.split(':')[1].strip().replace(' ', '') for line in memory_dump.strip().split('\\n'))\n", + "\thex_values = hex_values.replace('0x', '').replace('\\n', '')\n", + "\t\n", + "\t# Convert the cleaned hex string to bytes\n", + "\tmemory_bytes = bytes.fromhex(hex_values)\n", + "\t\n", + "\t# Convert bytes to 32-bit words\n", + "\t# words = struct.unpack('<8I', memory_bytes[:32])\n", + "\twords = struct.unpack('<8I', memory_bytes[:32])\n", + "\t\n", + "\tsettings = {\n", + "\t\t'BOD33 Disable': extract_bits(words[0], 0, 0),\n", + "\t\t'BOD33 Level': extract_bits(words[0], 1, 8),\n", + "\t\t'BOD33 Action': extract_bits(words[0], 9, 10),\n", + "\t\t'BOD33 Hysteresis': extract_bits(words[0], 11, 14),\n", + "\t\t'BOD12 Calibration': extract_bits(words[0], 15, 25),\n", + "\t\t'NVM BOOTPROT': extract_bits(words[0], 26, 29),\n", + "\t\t'SBLK': extract_bits(words[1], 0, 3),\n", + "\t\t'PSZ': extract_bits(words[1], 4, 6),\n", + "\t\t'RAM ECCDIS': extract_bits(words[1], 7, 7),\n", + "\t\t'WDT Enable': extract_bits(words[1], 16, 16),\n", + "\t\t'WDT Always-On': extract_bits(words[1], 17, 17),\n", + "\t\t'WDT Period': extract_bits(words[1], 18, 21),\n", + "\t\t'WDT Window': extract_bits(words[1], 22, 25),\n", + "\t\t'WDT EWOFFSET': extract_bits(words[1], 26, 29),\n", + "\t\t'WDT WEN': extract_bits(words[1], 30, 30),\n", + "\t\t'NVM LOCKS': words[2],\n", + "\t\t'User Page': words[3]\n", + "\t}\n", + "\treturn settings\n", + "\n", + "\n", + "\n", + "def display_user_row_settings(settings):\n", + "\tprint(\"SAME54 User Row Settings (Current vs Default):\")\n", + "\tprint(\"-\" * 50)\n", + "\tfor key, value in settings.items():\n", + "\t\tif key in DEFAULTS:\n", + "\t\t\tif value != DEFAULTS[key]:\n", + "\t\t\t\tprint(f\"{key:15}: 0x{value:X} (Default: 0x{DEFAULTS[key]:X}) *DIFFERENT*\")\n", + "\t\t\telse:\n", + "\t\t\t\tprint(f\"{key:15}: 0x{value:X} (Default: 0x{DEFAULTS[key]:X})\")\n", + "\t\telse:\n", + "\t\t\tprint(f\"{key:15}: 0x{value:X}\")\n", + "\n", + "\n", + "\n", + "# Decode the memory dump\n", + "decoded_settings = decode_user_row(memory_dump)\n", + "\n", + "# Display the formatted settings\n", + "display_user_row_settings(decoded_settings)\n" + ] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.12.3" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I588838d7c33be24636e00cec65c3b485a486f747 Gerrit-Change-Number: 39436 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

3 months, 3 weeks

1
0
0 0

[L] Change in osmo-asf4-dfu[master]: add fw update crcstub

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39437?usp=email ) Change subject: add fw update crcstub ...................................................................... add fw update crcstub Adds a crc stub that lives in front of the dfu bl updater app and checks it. The whole process is somewhat complicated to ensure we end up not just with a firmware file that contains the right crc for the right offsets, but the elf file is updated as well, to ensure the result is debuggable as-is. The stub is built as part of the firmware code, and ends up in its own section. Linker script padding and alignment ensures that this works. Change-Id: I39eae7aaafd5531db6ce48837c9499432caadbed --- A crc_code.c A crc_params.c M gcc/Makefile M gcc/gcc/same54p20a_dfu.ld M gcc/gcc/same54p20a_flash.ld M gcc/gcc/startup_same54.c M usb_dfu_main.c M usb_flash_main.c M usb_start.c 9 files changed, 246 insertions(+), 104 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/crc_code.c b/crc_code.c new file mode 100644 index 0000000..a48229f --- /dev/null +++ b/crc_code.c @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2024 sysmocom -s.f.m.c. GmbH, Author: Eric Wild <ewild(a)sysmocom.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#include <stdint.h> +#ifndef HOST_TOOL +#include "atmel_start.h" + +#ifdef __clang__ +#define OPTNONE optnone +#else +#define OPTNONE optimize("O0") +#endif + +extern void _Reset_Handler(void); + +__attribute__((used, section(".crc_code"))) +#endif +static uint32_t +calculate_crc(const uint8_t *data, uint32_t length) +{ + uint32_t crc = 0xFFFFFFFF; + for (uint32_t i = 0; i < length; i++) { + crc ^= data[i]; + for (uint8_t j = 0; j < 8; j++) { + crc = (crc & 1) ? (crc >> 1) ^ 0xEDB88320 : crc >> 1; + } + } + return ~crc; +} + +#ifndef HOST_TOOL +__attribute__((used, section(".crc_code"), OPTNONE)) void Reset_Handler(void) +{ + extern uint32_t __CRC_Checksum; + extern uint32_t __CRC_Start; + extern uint32_t __CRC_End; + extern int main(void); + + /* + the old BL will unfortunately enable usb even when booting and not doing dfu.. + we must reset it here, or the host will get really unhappy trying to talk to the "attached" + dev and reset the bus... + */ + USB->DEVICE.CTRLA.reg = 0x1; + + uint32_t length = (uint32_t)&__CRC_End - (uint32_t)&__CRC_Start; + uint32_t calculated_crc = calculate_crc((uint8_t *)&__CRC_Start, length); + uint32_t expected_crc = *(uint32_t *)&__CRC_Checksum; + + if (calculated_crc != expected_crc) { + static volatile uint32_t *dfu_magic = (uint32_t *)HSRAM_ADDR; + *dfu_magic = 0x44465521; + + /* Reset the device if CRC does not match */ + __DSB(); + SCB->AIRCR = (uint32_t)((0x5FAUL << SCB_AIRCR_VECTKEY_Pos) | (SCB->AIRCR & SCB_AIRCR_PRIGROUP_Msk) | + SCB_AIRCR_SYSRESETREQ_Msk); + __DSB(); + } + + /* Proceed to main application */ + // main(); + _Reset_Handler(); + + /* Infinite loop if main returns */ + while (1) + ; +} +#endif + +#ifdef HOST_TOOL +#include <stdio.h> +#include <stdlib.h> + +/* Usage: ./tool <binary_file> <start_offset_hex> <length_hex> + - start_offset_hex and length_hex are hex values indicating where to calculate the CRC. +*/ +int main(int argc, char *argv[]) +{ + if (argc != 4) { + fprintf(stderr, "Usage: %s <binary_file> <start_offset_hex> <length_hex>\n", argv[0]); + return 1; + } + + const char *filename = argv[1]; + uint32_t start_offset = strtoul(argv[2], NULL, 10); + uint32_t length = strtoul(argv[3], NULL, 10); + + FILE *f = fopen(filename, "rb"); + if (!f) { + perror("fopen"); + return 1; + } + + // Seek to start_offset + if (fseek(f, (long)start_offset, SEEK_SET) != 0) { + perror("fseek"); + fclose(f); + return 1; + } + + uint8_t *buf = (uint8_t *)malloc(length); + if (!buf) { + fprintf(stderr, "Memory allocation error\n"); + fclose(f); + return 1; + } + + size_t read_bytes = fread(buf, 1, length, f); + fclose(f); + + if (read_bytes != length) { + fprintf(stderr, "Error reading file or not enough data\n"); + free(buf); + return 1; + } + + uint32_t crc = calculate_crc(buf, length); + free(buf); + + printf("%08X\n", crc); + return 0; +} +#endif diff --git a/crc_params.c b/crc_params.c new file mode 100644 index 0000000..032c71e --- /dev/null +++ b/crc_params.c @@ -0,0 +1,5 @@ +#include <stdint.h> + +__attribute__((used, section(".crc_par"))) const uint32_t __CRC_Checksum = 0xFFFFFFFF; /* Placeholder */ +// __attribute__((used, section(".crc_par"))) const uint32_t __CRC_Start = 0xFFFFFFFF; /* Placeholder */ +// __attribute__((used, section(".crc_par"))) const uint32_t __CRC_End = 0xFFFFFFFF; /* Placeholder */ diff --git a/gcc/Makefile b/gcc/Makefile index 2df931e..7813750 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -1,62 +1,18 @@ -################################################################################ -# User configuration. Can be edited -################################################################################ - -# Set for which board the bootloader should be compiled -# run `make clean` for the change to be effective # possible values: SAME54_XPLAINED_PRO, SYSMOOCTSIM +SHELL := /bin/bash BOARD ?= SYSMOOCTSIM +CROSSCC ?= arm-none-eabi- +SILENT ?= @ +ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) + +#DBGFLGS = -fdebug-prefix-map=..=$(readlink -f .) +DBGFLGS = -fdebug-prefix-map=..=$(ROOT_DIR)/.. -fno-omit-frame-pointer -ggdb3 -Os # -fdata-sections -fno-common -Wl,--no-undefined -Wl,--strip-discarded #-Wl,--gc-debuginfo GIT_VERSION=$(shell ../git-version-gen $(TOP)/.tarvers) +DBGFLGS += -DGIT_VERSION=\"$(GIT_VERSION)\" -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ +MK_DIR = mkdir -p -ifdef SystemRoot - SHELL = cmd.exe - MK_DIR = mkdir -else - ifeq ($(shell uname), Linux) - MK_DIR = mkdir -p - endif - - ifeq ($(shell uname | cut -d _ -f 1), CYGWIN) - MK_DIR = mkdir -p - endif - - ifeq ($(shell uname | cut -d _ -f 1), MINGW32) - MK_DIR = mkdir -p - endif - - ifeq ($(shell uname | cut -d _ -f 1), MINGW64) - MK_DIR = mkdir -p - endif -endif - -# List the subdirectories for creating object files -SUB_DIRS += \ - \ -hpl/pm \ -gcc \ -hpl/osc32kctrl \ -hpl/ramecc \ -hpl/dmac \ -usb/class/dfu/device \ -hal/src \ -hpl/mclk \ -usb \ -hal/utils/src \ -hpl/gclk \ -usb/device \ -hpl/oscctrl \ -gcc/gcc \ -hpl/nvmctrl \ -hpl/usb \ -hpl/core \ -hpl/cmcc - -# List the object files OBJS += \ hal/src/hal_io.o \ hpl/core/hpl_core_m4.o \ @@ -92,6 +48,18 @@ usb/device/usbdc.o \ hal/src/hal_atomic.o +SRC_hosttools = crc_code.c +SRC_dfu = usb_dfu_main.c crc_code.c crc_params.c +SRC_flash = usb_flash_main.c + +OBJ_dfu := $(SRC_dfu:.c=.o) +OBJ_flash := $(SRC_flash:.c=.o) + +DFU_DEPS := $(OBJ_dfu:.o=.d) +FLASH_DEPS := $(OBJ_flash:.o=.d) + + +SUB_DIRS := $(sort $(dir $(OBJS))) DEPS := $(OBJS:%.o=%.d) OBJS_AS_ARGS = $(patsubst %,"%",$(OBJS)) DEPS_AS_ARGS = $(patsubst %,"%",$(DEPS)) @@ -99,64 +67,81 @@ BOARD_LC := $(shell echo $(BOARD) | tr A-Z a-z) OUTPUT_FILE_NAME := bootloader-$(BOARD_LC)-$(GIT_VERSION) QUOTE := " -# OUTPUT_FILE_PATH +=$(OUTPUT_FILE_NAME).elf -#OUTPUT_FILE_PATH_AS_ARGS +=$(OUTPUT_FILE_NAME).elf -BLSIZE_DEF := -D$(QUOTE)$(shell sed 's/;//g' gcc/blsize.ld | tr -d ' ')$(QUOTE) - -# .PHONY MAIN_dfu MAIN_flash -# MAIN_%: -# = usb_dfu_main.o +BLSZ = $(shell sed 's/;//g' gcc/blsize.ld | tr -d ' ' | cut -d '=' -f2) +CALC_BLSZ = $(shell echo $$(( $(BLSZ) ))) +$(info blsize is $(CALC_BLSZ)) +BLSIZE_DEF := -D$(QUOTE)BL_SIZE_BYTE=$(CALC_BLSZ)$(QUOTE) vpath %.c ../ vpath %.s ../ vpath %.S ../ -.PHONY: clean-dfu clean-flash +.PHONY: clean-dfu clean-flash hosttools -all: $(SUB_DIRS) dfu-merge +all: $(SUB_DIRS) hosttools dfu-merge + +hosttools: + $(CC) -DHOST_TOOL ../$(SRC_hosttools) -o crctool dfu-merge: $(OUTPUT_FILE_NAME)-dfu $(OUTPUT_FILE_NAME)-dfu: $(OUTPUT_FILE_NAME)-flash -# Linker target - -$(OUTPUT_FILE_NAME)-%: $(OBJS) usb_%_main.o - @echo Building target: $@ +.SECONDEXPANSION: +$(OUTPUT_FILE_NAME)-%: $(OBJS) $$(OBJ_$$*) + @echo Building target: $@ $^ @echo Invoking: ARM/GNU Linker - $(QUOTE)arm-none-eabi-gcc$(QUOTE) -o $(OUTPUT_FILE_NAME)-$*.elf $(OBJS_AS_ARGS) "usb_$*_main.o" \ - -Wl,--no-undefined -Wl,--print-memory-usage -Wl,--strip-discarded -Wl,--start-group -lm -Wl,--end-group -mthumb \ + $(SILENT)$(QUOTE)$(CROSSCC)gcc$(QUOTE) -o $(OUTPUT_FILE_NAME)-$*.elf $(OBJS_AS_ARGS) $(OBJ_$*) \ + $(DBGFLGS) -Wl,--no-undefined -Wl,--print-memory-usage -Wl,--strip-discarded -Wl,--start-group -lm -Wl,--end-group -mthumb \ -Wl,-Map="$(OUTPUT_FILE_NAME)-$*.map" --specs=nano.specs -Wl,--gc-sections -mcpu=cortex-m4 \ -T"../gcc/gcc/same54p20a_$*.ld" \ -L"../gcc/gcc" @echo Finished building target: $@ - "arm-none-eabi-objcopy" -O binary "$(OUTPUT_FILE_NAME)-$*.elf" "$(OUTPUT_FILE_NAME)-$*.bin" -# "arm-none-eabi-objcopy" -O ihex -R .eeprom -R .fuse -R .lock -R .signature "$(OUTPUT_FILE_NAME)-$*.elf" "$(OUTPUT_FILE_NAME)-$*.hex" -# "arm-none-eabi-objcopy" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O binary "$(OUTPUT_FILE_NAME)-$*.elf" "$(OUTPUT_FILE_NAME)-$*.eep" || exit 0 - "arm-none-eabi-objdump" -h -S "$(OUTPUT_FILE_NAME)-$*.elf" > "$(OUTPUT_FILE_NAME)-$*.lss" - "arm-none-eabi-size" "$(OUTPUT_FILE_NAME)-$*.elf" - ln -sf $(OUTPUT_FILE_NAME)-$*.bin bootloader-$(BOARD_LC)-$*.bin - ln -sf $(OUTPUT_FILE_NAME)-$*.elf bootloader-$(BOARD_LC)-$*.elf + $(SILENT)"$(CROSSCC)objcopy" -O binary "$(OUTPUT_FILE_NAME)-$*.elf" "$(OUTPUT_FILE_NAME)-$*.bin" +# $(SILENT)"$(CROSSCC)objcopy" -O ihex -R .eeprom -R .fuse -R .lock -R .signature "$(OUTPUT_FILE_NAME)-$*.elf" "$(OUTPUT_FILE_NAME)-$*.hex" +# $(SILENT)"$(CROSSCC)objcopy" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O binary "$(OUTPUT_FILE_NAME)-$*.elf" "$(OUTPUT_FILE_NAME)-$*.eep" || exit 0 + $(SILENT)"$(CROSSCC)objdump" -h -S "$(OUTPUT_FILE_NAME)-$*.elf" > "$(OUTPUT_FILE_NAME)-$*.lss" + $(SILENT)"$(CROSSCC)size" "$(OUTPUT_FILE_NAME)-$*.elf" + $(SILENT)ln -sf $(OUTPUT_FILE_NAME)-$*.bin bootloader-$(BOARD_LC)-$*.bin + $(SILENT)ln -sf $(OUTPUT_FILE_NAME)-$*.elf bootloader-$(BOARD_LC)-$*.elf .PHONY: dfu-merge dfu-merge: $(info updating updater section with padded bootloader file..) - $(SILENT)dd if=/dev/zero bs=16384 count=1 of=dfu-flash-padded.bin - $(SILENT)dd if=$(OUTPUT_FILE_NAME)-flash.bin conv=notrunc of=dfu-flash-padded.bin - $(SILENT)"arm-none-eabi-objcopy" --update-section .blupdate=dfu-flash-padded.bin $(OUTPUT_FILE_NAME)-dfu.elf - $(SILENT)"arm-none-eabi-objcopy" -O binary $(OUTPUT_FILE_NAME)-dfu.elf $(OUTPUT_FILE_NAME)-dfu.bin - rm dfu-flash-padded.bin + #$(SILENT)dd status=none if=/dev/zero bs=$(CALC_BLSZ) count=1 of=dfu-flash-padded.bin + #$(SILENT)dd status=none if=$(OUTPUT_FILE_NAME)-flash.bin conv=notrunc of=dfu-flash-padded.bin + $(SILENT)cp -a $(OUTPUT_FILE_NAME)-flash.bin dfu-flash-padded.bin + $(SILENT)truncate -s $(CALC_BLSZ) dfu-flash-padded.bin + $(SILENT)"$(CROSSCC)objcopy" --update-section .blupdate=dfu-flash-padded.bin $(OUTPUT_FILE_NAME)-dfu.elf + $(SILENT)"$(CROSSCC)objcopy" -O binary $(OUTPUT_FILE_NAME)-dfu.elf $(OUTPUT_FILE_NAME)-dfu.bin + $(SILENT)rm dfu-flash-padded.bin + + @FLASH_START_ADDR=0x$$($(CROSSCC)nm $(OUTPUT_FILE_NAME)-dfu.elf | grep ' _sfixed$$' | cut -d' ' -f1); \ + CRC_START_ADDR=0x$$($(CROSSCC)nm $(OUTPUT_FILE_NAME)-dfu.elf | grep ' __CRC_Start$$' | cut -d' ' -f1); \ + CRC_END_ADDR=0x$$($(CROSSCC)nm $(OUTPUT_FILE_NAME)-dfu.elf | grep ' _etext$$' | cut -d' ' -f1); \ + CRC_CHECKSUM_ADDR=0x$$($(CROSSCC)nm $(OUTPUT_FILE_NAME)-dfu.elf | grep ' __CRC_Checksum$$' | cut -d' ' -f1); \ + echo $$CRC_START_ADDR $$CRC_END_ADDR $$CRC_CHECKSUM_ADDR; \ + CRC_START_OFFSET=$$(($$CRC_START_ADDR - $$FLASH_START_ADDR)); \ + CRC_END_OFFSET=$$(($$CRC_END_ADDR - $$FLASH_START_ADDR)); \ + CRC_CHECKSUM_OFFSET=$$(($$CRC_CHECKSUM_ADDR - $$FLASH_START_ADDR)); \ + LENGTH=$$(($$CRC_END_OFFSET - $$CRC_START_OFFSET)); \ + CRC_HEX=$$(./crctool $(OUTPUT_FILE_NAME)-dfu.bin $$CRC_START_OFFSET $$LENGTH ); \ + echo len $$LENGTH : $$CRC_START_OFFSET-$$CRC_END_OFFSET, crco: $$CRC_CHECKSUM_OFFSET, start: $$CRC_START_ADDR crcval: $$CRC_HEX; \ + [ $$(($$CRC_START_OFFSET - $$CRC_CHECKSUM_OFFSET)) -ne 4 ] && exit 1; \ + printf $$CRC_HEX | xxd -r -p | xxd -e | xxd -r | dd of=$(OUTPUT_FILE_NAME)-dfu.bin bs=1 seek=$$CRC_CHECKSUM_OFFSET conv=notrunc 2>/dev/null; \ + xxd -s $$(($$CRC_START_ADDR - $$FLASH_START_ADDR -4)) -l 4 -g 1 $(OUTPUT_FILE_NAME)-dfu.bin; \ + "$(CROSSCC)objcopy" -O binary --only-section=.text $(OUTPUT_FILE_NAME)-dfu.elf section_text.bin; \ + printf $$CRC_HEX | xxd -r -p | xxd -e | xxd -r | dd of=section_text.bin bs=1 seek=$$CRC_CHECKSUM_OFFSET conv=notrunc 2>/dev/null; \ + xxd -s $$(($$CRC_START_ADDR - $$FLASH_START_ADDR -4)) -l 4 -g 1 section_text.bin; \ + "$(CROSSCC)objcopy" --update-section .text=section_text.bin $(OUTPUT_FILE_NAME)-dfu.elf; + # Compiler targets - - - - %.o: %.c @echo Building file: $< @echo ARM/GNU C Compiler - $(QUOTE)arm-none-eabi-gcc$(QUOTE) -x c -mthumb -DDEBUG -Os -ffunction-sections -mlong-calls -g3 -Wall -c -std=gnu99 \ + $(QUOTE)$(CROSSCC)gcc$(QUOTE) $(DBGFLGS) -x c -Wstringop-truncation -Wformat-truncation -mthumb -DDEBUG -ffunction-sections -mlong-calls -Wall -c -std=gnu99 \ $(BLSIZE_DEF) -D__SAME54P19A__ -D$(BOARD) -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 \ -I"../" -I"../config" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -I"../hpl/nvmctrl" -I"../hpl/osc32kctrl" -I"../hpl/oscctrl" -I"../hpl/pm" -I"../hpl/port" -I"../hpl/ramecc" -I"../hpl/usb" -I"../hri" -I"../" -I"../config" -I"../usb" -I"../usb/class/dfu" -I"../usb/class/dfu/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @@ -165,7 +150,7 @@ %.o: %.s @echo Building file: $< @echo ARM/GNU Assembler - $(QUOTE)arm-none-eabi-as$(QUOTE) -x c -mthumb -DDEBUG -Os -ffunction-sections -mlong-calls -g3 -Wall -c -std=gnu99 \ + $(QUOTE)$(CROSSCC)as$(QUOTE) $(DBGFLGS) -x c -mthumb -DDEBUG -ffunction-sections -mlong-calls -Wall -c -std=gnu99 \ $(BLSIZE_DEF) -D__SAME54P19A__ -D$(BOARD) -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 \ -I"../" -I"../config" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -I"../hpl/nvmctrl" -I"../hpl/osc32kctrl" -I"../hpl/oscctrl" -I"../hpl/pm" -I"../hpl/port" -I"../hpl/ramecc" -I"../hpl/usb" -I"../hri" -I"../" -I"../config" -I"../usb" -I"../usb/class/dfu" -I"../usb/class/dfu/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @@ -174,7 +159,7 @@ %.o: %.S @echo Building file: $< @echo ARM/GNU Preprocessing Assembler - $(QUOTE)arm-none-eabi-gcc$(QUOTE) -x c -mthumb -DDEBUG -Os -ffunction-sections -mlong-calls -g3 -Wall -c -std=gnu99 \ + $(QUOTE)$(CROSSCC)gcc$(QUOTE) $(DBGFLGS) -x c -mthumb -DDEBUG -ffunction-sections -mlong-calls -Wall -c -std=gnu99 \ $(BLSIZE_DEF) -D__SAME54P19A__ -D$(BOARD) -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 \ -I"../" -I"../config" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -I"../hpl/nvmctrl" -I"../hpl/osc32kctrl" -I"../hpl/oscctrl" -I"../hpl/pm" -I"../hpl/port" -I"../hpl/ramecc" -I"../hpl/usb" -I"../hri" -I"../" -I"../config" -I"../usb" -I"../usb/class/dfu" -I"../usb/class/dfu/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @@ -184,7 +169,8 @@ ifneq ($(MAKECMDGOALS),clean) ifneq ($(strip $(DEPS)),) -include $(DEPS) --include usb_flash_main.d usb_dfu_main.d +-include $(DFU_DEPS) +-include $(FLASH_DEPS) endif endif @@ -192,20 +178,13 @@ $(MK_DIR) "$@" clean-%: - rm -f $(OBJS_AS_ARGS) - # rm -f $(OUTPUT_FILE_PATH) - rm -f $(DEPS_AS_ARGS) rm -f $(OUTPUT_FILE_NAME)-$*.a $(OUTPUT_FILE_NAME)-$*.hex $(OUTPUT_FILE_NAME)-$*.bin \ $(OUTPUT_FILE_NAME)-$*.lss $(OUTPUT_FILE_NAME)-$*.eep $(OUTPUT_FILE_NAME)-$*.map \ $(OUTPUT_FILE_NAME)-$*.srec bootloader-$(BOARD_LC)-$*.bin bootloader-$(BOARD_LC)-$*.elf clean: clean-dfu clean-flash rm -f $(OBJS_AS_ARGS) - # rm -f $(OUTPUT_FILE_PATH) rm -f $(DEPS_AS_ARGS) - # rm -f $(OUTPUT_FILE_NAME).a $(OUTPUT_FILE_NAME).hex $(OUTPUT_FILE_NAME).bin \ - # $(OUTPUT_FILE_NAME).lss $(OUTPUT_FILE_NAME).eep $(OUTPUT_FILE_NAME).map \ - # $(OUTPUT_FILE_NAME).srec bootloader-$(BOARD_LC).bin bootloader-$(BOARD_LC).elf mrproper: clean rm -f *.o *.d *.a *.elf *.bin *.hex *.ihex *.eep *.lss *.map *.srec diff --git a/gcc/gcc/same54p20a_dfu.ld b/gcc/gcc/same54p20a_dfu.ld index 532e32a..17642a2 100644 --- a/gcc/gcc/same54p20a_dfu.ld +++ b/gcc/gcc/same54p20a_dfu.ld @@ -54,6 +54,10 @@ . = ALIGN(4); _sfixed = .; KEEP(*(.vectors .vectors.*)) + KEEP(*(.crc_code)) /* CRC checking code */ + KEEP(*(.crc_par)) /* CRC parameters */ + . = ALIGN(4); + __CRC_Start = ORIGIN(rom) + .; *(.text .text.* .gnu.linkonce.t.*) *(.glue_7t) *(.glue_7) *(.rodata .rodata* .gnu.linkonce.r.*) @@ -96,14 +100,14 @@ . = ALIGN(4); _efixed = .; /* End of text section */ - } > rom + } > rom = 0xff /* .ARM.exidx is sorted, so has to go in its own output section. */ PROVIDE_HIDDEN (__exidx_start = .); .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > rom + } > rom = 0xff PROVIDE_HIDDEN (__exidx_end = .); .blupdate : @@ -112,10 +116,11 @@ _blupdate_start = .; KEEP(*(.fwupdate .fwupdate.*)); _blupdate_end = .; - } > rom + } > rom = 0xff . = ALIGN(4); _etext = .; + __CRC_End = .; .relocate : AT (_etext) { diff --git a/gcc/gcc/same54p20a_flash.ld b/gcc/gcc/same54p20a_flash.ld index f2c5124..a3d94a5 100644 --- a/gcc/gcc/same54p20a_flash.ld +++ b/gcc/gcc/same54p20a_flash.ld @@ -96,14 +96,14 @@ . = ALIGN(4); _efixed = .; /* End of text section */ - } > rom + } > rom = 0xff /* .ARM.exidx is sorted, so has to go in its own output section. */ PROVIDE_HIDDEN (__exidx_start = .); .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > rom + } > rom = 0xff PROVIDE_HIDDEN (__exidx_end = .); . = ALIGN(4); @@ -162,4 +162,11 @@ . = ALIGN(4); _end = . ; + + /DISCARD/ : + { + *(.crc_code*) + *(.crc_par*) + } + } diff --git a/gcc/gcc/startup_same54.c b/gcc/gcc/startup_same54.c index 3bdd4c4..710efe8 100644 --- a/gcc/gcc/startup_same54.c +++ b/gcc/gcc/startup_same54.c @@ -668,7 +668,7 @@ ; } -__attribute__((naked,noreturn)) void Reset_Handler(void) +__attribute__((naked, noreturn, weak)) void Reset_Handler(void) { // errata 2.6.10, do not remove this, ever. // WDT->CTRLA.reg = 0; diff --git a/usb_dfu_main.c b/usb_dfu_main.c index a5b2343..dca428f 100644 --- a/usb_dfu_main.c +++ b/usb_dfu_main.c @@ -25,7 +25,7 @@ #ifdef __clang__ #define OPTNONE optnone #else -#define OPTNONE optimize(0) +#define OPTNONE optimize("O0") #endif #define BLSZ_BYTE (BL_SIZE_BYTE) diff --git a/usb_flash_main.c b/usb_flash_main.c index 19d447a..c78c55c 100644 --- a/usb_flash_main.c +++ b/usb_flash_main.c @@ -20,6 +20,7 @@ */ #include <errno.h> +#include <stdio.h> #include "atmel_start.h" #include "atmel_start_pins.h" #include "hpl_user_area.h" @@ -121,8 +122,9 @@ } char sernr_buf[16 * 2 + 1]; -//unicode for descriptor -uint8_t sernr_buf_descr[1 + 1 + 16 * 2 * 2]; +char product_buf[] = "sysmoOCTSIM DFU-" GIT_VERSION; +uint8_t __attribute__((aligned(16))) sernr_buf_descr[1 + 1 + 16 * 2 * 2]; +uint8_t __attribute__((aligned(16))) product_buf_descr[1 + 1 + (sizeof(product_buf) - 1) * 2]; #endif int main(void) @@ -131,6 +133,7 @@ #if defined(SYSMOOCTSIM) get_chip_unique_serial_str(sernr_buf, sizeof(sernr_buf)); str_to_usb_desc(sernr_buf, sizeof(sernr_buf), sernr_buf_descr, sizeof(sernr_buf_descr)); + str_to_usb_desc(product_buf, sizeof(product_buf) - 1, product_buf_descr, sizeof(product_buf_descr)); #endif // errata 2.6.10, do not remove this, ever. diff --git a/usb_start.c b/usb_start.c index 16b163d..47e287f 100644 --- a/usb_start.c +++ b/usb_start.c @@ -72,6 +72,8 @@ } extern uint8_t sernr_buf_descr[]; +extern uint8_t product_buf_descr[]; + /* call-back for every control EP request */ static int32_t string_req_cb(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) { @@ -101,6 +103,8 @@ switch (index) { case CONF_USB_DFUD_ISERIALNUM: return send_str_desc(ep, req, stage, sernr_buf_descr); + case CONF_USB_DFUD_IPRODUCT: + return send_str_desc(ep, req, stage, product_buf_descr); default: return ERR_NOT_FOUND; } -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39437?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I39eae7aaafd5531db6ce48837c9499432caadbed Gerrit-Change-Number: 39437 Gerrit-PatchSet: 13 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

3 months, 3 weeks

1
0
0 0

[XS] Change in osmo-asf4-dfu[master]: gitgnore

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39431?usp=email ) Change subject: gitgnore ...................................................................... gitgnore Change-Id: I95af162a01fb35656e0f9ccc9ce46b59a15c8c34 --- M .gitignore 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index ad0fce7..912ad53 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,8 @@ *.map .gdb_history NOTES +gcc/.cache/* +gcc/crctool +install/* +**/compile_commands.json +.cache/* \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39431?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I95af162a01fb35656e0f9ccc9ce46b59a15c8c34 Gerrit-Change-Number: 39431 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu>

3 months, 3 weeks

1
0
0 0

[S] Change in osmo-asf4-dfu[master]: tame the linter

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39439?usp=email ) Change subject: tame the linter ...................................................................... tame the linter Change-Id: I745b741dedf2c2ed5679c289e70adcb01c750e4d --- A .checkpatch.conf 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.checkpatch.conf b/.checkpatch.conf new file mode 100644 index 0000000..b97ab25 --- /dev/null +++ b/.checkpatch.conf @@ -0,0 +1,17 @@ +--exclude gcc/gcc/.*ld +--exclude CMSIS +--exclude hpl +--exclude hal + +--ignore BRACES_NOT_NECESSARY +--ignore OPEN_BRACE +--ignore FSF_MAILING_ADDRESS +--ignore DOS_LINE_ENDINGS +--ignore FUNCTION_WITHOUT_ARGS +--ignore TRAILING_WHITESPACE +--ignore CODE_INDENT +--ignore SPACING +--ignore POINTER_LOCATION +--ignore INLINE_LOCATION +--ignore LEADING_SPACE +--ignore SUSPECT_CODE_INDENT -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39439?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I745b741dedf2c2ed5679c289e70adcb01c750e4d Gerrit-Change-Number: 39439 Gerrit-PatchSet: 9 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[M] Change in osmo-asf4-dfu[master]: linker scripts: add bl size, fix ram size to 19a part

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39433?usp=email ) Change subject: linker scripts: add bl size, fix ram size to 19a part ...................................................................... linker scripts: add bl size, fix ram size to 19a part Change-Id: Ic2da201b8f95855d05e15ac6ac8461e434593760 --- A gcc/gcc/blsize.ld A gcc/gcc/same54p20a_dfu.ld M gcc/gcc/same54p20a_flash.ld M gcc/gcc/same54p20a_sram.ld 4 files changed, 178 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gcc/gcc/blsize.ld b/gcc/gcc/blsize.ld new file mode 100644 index 0000000..2ef3633 --- /dev/null +++ b/gcc/gcc/blsize.ld @@ -0,0 +1 @@ +BL_SIZE_BYTE = 8192 * 2; \ No newline at end of file diff --git a/gcc/gcc/same54p20a_dfu.ld b/gcc/gcc/same54p20a_dfu.ld new file mode 100644 index 0000000..532e32a --- /dev/null +++ b/gcc/gcc/same54p20a_dfu.ld @@ -0,0 +1,173 @@ +/** + * \file + * + * \brief Linker script for running in internal FLASH on the SAME54P20A + * + * Copyright (c) 2018 Microchip Technology Inc. + * + * \asf_license_start + * + * \page License + * + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the Licence at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * \asf_license_stop + * + */ + +INCLUDE blsize.ld + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +SEARCH_DIR(.) + +/* Memory Spaces Definitions */ +MEMORY +{ + rom (rx) : ORIGIN = 0x00000000 + BL_SIZE_BYTE, LENGTH = 0x00080000 - BL_SIZE_BYTE + /* The first word of the RAM is used for the DFU magic */ + ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00030000 - 4 + bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 + qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 +} + +/* The stack size used by the application. NOTE: you need to adjust according to your application. */ +STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x10000; + +/* Section Definitions */ +SECTIONS +{ + .text : + { + . = ALIGN(4); + _sfixed = .; + KEEP(*(.vectors .vectors.*)) + *(.text .text.* .gnu.linkonce.t.*) + *(.glue_7t) *(.glue_7) + *(.rodata .rodata* .gnu.linkonce.r.*) + *(.ARM.extab* .gnu.linkonce.armextab.*) + + /* Support C constructors, and C destructors in both user code + and the C library. This also provides support for C++ code. */ + . = ALIGN(4); + KEEP(*(.init)) + . = ALIGN(4); + __preinit_array_start = .; + KEEP (*(.preinit_array)) + __preinit_array_end = .; + + . = ALIGN(4); + __init_array_start = .; + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array)) + __init_array_end = .; + + . = ALIGN(4); + KEEP (*crtbegin.o(.ctors)) + KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) + KEEP (*(SORT(.ctors.*))) + KEEP (*crtend.o(.ctors)) + + . = ALIGN(4); + KEEP(*(.fini)) + + . = ALIGN(4); + __fini_array_start = .; + KEEP (*(.fini_array)) + KEEP (*(SORT(.fini_array.*))) + __fini_array_end = .; + + KEEP (*crtbegin.o(.dtors)) + KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*crtend.o(.dtors)) + + . = ALIGN(4); + _efixed = .; /* End of text section */ + } > rom + + /* .ARM.exidx is sorted, so has to go in its own output section. */ + PROVIDE_HIDDEN (__exidx_start = .); + .ARM.exidx : + { + *(.ARM.exidx* .gnu.linkonce.armexidx.*) + } > rom + PROVIDE_HIDDEN (__exidx_end = .); + + .blupdate : + { + . = ALIGN(4); + _blupdate_start = .; + KEEP(*(.fwupdate .fwupdate.*)); + _blupdate_end = .; + } > rom + + . = ALIGN(4); + _etext = .; + + .relocate : AT (_etext) + { + . = ALIGN(4); + _srelocate = .; + *(.ramfunc .ramfunc.*); + *(.data .data.*); + . = ALIGN(4); + _erelocate = .; + } > ram + + .bkupram (NOLOAD): + { + . = ALIGN(8); + _sbkupram = .; + *(.bkupram .bkupram.*); + . = ALIGN(8); + _ebkupram = .; + } > bkupram + + .qspi (NOLOAD): + { + . = ALIGN(8); + _sqspi = .; + *(.qspi .qspi.*); + . = ALIGN(8); + _eqspi = .; + } > qspi + + /* .bss section which is used for uninitialized data */ + .bss (NOLOAD) : + { + . = ALIGN(4); + _sbss = . ; + _szero = .; + *(.bss .bss.*) + *(COMMON) + . = ALIGN(4); + _ebss = . ; + _ezero = .; + } > ram + + /* stack section */ + .stack (NOLOAD): + { + . = ALIGN(8); + _sstack = .; + . = . + STACK_SIZE; + . = ALIGN(8); + _estack = .; + } > ram + + . = ALIGN(4); + _end = . ; +} diff --git a/gcc/gcc/same54p20a_flash.ld b/gcc/gcc/same54p20a_flash.ld index 6aa3fb1..f2c5124 100644 --- a/gcc/gcc/same54p20a_flash.ld +++ b/gcc/gcc/same54p20a_flash.ld @@ -27,6 +27,7 @@ * */ +INCLUDE blsize.ld OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) @@ -35,9 +36,9 @@ /* Memory Spaces Definitions */ MEMORY { - rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00100000 + rom (rx) : ORIGIN = 0x00000000, LENGTH = BL_SIZE_BYTE /* The first word of the RAM is used for the DFU magic */ - ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00040000 - 4 + ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00030000 - 4 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 } diff --git a/gcc/gcc/same54p20a_sram.ld b/gcc/gcc/same54p20a_sram.ld index b3be5b3..5cf354c 100644 --- a/gcc/gcc/same54p20a_sram.ld +++ b/gcc/gcc/same54p20a_sram.ld @@ -35,7 +35,7 @@ /* Memory Spaces Definitions */ MEMORY { - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000 + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 } -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39433?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: Ic2da201b8f95855d05e15ac6ac8461e434593760 Gerrit-Change-Number: 39433 Gerrit-PatchSet: 10 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

3 months, 3 weeks

1
0
0 0

[L] Change in osmo-asf4-dfu[master]: clang-format

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39470?usp=email ) Change subject: clang-format ...................................................................... clang-format pre commit hook -> .git/hooks/pre-commit Change-Id: I9768bc2590ca5306ee19d3276f0953c6b0b6f926 --- A .clang-format A contrib/pre-commit-hook 2 files changed, 547 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..4de65a5 --- /dev/null +++ b/.clang-format @@ -0,0 +1,521 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# clang-format configuration file. Intended for clang-format >= 4. +# +# For more information, see: +# +# Documentation/process/clang-format.rst +# https://clang.llvm.org/docs/ClangFormat.html +# https://clang.llvm.org/docs/ClangFormatStyleOptions.html +# +--- +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +#AlignEscapedNewlines: Left # Unknown to clang-format-4.0 +AlignOperands: true +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: true +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterClass: false + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: true + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + #AfterExternBlock: false # Unknown to clang-format-5.0 + BeforeCatch: false + BeforeElse: false + IndentBraces: false + #SplitEmptyFunction: true # Unknown to clang-format-4.0 + #SplitEmptyRecord: true # Unknown to clang-format-4.0 + #SplitEmptyNamespace: true # Unknown to clang-format-4.0 +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Custom +#BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0 +BreakBeforeTernaryOperators: false +BreakConstructorInitializersBeforeComma: false +#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0 +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: false +ColumnLimit: 120 +CommentPragmas: '^ IWYU pragma:' +#CompactNamespaces: false # Unknown to clang-format-4.0 +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 8 +ContinuationIndentWidth: 8 +Cpp11BracedListStyle: false +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +#FixNamespaceComments: false # Unknown to clang-format-4.0 + +# Taken from: +# git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ \ +# | sed "s,^#define $[^[:space:]]*for_each[^[:space:]]*$(.*$, - '\1'," \ +# | sort | uniq +ForEachMacros: + - 'apei_estatus_for_each_section' + - 'ata_for_each_dev' + - 'ata_for_each_link' + - '__ata_qc_for_each' + - 'ata_qc_for_each' + - 'ata_qc_for_each_raw' + - 'ata_qc_for_each_with_internal' + - 'ax25_for_each' + - 'ax25_uid_for_each' + - '__bio_for_each_bvec' + - 'bio_for_each_bvec' + - 'bio_for_each_integrity_vec' + - '__bio_for_each_segment' + - 'bio_for_each_segment' + - 'bio_for_each_segment_all' + - 'bio_list_for_each' + - 'bip_for_each_vec' + - 'bitmap_for_each_clear_region' + - 'bitmap_for_each_set_region' + - 'blkg_for_each_descendant_post' + - 'blkg_for_each_descendant_pre' + - 'blk_queue_for_each_rl' + - 'bond_for_each_slave' + - 'bond_for_each_slave_rcu' + - 'bpf_for_each_spilled_reg' + - 'btree_for_each_safe128' + - 'btree_for_each_safe32' + - 'btree_for_each_safe64' + - 'btree_for_each_safel' + - 'card_for_each_dev' + - 'cgroup_taskset_for_each' + - 'cgroup_taskset_for_each_leader' + - 'cpufreq_for_each_entry' + - 'cpufreq_for_each_entry_idx' + - 'cpufreq_for_each_valid_entry' + - 'cpufreq_for_each_valid_entry_idx' + - 'css_for_each_child' + - 'css_for_each_descendant_post' + - 'css_for_each_descendant_pre' + - 'device_for_each_child_node' + - 'dma_fence_chain_for_each' + - 'drm_atomic_crtc_for_each_plane' + - 'drm_atomic_crtc_state_for_each_plane' + - 'drm_atomic_crtc_state_for_each_plane_state' + - 'drm_atomic_for_each_plane_damage' + - 'drm_client_for_each_connector_iter' + - 'drm_client_for_each_modeset' + - 'drm_connector_for_each_possible_encoder' + - 'drm_for_each_bridge_in_chain' + - 'drm_for_each_connector_iter' + - 'drm_for_each_crtc' + - 'drm_for_each_encoder' + - 'drm_for_each_encoder_mask' + - 'drm_for_each_fb' + - 'drm_for_each_legacy_plane' + - 'drm_for_each_plane' + - 'drm_for_each_plane_mask' + - 'drm_for_each_privobj' + - 'drm_mm_for_each_hole' + - 'drm_mm_for_each_node' + - 'drm_mm_for_each_node_in_range' + - 'drm_mm_for_each_node_safe' + - 'flow_action_for_each' + - 'for_each_active_dev_scope' + - 'for_each_active_drhd_unit' + - 'for_each_active_iommu' + - 'for_each_available_child_of_node' + - 'for_each_bio' + - 'for_each_board_func_rsrc' + - 'for_each_bvec' + - 'for_each_card_auxs' + - 'for_each_card_auxs_safe' + - 'for_each_card_components' + - 'for_each_card_pre_auxs' + - 'for_each_card_prelinks' + - 'for_each_card_rtds' + - 'for_each_card_rtds_safe' + - 'for_each_cgroup_storage_type' + - 'for_each_child_of_node' + - 'for_each_clear_bit' + - 'for_each_clear_bit_from' + - 'for_each_cmsghdr' + - 'for_each_compatible_node' + - 'for_each_component_dais' + - 'for_each_component_dais_safe' + - 'for_each_comp_order' + - 'for_each_console' + - 'for_each_cpu' + - 'for_each_cpu_and' + - 'for_each_cpu_not' + - 'for_each_cpu_wrap' + - 'for_each_dev_addr' + - 'for_each_dev_scope' + - 'for_each_displayid_db' + - 'for_each_dma_cap_mask' + - 'for_each_dpcm_be' + - 'for_each_dpcm_be_rollback' + - 'for_each_dpcm_be_safe' + - 'for_each_dpcm_fe' + - 'for_each_drhd_unit' + - 'for_each_dss_dev' + - 'for_each_efi_handle' + - 'for_each_efi_memory_desc' + - 'for_each_efi_memory_desc_in_map' + - 'for_each_element' + - 'for_each_element_extid' + - 'for_each_element_id' + - 'for_each_endpoint_of_node' + - 'for_each_evictable_lru' + - 'for_each_fib6_node_rt_rcu' + - 'for_each_fib6_walker_rt' + - 'for_each_free_mem_pfn_range_in_zone' + - 'for_each_free_mem_pfn_range_in_zone_from' + - 'for_each_free_mem_range' + - 'for_each_free_mem_range_reverse' + - 'for_each_func_rsrc' + - 'for_each_hstate' + - 'for_each_if' + - 'for_each_iommu' + - 'for_each_ip_tunnel_rcu' + - 'for_each_irq_nr' + - 'for_each_link_codecs' + - 'for_each_link_platforms' + - 'for_each_lru' + - 'for_each_matching_node' + - 'for_each_matching_node_and_match' + - 'for_each_member' + - 'for_each_memblock' + - 'for_each_memblock_type' + - 'for_each_memcg_cache_index' + - 'for_each_mem_pfn_range' + - 'for_each_mem_range' + - 'for_each_mem_range_rev' + - 'for_each_migratetype_order' + - 'for_each_msi_entry' + - 'for_each_msi_entry_safe' + - 'for_each_net' + - 'for_each_net_continue_reverse' + - 'for_each_netdev' + - 'for_each_netdev_continue' + - 'for_each_netdev_continue_rcu' + - 'for_each_netdev_continue_reverse' + - 'for_each_netdev_feature' + - 'for_each_netdev_in_bond_rcu' + - 'for_each_netdev_rcu' + - 'for_each_netdev_reverse' + - 'for_each_netdev_safe' + - 'for_each_net_rcu' + - 'for_each_new_connector_in_state' + - 'for_each_new_crtc_in_state' + - 'for_each_new_mst_mgr_in_state' + - 'for_each_new_plane_in_state' + - 'for_each_new_private_obj_in_state' + - 'for_each_node' + - 'for_each_node_by_name' + - 'for_each_node_by_type' + - 'for_each_node_mask' + - 'for_each_node_state' + - 'for_each_node_with_cpus' + - 'for_each_node_with_property' + - 'for_each_of_allnodes' + - 'for_each_of_allnodes_from' + - 'for_each_of_cpu_node' + - 'for_each_of_pci_range' + - 'for_each_old_connector_in_state' + - 'for_each_old_crtc_in_state' + - 'for_each_old_mst_mgr_in_state' + - 'for_each_oldnew_connector_in_state' + - 'for_each_oldnew_crtc_in_state' + - 'for_each_oldnew_mst_mgr_in_state' + - 'for_each_oldnew_plane_in_state' + - 'for_each_oldnew_plane_in_state_reverse' + - 'for_each_oldnew_private_obj_in_state' + - 'for_each_old_plane_in_state' + - 'for_each_old_private_obj_in_state' + - 'for_each_online_cpu' + - 'for_each_online_node' + - 'for_each_online_pgdat' + - 'for_each_pci_bridge' + - 'for_each_pci_dev' + - 'for_each_pci_msi_entry' + - 'for_each_populated_zone' + - 'for_each_possible_cpu' + - 'for_each_present_cpu' + - 'for_each_prime_number' + - 'for_each_prime_number_from' + - 'for_each_process' + - 'for_each_process_thread' + - 'for_each_property_of_node' + - 'for_each_registered_fb' + - 'for_each_reserved_mem_region' + - 'for_each_rtd_codec_dai' + - 'for_each_rtd_codec_dai_rollback' + - 'for_each_rtd_components' + - 'for_each_set_bit' + - 'for_each_set_bit_from' + - 'for_each_set_clump8' + - 'for_each_sg' + - 'for_each_sg_dma_page' + - 'for_each_sg_page' + - 'for_each_sibling_event' + - 'for_each_subelement' + - 'for_each_subelement_extid' + - 'for_each_subelement_id' + - '__for_each_thread' + - 'for_each_thread' + - 'for_each_wakeup_source' + - 'for_each_zone' + - 'for_each_zone_zonelist' + - 'for_each_zone_zonelist_nodemask' + - 'fwnode_for_each_available_child_node' + - 'fwnode_for_each_child_node' + - 'fwnode_graph_for_each_endpoint' + - 'gadget_for_each_ep' + - 'genradix_for_each' + - 'genradix_for_each_from' + - 'hash_for_each' + - 'hash_for_each_possible' + - 'hash_for_each_possible_rcu' + - 'hash_for_each_possible_rcu_notrace' + - 'hash_for_each_possible_safe' + - 'hash_for_each_rcu' + - 'hash_for_each_safe' + - 'hctx_for_each_ctx' + - 'hlist_bl_for_each_entry' + - 'hlist_bl_for_each_entry_rcu' + - 'hlist_bl_for_each_entry_safe' + - 'hlist_for_each' + - 'hlist_for_each_entry' + - 'hlist_for_each_entry_continue' + - 'hlist_for_each_entry_continue_rcu' + - 'hlist_for_each_entry_continue_rcu_bh' + - 'hlist_for_each_entry_from' + - 'hlist_for_each_entry_from_rcu' + - 'hlist_for_each_entry_rcu' + - 'hlist_for_each_entry_rcu_bh' + - 'hlist_for_each_entry_rcu_notrace' + - 'hlist_for_each_entry_safe' + - '__hlist_for_each_rcu' + - 'hlist_for_each_safe' + - 'hlist_nulls_for_each_entry' + - 'hlist_nulls_for_each_entry_from' + - 'hlist_nulls_for_each_entry_rcu' + - 'hlist_nulls_for_each_entry_safe' + - 'i3c_bus_for_each_i2cdev' + - 'i3c_bus_for_each_i3cdev' + - 'ide_host_for_each_port' + - 'ide_port_for_each_dev' + - 'ide_port_for_each_present_dev' + - 'idr_for_each_entry' + - 'idr_for_each_entry_continue' + - 'idr_for_each_entry_continue_ul' + - 'idr_for_each_entry_ul' + - 'in_dev_for_each_ifa_rcu' + - 'in_dev_for_each_ifa_rtnl' + - 'inet_bind_bucket_for_each' + - 'inet_lhash2_for_each_icsk_rcu' + - 'key_for_each' + - 'key_for_each_safe' + - 'klp_for_each_func' + - 'klp_for_each_func_safe' + - 'klp_for_each_func_static' + - 'klp_for_each_object' + - 'klp_for_each_object_safe' + - 'klp_for_each_object_static' + - 'kvm_for_each_memslot' + - 'kvm_for_each_vcpu' + - 'list_for_each' + - 'list_for_each_codec' + - 'list_for_each_codec_safe' + - 'list_for_each_continue' + - 'list_for_each_entry' + - 'list_for_each_entry_continue' + - 'list_for_each_entry_continue_rcu' + - 'list_for_each_entry_continue_reverse' + - 'list_for_each_entry_from' + - 'list_for_each_entry_from_rcu' + - 'list_for_each_entry_from_reverse' + - 'list_for_each_entry_lockless' + - 'list_for_each_entry_rcu' + - 'list_for_each_entry_reverse' + - 'list_for_each_entry_safe' + - 'list_for_each_entry_safe_continue' + - 'list_for_each_entry_safe_from' + - 'list_for_each_entry_safe_reverse' + - 'list_for_each_prev' + - 'list_for_each_prev_safe' + - 'list_for_each_safe' + - 'llist_for_each' + - 'llist_for_each_entry' + - 'llist_for_each_entry_safe' + - 'llist_for_each_safe' + - 'mci_for_each_dimm' + - 'media_device_for_each_entity' + - 'media_device_for_each_intf' + - 'media_device_for_each_link' + - 'media_device_for_each_pad' + - 'nanddev_io_for_each_page' + - 'netdev_for_each_lower_dev' + - 'netdev_for_each_lower_private' + - 'netdev_for_each_lower_private_rcu' + - 'netdev_for_each_mc_addr' + - 'netdev_for_each_uc_addr' + - 'netdev_for_each_upper_dev_rcu' + - 'netdev_hw_addr_list_for_each' + - 'nft_rule_for_each_expr' + - 'nla_for_each_attr' + - 'nla_for_each_nested' + - 'nlmsg_for_each_attr' + - 'nlmsg_for_each_msg' + - 'nr_neigh_for_each' + - 'nr_neigh_for_each_safe' + - 'nr_node_for_each' + - 'nr_node_for_each_safe' + - 'of_for_each_phandle' + - 'of_property_for_each_string' + - 'of_property_for_each_u32' + - 'pci_bus_for_each_resource' + - 'ping_portaddr_for_each_entry' + - 'plist_for_each' + - 'plist_for_each_continue' + - 'plist_for_each_entry' + - 'plist_for_each_entry_continue' + - 'plist_for_each_entry_safe' + - 'plist_for_each_safe' + - 'pnp_for_each_card' + - 'pnp_for_each_dev' + - 'protocol_for_each_card' + - 'protocol_for_each_dev' + - 'queue_for_each_hw_ctx' + - 'radix_tree_for_each_slot' + - 'radix_tree_for_each_tagged' + - 'rbtree_postorder_for_each_entry_safe' + - 'rdma_for_each_block' + - 'rdma_for_each_port' + - 'resource_list_for_each_entry' + - 'resource_list_for_each_entry_safe' + - 'rhl_for_each_entry_rcu' + - 'rhl_for_each_rcu' + - 'rht_for_each' + - 'rht_for_each_entry' + - 'rht_for_each_entry_from' + - 'rht_for_each_entry_rcu' + - 'rht_for_each_entry_rcu_from' + - 'rht_for_each_entry_safe' + - 'rht_for_each_from' + - 'rht_for_each_rcu' + - 'rht_for_each_rcu_from' + - '__rq_for_each_bio' + - 'rq_for_each_bvec' + - 'rq_for_each_segment' + - 'scsi_for_each_prot_sg' + - 'scsi_for_each_sg' + - 'sctp_for_each_hentry' + - 'sctp_skb_for_each' + - 'shdma_for_each_chan' + - '__shost_for_each_device' + - 'shost_for_each_device' + - 'sk_for_each' + - 'sk_for_each_bound' + - 'sk_for_each_entry_offset_rcu' + - 'sk_for_each_from' + - 'sk_for_each_rcu' + - 'sk_for_each_safe' + - 'sk_nulls_for_each' + - 'sk_nulls_for_each_from' + - 'sk_nulls_for_each_rcu' + - 'snd_array_for_each' + - 'snd_pcm_group_for_each_entry' + - 'snd_soc_dapm_widget_for_each_path' + - 'snd_soc_dapm_widget_for_each_path_safe' + - 'snd_soc_dapm_widget_for_each_sink_path' + - 'snd_soc_dapm_widget_for_each_source_path' + - 'tb_property_for_each' + - 'tcf_exts_for_each_action' + - 'udp_portaddr_for_each_entry' + - 'udp_portaddr_for_each_entry_rcu' + - 'usb_hub_for_each_child' + - 'v4l2_device_for_each_subdev' + - 'v4l2_m2m_for_each_dst_buf' + - 'v4l2_m2m_for_each_dst_buf_safe' + - 'v4l2_m2m_for_each_src_buf' + - 'v4l2_m2m_for_each_src_buf_safe' + - 'virtio_device_for_each_vq' + - 'xa_for_each' + - 'xa_for_each_marked' + - 'xa_for_each_range' + - 'xa_for_each_start' + - 'xas_for_each' + - 'xas_for_each_conflict' + - 'xas_for_each_marked' + - 'xbc_array_for_each_value' + - 'xbc_for_each_key_value' + - 'xbc_node_for_each_array_value' + - 'xbc_node_for_each_child' + - 'xbc_node_for_each_key_value' + - 'zorro_for_each_dev' + +#IncludeBlocks: Preserve # Unknown to clang-format-5.0 +IncludeCategories: + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '(Test)?$' +IndentCaseLabels: false +#IndentPPDirectives: None # Unknown to clang-format-5.0 +IndentWidth: 8 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: Inner +#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0 +ObjCBlockIndentWidth: 8 +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: true + +# Taken from git's rules +#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0 +PenaltyBreakBeforeFirstCallParameter: 30 +PenaltyBreakComment: 10 +PenaltyBreakFirstLessLess: 0 +PenaltyBreakString: 10 +PenaltyExcessCharacter: 100 +PenaltyReturnTypeOnItsOwnLine: 60 + +PointerAlignment: Right +ReflowComments: false +SortIncludes: false +#SortUsingDeclarations: false # Unknown to clang-format-4.0 +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0 +#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0 +SpaceBeforeParens: ControlStatements +#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0 +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: false +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +TabWidth: 8 +UseTab: Always +... diff --git a/contrib/pre-commit-hook b/contrib/pre-commit-hook new file mode 100644 index 0000000..aacd6a5 --- /dev/null +++ b/contrib/pre-commit-hook @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +########################################## +# +# this file goes to .git/hooks/pre-commit +# +# git config --global clangFormat.binary clang-format-18 +# git config --global alias.clang-format clang-format-18 +# git config --global clangFormat.style file +# +# workflow: +# 1) try to commit / with or without staged changes +# 2) hook complains -> changes now staged +# 3) run git clang-format +# 4) inspect new unstaged formatting changes, stage/modify +# 5) commit +########################################## + +# needs to be staged/cached or check would fail with staged +# wrong changes + unstaged fmt fixes +cfmsg=$(git clang-format -v --cached --diff) + +if [[ "$cfmsg" == *"no modified files to format"* ]]; then exit 0; fi +if [[ "$cfmsg" == *"clang-format did not modify any files"* ]]; then exit 0; fi + +echo "formatting issues, run \"git clang-format\" !" +exit 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39470?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I9768bc2590ca5306ee19d3276f0953c6b0b6f926 Gerrit-Change-Number: 39470 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[S] Change in osmo-asf4-dfu[master]: errata 2.6.10

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39435?usp=email ) Change subject: errata 2.6.10 ...................................................................... errata 2.6.10 set wdt urow bits to ensure nvm cache is clear Change-Id: Ifbc6a3dfe91462029fce50ed42f20440debaa552 --- M gcc/gcc/startup_same54.c M hpl/nvmctrl/hpl_nvmctrl.c M usb_flash_main.c 3 files changed, 24 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gcc/gcc/startup_same54.c b/gcc/gcc/startup_same54.c index 7d8015e..3bdd4c4 100644 --- a/gcc/gcc/startup_same54.c +++ b/gcc/gcc/startup_same54.c @@ -627,7 +627,7 @@ * \brief This is the code that gets called on processor reset. * To initialize the device, and call the main() routine. */ -void Reset_Handler(void) +void _Reset_Handler(void) { uint32_t *pSrc, *pDest; @@ -668,6 +668,17 @@ ; } +__attribute__((naked,noreturn)) void Reset_Handler(void) +{ + // errata 2.6.10, do not remove this, ever. + // WDT->CTRLA.reg = 0; + __asm volatile("movs r0, #0\n" + "ldr r1, =0x40002000\n" + "strb r0, [r1]\n" + "bl _Reset_Handler\n" + ::: "r0", "r1", "memory"); +} + /** * \brief Default interrupt handler for unused IRQs. */ diff --git a/hpl/nvmctrl/hpl_nvmctrl.c b/hpl/nvmctrl/hpl_nvmctrl.c index 63f6145..05db578 100644 --- a/hpl/nvmctrl/hpl_nvmctrl.c +++ b/hpl/nvmctrl/hpl_nvmctrl.c @@ -74,6 +74,10 @@ ASSERT(device && (hw == NVMCTRL)); + // errata 2.6.10, do not remove this, ever. + hri_nvmctrl_set_CTRLA_CACHEDIS1_bit(hw); + hri_nvmctrl_clear_CTRLA_CACHEDIS1_bit(hw); + device->hw = hw; ctrla = hri_nvmctrl_read_CTRLA_reg(hw); ctrla &= ~(NVMCTRL_CTRLA_CACHEDIS0 | NVMCTRL_CTRLA_CACHEDIS1 | NVMCTRL_CTRLA_PRM_Msk); diff --git a/usb_flash_main.c b/usb_flash_main.c index b3e293b..19d447a 100644 --- a/usb_flash_main.c +++ b/usb_flash_main.c @@ -133,6 +133,14 @@ str_to_usb_desc(sernr_buf, sizeof(sernr_buf), sernr_buf_descr, sizeof(sernr_buf_descr)); #endif + // errata 2.6.10, do not remove this, ever. + bool chiprev_lower_revG = ((DSU->DID.reg >> 8) & 0xf) < 0x6; + bool startup_wdt_inactive = _user_area_read_bits((void *)NVMCTRL_USER, 62, 1) != 1; + if (chiprev_lower_revG && startup_wdt_inactive) { + _user_area_write_bits((void *)NVMCTRL_USER, 50, 0, 4); + _user_area_write_bits((void *)NVMCTRL_USER, 62, 1, 1); + } + // set bootprot bits for (15-13)=2 x8192 byte // hri_nvmctrl_write_CTRLB_reg(NVMCTRL, NVMCTRL_CTRLB_CMD_SBPDIS | NVMCTRL_CTRLB_CMDEX_KEY); while (!hri_nvmctrl_get_STATUS_READY_bit(NVMCTRL)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: Ifbc6a3dfe91462029fce50ed42f20440debaa552 Gerrit-Change-Number: 39435 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

3 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2025