| Message ID | 1428997852-23463-3-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Superseded |
| Delegated to: | Michal Simek |
| Headers | show |
On Tue, 2015-04-14 at 04:50PM +0900, Masahiro Yamada wrote: > Separate CONFIG_TARGET_ZYNQ_{ZC702,ZC706} which is necessary > for the next commit. Adjust doc/README.zynq too. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > Changes in v2: None > > arch/arm/cpu/armv7/zynq/Kconfig | 9 ++++++--- > configs/{zynq_zc70x_defconfig => zynq_zc702_defconfig} | 2 +- > configs/zynq_zc706_defconfig | 11 +++++++++++ > doc/README.zynq | 15 ++++----------- > 4 files changed, 22 insertions(+), 15 deletions(-) > rename configs/{zynq_zc70x_defconfig => zynq_zc702_defconfig} (88%) > create mode 100644 configs/zynq_zc706_defconfig > > diff --git a/arch/arm/cpu/armv7/zynq/Kconfig b/arch/arm/cpu/armv7/zynq/Kconfig > index 3a52535..ab4768a 100644 > --- a/arch/arm/cpu/armv7/zynq/Kconfig > +++ b/arch/arm/cpu/armv7/zynq/Kconfig > @@ -9,8 +9,11 @@ config TARGET_ZYNQ_ZED > config TARGET_ZYNQ_MICROZED > bool "Zynq MicroZed" > > -config TARGET_ZYNQ_ZC70X > - bool "Zynq ZC702/ZC706 Board" > +config TARGET_ZYNQ_ZC702 > + bool "Zynq ZC702 Board" > + > +config TARGET_ZYNQ_ZC706 > + bool "Zynq ZC706 Board" Is there a good way to make this more friendly towards a user who is familiar with the current flow? By simply removing it, we'll get plenty of support requests asking what happened. Also, it would void all the documentation we have in wikis etc. A more soft migration path would be better. Sören
Hi Sören, 2015-04-15 1:03 GMT+09:00 Sören Brinkmann <soren.brinkmann@xilinx.com>: > On Tue, 2015-04-14 at 04:50PM +0900, Masahiro Yamada wrote: >> Separate CONFIG_TARGET_ZYNQ_{ZC702,ZC706} which is necessary >> for the next commit. Adjust doc/README.zynq too. >> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> >> --- >> >> Changes in v2: None >> >> arch/arm/cpu/armv7/zynq/Kconfig | 9 ++++++--- >> configs/{zynq_zc70x_defconfig => zynq_zc702_defconfig} | 2 +- >> configs/zynq_zc706_defconfig | 11 +++++++++++ >> doc/README.zynq | 15 ++++----------- >> 4 files changed, 22 insertions(+), 15 deletions(-) >> rename configs/{zynq_zc70x_defconfig => zynq_zc702_defconfig} (88%) >> create mode 100644 configs/zynq_zc706_defconfig >> >> diff --git a/arch/arm/cpu/armv7/zynq/Kconfig b/arch/arm/cpu/armv7/zynq/Kconfig >> index 3a52535..ab4768a 100644 >> --- a/arch/arm/cpu/armv7/zynq/Kconfig >> +++ b/arch/arm/cpu/armv7/zynq/Kconfig >> @@ -9,8 +9,11 @@ config TARGET_ZYNQ_ZED >> config TARGET_ZYNQ_MICROZED >> bool "Zynq MicroZed" >> >> -config TARGET_ZYNQ_ZC70X >> - bool "Zynq ZC702/ZC706 Board" >> +config TARGET_ZYNQ_ZC702 >> + bool "Zynq ZC702 Board" >> + >> +config TARGET_ZYNQ_ZC706 >> + bool "Zynq ZC706 Board" > > Is there a good way to make this more friendly towards a user who is > familiar with the current flow? By simply removing it, we'll get plenty > of support requests asking what happened. Also, it would void all the > documentation we have in wikis etc. A more soft migration path would be > better. > Currently, the difference between ZC702 and ZC706 is just their device trees. So, we can use $(DEVICE_TREE) for distinguishing one from the other. Like this. ---------------->8--------------------------- DEVICE_TREE ?= $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%) hw-platform-$(CONFIG_TARGET_ZYNQ_ZED) := zed_hw_platform hw-platform-$(CONFIG_TARGET_ZYNQ_MICROZED) := MicroZed_hw_platform hw-platform-$(CONFIG_TARGET_ZYNQ_ZC70X) := $(if $(filter zynq-zc702 $(DEVICE_TREE)), ZC702_hw_platform, ZC706_hw_platform) ----------------8<--------------------------- Another option is to reject this series and stick to the current work-flow. It is up to you and Michal, of course. The path to ps7_init_gpl.[ch] will change, anyway. If it is troublesome, I do not persist on this series.
On Fri, 2015-04-17 at 10:38AM +0900, Masahiro Yamada wrote: > Hi Sören, > > > 2015-04-15 1:03 GMT+09:00 Sören Brinkmann <soren.brinkmann@xilinx.com>: > > On Tue, 2015-04-14 at 04:50PM +0900, Masahiro Yamada wrote: > >> Separate CONFIG_TARGET_ZYNQ_{ZC702,ZC706} which is necessary > >> for the next commit. Adjust doc/README.zynq too. > >> > >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > >> --- > >> > >> Changes in v2: None > >> > >> arch/arm/cpu/armv7/zynq/Kconfig | 9 ++++++--- > >> configs/{zynq_zc70x_defconfig => zynq_zc702_defconfig} | 2 +- > >> configs/zynq_zc706_defconfig | 11 +++++++++++ > >> doc/README.zynq | 15 ++++----------- > >> 4 files changed, 22 insertions(+), 15 deletions(-) > >> rename configs/{zynq_zc70x_defconfig => zynq_zc702_defconfig} (88%) > >> create mode 100644 configs/zynq_zc706_defconfig > >> > >> diff --git a/arch/arm/cpu/armv7/zynq/Kconfig b/arch/arm/cpu/armv7/zynq/Kconfig > >> index 3a52535..ab4768a 100644 > >> --- a/arch/arm/cpu/armv7/zynq/Kconfig > >> +++ b/arch/arm/cpu/armv7/zynq/Kconfig > >> @@ -9,8 +9,11 @@ config TARGET_ZYNQ_ZED > >> config TARGET_ZYNQ_MICROZED > >> bool "Zynq MicroZed" > >> > >> -config TARGET_ZYNQ_ZC70X > >> - bool "Zynq ZC702/ZC706 Board" > >> +config TARGET_ZYNQ_ZC702 > >> + bool "Zynq ZC702 Board" > >> + > >> +config TARGET_ZYNQ_ZC706 > >> + bool "Zynq ZC706 Board" > > > > Is there a good way to make this more friendly towards a user who is > > familiar with the current flow? By simply removing it, we'll get plenty > > of support requests asking what happened. Also, it would void all the > > documentation we have in wikis etc. A more soft migration path would be > > better. > > > > > Currently, the difference between ZC702 and ZC706 is just their device trees. > > So, we can use $(DEVICE_TREE) for distinguishing one from the other. Like this. > > ---------------->8--------------------------- > DEVICE_TREE ?= $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%) > > hw-platform-$(CONFIG_TARGET_ZYNQ_ZED) := zed_hw_platform > hw-platform-$(CONFIG_TARGET_ZYNQ_MICROZED) := MicroZed_hw_platform > hw-platform-$(CONFIG_TARGET_ZYNQ_ZC70X) := $(if $(filter > zynq-zc702 $(DEVICE_TREE)), ZC702_hw_platform, ZC706_hw_platform) > ----------------8<--------------------------- > > > > Another option is to reject this series and stick to the current work-flow. > It is up to you and Michal, of course. > The path to ps7_init_gpl.[ch] will change, anyway. > If it is troublesome, I do not persist on this series. I personally think the patches are going into the right direction. But I'd highly prefer having a clean migration path for all people that build a zynq_zc70x config. Something similar we did with the ps7_init_gpl files perhaps? Just something that gives us time to migrate users and documentation to the new flow without breaking them all. Sören
Hi Sören, 2015-04-22 2:25 GMT+09:00 Sören Brinkmann <soren.brinkmann@xilinx.com>: > On Fri, 2015-04-17 at 10:38AM +0900, Masahiro Yamada wrote: >> Hi Sören, >> >> >> 2015-04-15 1:03 GMT+09:00 Sören Brinkmann <soren.brinkmann@xilinx.com>: >> > On Tue, 2015-04-14 at 04:50PM +0900, Masahiro Yamada wrote: >> >> Separate CONFIG_TARGET_ZYNQ_{ZC702,ZC706} which is necessary >> >> for the next commit. Adjust doc/README.zynq too. >> >> >> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> >> >> --- >> >> >> >> Changes in v2: None >> >> >> >> arch/arm/cpu/armv7/zynq/Kconfig | 9 ++++++--- >> >> configs/{zynq_zc70x_defconfig => zynq_zc702_defconfig} | 2 +- >> >> configs/zynq_zc706_defconfig | 11 +++++++++++ >> >> doc/README.zynq | 15 ++++----------- >> >> 4 files changed, 22 insertions(+), 15 deletions(-) >> >> rename configs/{zynq_zc70x_defconfig => zynq_zc702_defconfig} (88%) >> >> create mode 100644 configs/zynq_zc706_defconfig >> >> >> >> diff --git a/arch/arm/cpu/armv7/zynq/Kconfig b/arch/arm/cpu/armv7/zynq/Kconfig >> >> index 3a52535..ab4768a 100644 >> >> --- a/arch/arm/cpu/armv7/zynq/Kconfig >> >> +++ b/arch/arm/cpu/armv7/zynq/Kconfig >> >> @@ -9,8 +9,11 @@ config TARGET_ZYNQ_ZED >> >> config TARGET_ZYNQ_MICROZED >> >> bool "Zynq MicroZed" >> >> >> >> -config TARGET_ZYNQ_ZC70X >> >> - bool "Zynq ZC702/ZC706 Board" >> >> +config TARGET_ZYNQ_ZC702 >> >> + bool "Zynq ZC702 Board" >> >> + >> >> +config TARGET_ZYNQ_ZC706 >> >> + bool "Zynq ZC706 Board" >> > >> > Is there a good way to make this more friendly towards a user who is >> > familiar with the current flow? By simply removing it, we'll get plenty >> > of support requests asking what happened. Also, it would void all the >> > documentation we have in wikis etc. A more soft migration path would be >> > better. >> > >> >> >> Currently, the difference between ZC702 and ZC706 is just their device trees. >> >> So, we can use $(DEVICE_TREE) for distinguishing one from the other. Like this. >> >> ---------------->8--------------------------- >> DEVICE_TREE ?= $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%) >> >> hw-platform-$(CONFIG_TARGET_ZYNQ_ZED) := zed_hw_platform >> hw-platform-$(CONFIG_TARGET_ZYNQ_MICROZED) := MicroZed_hw_platform >> hw-platform-$(CONFIG_TARGET_ZYNQ_ZC70X) := $(if $(filter >> zynq-zc702 $(DEVICE_TREE)), ZC702_hw_platform, ZC706_hw_platform) >> ----------------8<--------------------------- >> >> >> >> Another option is to reject this series and stick to the current work-flow. >> It is up to you and Michal, of course. >> The path to ps7_init_gpl.[ch] will change, anyway. >> If it is troublesome, I do not persist on this series. > > I personally think the patches are going into the right direction. But > I'd highly prefer having a clean migration path for all people that > build a zynq_zc70x config. Something similar we did with the > ps7_init_gpl files perhaps? Just something that gives us time to > migrate users and documentation to the new flow without breaking them > all. OK, I did so in v3.
diff --git a/arch/arm/cpu/armv7/zynq/Kconfig b/arch/arm/cpu/armv7/zynq/Kconfig index 3a52535..ab4768a 100644 --- a/arch/arm/cpu/armv7/zynq/Kconfig +++ b/arch/arm/cpu/armv7/zynq/Kconfig @@ -9,8 +9,11 @@ config TARGET_ZYNQ_ZED config TARGET_ZYNQ_MICROZED bool "Zynq MicroZed" -config TARGET_ZYNQ_ZC70X - bool "Zynq ZC702/ZC706 Board" +config TARGET_ZYNQ_ZC702 + bool "Zynq ZC702 Board" + +config TARGET_ZYNQ_ZC706 + bool "Zynq ZC706 Board" config TARGET_ZYNQ_ZC770 bool "Zynq ZC770 Board" @@ -32,7 +35,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "zynq_zed" if TARGET_ZYNQ_ZED default "zynq_microzed" if TARGET_ZYNQ_MICROZED - default "zynq_zc70x" if TARGET_ZYNQ_ZC70X + default "zynq_zc70x" if TARGET_ZYNQ_ZC702 || TARGET_ZYNQ_ZC706 default "zynq_zc770" if TARGET_ZYNQ_ZC770 default "zynq_zybo" if TARGET_ZYNQ_ZYBO diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc702_defconfig similarity index 88% rename from configs/zynq_zc70x_defconfig rename to configs/zynq_zc702_defconfig index 44f3ae0..93641cd 100644 --- a/configs/zynq_zc70x_defconfig +++ b/configs/zynq_zc702_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_ZYNQ=y -CONFIG_TARGET_ZYNQ_ZC70X=y +CONFIG_TARGET_ZYNQ_ZC702=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702" # CONFIG_SYS_MALLOC_F is not set diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig new file mode 100644 index 0000000..821bd82 --- /dev/null +++ b/configs/zynq_zc706_defconfig @@ -0,0 +1,11 @@ +CONFIG_SPL=y +CONFIG_ARM=y +CONFIG_ZYNQ=y +CONFIG_TARGET_ZYNQ_ZC706=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706" +# CONFIG_SYS_MALLOC_F is not set +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_FIT_SIGNATURE=y +CONFIG_DM=y diff --git a/doc/README.zynq b/doc/README.zynq index 043c970..b89c39e 100644 --- a/doc/README.zynq +++ b/doc/README.zynq @@ -17,9 +17,8 @@ Xilinx Zynq-7000 All Programmable SoCs enable extensive system level differentiation, integration, and flexibility through hardware, software, and I/O programmability. -* zc70x - - zc702 (single qspi, gem0, mmc) [1] - - zc706 (dual parallel qspi, gem0, mmc) [2] +* zc702 (single qspi, gem0, mmc) [1] +* zc706 (dual parallel qspi, gem0, mmc) [2] * zed (single qspi, gem0, mmc) [3] * microzed (single qspi, gem0, mmc) [4] * zc770 @@ -30,16 +29,10 @@ and I/O programmability. 3. Building - # Configure for zc70x board - $ make zynq_zc70x_config - Configuring for zynq_zc70x board... - - # Building default dts for zc702 board + ex. configure and build for zc702 board + $ make zynq_zc702_config $ make - # Building specified dts for zc706 board - $ make DEVICE_TREE=zynq-zc706 - 4. Bootmode Zynq has a facility to read the bootmode from the slcr bootmode register
Separate CONFIG_TARGET_ZYNQ_{ZC702,ZC706} which is necessary for the next commit. Adjust doc/README.zynq too. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Changes in v2: None arch/arm/cpu/armv7/zynq/Kconfig | 9 ++++++--- configs/{zynq_zc70x_defconfig => zynq_zc702_defconfig} | 2 +- configs/zynq_zc706_defconfig | 11 +++++++++++ doc/README.zynq | 15 ++++----------- 4 files changed, 22 insertions(+), 15 deletions(-) rename configs/{zynq_zc70x_defconfig => zynq_zc702_defconfig} (88%) create mode 100644 configs/zynq_zc706_defconfig