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

tock-rt0 related cosmetic changes. #1856

Merged
merged 2 commits into from May 18, 2020
Merged

tock-rt0 related cosmetic changes. #1856

merged 2 commits into from May 18, 2020

Conversation

rajivr
Copy link
Contributor

@rajivr rajivr commented May 16, 2020

There are two changes in this PR.

  1. Tree-wide rename of tock_rt0 to tock-rt0. This makes it consistent with other tock-* crate names.

  2. Rename parameters to zero_bss to make it consistent with init_data.

This makes the crate name consistent with other `tock-*` crates such as
`tock-cells` and `tock-registers`.

Signed-off-by: Rajiv Ranganath <rajiv.ranganath@atihita.com>
This change makes parameter names to `zero_bss` consistent with `init_data`
function.

Signed-off-by: Rajiv Ranganath <rajiv.ranganath@atihita.com>
Copy link
Contributor

@hudson-ayers hudson-ayers left a comment

Choose a reason for hiding this comment

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

I think you missed a few:

hudson: ~/tock ((HEAD detached at rajivr/for-upstream-15)) $ rg tock_rt0
chips/nrf52/src/crt1.rs
2:use tock_rt0;
168:    tock_rt0::init_data(&mut _etext, &mut _srelocate, &mut _erelocate);
169:    tock_rt0::zero_bss(&mut _szero, &mut _ezero);

chips/stm32f303xc/src/lib.rs
183:    tock_rt0::init_data(&mut _etext, &mut _srelocate, &mut _erelocate);
184:    tock_rt0::zero_bss(&mut _szero, &mut _ezero);

chips/stm32f4xx/src/lib.rs
93:    tock_rt0::init_data(&mut _etext, &mut _srelocate, &mut _erelocate);
94:    tock_rt0::zero_bss(&mut _szero, &mut _ezero);

chips/sam4l/src/lib.rs
111:    tock_rt0::init_data(&mut _etext, &mut _srelocate, &mut _erelocate);
112:    tock_rt0::zero_bss(&mut _szero, &mut _ezero);

arch/rv32i/src/lib.rs
94:    tock_rt0::init_data(&mut _etext, &mut _srelocate, &mut _erelocate);
95:    tock_rt0::zero_bss(&mut _szero, &mut _ezero);

chips/cc26x2/src/crt1.rs
2:use tock_rt0;
89:    tock_rt0::init_data(&mut _etext, &mut _srelocate, &mut _erelocate);
90:    tock_rt0::zero_bss(&mut _szero, &mut _ezero);

I'm actually confused why this compiles. How are those remaining tock_rt0 dependencies being resolved? I also see tock_rt0 in most of the cargo.lock files even after running a top-level make clean and rebuilding boards.

@hudson-ayers hudson-ayers added the P-Upkeep This a relatively minor change, or one that is limited in scope, and requires less scrutiny. label May 18, 2020
@rajivr
Copy link
Contributor Author

rajivr commented May 18, 2020

I think you missed a few:

hudson: ~/tock ((HEAD detached at rajivr/for-upstream-15)) $ rg tock_rt0
chips/nrf52/src/crt1.rs
2:use tock_rt0;
168:    tock_rt0::init_data(&mut _etext, &mut _srelocate, &mut _erelocate);
169:    tock_rt0::zero_bss(&mut _szero, &mut _ezero);

chips/stm32f303xc/src/lib.rs
183:    tock_rt0::init_data(&mut _etext, &mut _srelocate, &mut _erelocate);
184:    tock_rt0::zero_bss(&mut _szero, &mut _ezero);

chips/stm32f4xx/src/lib.rs
93:    tock_rt0::init_data(&mut _etext, &mut _srelocate, &mut _erelocate);
94:    tock_rt0::zero_bss(&mut _szero, &mut _ezero);

chips/sam4l/src/lib.rs
111:    tock_rt0::init_data(&mut _etext, &mut _srelocate, &mut _erelocate);
112:    tock_rt0::zero_bss(&mut _szero, &mut _ezero);

arch/rv32i/src/lib.rs
94:    tock_rt0::init_data(&mut _etext, &mut _srelocate, &mut _erelocate);
95:    tock_rt0::zero_bss(&mut _szero, &mut _ezero);

chips/cc26x2/src/crt1.rs
2:use tock_rt0;
89:    tock_rt0::init_data(&mut _etext, &mut _srelocate, &mut _erelocate);
90:    tock_rt0::zero_bss(&mut _szero, &mut _ezero);

I'm actually confused why this compiles. How are those remaining tock_rt0 dependencies being resolved? I also see tock_rt0 in most of the cargo.lock files even after running a top-level make clean and rebuilding boards.

I don't think we can use tock-rt0::init_data, as it would not compile. It has to be tock_rt0::init_data.

Copy link
Contributor

@hudson-ayers hudson-ayers left a comment

Choose a reason for hiding this comment

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

Yep, looks like I misunderstood. Sorry for the confusion.

@ppannuto
Copy link
Member

bors r+

@bors bors bot merged commit 18a288f into tock:master May 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
P-Upkeep This a relatively minor change, or one that is limited in scope, and requires less scrutiny.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants