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

cpu/cc2538: fix build errors when UART1 or the 32 kHz crystal is enabled #5124

Merged
merged 1 commit into from
Apr 14, 2016

Conversation

hexluthor
Copy link
Contributor

4780b5c introduced a couple of build errors that aren't apparent unless UART_1_EN=1 or SYS_CTRL_OSC32K_USE_XTAL=1. This patch fixes both.

@OlegHahm OlegHahm added this to the Release 2016.04 milestone Mar 21, 2016
@OlegHahm OlegHahm added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Platform: ARM Platform: This PR/issue effects ARM-based platforms Area: drivers Area: Device drivers labels Mar 21, 2016
@OlegHahm
Copy link
Member

Oops, sorry!

@kYc0o kYc0o added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Mar 21, 2016
@kYc0o
Copy link
Contributor

kYc0o commented Mar 28, 2016

let's test this tomorrow ;-)

@kYc0o kYc0o added the Community: Hack'n'ACK candidate This PR is a candidate for review and discussion during one of RIOT's monthly Hack'n'ACK parties label Mar 28, 2016
@OlegHahm
Copy link
Member

Did you?

@kYc0o
Copy link
Contributor

kYc0o commented Mar 30, 2016

I'm on it ;)

@kYc0o kYc0o removed the Community: Hack'n'ACK candidate This PR is a candidate for review and discussion during one of RIOT's monthly Hack'n'ACK parties label Apr 1, 2016
@kYc0o
Copy link
Contributor

kYc0o commented Apr 1, 2016

On which hardware did you tested? I'm trying with cc2538dk and remote without success...

@hexluthor
Copy link
Contributor Author

@kYc0o I tested this on a custom PCB (similar to cc2538dk, but with two dedicated UARTs). But the patch is intended primarily to fix a compile-time issue. Please try the following.

Test 1

Modify boards/cc2538dk/include/periph_conf.h:

#define UART_NUMOF    2
#define UART_1_EN     1
#define UART_1_TX_PIN GPIO_UNDEF
#define UART_1_RX_PIN GPIO_UNDEF

Then

git checkout a553fe0^
make -C examples/default BOARD=cc2538dk clean all

This build fails.

git checkout a553fe0
make -C examples/default BOARD=cc2538dk clean all

This build succeeds.

Test 2

Add CFLAGS += -DSYS_CTRL_OSC32K_USE_XTAL=1 to examples/default/Makefile, then:

git checkout a553fe0^
make -C examples/default BOARD=cc2538dk clean all

This build fails.

git checkout a553fe0
make -C examples/default BOARD=cc2538dk clean all

This build succeeds.

@haukepetersen
Copy link
Contributor

@kYc0o: are you still on it?

@kYc0o
Copy link
Contributor

kYc0o commented Apr 11, 2016

Ok yeah, sorry for the delay I forgot it... I'll test this now

@kYc0o
Copy link
Contributor

kYc0o commented Apr 11, 2016

Tests succeed. There's a small error on the board's definition but I'll PR it afterwards. So ACK and since Murdock is ok we can merge it ASAP. @haukepetersen everything's ok for you too?

@kYc0o
Copy link
Contributor

kYc0o commented Apr 14, 2016

Murdock and Travis are OK -> GO!

@kYc0o kYc0o merged commit 699410e into RIOT-OS:master Apr 14, 2016
@miri64
Copy link
Member

miri64 commented Apr 19, 2016

Needs backport.

@miri64 miri64 added the Process: needs backport Integration Process: The PR is required to be backported to a release or feature branch label Apr 19, 2016
@miri64 miri64 removed the Process: needs backport Integration Process: The PR is required to be backported to a release or feature branch label Apr 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: drivers Area: Device drivers CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ARM Platform: This PR/issue effects ARM-based platforms Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants