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.

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

Jump to bottom

Patch file for linker + makefile fix #15

Merged
merged 6 commits into from Jan 9, 2017
Merged

Patch file for linker + makefile fix #15

merged 6 commits into from Jan 9, 2017

Conversation

wxcafe
Copy link
Contributor

@wxcafe wxcafe commented Jan 2, 2017

No description provided.

mithro
mithro requested changes Jan 6, 2017
View reviewed changes
efm32hg-blinky/Makefile
CROSS_COMPILE ?= gcc-arm-none-eabi-5_4-2016q2/bin/arm-none-eabi-
# You can download the ARM toolchain from:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you leave this comment here?

efm32hg-blinky/Makefile
@@ -132,7 +132,7 @@ deps:
# REAL TARGETS // COMMON
#
GECKO_A_SRC = Gecko_SDK/Device/SiliconLabs/EFM32HG/Source/GCC/startup_efm32hg.S
GECKO_C_SRC = $(shell find Gecko_SDK/emlib/src -name \*.c) \
GECKO_C_SRC = $(shell [ -d Gecko_SDK ] && find Gecko_SDK/emlib/src -name \*.c) \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed to allow the make deps to work when the directory doesn't exist?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey! Sorry, I didn't see your comment from two days ago. I re-added the comments with the toolchain location, I removed them because it's in the README but if you feel they should be in there as well...
And yes, this is needed to allow make deps to work. Well, it will "work" if this isn't here, but it will error, so...

@mithro
Copy link
Member

mithro commented Jan 9, 2017

Is this okay to merge now?

@wxcafe
Copy link
Contributor Author

wxcafe commented Jan 9, 2017

As far as I can tell, it should, yeah

@mithro
Copy link
Member

mithro commented Jan 9, 2017

Travis seems to not like your changes to the patch
https://travis-ci.org/im-tomu/tomu-samples/builds/190124722

Hunk #1 FAILED at 11.
1 out of 1 hunk FAILED -- saving rejects to file tomu.ld.rej
make: *** [deps] Error 1
The command "make deps" exited with 2.

@mithro
Copy link
Member

mithro commented Jan 9, 2017

It looks like SiliconLabs has rearrange their SDK?

@wxcafe
Copy link
Contributor Author

wxcafe commented Jan 9, 2017

huh. Yeah, that's what felt weird, I was pretty sure this built last week.

Anyway, it's 3:30 am so I'm gonna look at this tomorrow :)

@wxcafe
Copy link
Contributor Author

wxcafe commented Jan 9, 2017

And done

@mithro mithro merged commit 3f48c85 into im-tomu:master Jan 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mithro mithro mithro approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@wxcafe @mithro