Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: update on changing to relpath #18

Closed
wants to merge 11 commits into from
+10 −8
Closed

CI: update on changing to relpath #18

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
206f616
relpath
bongbui321 Dec 19, 2023
7909259
remove abspath
bongbui321 Dec 19, 2023
7fc9e03
back to abspath
bongbui321 Dec 20, 2023
78d9434
relpath
bongbui321 Dec 20, 2023
566e7b0
add print
bongbui321 Dec 21, 2023
3aa6be3
relpath
bongbui321 Dec 21, 2023
747f270
relpath
bongbui321 Dec 21, 2023
14da223
relpath to sign_py
bongbui321 Dec 22, 2023
3bcd280
Merge branch 'commaai:master' into master
bongbui321 Dec 24, 2023
74c585f
warn=all
bongbui321 Dec 26, 2023
ab9ee47
warn=all works
bongbui321 Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions board/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@ else:
if os.getenv("DEBUG"):
common_flags += ["-DDEBUG"]

includes = [
"inc/STM32F4xx_HAL_Driver/Inc",
"inc",
"..",
".",
]

c_sources = [
["hal_flash", "inc/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c"],
["hal_pwr", "inc/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c"],
Expand Down Expand Up @@ -87,7 +80,6 @@ def get_version(builder, build_type):
git = "00000000"
return f"{git}"


def to_c_uint32(x):
nums = []
for _ in range(0x20):
Expand Down Expand Up @@ -129,6 +121,14 @@ certs = [get_key_header(n) for n in ["debug", "release"]]
with open("obj/cert.h", "w") as f:
for cert in certs:
f.write("\n".join(cert) + "\n")

includes = [
"inc/STM32F4xx_HAL_Driver/Inc/Legacy",
"inc/STM32F4xx_HAL_Driver/Inc",
"inc",
'..',
'.'
]

for project_name in build_projects:
project = build_projects[project_name]
Expand Down Expand Up @@ -166,6 +166,8 @@ for project_name in build_projects:
'Objcopy': Builder(generator=objcopy, suffix='.bin', src_suffix='.elf')
}
)


startup = project_env.Object(project["STARTUP_FILE"])

c_bstub_obj_list = []
Expand Down
Loading