Skip to content
New issue

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

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

Already on GitHub? # to your account

Fixed wrong script dir location for flash targets #157

Closed
wants to merge 3 commits into from

Conversation

JelmerT
Copy link
Contributor

@JelmerT JelmerT commented Jul 25, 2017

This PR tries to fix some of #34
It seems like there are 2 script dirs, one in the examples and one in the library itself. The scripts for the BMP are in the examples/scripts dir, not the library one.

I can't seem to find the stlink_flash.scr script anywhere though :/

@karlp
Copy link
Member

karlp commented Jul 26, 2017

You're right, some of this is some old stubs that aren't used much, carried over from when this was part of the main repo. It's proven difficult to maintain all the duplicated bits of makefile for this sort of stuff.

@@ -92,7 +92,8 @@ endif
include $(OPENCM3_DIR)/mk/genlink-config.mk
endif

SCRIPT_DIR = $(OPENCM3_DIR)/scripts
OPENCM3_SCRIPT_DIR = $(OPENCM3_DIR)/scripts
EXAMPLES_SCRIPT_DIR = $(OPENCM3_DIR)../scripts
Copy link
Member

Choose a reason for hiding this comment

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

in one of them, you use an intermediate, /, but not the otther, is this really intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

tried to avoid the double // in the path, but they're all over the file anyway. Updated to double //

@JelmerT
Copy link
Contributor Author

JelmerT commented Jul 27, 2017

should the refs to stlink_flash.scrbe removed? I can't seem to find the file in the history of the main repo either.

@karlp
Copy link
Member

karlp commented Jul 27, 2017

I'd be totally fine with just dropping support for that flashing method enttirely, it clearly hasn't worked for a very long time, and required make vars to be set to even try.

@JelmerT
Copy link
Contributor Author

JelmerT commented Aug 2, 2017

Removed the references to the script, any other changes needed?

@karlp
Copy link
Member

karlp commented Aug 25, 2017

merged in 2107faf and predecessor tahnks!

@karlp karlp closed this Aug 25, 2017
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants