| Message ID | 1423197710-1568-19-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
Hi Simon, On 02/05/2015 10:41 PM, Simon Glass wrote: > Remove driver model CONFIGs from the board config headers and use Kconfig > instead. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v2: None > > configs/socfpga_socrates_defconfig | 3 +++ > include/configs/socfpga_common.h | 7 ------- > 2 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig > index 0f3896d..888bbb6 100644 > --- a/configs/socfpga_socrates_defconfig > +++ b/configs/socfpga_socrates_defconfig > @@ -3,3 +3,6 @@ CONFIG_SPL=y > +S:CONFIG_TARGET_SOCFPGA_CYCLONE5=y > CONFIG_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" > +CONFIG_DM=y > +CONFIG_DM_SPI=y > +CONFIG_DM_SPI_FLASH=y Would you need to also update socfpga_cyclone5_defconfig or is that not needed? Thanks, Dinh
Hi Dinh, On 6 February 2015 at 16:36, Dinh Nguyen <dinguyen@opensource.altera.com> wrote: > Hi Simon, > > On 02/05/2015 10:41 PM, Simon Glass wrote: >> Remove driver model CONFIGs from the board config headers and use Kconfig >> instead. >> >> Signed-off-by: Simon Glass <sjg@chromium.org> >> --- >> >> Changes in v2: None >> >> configs/socfpga_socrates_defconfig | 3 +++ >> include/configs/socfpga_common.h | 7 ------- >> 2 files changed, 3 insertions(+), 7 deletions(-) >> >> diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig >> index 0f3896d..888bbb6 100644 >> --- a/configs/socfpga_socrates_defconfig >> +++ b/configs/socfpga_socrates_defconfig >> @@ -3,3 +3,6 @@ CONFIG_SPL=y >> +S:CONFIG_TARGET_SOCFPGA_CYCLONE5=y >> CONFIG_OF_CONTROL=y >> CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" >> +CONFIG_DM=y >> +CONFIG_DM_SPI=y >> +CONFIG_DM_SPI_FLASH=y > > Would you need to also update socfpga_cyclone5_defconfig or is that not > needed? From what I can tell it does not use driver model yet (it doesn't define CONFIG_OF_CONTROL either). Regards, Simon
Hi, (added Marek to Cc) On 07.02.2015 01:11, Simon Glass wrote: > Hi Dinh, > > On 6 February 2015 at 16:36, Dinh Nguyen <dinguyen@opensource.altera.com> wrote: >> Hi Simon, >> >> On 02/05/2015 10:41 PM, Simon Glass wrote: >>> Remove driver model CONFIGs from the board config headers and use Kconfig >>> instead. >>> >>> Signed-off-by: Simon Glass <sjg@chromium.org> >>> --- >>> >>> Changes in v2: None >>> >>> configs/socfpga_socrates_defconfig | 3 +++ >>> include/configs/socfpga_common.h | 7 ------- >>> 2 files changed, 3 insertions(+), 7 deletions(-) >>> >>> diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig >>> index 0f3896d..888bbb6 100644 >>> --- a/configs/socfpga_socrates_defconfig >>> +++ b/configs/socfpga_socrates_defconfig >>> @@ -3,3 +3,6 @@ CONFIG_SPL=y >>> +S:CONFIG_TARGET_SOCFPGA_CYCLONE5=y >>> CONFIG_OF_CONTROL=y >>> CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" >>> +CONFIG_DM=y >>> +CONFIG_DM_SPI=y >>> +CONFIG_DM_SPI_FLASH=y >> >> Would you need to also update socfpga_cyclone5_defconfig or is that not >> needed? > > From what I can tell it does not use driver model yet (it doesn't > define CONFIG_OF_CONTROL either). socrates was the first SoCFPGA board to use DT and DM. IIRC, Marek has a patch series queued to move the other SoCFPGA boards over to DT based probing (with DM enabled) as well. Thanks, Stefan
On 02/09/2015 01:29 AM, Stefan Roese wrote: > Hi, > > (added Marek to Cc) > > On 07.02.2015 01:11, Simon Glass wrote: >> Hi Dinh, >> >> On 6 February 2015 at 16:36, Dinh Nguyen >> <dinguyen@opensource.altera.com> wrote: >>> Hi Simon, >>> >>> On 02/05/2015 10:41 PM, Simon Glass wrote: >>>> Remove driver model CONFIGs from the board config headers and use >>>> Kconfig >>>> instead. >>>> >>>> Signed-off-by: Simon Glass <sjg@chromium.org> >>>> --- >>>> >>>> Changes in v2: None >>>> >>>> configs/socfpga_socrates_defconfig | 3 +++ >>>> include/configs/socfpga_common.h | 7 ------- >>>> 2 files changed, 3 insertions(+), 7 deletions(-) >>>> >>>> diff --git a/configs/socfpga_socrates_defconfig >>>> b/configs/socfpga_socrates_defconfig >>>> index 0f3896d..888bbb6 100644 >>>> --- a/configs/socfpga_socrates_defconfig >>>> +++ b/configs/socfpga_socrates_defconfig >>>> @@ -3,3 +3,6 @@ CONFIG_SPL=y >>>> +S:CONFIG_TARGET_SOCFPGA_CYCLONE5=y >>>> CONFIG_OF_CONTROL=y >>>> CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" >>>> +CONFIG_DM=y >>>> +CONFIG_DM_SPI=y >>>> +CONFIG_DM_SPI_FLASH=y >>> >>> Would you need to also update socfpga_cyclone5_defconfig or is that not >>> needed? >> >> From what I can tell it does not use driver model yet (it doesn't >> define CONFIG_OF_CONTROL either). > > socrates was the first SoCFPGA board to use DT and DM. IIRC, Marek has a > patch series queued to move the other SoCFPGA boards over to DT based > probing (with DM enabled) as well. > Ah ok, thanks for the clarification. Dinh
On Monday, February 09, 2015 at 05:45:37 PM, Dinh Nguyen wrote: > On 02/09/2015 01:29 AM, Stefan Roese wrote: > > Hi, > > > > (added Marek to Cc) [...] > >>> Would you need to also update socfpga_cyclone5_defconfig or is that not > >>> needed? > >>> > >> From what I can tell it does not use driver model yet (it doesn't > >> > >> define CONFIG_OF_CONTROL either). > > > > socrates was the first SoCFPGA board to use DT and DM. IIRC, Marek has a > > patch series queued to move the other SoCFPGA boards over to DT based > > probing (with DM enabled) as well. > > Ah ok, thanks for the clarification. Hi! it's only DT, not DM. It's the Arria V patchset I sent out that Stefan is referring to. I'll address his comment this week and will repost then. In case you want to base on top of that patchset, it's in the u-boot-socfpga repository, branch "topic/vip-arriav" . Best regards, Marek Vasut
On 9 February 2015 at 10:04, Marek Vasut <marex@denx.de> wrote: > On Monday, February 09, 2015 at 05:45:37 PM, Dinh Nguyen wrote: >> On 02/09/2015 01:29 AM, Stefan Roese wrote: >> > Hi, >> > >> > (added Marek to Cc) > > [...] > >> >>> Would you need to also update socfpga_cyclone5_defconfig or is that not >> >>> needed? >> >>> >> >> From what I can tell it does not use driver model yet (it doesn't >> >> >> >> define CONFIG_OF_CONTROL either). >> > >> > socrates was the first SoCFPGA board to use DT and DM. IIRC, Marek has a >> > patch series queued to move the other SoCFPGA boards over to DT based >> > probing (with DM enabled) as well. >> >> Ah ok, thanks for the clarification. > > Hi! > > it's only DT, not DM. It's the Arria V patchset I sent out that Stefan is > referring to. I'll address his comment this week and will repost then. > > In case you want to base on top of that patchset, it's in the u-boot-socfpga > repository, branch "topic/vip-arriav" . > > Best regards, > Marek Vasut Applied to u-boot-dm.
diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 0f3896d..888bbb6 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -3,3 +3,6 @@ CONFIG_SPL=y +S:CONFIG_TARGET_SOCFPGA_CYCLONE5=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" +CONFIG_DM=y +CONFIG_DM_SPI=y +CONFIG_DM_SPI_FLASH=y diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 6b1f967..ee227fe 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -190,10 +190,6 @@ unsigned int cm_get_l4_sp_clk_hz(void); * QSPI support */ #ifdef CONFIG_OF_CONTROL /* QSPI is controlled via DT */ -#define CONFIG_CMD_DM -#define CONFIG_DM -#define CONFIG_DM_SPI -#define CONFIG_DM_SPI_FLASH #define CONFIG_CADENCE_QSPI /* Enable multiple SPI NOR flash manufacturers */ #define CONFIG_SPI_FLASH /* SPI flash subsystem */ @@ -210,9 +206,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #endif #ifdef CONFIG_OF_CONTROL /* DW SPI is controlled via DT */ -#define CONFIG_CMD_DM -#define CONFIG_DM -#define CONFIG_DM_SPI #define CONFIG_DESIGNWARE_SPI #define CONFIG_CMD_SPI #endif
Remove driver model CONFIGs from the board config headers and use Kconfig instead. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v2: None configs/socfpga_socrates_defconfig | 3 +++ include/configs/socfpga_common.h | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-)