| Message ID | 1415965022-4912-4-git-send-email-festevam@gmail.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
Hi Fabio, On 14/11/2014 12:37, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > Many boards use a minimal .cfg file in the SPL case. > > Introduce spl_sd.cfg so that we can reuse it. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- > Changes since v1: > - Newly introduced on this series > > arch/arm/imx-common/spl_sd.cfg | 8 ++++++++ > board/compulab/cm_fx6/imximage.cfg | 8 -------- > board/freescale/mx6sabresd/mx6sabresd_spl.cfg | 20 -------------------- > board/kosagi/novena/setup.cfg | 16 ---------------- > configs/cm_fx6_defconfig | 2 +- > configs/mx6sabresd_spl_defconfig | 2 +- > configs/novena_defconfig | 2 +- > 7 files changed, 11 insertions(+), 47 deletions(-) > create mode 100644 arch/arm/imx-common/spl_sd.cfg > delete mode 100644 board/compulab/cm_fx6/imximage.cfg > delete mode 100644 board/freescale/mx6sabresd/mx6sabresd_spl.cfg > delete mode 100644 board/kosagi/novena/setup.cfg > > diff --git a/arch/arm/imx-common/spl_sd.cfg b/arch/arm/imx-common/spl_sd.cfg > new file mode 100644 > index 0000000..5fc3e8a > --- /dev/null > +++ b/arch/arm/imx-common/spl_sd.cfg > @@ -0,0 +1,8 @@ > +/* > + * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/ > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +IMAGE_VERSION 2 > +BOOT_FROM sd > diff --git a/board/compulab/cm_fx6/imximage.cfg b/board/compulab/cm_fx6/imximage.cfg > deleted file mode 100644 > index 420947e..0000000 > --- a/board/compulab/cm_fx6/imximage.cfg > +++ /dev/null > @@ -1,8 +0,0 @@ > -/* > - * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/ > - * > - * SPDX-License-Identifier: GPL-2.0+ > - */ > - > -IMAGE_VERSION 2 > -BOOT_FROM sd > diff --git a/board/freescale/mx6sabresd/mx6sabresd_spl.cfg b/board/freescale/mx6sabresd/mx6sabresd_spl.cfg > deleted file mode 100644 > index 1d031ba..0000000 > --- a/board/freescale/mx6sabresd/mx6sabresd_spl.cfg > +++ /dev/null > @@ -1,20 +0,0 @@ > -/* > - * Copyright (C) 2011 Freescale Semiconductor, Inc. > - * Jason Liu <r64343@freescale.com> > - * > - * SPDX-License-Identifier: GPL-2.0+ > - * > - * Refer doc/README.imximage for more details about how-to configure > - * and create imximage boot image > - * > - * The syntax is taken as close as possible with the kwbimage > - */ > - > -/* image version */ > -IMAGE_VERSION 2 > - > -/* > - * Boot Device : one of > - * spi, sd (the board has no nand neither onenand) > - */ > -BOOT_FROM sd > diff --git a/board/kosagi/novena/setup.cfg b/board/kosagi/novena/setup.cfg > deleted file mode 100644 > index a79d1f7..0000000 > --- a/board/kosagi/novena/setup.cfg > +++ /dev/null > @@ -1,16 +0,0 @@ > -/* > - * Copyright (C) 2014 Marek Vasut <marex@denx.de> > - * > - * SPDX-License-Identifier: GPL-2.0+ > - * > - * Refer docs/README.imxmage for more details about how-to configure > - * and create imximage boot image > - * > - * The syntax is taken as close as possible with the kwbimage > - */ > - > -/* image version */ > -IMAGE_VERSION 2 > - > -/* Boot Device : sd */ > -BOOT_FROM sd > diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig > index 50c06f7..3c0d64f 100644 > --- a/configs/cm_fx6_defconfig > +++ b/configs/cm_fx6_defconfig > @@ -1,4 +1,4 @@ > CONFIG_SPL=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/compulab/cm_fx6/imximage.cfg,MX6QDL,SPL" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" > +S:CONFIG_ARM=y > +S:CONFIG_TARGET_CM_FX6=y > diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig > index b7b26df..12e7844 100644 > --- a/configs/mx6sabresd_spl_defconfig > +++ b/configs/mx6sabresd_spl_defconfig > @@ -1,5 +1,5 @@ > CONFIG_SPL=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6sabresd_spl.cfg,SPL,MX6Q" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q" > +S:CONFIG_ARM=y > +S:CONFIG_TARGET_MX6SABRESD=y > > diff --git a/configs/novena_defconfig b/configs/novena_defconfig > index a560afb..d28dbd7 100644 > --- a/configs/novena_defconfig > +++ b/configs/novena_defconfig > @@ -1,4 +1,4 @@ > CONFIG_SPL=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/kosagi/novena/setup.cfg,MX6Q,SPL" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q,SPL" > +S:CONFIG_ARM=y > +S:CONFIG_TARGET_KOSAGI_NOVENA=y > Acked-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 14/11/2014 12:37, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > Many boards use a minimal .cfg file in the SPL case. > > Introduce spl_sd.cfg so that we can reuse it. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/imx-common/spl_sd.cfg b/arch/arm/imx-common/spl_sd.cfg new file mode 100644 index 0000000..5fc3e8a --- /dev/null +++ b/arch/arm/imx-common/spl_sd.cfg @@ -0,0 +1,8 @@ +/* + * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/ + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +IMAGE_VERSION 2 +BOOT_FROM sd diff --git a/board/compulab/cm_fx6/imximage.cfg b/board/compulab/cm_fx6/imximage.cfg deleted file mode 100644 index 420947e..0000000 --- a/board/compulab/cm_fx6/imximage.cfg +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/ - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -IMAGE_VERSION 2 -BOOT_FROM sd diff --git a/board/freescale/mx6sabresd/mx6sabresd_spl.cfg b/board/freescale/mx6sabresd/mx6sabresd_spl.cfg deleted file mode 100644 index 1d031ba..0000000 --- a/board/freescale/mx6sabresd/mx6sabresd_spl.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (C) 2011 Freescale Semiconductor, Inc. - * Jason Liu <r64343@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ - * - * Refer doc/README.imximage for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -/* image version */ -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi, sd (the board has no nand neither onenand) - */ -BOOT_FROM sd diff --git a/board/kosagi/novena/setup.cfg b/board/kosagi/novena/setup.cfg deleted file mode 100644 index a79d1f7..0000000 --- a/board/kosagi/novena/setup.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2014 Marek Vasut <marex@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ - * - * Refer docs/README.imxmage for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -/* image version */ -IMAGE_VERSION 2 - -/* Boot Device : sd */ -BOOT_FROM sd diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 50c06f7..3c0d64f 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/compulab/cm_fx6/imximage.cfg,MX6QDL,SPL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" +S:CONFIG_ARM=y +S:CONFIG_TARGET_CM_FX6=y diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index b7b26df..12e7844 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6sabresd_spl.cfg,SPL,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q" +S:CONFIG_ARM=y +S:CONFIG_TARGET_MX6SABRESD=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index a560afb..d28dbd7 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/kosagi/novena/setup.cfg,MX6Q,SPL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q,SPL" +S:CONFIG_ARM=y +S:CONFIG_TARGET_KOSAGI_NOVENA=y