diff mbox series

dm: core: Reorder include files in read.c

Message ID 20200429070844.11939-1-sr@denx.de
State Accepted
Commit 979afd14c3e29dedcc020a49f59d6cb28124f038
Headers show
Series dm: core: Reorder include files in read.c | expand

Commit Message

Stefan Roese April 29, 2020, 7:08 a.m. UTC
Including the assembler headers before including common.h etc leads to
compilation errors upon MIPS64 based platforms using OF_LIVE. This
patch reorders the include files to the "correct" oder.

Signed-off-by: Stefan Roese <sr at denx.de>
Cc: Simon Glass <sjg at chromium.org>
---
 drivers/core/read.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Simon Glass April 29, 2020, 6:04 p.m. UTC | #1
On Wed, 29 Apr 2020 at 01:08, Stefan Roese <sr at denx.de> wrote:
>
> Including the assembler headers before including common.h etc leads to
> compilation errors upon MIPS64 based platforms using OF_LIVE. This
> patch reorders the include files to the "correct" oder.
>
> Signed-off-by: Stefan Roese <sr at denx.de>
> Cc: Simon Glass <sjg at chromium.org>
> ---
>  drivers/core/read.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Simon Glass <sjg at chromium.org>
Stefan Roese May 14, 2020, 9:28 a.m. UTC | #2
Hi Simon,

On 29.04.20 20:04, Simon Glass wrote:
> On Wed, 29 Apr 2020 at 01:08, Stefan Roese <sr at denx.de> wrote:
>>
>> Including the assembler headers before including common.h etc leads to
>> compilation errors upon MIPS64 based platforms using OF_LIVE. This
>> patch reorders the include files to the "correct" oder.
>>
>> Signed-off-by: Stefan Roese <sr at denx.de>
>> Cc: Simon Glass <sjg at chromium.org>
>> ---
>>   drivers/core/read.c | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> Reviewed-by: Simon Glass <sjg at chromium.org>
> 

Just a short reminder about this patch, as its needed for the base
Octeon (MIPS) support, I'm currently working on. Otherwise, usage of
OF_LIVE is not possible.

Thanks,
Stefan
Simon Glass May 14, 2020, 12:49 p.m. UTC | #3
Hi Stefan,

OK. Feel free to pull it in if you like as you have my review tag.

Regards,
SImon

On Thu, 14 May 2020 at 03:30, Stefan Roese <sr at denx.de> wrote:
>
> Hi Simon,
>
> On 29.04.20 20:04, Simon Glass wrote:
> > On Wed, 29 Apr 2020 at 01:08, Stefan Roese <sr at denx.de> wrote:
> >>
> >> Including the assembler headers before including common.h etc leads to
> >> compilation errors upon MIPS64 based platforms using OF_LIVE. This
> >> patch reorders the include files to the "correct" oder.
> >>
> >> Signed-off-by: Stefan Roese <sr at denx.de>
> >> Cc: Simon Glass <sjg at chromium.org>
> >> ---
> >>   drivers/core/read.c | 6 +++---
> >>   1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > Reviewed-by: Simon Glass <sjg at chromium.org>
> >
>
> Just a short reminder about this patch, as its needed for the base
> Octeon (MIPS) support, I'm currently working on. Otherwise, usage of
> OF_LIVE is not possible.
>
> Thanks,
> Stefan
>
Stefan Roese May 14, 2020, 12:55 p.m. UTC | #4
Hi Simon,

On 14.05.20 14:49, Simon Glass wrote:
> OK. Feel free to pull it in if you like as you have my review tag.

Thanks Simon. Since Daniel will be the one pulling the Octeon patchset
once we've reached the necessary ack's, he now knows that he can pull
this one as well. But this will take a few more versions most likely.
Perhaps this patch has landed in mainline until then.

Thanks,
Stefan

> Regards,
> SImon
> 
> On Thu, 14 May 2020 at 03:30, Stefan Roese <sr at denx.de> wrote:
>>
>> Hi Simon,
>>
>> On 29.04.20 20:04, Simon Glass wrote:
>>> On Wed, 29 Apr 2020 at 01:08, Stefan Roese <sr at denx.de> wrote:
>>>>
>>>> Including the assembler headers before including common.h etc leads to
>>>> compilation errors upon MIPS64 based platforms using OF_LIVE. This
>>>> patch reorders the include files to the "correct" oder.
>>>>
>>>> Signed-off-by: Stefan Roese <sr at denx.de>
>>>> Cc: Simon Glass <sjg at chromium.org>
>>>> ---
>>>>    drivers/core/read.c | 6 +++---
>>>>    1 file changed, 3 insertions(+), 3 deletions(-)
>>>
>>> Reviewed-by: Simon Glass <sjg at chromium.org>
>>>
>>
>> Just a short reminder about this patch, as its needed for the base
>> Octeon (MIPS) support, I'm currently working on. Otherwise, usage of
>> OF_LIVE is not possible.
>>
>> Thanks,
>> Stefan
>>


Viele Gr??e,
Stefan
diff mbox series

Patch

diff --git a/drivers/core/read.c b/drivers/core/read.c
index 47b8e03446..8e65dd2d50 100644
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -4,12 +4,12 @@ 
  * Written by Simon Glass <sjg at chromium.org>
  */
 
-#include <asm/types.h>
-#include <asm/io.h>
 #include <common.h>
 #include <dm.h>
-#include <mapmem.h>
 #include <dm/of_access.h>
+#include <mapmem.h>
+#include <asm/types.h>
+#include <asm/io.h>
 
 int dev_read_u32(const struct udevice *dev, const char *propname, u32 *outp)
 {