Message ID | 1528283747-31735-1-git-send-email-pramod.kumar_1@nxp.com |
---|---|
State | Superseded |
Delegated to: | York Sun |
Headers | show |
Series | [U-Boot,1/2,v2] board: freescale: ls1012afrx:Common files to support | expand |
On 06/06/2018 04:16 AM, Pramod Kumar wrote: > LS1012A-FRDM and LS1012A-FRWY board. > > 1-Move all common files applicable for both boards LS1012A-FRDM > and LS1012A-FRWY into board directory ls1012afrx. > 2-Restructure LS1012A-FRDM code. Only board specific files are > in LS1012A-FRDM board directory. > > Signed-off-by: Pramod Kumar <pramod.kumar_1@nxp.com> > --- > Depends on: > http://patchwork.ozlabs.org/patch/918935/ > http://patchwork.ozlabs.org/patch/918933/ > http://patchwork.ozlabs.org/patch/918932/ > > Changes for v2: > - Rebased patch to above dependency patches > Previous patch 918933 added FRWY board into FRDM Kconfig. If you want to separate them, send a patch to do that. Don't mix with adding a new board. York
>-----Original Message----- >From: York Sun >Sent: Tuesday, July 3, 2018 8:53 PM >To: Pramod Kumar <pramod.kumar_1@nxp.com>; u-boot@lists.denx.de >Subject: Re: [PATCH 1/2 v2] board: freescale: ls1012afrx:Common files to >support > >On 06/06/2018 04:16 AM, Pramod Kumar wrote: >> LS1012A-FRDM and LS1012A-FRWY board. >> >> 1-Move all common files applicable for both boards LS1012A-FRDM >> and LS1012A-FRWY into board directory ls1012afrx. >> 2-Restructure LS1012A-FRDM code. Only board specific files are >> in LS1012A-FRDM board directory. >> >> Signed-off-by: Pramod Kumar <pramod.kumar_1@nxp.com> >> --- >> Depends on: >> http://patchwork.ozlabs.org/patch/918935/ >> http://patchwork.ozlabs.org/patch/918933/ >> http://patchwork.ozlabs.org/patch/918932/ >> >> Changes for v2: >> - Rebased patch to above dependency patches >> > >Previous patch 918933 added FRWY board into FRDM Kconfig. If you want to >separate them, send a patch to do that. Don't mix with adding a new board. > For patch http://patchwork.ozlabs.org/patch/926134/ [U-Boot,1/2,v2] board: freescale: ls1012afrx:Common files to support In this patch, i have removed FRWY kconfig support. I have created a new directory "board/freescale/ls1012afrx/" and added common files which are applicable for both FRDM and FRWY. This patch would enable only FRDM board. For patch http://patchwork.ozlabs.org/patch/926132/ [U-Boot,2/2,v2] board: freescale: ls1012afrwy: Add LS1012A-FRWY board support. This patch create support for FRWY board by creating new directory "/board/freescale/ls1012afrwy". FRWY board would use the common files located in "board/freescale/ls1012afrx/". This patch would enable the FRWY board. >York
On 06/06/2018 04:16 AM, Pramod Kumar wrote: > LS1012A-FRDM and LS1012A-FRWY board. > > 1-Move all common files applicable for both boards LS1012A-FRDM > and LS1012A-FRWY into board directory ls1012afrx. > 2-Restructure LS1012A-FRDM code. Only board specific files are > in LS1012A-FRDM board directory. > > Signed-off-by: Pramod Kumar <pramod.kumar_1@nxp.com> > --- > Depends on: > http://patchwork.ozlabs.org/patch/918935/ > http://patchwork.ozlabs.org/patch/918933/ > http://patchwork.ozlabs.org/patch/918932/ > > Changes for v2: > - Rebased patch to above dependency patches > > arch/arm/Kconfig | 2 + > board/freescale/ls1012afrdm/Kconfig | 60 ---------------------- > board/freescale/ls1012afrdm/MAINTAINERS | 12 +---- > board/freescale/ls1012afrdm/Makefile | 4 +- > board/freescale/ls1012afrx/Kconfig | 27 ++++++++++ > board/freescale/{ls1012afrdm => ls1012afrx}/eth.c | 0 > .../ls1012afrdm.c => ls1012afrx/ls1012afrx.c} | 0 > 7 files changed, 32 insertions(+), 73 deletions(-) > create mode 100644 board/freescale/ls1012afrx/Kconfig > rename board/freescale/{ls1012afrdm => ls1012afrx}/eth.c (100%) > rename board/freescale/{ls1012afrdm/ls1012afrdm.c => ls1012afrx/ls1012afrx.c} (100%) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 22234cd..ffff190 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -1417,6 +1417,8 @@ source "board/freescale/ls1046ardb/Kconfig" > source "board/freescale/ls1012aqds/Kconfig" > source "board/freescale/ls1012ardb/Kconfig" > source "board/freescale/ls1012afrdm/Kconfig" > +source "board/freescale/ls1012afrx/Kconfig" > +source "board/freescale/ls1012afrwy/Kconfig" > source "board/freescale/mx35pdk/Kconfig" > source "board/freescale/s32v234evb/Kconfig" > source "board/gdsys/a38x/Kconfig" > diff --git a/board/freescale/ls1012afrdm/Kconfig b/board/freescale/ls1012afrdm/Kconfig > index f52a896..58e592d 100644 > --- a/board/freescale/ls1012afrdm/Kconfig > +++ b/board/freescale/ls1012afrdm/Kconfig > @@ -21,63 +21,3 @@ config SYS_LS_PPA_FW_ADDR > default 0x40400000 > > endif > - > -if FSL_PFE > - > -config BOARD_SPECIFIC_OPTIONS # dummy > - def_bool y > - select PHYLIB > - imply PHY_REALTEK > - imply PHY_ATHEROS > - > -config DDR_PFE_PHYS_BASEADDR > - hex "PFE DDR physical base address" > - default 0x03800000 > - > -config DDR_PFE_BASEADDR > - hex "PFE DDR base address" > - default 0x83800000 > - > -config PFE_EMAC1_PHY_ADDR > - hex "PFE DDR base address" > - default 0x2 > - > -config PFE_EMAC2_PHY_ADDR > - hex "PFE DDR base address" > - default 0x1 > - > -endif > - > -if TARGET_LS1012AFRWY > - > -config SYS_BOARD > - default "ls1012afrdm" > - > -config SYS_VENDOR > - default "freescale" > - > -config SYS_SOC > - default "fsl-layerscape" > - > -config SYS_CONFIG_NAME > - default "ls1012afrwy" > - > -config SYS_LS_PFE_FW_ADDR > - hex "Flash address of PFE firmware" > - default 0x40020000 > - > -config SYS_LS_PPA_FW_ADDR > - hex "PPA Firmware Addr" > - default 0x40060000 > - > -config SYS_LS_PPA_ESBC_ADDR > - hex "PPA Firmware HDR Addr" > - default 0x401f4000 > - > -config SYS_LS_PFE_ESBC_ADDR > - hex "PFE Firmware HDR Addr" > - default 0x401f8000 > - > -endif > - > -source "board/freescale/common/Kconfig" Why do you remove this file, but only add it for ls1012afrx below? Doesn't ls1012afrdm use the same common file? Please rebase before sending another version. York
>-----Original Message----- >From: York Sun >Sent: Wednesday, July 11, 2018 2:52 AM >To: Pramod Kumar <pramod.kumar_1@nxp.com>; u-boot@lists.denx.de >Subject: Re: [PATCH 1/2 v2] board: freescale: ls1012afrx:Common files to >support > >On 06/06/2018 04:16 AM, Pramod Kumar wrote: >> LS1012A-FRDM and LS1012A-FRWY board. >> >> 1-Move all common files applicable for both boards LS1012A-FRDM >> and LS1012A-FRWY into board directory ls1012afrx. >> 2-Restructure LS1012A-FRDM code. Only board specific files are >> in LS1012A-FRDM board directory. >> >> Signed-off-by: Pramod Kumar <pramod.kumar_1@nxp.com> >> --- >> Depends on: >> http://patchwork.ozlabs.org/patch/918935/ >> http://patchwork.ozlabs.org/patch/918933/ >> http://patchwork.ozlabs.org/patch/918932/ >> >> Changes for v2: >> - Rebased patch to above dependency patches >> >> arch/arm/Kconfig | 2 + >> board/freescale/ls1012afrdm/Kconfig | 60 ---------------------- >> board/freescale/ls1012afrdm/MAINTAINERS | 12 +---- >> board/freescale/ls1012afrdm/Makefile | 4 +- >> board/freescale/ls1012afrx/Kconfig | 27 ++++++++++ >> board/freescale/{ls1012afrdm => ls1012afrx}/eth.c | 0 >> .../ls1012afrdm.c => ls1012afrx/ls1012afrx.c} | 0 >> 7 files changed, 32 insertions(+), 73 deletions(-) create mode >> 100644 board/freescale/ls1012afrx/Kconfig >> rename board/freescale/{ls1012afrdm => ls1012afrx}/eth.c (100%) >> rename board/freescale/{ls1012afrdm/ls1012afrdm.c => >> ls1012afrx/ls1012afrx.c} (100%) >> >> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index >> 22234cd..ffff190 100644 >> --- a/arch/arm/Kconfig >> +++ b/arch/arm/Kconfig >> @@ -1417,6 +1417,8 @@ source "board/freescale/ls1046ardb/Kconfig" >> source "board/freescale/ls1012aqds/Kconfig" >> source "board/freescale/ls1012ardb/Kconfig" >> source "board/freescale/ls1012afrdm/Kconfig" >> +source "board/freescale/ls1012afrx/Kconfig" >> +source "board/freescale/ls1012afrwy/Kconfig" >> source "board/freescale/mx35pdk/Kconfig" >> source "board/freescale/s32v234evb/Kconfig" >> source "board/gdsys/a38x/Kconfig" >> diff --git a/board/freescale/ls1012afrdm/Kconfig >> b/board/freescale/ls1012afrdm/Kconfig >> index f52a896..58e592d 100644 >> --- a/board/freescale/ls1012afrdm/Kconfig >> +++ b/board/freescale/ls1012afrdm/Kconfig >> @@ -21,63 +21,3 @@ config SYS_LS_PPA_FW_ADDR >> default 0x40400000 >> >> endif >> - >> -if FSL_PFE >> - >> -config BOARD_SPECIFIC_OPTIONS # dummy >> - def_bool y >> - select PHYLIB >> - imply PHY_REALTEK >> - imply PHY_ATHEROS >> - >> -config DDR_PFE_PHYS_BASEADDR >> - hex "PFE DDR physical base address" >> - default 0x03800000 >> - >> -config DDR_PFE_BASEADDR >> - hex "PFE DDR base address" >> - default 0x83800000 >> - >> -config PFE_EMAC1_PHY_ADDR >> - hex "PFE DDR base address" >> - default 0x2 >> - >> -config PFE_EMAC2_PHY_ADDR >> - hex "PFE DDR base address" >> - default 0x1 >> - >> -endif >> - >> -if TARGET_LS1012AFRWY >> - >> -config SYS_BOARD >> - default "ls1012afrdm" >> - >> -config SYS_VENDOR >> - default "freescale" >> - >> -config SYS_SOC >> - default "fsl-layerscape" >> - >> -config SYS_CONFIG_NAME >> - default "ls1012afrwy" >> - >> -config SYS_LS_PFE_FW_ADDR >> - hex "Flash address of PFE firmware" >> - default 0x40020000 >> - >> -config SYS_LS_PPA_FW_ADDR >> - hex "PPA Firmware Addr" >> - default 0x40060000 >> - >> -config SYS_LS_PPA_ESBC_ADDR >> - hex "PPA Firmware HDR Addr" >> - default 0x401f4000 >> - >> -config SYS_LS_PFE_ESBC_ADDR >> - hex "PFE Firmware HDR Addr" >> - default 0x401f8000 >> - >> -endif >> - >> -source "board/freescale/common/Kconfig" > >Why do you remove this file, but only add it for ls1012afrx below? >Doesn't ls1012afrdm use the same common file? > >Please rebase before sending another version. >> ls1012frdm and ls1012afrwy common kconfigs are in "board/freescale/ls1012afrx/Kconfig", however >>board specific kconfigs are in >>"board/freescale/ls1012afrdm/Kconfig" >>and >> "board/freescale/ls1012afrwy/Kconfig" >York
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 22234cd..ffff190 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1417,6 +1417,8 @@ source "board/freescale/ls1046ardb/Kconfig" source "board/freescale/ls1012aqds/Kconfig" source "board/freescale/ls1012ardb/Kconfig" source "board/freescale/ls1012afrdm/Kconfig" +source "board/freescale/ls1012afrx/Kconfig" +source "board/freescale/ls1012afrwy/Kconfig" source "board/freescale/mx35pdk/Kconfig" source "board/freescale/s32v234evb/Kconfig" source "board/gdsys/a38x/Kconfig" diff --git a/board/freescale/ls1012afrdm/Kconfig b/board/freescale/ls1012afrdm/Kconfig index f52a896..58e592d 100644 --- a/board/freescale/ls1012afrdm/Kconfig +++ b/board/freescale/ls1012afrdm/Kconfig @@ -21,63 +21,3 @@ config SYS_LS_PPA_FW_ADDR default 0x40400000 endif - -if FSL_PFE - -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - select PHYLIB - imply PHY_REALTEK - imply PHY_ATHEROS - -config DDR_PFE_PHYS_BASEADDR - hex "PFE DDR physical base address" - default 0x03800000 - -config DDR_PFE_BASEADDR - hex "PFE DDR base address" - default 0x83800000 - -config PFE_EMAC1_PHY_ADDR - hex "PFE DDR base address" - default 0x2 - -config PFE_EMAC2_PHY_ADDR - hex "PFE DDR base address" - default 0x1 - -endif - -if TARGET_LS1012AFRWY - -config SYS_BOARD - default "ls1012afrdm" - -config SYS_VENDOR - default "freescale" - -config SYS_SOC - default "fsl-layerscape" - -config SYS_CONFIG_NAME - default "ls1012afrwy" - -config SYS_LS_PFE_FW_ADDR - hex "Flash address of PFE firmware" - default 0x40020000 - -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x40060000 - -config SYS_LS_PPA_ESBC_ADDR - hex "PPA Firmware HDR Addr" - default 0x401f4000 - -config SYS_LS_PFE_ESBC_ADDR - hex "PFE Firmware HDR Addr" - default 0x401f8000 - -endif - -source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls1012afrdm/MAINTAINERS b/board/freescale/ls1012afrdm/MAINTAINERS index f3fcdb8..b618d78 100644 --- a/board/freescale/ls1012afrdm/MAINTAINERS +++ b/board/freescale/ls1012afrdm/MAINTAINERS @@ -1,17 +1,7 @@ LS1012AFRDM BOARD M: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> S: Maintained +F: board/freescale/ls1012afrx/ F: board/freescale/ls1012afrdm/ F: include/configs/ls1012afrdm.h F: configs/ls1012afrdm_qspi_defconfig - -LS1012AFRWY BOARD -M: Bhaskar Upadhaya <bhaskar.upadhaya@nxp.com> -S: Maintained -F: board/freescale/ls1012afrwy/ -F: include/configs/ls1012afrwy.h -F: configs/ls1012afrwy_qspi_defconfig - -M: Vinitha V Pillai <vinitha.pillai@nxp.com> -S: Maintained -F: configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig diff --git a/board/freescale/ls1012afrdm/Makefile b/board/freescale/ls1012afrdm/Makefile index 1e53c96..a318506 100644 --- a/board/freescale/ls1012afrdm/Makefile +++ b/board/freescale/ls1012afrdm/Makefile @@ -4,5 +4,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += ls1012afrdm.o -obj-$(CONFIG_FSL_PFE) += eth.o +obj-y += ../ls1012afrx/ls1012afrx.o +obj-$(CONFIG_FSL_PFE) += ../ls1012afrx/eth.o diff --git a/board/freescale/ls1012afrx/Kconfig b/board/freescale/ls1012afrx/Kconfig new file mode 100644 index 0000000..a2884e5 --- /dev/null +++ b/board/freescale/ls1012afrx/Kconfig @@ -0,0 +1,27 @@ +if FSL_PFE + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select PHYLIB + imply PHY_REALTEK + imply PHY_ATHEROS + +config DDR_PFE_PHYS_BASEADDR + hex "PFE DDR physical base address" + default 0x03800000 + +config DDR_PFE_BASEADDR + hex "PFE DDR base address" + default 0x83800000 + +config PFE_EMAC1_PHY_ADDR + hex "PFE DDR base address" + default 0x2 + +config PFE_EMAC2_PHY_ADDR + hex "PFE DDR base address" + default 0x1 + +endif + +source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls1012afrdm/eth.c b/board/freescale/ls1012afrx/eth.c similarity index 100% rename from board/freescale/ls1012afrdm/eth.c rename to board/freescale/ls1012afrx/eth.c diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrx/ls1012afrx.c similarity index 100% rename from board/freescale/ls1012afrdm/ls1012afrdm.c rename to board/freescale/ls1012afrx/ls1012afrx.c
LS1012A-FRDM and LS1012A-FRWY board. 1-Move all common files applicable for both boards LS1012A-FRDM and LS1012A-FRWY into board directory ls1012afrx. 2-Restructure LS1012A-FRDM code. Only board specific files are in LS1012A-FRDM board directory. Signed-off-by: Pramod Kumar <pramod.kumar_1@nxp.com> --- Depends on: http://patchwork.ozlabs.org/patch/918935/ http://patchwork.ozlabs.org/patch/918933/ http://patchwork.ozlabs.org/patch/918932/ Changes for v2: - Rebased patch to above dependency patches arch/arm/Kconfig | 2 + board/freescale/ls1012afrdm/Kconfig | 60 ---------------------- board/freescale/ls1012afrdm/MAINTAINERS | 12 +---- board/freescale/ls1012afrdm/Makefile | 4 +- board/freescale/ls1012afrx/Kconfig | 27 ++++++++++ board/freescale/{ls1012afrdm => ls1012afrx}/eth.c | 0 .../ls1012afrdm.c => ls1012afrx/ls1012afrx.c} | 0 7 files changed, 32 insertions(+), 73 deletions(-) create mode 100644 board/freescale/ls1012afrx/Kconfig rename board/freescale/{ls1012afrdm => ls1012afrx}/eth.c (100%) rename board/freescale/{ls1012afrdm/ls1012afrdm.c => ls1012afrx/ls1012afrx.c} (100%)