You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2020/03/17 14:41:50 UTC
[GitHub] [incubator-nuttx-apps] patacongo edited a comment on issue #124:
Nshlib nxstyle fixes
patacongo edited a comment on issue #124: Nshlib nxstyle fixes
URL: https://github.com/apache/incubator-nuttx-apps/pull/124#issuecomment-600104919
I tried to rebase to master and I get some conflicts. I would like you input on which is correct:
s21K1xx_periphclocks.c:
137 <<<<<<< HEAD
138 .clkname = LPSPI1_CLK,
139 #ifdef CONFIG_S32K1XX_LPSPI1
140 .clkgate = true,
141 #else
142 .clkgate = false,
143 #endif
144 .clksrc = CLK_SRC_SIRC_DIV2,
145 =======
146 .clkname = FlexCAN0_CLK,
147 .clkgate = true,
148 .clksrc = CLK_SRC_SOSC,
149 .frac = MULTIPLY_BY_ONE,
150 .divider = 1,
151 },
152 {
153 .clkname = RTC0_CLK,
154 .clkgate = true,
155 .clksrc = CLK_SRC_OFF,
156 .frac = MULTIPLY_BY_ONE,
157 .divider = 1,
158 >>>>>>> PoC S32K1XX FlexCAN sends CAN msgs through SocketCAN
The FlexCAN0 change is, I suspect, yours. FYI: All FlexCAN definitions have been renamed as FLEXCAN on master to conform to the coding standard.
And the other conflict is in boards/arm/s32k1xx/s32k148evb/src/s32k148evb.h
85 <<<<<<< HEAD
86 #define NUM_OF_PERIPHERAL_CLOCKS_0 18
87 =======
88 #define NUM_OF_PERIPHERAL_CLOCKS_0 15
89 >>>>>>> PoC S32K1XX FlexCAN sends CAN msgs through SocketCAN
I think that in both cases, the second change "PoC S32K1XX FlexCAN sends CAN msgs through SocketCAN" takes precedence, correct.
I have aborted the rebase for now, but will try again based on your advice.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services