| Message ID | 20191021173408.2151-1-michael@walle.cc |
|---|---|
| State | Changes Requested |
| Delegated to: | Priyanka Jain |
| Headers | show |
| Series | [U-Boot] armv8: layerscape: set HWCONFIG_BUFFER_SIZE | expand |
>-----Original Message----- >From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Michael Walle >Sent: Monday, October 21, 2019 11:04 PM >To: u-boot@lists.denx.de >Cc: Tom Rini <trini@konsulko.com> >Subject: [U-Boot] [PATCH] armv8: layerscape: set HWCONFIG_BUFFER_SIZE > >Set the HWCONFIG_BUFFER_SIZE if it is not already set. Otherwise >compilation will fail if CONFIG_HWCONFIG and HWCONFIG_BUFFER_SIZE are >not set. > >Taken from arch/powerpc/include/asm/config.h. > >Signed-off-by: Michael Walle <michael@walle.cc> >--- > arch/arm/include/asm/arch-fsl-layerscape/config.h | 4 ++++ > 1 file changed, 4 insertions(+) > >diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h >b/arch/arm/include/asm/arch-fsl-layerscape/config.h >index a83c70ece2..24bf854cbe 100644 >--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h >+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h >@@ -12,6 +12,10 @@ > > #define CONFIG_STANDALONE_LOAD_ADDR 0x80300000 > >+#ifndef HWCONFIG_BUFFER_SIZE >+ #define HWCONFIG_BUFFER_SIZE 256 >+#endif >+ This breaks compilation for platform like lx2160ardb. Error snippet: include/configs/lx2160a_common.h:173: warning: "HWCONFIG_BUFFER_SIZE" redefined #define HWCONFIG_BUFFER_SIZE 128 In file included from include/configs/lx2160a_common.h:10, from include/configs/lx2160ardb.h:9, from include/config.h:5, from include/common.h:23, from common/malloc_simple.c:10: ./arch/arm/include/asm/arch/config.h:16: note: this is the location of the previous definition #define HWCONFIG_BUFFER_SIZE 256 --priyankajain
>-----Original Message----- >From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Michael Walle >Sent: Monday, October 21, 2019 11:04 PM >To: u-boot@lists.denx.de >Cc: Tom Rini <trini@konsulko.com> >Subject: [U-Boot] [PATCH] armv8: layerscape: set HWCONFIG_BUFFER_SIZE > >Set the HWCONFIG_BUFFER_SIZE if it is not already set. Otherwise >compilation will fail if CONFIG_HWCONFIG and HWCONFIG_BUFFER_SIZE are >not set. > >Taken from arch/powerpc/include/asm/config.h. > >Signed-off-by: Michael Walle <michael@walle.cc> >--- Applied to fsl-qoriq master, awaiting upstream. Thanks priyankajain
Am 2019-11-11 16:20, schrieb Priyanka Jain: >> -----Original Message----- >> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Michael Walle >> Sent: Monday, October 21, 2019 11:04 PM >> To: u-boot@lists.denx.de >> Cc: Tom Rini <trini@konsulko.com> >> Subject: [U-Boot] [PATCH] armv8: layerscape: set HWCONFIG_BUFFER_SIZE >> >> Set the HWCONFIG_BUFFER_SIZE if it is not already set. Otherwise >> compilation will fail if CONFIG_HWCONFIG and HWCONFIG_BUFFER_SIZE are >> not set. >> >> Taken from arch/powerpc/include/asm/config.h. >> >> Signed-off-by: Michael Walle <michael@walle.cc> >> --- > > Applied to fsl-qoriq master, awaiting upstream. That one wasn't applied, was it? You said this patch breaks other boards. For now, I just had time to had a brief look at it. Seems like the culprit is that the configs/bla_common.h for the these boards include <asm/arch/config.h>, although will be included later in include/config.h. So it is not possible to provide "defaults" for any macros. Do you think it is possible to remove the "#include <asm/arch/config.h>" in your _common.h config files? -michael
>-----Original Message----- >From: Michael Walle <michael@walle.cc> >Sent: Tuesday, November 12, 2019 2:20 PM >To: Priyanka Jain <priyanka.jain@nxp.com> >Cc: u-boot@lists.denx.de; Tom Rini <trini@konsulko.com> >Subject: Re: [U-Boot] [PATCH] armv8: layerscape: set HWCONFIG_BUFFER_SIZE > >Am 2019-11-11 16:20, schrieb Priyanka Jain: >>> -----Original Message----- >>> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Michael >>> Walle >>> Sent: Monday, October 21, 2019 11:04 PM >>> To: u-boot@lists.denx.de >>> Cc: Tom Rini <trini@konsulko.com> >>> Subject: [U-Boot] [PATCH] armv8: layerscape: set HWCONFIG_BUFFER_SIZE >>> >>> Set the HWCONFIG_BUFFER_SIZE if it is not already set. Otherwise >>> compilation will fail if CONFIG_HWCONFIG and HWCONFIG_BUFFER_SIZE >are >>> not set. >>> >>> Taken from arch/powerpc/include/asm/config.h. >>> >>> Signed-off-by: Michael Walle <michael@walle.cc> >>> --- >> >> Applied to fsl-qoriq master, awaiting upstream. > >That one wasn't applied, was it? You said this patch breaks other boards. For >now, I just had time to had a brief look at it. Seems like the culprit is that the >configs/bla_common.h for the these boards include <asm/arch/config.h>, >although will be included later in include/config.h. So it is not possible to >provide "defaults" for any macros. Do you think it is possible to remove the >"#include <asm/arch/config.h>" in your _common.h config files? > >-michael Yes you are right. I dropped this patch at the last moment. Sorry for confusion. Regarding dropping "#include <asm/arch/config.h>" in your _common.h config files This wont be simple. Can you please think of alternative way. -priyankajain
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index a83c70ece2..24bf854cbe 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -12,6 +12,10 @@ #define CONFIG_STANDALONE_LOAD_ADDR 0x80300000 +#ifndef HWCONFIG_BUFFER_SIZE + #define HWCONFIG_BUFFER_SIZE 256 +#endif + /* * Reserve secure memory * To be aligned with MMU block size
Set the HWCONFIG_BUFFER_SIZE if it is not already set. Otherwise compilation will fail if CONFIG_HWCONFIG and HWCONFIG_BUFFER_SIZE are not set. Taken from arch/powerpc/include/asm/config.h. Signed-off-by: Michael Walle <michael@walle.cc> --- arch/arm/include/asm/arch-fsl-layerscape/config.h | 4 ++++ 1 file changed, 4 insertions(+)