| Message ID | 1492105285-2804-15-git-send-email-ley.foon.tan@intel.com |
|---|---|
| State | Accepted |
| Commit | 1b2594030d765ae2c7b5949eee2f6e3f20642241 |
| Delegated to: | Marek Vasut |
| Headers | show |
On 04/13/2017 07:41 PM, Ley Foon Tan wrote: > Add config and defconfig for the Arria10 and update socfpga_common.h. > > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> [...] > @@ -298,7 +306,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); > */ > #define CONFIG_SPL_FRAMEWORK > #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR > -#define CONFIG_SPL_MAX_SIZE (64 * 1024) > +#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE > +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) > +#define CONFIG_SPL_BOARD_INIT This should be in Kconfig and selected by arch/arm/mach-socfpga/Kconfig entry for A10 > +#endif > > /* SPL SDMMC boot support */ > #ifdef CONFIG_SPL_MMC_SUPPORT >
On Fri, Apr 14, 2017 at 6:25 PM, Marek Vasut <marex@denx.de> wrote: > On 04/13/2017 07:41 PM, Ley Foon Tan wrote: >> Add config and defconfig for the Arria10 and update socfpga_common.h. >> >> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> > > [...] > >> @@ -298,7 +306,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); >> */ >> #define CONFIG_SPL_FRAMEWORK >> #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR >> -#define CONFIG_SPL_MAX_SIZE (64 * 1024) >> +#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE >> +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) >> +#define CONFIG_SPL_BOARD_INIT > > This should be in Kconfig and selected by arch/arm/mach-socfpga/Kconfig > entry for A10 We can't use Kconfig method for CONFIG_SPL_BOARD_INIT, it is not a Kconfig parameter now. Regards Ley Foon
On 04/17/2017 05:05 AM, Ley Foon Tan wrote: > On Fri, Apr 14, 2017 at 6:25 PM, Marek Vasut <marex@denx.de> wrote: >> On 04/13/2017 07:41 PM, Ley Foon Tan wrote: >>> Add config and defconfig for the Arria10 and update socfpga_common.h. >>> >>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >>> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> >> >> [...] >> >>> @@ -298,7 +306,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); >>> */ >>> #define CONFIG_SPL_FRAMEWORK >>> #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR >>> -#define CONFIG_SPL_MAX_SIZE (64 * 1024) >>> +#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE >>> +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) >>> +#define CONFIG_SPL_BOARD_INIT >> >> This should be in Kconfig and selected by arch/arm/mach-socfpga/Kconfig >> entry for A10 > We can't use Kconfig method for CONFIG_SPL_BOARD_INIT, it is not a > Kconfig parameter now. OK. You can turn it into one, although that is out of the scope of this patchset.
On Mon, Apr 17, 2017 at 6:39 PM, Marek Vasut <marex@denx.de> wrote: > On 04/17/2017 05:05 AM, Ley Foon Tan wrote: >> On Fri, Apr 14, 2017 at 6:25 PM, Marek Vasut <marex@denx.de> wrote: >>> On 04/13/2017 07:41 PM, Ley Foon Tan wrote: >>>> Add config and defconfig for the Arria10 and update socfpga_common.h. >>>> >>>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >>>> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> >>> >>> [...] >>> >>>> @@ -298,7 +306,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); >>>> */ >>>> #define CONFIG_SPL_FRAMEWORK >>>> #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR >>>> -#define CONFIG_SPL_MAX_SIZE (64 * 1024) >>>> +#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE >>>> +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) >>>> +#define CONFIG_SPL_BOARD_INIT >>> >>> This should be in Kconfig and selected by arch/arm/mach-socfpga/Kconfig >>> entry for A10 >> We can't use Kconfig method for CONFIG_SPL_BOARD_INIT, it is not a >> Kconfig parameter now. > > OK. You can turn it into one, although that is out of the scope of this > patchset. Okay, I will add SPL_BOARD_INIT to arch/arm/mach-socfpga/Kconfig and select it for Arria 10. Thanks. Regards Ley Foon
On 04/18/2017 05:12 AM, Ley Foon Tan wrote: > On Mon, Apr 17, 2017 at 6:39 PM, Marek Vasut <marex@denx.de> wrote: >> On 04/17/2017 05:05 AM, Ley Foon Tan wrote: >>> On Fri, Apr 14, 2017 at 6:25 PM, Marek Vasut <marex@denx.de> wrote: >>>> On 04/13/2017 07:41 PM, Ley Foon Tan wrote: >>>>> Add config and defconfig for the Arria10 and update socfpga_common.h. >>>>> >>>>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >>>>> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> >>>> >>>> [...] >>>> >>>>> @@ -298,7 +306,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); >>>>> */ >>>>> #define CONFIG_SPL_FRAMEWORK >>>>> #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR >>>>> -#define CONFIG_SPL_MAX_SIZE (64 * 1024) >>>>> +#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE >>>>> +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) >>>>> +#define CONFIG_SPL_BOARD_INIT >>>> >>>> This should be in Kconfig and selected by arch/arm/mach-socfpga/Kconfig >>>> entry for A10 >>> We can't use Kconfig method for CONFIG_SPL_BOARD_INIT, it is not a >>> Kconfig parameter now. >> >> OK. You can turn it into one, although that is out of the scope of this >> patchset. > Okay, I will add SPL_BOARD_INIT to arch/arm/mach-socfpga/Kconfig and > select it for Arria 10. Do it in a separate patch please . Also, there's a script for turning symbols into Kconfig symbols in u-boot.
On Tue, Apr 18, 2017 at 6:58 PM, Marek Vasut <marex@denx.de> wrote: > On 04/18/2017 05:12 AM, Ley Foon Tan wrote: >> On Mon, Apr 17, 2017 at 6:39 PM, Marek Vasut <marex@denx.de> wrote: >>> On 04/17/2017 05:05 AM, Ley Foon Tan wrote: >>>> On Fri, Apr 14, 2017 at 6:25 PM, Marek Vasut <marex@denx.de> wrote: >>>>> On 04/13/2017 07:41 PM, Ley Foon Tan wrote: >>>>>> Add config and defconfig for the Arria10 and update socfpga_common.h. >>>>>> >>>>>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >>>>>> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> >>>>> >>>>> [...] >>>>> >>>>>> @@ -298,7 +306,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); >>>>>> */ >>>>>> #define CONFIG_SPL_FRAMEWORK >>>>>> #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR >>>>>> -#define CONFIG_SPL_MAX_SIZE (64 * 1024) >>>>>> +#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE >>>>>> +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) >>>>>> +#define CONFIG_SPL_BOARD_INIT >>>>> >>>>> This should be in Kconfig and selected by arch/arm/mach-socfpga/Kconfig >>>>> entry for A10 >>>> We can't use Kconfig method for CONFIG_SPL_BOARD_INIT, it is not a >>>> Kconfig parameter now. >>> >>> OK. You can turn it into one, although that is out of the scope of this >>> patchset. >> Okay, I will add SPL_BOARD_INIT to arch/arm/mach-socfpga/Kconfig and >> select it for Arria 10. > > Do it in a separate patch please . Also, there's a script for turning > symbols into Kconfig symbols in u-boot. I think we don't need script if just add Kconfig to arch/arm/mach-socfpga/Kconfig, unless you want me add to common/spl/Kconfig and move this option to kconfig for all architectures. Regards Ley Foon
On 04/19/2017 05:32 AM, Ley Foon Tan wrote: > On Tue, Apr 18, 2017 at 6:58 PM, Marek Vasut <marex@denx.de> wrote: >> On 04/18/2017 05:12 AM, Ley Foon Tan wrote: >>> On Mon, Apr 17, 2017 at 6:39 PM, Marek Vasut <marex@denx.de> wrote: >>>> On 04/17/2017 05:05 AM, Ley Foon Tan wrote: >>>>> On Fri, Apr 14, 2017 at 6:25 PM, Marek Vasut <marex@denx.de> wrote: >>>>>> On 04/13/2017 07:41 PM, Ley Foon Tan wrote: >>>>>>> Add config and defconfig for the Arria10 and update socfpga_common.h. >>>>>>> >>>>>>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >>>>>>> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> >>>>>> >>>>>> [...] >>>>>> >>>>>>> @@ -298,7 +306,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); >>>>>>> */ >>>>>>> #define CONFIG_SPL_FRAMEWORK >>>>>>> #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR >>>>>>> -#define CONFIG_SPL_MAX_SIZE (64 * 1024) >>>>>>> +#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE >>>>>>> +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) >>>>>>> +#define CONFIG_SPL_BOARD_INIT >>>>>> >>>>>> This should be in Kconfig and selected by arch/arm/mach-socfpga/Kconfig >>>>>> entry for A10 >>>>> We can't use Kconfig method for CONFIG_SPL_BOARD_INIT, it is not a >>>>> Kconfig parameter now. >>>> >>>> OK. You can turn it into one, although that is out of the scope of this >>>> patchset. >>> Okay, I will add SPL_BOARD_INIT to arch/arm/mach-socfpga/Kconfig and >>> select it for Arria 10. >> >> Do it in a separate patch please . Also, there's a script for turning >> symbols into Kconfig symbols in u-boot. > I think we don't need script if just add Kconfig to > arch/arm/mach-socfpga/Kconfig, unless > you want me add to common/spl/Kconfig and move this option to kconfig > for all architectures. That's what I had in mind, but please do it outside of this patchset, so this one can go in.
On Wed, Apr 19, 2017 at 4:38 PM, Marek Vasut <marex@denx.de> wrote: > On 04/19/2017 05:32 AM, Ley Foon Tan wrote: >> On Tue, Apr 18, 2017 at 6:58 PM, Marek Vasut <marex@denx.de> wrote: >>> On 04/18/2017 05:12 AM, Ley Foon Tan wrote: >>>> On Mon, Apr 17, 2017 at 6:39 PM, Marek Vasut <marex@denx.de> wrote: >>>>> On 04/17/2017 05:05 AM, Ley Foon Tan wrote: >>>>>> On Fri, Apr 14, 2017 at 6:25 PM, Marek Vasut <marex@denx.de> wrote: >>>>>>> On 04/13/2017 07:41 PM, Ley Foon Tan wrote: >>>>>>>> Add config and defconfig for the Arria10 and update socfpga_common.h. >>>>>>>> >>>>>>>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >>>>>>>> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> >>>>>>> >>>>>>> [...] >>>>>>> >>>>>>>> @@ -298,7 +306,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); >>>>>>>> */ >>>>>>>> #define CONFIG_SPL_FRAMEWORK >>>>>>>> #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR >>>>>>>> -#define CONFIG_SPL_MAX_SIZE (64 * 1024) >>>>>>>> +#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE >>>>>>>> +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) >>>>>>>> +#define CONFIG_SPL_BOARD_INIT >>>>>>> >>>>>>> This should be in Kconfig and selected by arch/arm/mach-socfpga/Kconfig >>>>>>> entry for A10 >>>>>> We can't use Kconfig method for CONFIG_SPL_BOARD_INIT, it is not a >>>>>> Kconfig parameter now. >>>>> >>>>> OK. You can turn it into one, although that is out of the scope of this >>>>> patchset. >>>> Okay, I will add SPL_BOARD_INIT to arch/arm/mach-socfpga/Kconfig and >>>> select it for Arria 10. >>> >>> Do it in a separate patch please . Also, there's a script for turning >>> symbols into Kconfig symbols in u-boot. >> I think we don't need script if just add Kconfig to >> arch/arm/mach-socfpga/Kconfig, unless >> you want me add to common/spl/Kconfig and move this option to kconfig >> for all architectures. > > That's what I had in mind, but please do it outside of this patchset, so > this one can go in. For this A10 patchset, I will add it to arch/arm/mach-socfpga/Kconfig first and I will send another patchset to add SPL_BOARD_INIT to common/spl/Kconfig on top of this patchset. So, we can get this patchset to get in first because move SPL_BOARD_INIT to kconfig for all architectures might take longer time to review . What do you think? Regards Ley Foon
On 04/19/2017 10:49 AM, Ley Foon Tan wrote: > On Wed, Apr 19, 2017 at 4:38 PM, Marek Vasut <marex@denx.de> wrote: >> On 04/19/2017 05:32 AM, Ley Foon Tan wrote: >>> On Tue, Apr 18, 2017 at 6:58 PM, Marek Vasut <marex@denx.de> wrote: >>>> On 04/18/2017 05:12 AM, Ley Foon Tan wrote: >>>>> On Mon, Apr 17, 2017 at 6:39 PM, Marek Vasut <marex@denx.de> wrote: >>>>>> On 04/17/2017 05:05 AM, Ley Foon Tan wrote: >>>>>>> On Fri, Apr 14, 2017 at 6:25 PM, Marek Vasut <marex@denx.de> wrote: >>>>>>>> On 04/13/2017 07:41 PM, Ley Foon Tan wrote: >>>>>>>>> Add config and defconfig for the Arria10 and update socfpga_common.h. >>>>>>>>> >>>>>>>>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >>>>>>>>> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> >>>>>>>> >>>>>>>> [...] >>>>>>>> >>>>>>>>> @@ -298,7 +306,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); >>>>>>>>> */ >>>>>>>>> #define CONFIG_SPL_FRAMEWORK >>>>>>>>> #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR >>>>>>>>> -#define CONFIG_SPL_MAX_SIZE (64 * 1024) >>>>>>>>> +#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE >>>>>>>>> +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) >>>>>>>>> +#define CONFIG_SPL_BOARD_INIT >>>>>>>> >>>>>>>> This should be in Kconfig and selected by arch/arm/mach-socfpga/Kconfig >>>>>>>> entry for A10 >>>>>>> We can't use Kconfig method for CONFIG_SPL_BOARD_INIT, it is not a >>>>>>> Kconfig parameter now. >>>>>> >>>>>> OK. You can turn it into one, although that is out of the scope of this >>>>>> patchset. >>>>> Okay, I will add SPL_BOARD_INIT to arch/arm/mach-socfpga/Kconfig and >>>>> select it for Arria 10. >>>> >>>> Do it in a separate patch please . Also, there's a script for turning >>>> symbols into Kconfig symbols in u-boot. >>> I think we don't need script if just add Kconfig to >>> arch/arm/mach-socfpga/Kconfig, unless >>> you want me add to common/spl/Kconfig and move this option to kconfig >>> for all architectures. >> >> That's what I had in mind, but please do it outside of this patchset, so >> this one can go in. > For this A10 patchset, I will add it to arch/arm/mach-socfpga/Kconfig > first and I will send another patchset to add SPL_BOARD_INIT to > common/spl/Kconfig on top of this patchset. No, please don't, this will only introduce inconsistency. > So, we can get this patchset to get in first because move > SPL_BOARD_INIT to kconfig for all architectures might take longer time > to review . What do you think? Just keep it as is now and ev. submit a separate patch which converts that to Kconfig later.
On Wed, Apr 19, 2017 at 4:53 PM, Marek Vasut <marex@denx.de> wrote: > On 04/19/2017 10:49 AM, Ley Foon Tan wrote: >> On Wed, Apr 19, 2017 at 4:38 PM, Marek Vasut <marex@denx.de> wrote: >>> On 04/19/2017 05:32 AM, Ley Foon Tan wrote: >>>> On Tue, Apr 18, 2017 at 6:58 PM, Marek Vasut <marex@denx.de> wrote: >>>>> On 04/18/2017 05:12 AM, Ley Foon Tan wrote: >>>>>> On Mon, Apr 17, 2017 at 6:39 PM, Marek Vasut <marex@denx.de> wrote: >>>>>>> On 04/17/2017 05:05 AM, Ley Foon Tan wrote: >>>>>>>> On Fri, Apr 14, 2017 at 6:25 PM, Marek Vasut <marex@denx.de> wrote: >>>>>>>>> On 04/13/2017 07:41 PM, Ley Foon Tan wrote: >>>>>>>>>> Add config and defconfig for the Arria10 and update socfpga_common.h. >>>>>>>>>> >>>>>>>>>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >>>>>>>>>> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> >>>>>>>>> >>>>>>>>> [...] >>>>>>>>> >>>>>>>>>> @@ -298,7 +306,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); >>>>>>>>>> */ >>>>>>>>>> #define CONFIG_SPL_FRAMEWORK >>>>>>>>>> #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR >>>>>>>>>> -#define CONFIG_SPL_MAX_SIZE (64 * 1024) >>>>>>>>>> +#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE >>>>>>>>>> +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) >>>>>>>>>> +#define CONFIG_SPL_BOARD_INIT >>>>>>>>> >>>>>>>>> This should be in Kconfig and selected by arch/arm/mach-socfpga/Kconfig >>>>>>>>> entry for A10 >>>>>>>> We can't use Kconfig method for CONFIG_SPL_BOARD_INIT, it is not a >>>>>>>> Kconfig parameter now. >>>>>>> >>>>>>> OK. You can turn it into one, although that is out of the scope of this >>>>>>> patchset. >>>>>> Okay, I will add SPL_BOARD_INIT to arch/arm/mach-socfpga/Kconfig and >>>>>> select it for Arria 10. >>>>> >>>>> Do it in a separate patch please . Also, there's a script for turning >>>>> symbols into Kconfig symbols in u-boot. >>>> I think we don't need script if just add Kconfig to >>>> arch/arm/mach-socfpga/Kconfig, unless >>>> you want me add to common/spl/Kconfig and move this option to kconfig >>>> for all architectures. >>> >>> That's what I had in mind, but please do it outside of this patchset, so >>> this one can go in. >> For this A10 patchset, I will add it to arch/arm/mach-socfpga/Kconfig >> first and I will send another patchset to add SPL_BOARD_INIT to >> common/spl/Kconfig on top of this patchset. > > No, please don't, this will only introduce inconsistency. > >> So, we can get this patchset to get in first because move >> SPL_BOARD_INIT to kconfig for all architectures might take longer time >> to review . What do you think? > > Just keep it as is now and ev. submit a separate patch which converts > that to Kconfig later. Okay, will keep SPL_BOARD_INIT in include/configs/socfpga_common.h as now first and send separate patchset to convert it to kconfig later. Thanks. Regards Ley Foon
On 04/19/2017 10:58 AM, Ley Foon Tan wrote: > On Wed, Apr 19, 2017 at 4:53 PM, Marek Vasut <marex@denx.de> wrote: >> On 04/19/2017 10:49 AM, Ley Foon Tan wrote: >>> On Wed, Apr 19, 2017 at 4:38 PM, Marek Vasut <marex@denx.de> wrote: >>>> On 04/19/2017 05:32 AM, Ley Foon Tan wrote: >>>>> On Tue, Apr 18, 2017 at 6:58 PM, Marek Vasut <marex@denx.de> wrote: >>>>>> On 04/18/2017 05:12 AM, Ley Foon Tan wrote: >>>>>>> On Mon, Apr 17, 2017 at 6:39 PM, Marek Vasut <marex@denx.de> wrote: >>>>>>>> On 04/17/2017 05:05 AM, Ley Foon Tan wrote: >>>>>>>>> On Fri, Apr 14, 2017 at 6:25 PM, Marek Vasut <marex@denx.de> wrote: >>>>>>>>>> On 04/13/2017 07:41 PM, Ley Foon Tan wrote: >>>>>>>>>>> Add config and defconfig for the Arria10 and update socfpga_common.h. >>>>>>>>>>> >>>>>>>>>>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >>>>>>>>>>> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> >>>>>>>>>> >>>>>>>>>> [...] >>>>>>>>>> >>>>>>>>>>> @@ -298,7 +306,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); >>>>>>>>>>> */ >>>>>>>>>>> #define CONFIG_SPL_FRAMEWORK >>>>>>>>>>> #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR >>>>>>>>>>> -#define CONFIG_SPL_MAX_SIZE (64 * 1024) >>>>>>>>>>> +#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE >>>>>>>>>>> +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) >>>>>>>>>>> +#define CONFIG_SPL_BOARD_INIT >>>>>>>>>> >>>>>>>>>> This should be in Kconfig and selected by arch/arm/mach-socfpga/Kconfig >>>>>>>>>> entry for A10 >>>>>>>>> We can't use Kconfig method for CONFIG_SPL_BOARD_INIT, it is not a >>>>>>>>> Kconfig parameter now. >>>>>>>> >>>>>>>> OK. You can turn it into one, although that is out of the scope of this >>>>>>>> patchset. >>>>>>> Okay, I will add SPL_BOARD_INIT to arch/arm/mach-socfpga/Kconfig and >>>>>>> select it for Arria 10. >>>>>> >>>>>> Do it in a separate patch please . Also, there's a script for turning >>>>>> symbols into Kconfig symbols in u-boot. >>>>> I think we don't need script if just add Kconfig to >>>>> arch/arm/mach-socfpga/Kconfig, unless >>>>> you want me add to common/spl/Kconfig and move this option to kconfig >>>>> for all architectures. >>>> >>>> That's what I had in mind, but please do it outside of this patchset, so >>>> this one can go in. >>> For this A10 patchset, I will add it to arch/arm/mach-socfpga/Kconfig >>> first and I will send another patchset to add SPL_BOARD_INIT to >>> common/spl/Kconfig on top of this patchset. >> >> No, please don't, this will only introduce inconsistency. >> >>> So, we can get this patchset to get in first because move >>> SPL_BOARD_INIT to kconfig for all architectures might take longer time >>> to review . What do you think? >> >> Just keep it as is now and ev. submit a separate patch which converts >> that to Kconfig later. > Okay, will keep SPL_BOARD_INIT in include/configs/socfpga_common.h as > now first and send separate patchset to convert it to kconfig later. Super, thanks
diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig new file mode 100644 index 0000000..46bda47 --- /dev/null +++ b/configs/socfpga_arria10_defconfig @@ -0,0 +1,29 @@ +CONFIG_ARM=y +CONFIG_ARCH_SOCFPGA=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_SOCFPGA_ARRIA10_SOCDK=y +CONFIG_IDENT_STRING="socfpga_arria10" +CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc" +CONFIG_DEFAULT_FDT_FILE="socfpga_arria10_socdk_sdmmc.dtb" +CONFIG_SPL=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_ASKENV=y +CONFIG_CMD_GREPENV=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_DOS_PARTITION=y +# CONFIG_SPL_DOS_PARTITION is not set +CONFIG_SPL_DM=y +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_DM_GPIO=y +CONFIG_DWAPB_GPIO=y +CONFIG_DM_MMC=y +CONFIG_SYS_NS16550=y +CONFIG_USE_TINY_PRINTF=y diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h new file mode 100644 index 0000000..7ea780b --- /dev/null +++ b/include/configs/socfpga_arria10_socdk.h @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2015-2017 Altera Corporation <www.altera.com> + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#ifndef __CONFIG_SOCFGPA_ARRIA10_H__ +#define __CONFIG_SOCFGPA_ARRIA10_H__ + +#include <asm/arch/base_addr_a10.h> +/* U-Boot Commands */ +#define CONFIG_FAT_WRITE +#define CONFIG_HW_WATCHDOG + +/* Booting Linux */ +#define CONFIG_LOADADDR 0x01000000 +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + +/* + * U-Boot general configurations + */ +/* Cache options */ +#define CONFIG_SYS_DCACHE_OFF + +/* Memory configurations */ +#define PHYS_SDRAM_1_SIZE 0x40000000 + +/* Ethernet on SoC (EMAC) */ +#if defined(CONFIG_CMD_NET) +#define CONFIG_PHY_MICREL +#define CONFIG_PHY_MICREL_KSZ9031 +#endif + +/* + * U-Boot environment configurations + */ +#define CONFIG_ENV_IS_IN_MMC + +/* + * arguments passed to the bootz command. The value of + * CONFIG_BOOTARGS goes into the environment value "bootargs". + * Do note the value will overide also the chosen node in FDT blob. + */ +#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) + +/* + * Serial / UART configurations + */ +#define CONFIG_SYS_NS16550_MEM32 +#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200} + +/* + * L4 OSC1 Timer 0 + */ +/* reload value when timer count to zero */ +#define TIMER_LOAD_VAL 0xFFFFFFFF + +/* + * Flash configurations + */ +#define CONFIG_SYS_MAX_FLASH_BANKS 1 + +/* The rest of the configuration is shared */ +#include <configs/socfpga_common.h> + +#endif /* __CONFIG_SOCFGPA_ARRIA10_H__ */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index dd3038c..66a2e33 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -32,9 +32,13 @@ #define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 #define CONFIG_SYS_MEMTEST_END PHYS_SDRAM_1_SIZE - +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) #define CONFIG_SYS_INIT_RAM_ADDR 0xFFFF0000 #define CONFIG_SYS_INIT_RAM_SIZE 0x10000 +#elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10) +#define CONFIG_SYS_INIT_RAM_ADDR 0xFFE00000 +#define CONFIG_SYS_INIT_RAM_SIZE 0x40000 /* 256KB */ +#endif #define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_ADDR \ @@ -101,13 +105,14 @@ /* * FPGA Driver */ +#ifdef CONFIG_TARGET_SOCFPGA_GEN5 #ifdef CONFIG_CMD_FPGA #define CONFIG_FPGA #define CONFIG_FPGA_ALTERA #define CONFIG_FPGA_SOCFPGA #define CONFIG_FPGA_COUNT 1 #endif - +#endif /* * L4 OSC1 Timer 0 */ @@ -207,11 +212,14 @@ unsigned int cm_get_qspi_controller_clk_hz(void); */ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE -4 -#define CONFIG_SYS_NS16550_COM1 SOCFPGA_UART0_ADDRESS #ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET #define CONFIG_SYS_NS16550_CLK 1000000 -#else +#elif defined(CONFIG_TARGET_SOCFPGA_GEN5) +#define CONFIG_SYS_NS16550_COM1 SOCFPGA_UART0_ADDRESS #define CONFIG_SYS_NS16550_CLK 100000000 +#elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10) +#define CONFIG_SYS_NS16550_COM1 SOCFPGA_UART1_ADDRESS +#define CONFIG_SYS_NS16550_CLK 50000000 #endif #define CONFIG_CONS_INDEX 1 @@ -298,7 +306,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR -#define CONFIG_SPL_MAX_SIZE (64 * 1024) +#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) +#define CONFIG_SPL_BOARD_INIT +#endif /* SPL SDMMC boot support */ #ifdef CONFIG_SPL_MMC_SUPPORT