* [U-Boot] [PATCH v2 2/4] gw_ventana: Move the DCD settings to spl code
2014-11-14 11:36 [U-Boot] [PATCH v2 1/4] mx6sabresd: Move the DCD settings to spl code Fabio Estevam
@ 2014-11-14 11:37 ` Fabio Estevam
2014-11-20 9:36 ` Stefano Babic
2014-12-04 11:49 ` Stefan Roese
2014-11-14 11:37 ` [U-Boot] [PATCH v2 3/4] novena: " Fabio Estevam
` (2 subsequent siblings)
3 siblings, 2 replies; 12+ messages in thread
From: Fabio Estevam @ 2014-11-14 11:37 UTC (permalink / raw)
To: u-boot
From: Fabio Estevam <fabio.estevam@freescale.com>
mx6sabresd_spl.cfg configures CCM registers, GPR registers and CCM_CCOSR.
Move the configuration to the spl code.
CCM_CCOSR setting is no longer required to get audio functionality in the
kernel, so remove such setting.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Newly introduced on this series
board/gateworks/gw_ventana/clocks.cfg | 42 -----------------------------
board/gateworks/gw_ventana/gw_ventana.cfg | 6 -----
board/gateworks/gw_ventana/gw_ventana_spl.c | 28 +++++++++++++++++++
3 files changed, 28 insertions(+), 48 deletions(-)
delete mode 100644 board/gateworks/gw_ventana/clocks.cfg
diff --git a/board/gateworks/gw_ventana/clocks.cfg b/board/gateworks/gw_ventana/clocks.cfg
deleted file mode 100644
index a8118a2..0000000
--- a/board/gateworks/gw_ventana/clocks.cfg
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2013 Boundary Devices
- * Copyright (C) 2013 Gateworks Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
- *
- * Device Configuration Data (DCD)
- *
- * Each entry must have the format:
- * Addr-type Address Value
- *
- * where:
- * Addr-type register length (1,2 or 4 bytes)
- * Address absolute address of the register
- * value value to be stored in the register
- */
-
-/* set the default clock gate to save power */
-DATA 4, CCM_CCGR0, 0x00C03F3F
-DATA 4, CCM_CCGR1, 0x0030FC03
-DATA 4, CCM_CCGR2, 0x0FFFC000
-DATA 4, CCM_CCGR3, 0x3FF00000
-DATA 4, CCM_CCGR4, 0xFFFFF300 /* enable NAND/GPMI/BCH clocks */
-DATA 4, CCM_CCGR5, 0x0F0000C3
-DATA 4, CCM_CCGR6, 0x000003FF
-
-/* enable AXI cache for VDOA/VPU/IPU */
-DATA 4, MX6_IOMUXC_GPR4, 0xF00000CF
-/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
-DATA 4, MX6_IOMUXC_GPR6, 0x007F007F
-DATA 4, MX6_IOMUXC_GPR7, 0x007F007F
-
-/*
- * Setup CCM_CCOSR register as follows:
- *
- * cko1_en = 1 --> CKO1 enabled
- * cko1_div = 111 --> divide by 8
- * cko1_sel = 1011 --> ahb_clk_root
- *
- * This sets CKO1 at ahb_clk_root/8 = 132/8 = 16.5 MHz
- */
-DATA 4, CCM_CCOSR, 0x000000fb
diff --git a/board/gateworks/gw_ventana/gw_ventana.cfg b/board/gateworks/gw_ventana/gw_ventana.cfg
index 9ab95f5..dd8aa61 100644
--- a/board/gateworks/gw_ventana/gw_ventana.cfg
+++ b/board/gateworks/gw_ventana/gw_ventana.cfg
@@ -21,9 +21,3 @@ BOOT_FROM spi
#else
BOOT_FROM nand
#endif
-
-#define __ASSEMBLY__
-#include <config.h>
-#include "asm/arch/iomux.h"
-#include "asm/arch/crm_regs.h"
-#include "clocks.cfg"
diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index ca35b3c..d6a5847 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <i2c.h>
#include <asm/io.h>
+#include <asm/arch/crm_regs.h>
#include <asm/arch/iomux.h>
#include <asm/arch/mx6-ddr.h>
#include <asm/arch/mx6-pins.h>
@@ -392,6 +393,30 @@ static void spl_dram_init(int width, int size_mb, int board_model)
mx6_dram_cfg(&sysinfo, calib, mem);
}
+static void ccgr_init(void)
+{
+ struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
+ writel(0x00C03F3F, &ccm->CCGR0);
+ writel(0x0030FC03, &ccm->CCGR1);
+ writel(0x0FFFC000, &ccm->CCGR2);
+ writel(0x3FF00000, &ccm->CCGR3);
+ writel(0x00FFF300, &ccm->CCGR4);
+ writel(0x0F0000C3, &ccm->CCGR5);
+ writel(0x000003FF, &ccm->CCGR6);
+}
+
+static void gpr_init(void)
+{
+ struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
+
+ /* enable AXI cache for VDOA/VPU/IPU */
+ writel(0xF00000CF, &iomux->gpr[4]);
+ /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
+ writel(0x007F007F, &iomux->gpr[6]);
+ writel(0x007F007F, &iomux->gpr[7]);
+}
+
/*
* called from C runtime startup code (arch/arm/lib/crt0.S:_main)
* - we have a stack and a place to store GD, both in SRAM
@@ -405,6 +430,9 @@ void board_init_f(ulong dummy)
/* setup AIPS and disable watchdog */
arch_cpu_init();
+ ccgr_init();
+ gpr_init();
+
/* iomux and setup of i2c */
board_early_init_f();
i2c_setup_iomux();
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH v2 2/4] gw_ventana: Move the DCD settings to spl code
2014-11-14 11:37 ` [U-Boot] [PATCH v2 2/4] gw_ventana: " Fabio Estevam
@ 2014-11-20 9:36 ` Stefano Babic
2014-12-04 11:49 ` Stefan Roese
1 sibling, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2014-11-20 9:36 UTC (permalink / raw)
To: u-boot
On 14/11/2014 12:37, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> mx6sabresd_spl.cfg configures CCM registers, GPR registers and CCM_CCOSR.
>
> Move the configuration to the spl code.
>
> CCM_CCOSR setting is no longer required to get audio functionality in the
> kernel, so remove such setting.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 2/4] gw_ventana: Move the DCD settings to spl code
2014-11-14 11:37 ` [U-Boot] [PATCH v2 2/4] gw_ventana: " Fabio Estevam
2014-11-20 9:36 ` Stefano Babic
@ 2014-12-04 11:49 ` Stefan Roese
1 sibling, 0 replies; 12+ messages in thread
From: Stefan Roese @ 2014-12-04 11:49 UTC (permalink / raw)
To: u-boot
Hi Fabio, Hi Tim,
On 14.11.2014 12:37, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> mx6sabresd_spl.cfg configures CCM registers, GPR registers and CCM_CCOSR.
>
> Move the configuration to the spl code.
>
> CCM_CCOSR setting is no longer required to get audio functionality in the
> kernel, so remove such setting.
While reworking another mx6 based board (patches will follow soon), I
noticed a problem with this patch. Please see below.
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v1:
> - Newly introduced on this series
>
> board/gateworks/gw_ventana/clocks.cfg | 42 -----------------------------
> board/gateworks/gw_ventana/gw_ventana.cfg | 6 -----
> board/gateworks/gw_ventana/gw_ventana_spl.c | 28 +++++++++++++++++++
> 3 files changed, 28 insertions(+), 48 deletions(-)
> delete mode 100644 board/gateworks/gw_ventana/clocks.cfg
>
> diff --git a/board/gateworks/gw_ventana/clocks.cfg b/board/gateworks/gw_ventana/clocks.cfg
> deleted file mode 100644
> index a8118a2..0000000
> --- a/board/gateworks/gw_ventana/clocks.cfg
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -/*
> - * Copyright (C) 2013 Boundary Devices
> - * Copyright (C) 2013 Gateworks Corporation
> - *
> - * SPDX-License-Identifier: GPL-2.0+
> - *
> - * Device Configuration Data (DCD)
> - *
> - * Each entry must have the format:
> - * Addr-type Address Value
> - *
> - * where:
> - * Addr-type register length (1,2 or 4 bytes)
> - * Address absolute address of the register
> - * value value to be stored in the register
> - */
> -
> -/* set the default clock gate to save power */
> -DATA 4, CCM_CCGR0, 0x00C03F3F
> -DATA 4, CCM_CCGR1, 0x0030FC03
> -DATA 4, CCM_CCGR2, 0x0FFFC000
> -DATA 4, CCM_CCGR3, 0x3FF00000
> -DATA 4, CCM_CCGR4, 0xFFFFF300 /* enable NAND/GPMI/BCH clocks */
Notice here the 0xFFFFF300...
> -DATA 4, CCM_CCGR5, 0x0F0000C3
> -DATA 4, CCM_CCGR6, 0x000003FF
> -
> -/* enable AXI cache for VDOA/VPU/IPU */
> -DATA 4, MX6_IOMUXC_GPR4, 0xF00000CF
> -/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
> -DATA 4, MX6_IOMUXC_GPR6, 0x007F007F
> -DATA 4, MX6_IOMUXC_GPR7, 0x007F007F
> -
> -/*
> - * Setup CCM_CCOSR register as follows:
> - *
> - * cko1_en = 1 --> CKO1 enabled
> - * cko1_div = 111 --> divide by 8
> - * cko1_sel = 1011 --> ahb_clk_root
> - *
> - * This sets CKO1 at ahb_clk_root/8 = 132/8 = 16.5 MHz
> - */
> -DATA 4, CCM_CCOSR, 0x000000fb
> diff --git a/board/gateworks/gw_ventana/gw_ventana.cfg b/board/gateworks/gw_ventana/gw_ventana.cfg
> index 9ab95f5..dd8aa61 100644
> --- a/board/gateworks/gw_ventana/gw_ventana.cfg
> +++ b/board/gateworks/gw_ventana/gw_ventana.cfg
> @@ -21,9 +21,3 @@ BOOT_FROM spi
> #else
> BOOT_FROM nand
> #endif
> -
> -#define __ASSEMBLY__
> -#include <config.h>
> -#include "asm/arch/iomux.h"
> -#include "asm/arch/crm_regs.h"
> -#include "clocks.cfg"
> diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
> index ca35b3c..d6a5847 100644
> --- a/board/gateworks/gw_ventana/gw_ventana_spl.c
> +++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
> @@ -8,6 +8,7 @@
> #include <common.h>
> #include <i2c.h>
> #include <asm/io.h>
> +#include <asm/arch/crm_regs.h>
> #include <asm/arch/iomux.h>
> #include <asm/arch/mx6-ddr.h>
> #include <asm/arch/mx6-pins.h>
> @@ -392,6 +393,30 @@ static void spl_dram_init(int width, int size_mb, int board_model)
> mx6_dram_cfg(&sysinfo, calib, mem);
> }
>
> +static void ccgr_init(void)
> +{
> + struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
> +
> + writel(0x00C03F3F, &ccm->CCGR0);
> + writel(0x0030FC03, &ccm->CCGR1);
> + writel(0x0FFFC000, &ccm->CCGR2);
> + writel(0x3FF00000, &ccm->CCGR3);
> + writel(0x00FFF300, &ccm->CCGR4);
... and now here the 0x00FFF300! I'm pretty sure that it should be the
same value as above. Otherwise NAND booting will not work correctly. At
least from my experience.
I'll send a patch to fix this shortly...
Thanks,
Stefan
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 3/4] novena: Move the DCD settings to spl code
2014-11-14 11:36 [U-Boot] [PATCH v2 1/4] mx6sabresd: Move the DCD settings to spl code Fabio Estevam
2014-11-14 11:37 ` [U-Boot] [PATCH v2 2/4] gw_ventana: " Fabio Estevam
@ 2014-11-14 11:37 ` Fabio Estevam
2014-11-14 20:07 ` Marek Vasut
2014-11-20 9:37 ` Stefano Babic
2014-11-14 11:37 ` [U-Boot] [PATCH v2 4/4] mx6: Use a common SPL configuration file Fabio Estevam
2014-11-20 9:36 ` [U-Boot] [PATCH v2 1/4] mx6sabresd: Move the DCD settings to spl code Stefano Babic
3 siblings, 2 replies; 12+ messages in thread
From: Fabio Estevam @ 2014-11-14 11:37 UTC (permalink / raw)
To: u-boot
From: Fabio Estevam <fabio.estevam@freescale.com>
mx6sabresd_spl.cfg configures CCM registers, GPR registers and CCM_CCOSR.
Move the configuration to the spl code.
CCM_CCOSR setting is no longer required to get audio functionality in the
kernel, so remove such setting.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Newly introduced on this series
board/kosagi/novena/novena_spl.c | 27 +++++++++++++++++++++++++++
board/kosagi/novena/setup.cfg | 31 -------------------------------
2 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c
index c4155dd..9cf3979 100644
--- a/board/kosagi/novena/novena_spl.c
+++ b/board/kosagi/novena/novena_spl.c
@@ -533,6 +533,30 @@ static struct mx6_ddr3_cfg elpida_4gib_1600 = {
.trasmin = 3590,
};
+static void ccgr_init(void)
+{
+ struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
+ writel(0x00C03F3F, &ccm->CCGR0);
+ writel(0x0030FC03, &ccm->CCGR1);
+ writel(0x0FFFC000, &ccm->CCGR2);
+ writel(0x3FF00000, &ccm->CCGR3);
+ writel(0xFFFFF300, &ccm->CCGR4);
+ writel(0x0F0000C3, &ccm->CCGR5);
+ writel(0x000003FF, &ccm->CCGR6);
+}
+
+static void gpr_init(void)
+{
+ struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
+
+ /* enable AXI cache for VDOA/VPU/IPU */
+ writel(0xF00000CF, &iomux->gpr[4]);
+ /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
+ writel(0x007F007F, &iomux->gpr[6]);
+ writel(0x007F007F, &iomux->gpr[7]);
+}
+
/*
* called from C runtime startup code (arch/arm/lib/crt0.S:_main)
* - we have a stack and a place to store GD, both in SRAM
@@ -543,6 +567,9 @@ void board_init_f(ulong dummy)
/* setup AIPS and disable watchdog */
arch_cpu_init();
+ ccgr_init();
+ gpr_init();
+
/* setup GP timer */
timer_init();
diff --git a/board/kosagi/novena/setup.cfg b/board/kosagi/novena/setup.cfg
index 18d139c..a79d1f7 100644
--- a/board/kosagi/novena/setup.cfg
+++ b/board/kosagi/novena/setup.cfg
@@ -14,34 +14,3 @@ IMAGE_VERSION 2
/* Boot Device : sd */
BOOT_FROM sd
-
-#define __ASSEMBLY__
-#include <config.h>
-#include "asm/arch/iomux.h"
-#include "asm/arch/crm_regs.h"
-
-/* set the default clock gate to save power */
-DATA 4, CCM_CCGR0, 0x00C03F3F
-DATA 4, CCM_CCGR1, 0x0030FC03
-DATA 4, CCM_CCGR2, 0x0FFFC000
-DATA 4, CCM_CCGR3, 0x3FF00000
-DATA 4, CCM_CCGR4, 0xFFFFF300 /* enable NAND/GPMI/BCH clocks */
-DATA 4, CCM_CCGR5, 0x0F0000C3
-DATA 4, CCM_CCGR6, 0x000003FF
-
-/* enable AXI cache for VDOA/VPU/IPU */
-DATA 4, MX6_IOMUXC_GPR4, 0xF00000CF
-/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
-DATA 4, MX6_IOMUXC_GPR6, 0x007F007F
-DATA 4, MX6_IOMUXC_GPR7, 0x007F007F
-
-/*
- * Setup CCM_CCOSR register as follows:
- *
- * cko1_en = 1 --> CKO1 enabled
- * cko1_div = 111 --> divide by 8
- * cko1_sel = 1011 --> ahb_clk_root
- *
- * This sets CKO1 at ahb_clk_root/8 = 132/8 = 16.5 MHz
- */
-DATA 4, CCM_CCOSR, 0x000000fb
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH v2 3/4] novena: Move the DCD settings to spl code
2014-11-14 11:37 ` [U-Boot] [PATCH v2 3/4] novena: " Fabio Estevam
@ 2014-11-14 20:07 ` Marek Vasut
2014-11-20 9:29 ` Stefano Babic
2014-11-20 9:37 ` Stefano Babic
1 sibling, 1 reply; 12+ messages in thread
From: Marek Vasut @ 2014-11-14 20:07 UTC (permalink / raw)
To: u-boot
On Friday, November 14, 2014 at 12:37:01 PM, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> mx6sabresd_spl.cfg configures CCM registers, GPR registers and CCM_CCOSR.
>
> Move the configuration to the spl code.
>
> CCM_CCOSR setting is no longer required to get audio functionality in the
> kernel, so remove such setting.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Board still works.
Reviewed-by: Marek Vasut <marex@denx.de>
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 3/4] novena: Move the DCD settings to spl code
2014-11-14 20:07 ` Marek Vasut
@ 2014-11-20 9:29 ` Stefano Babic
0 siblings, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2014-11-20 9:29 UTC (permalink / raw)
To: u-boot
On 14/11/2014 21:07, Marek Vasut wrote:
> On Friday, November 14, 2014 at 12:37:01 PM, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>
>> mx6sabresd_spl.cfg configures CCM registers, GPR registers and CCM_CCOSR.
>>
>> Move the configuration to the spl code.
>>
>> CCM_CCOSR setting is no longer required to get audio functionality in the
>> kernel, so remove such setting.
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>
> Board still works.
I wonder you can compile it, because crm_regs.h is missing in
novena_spl.c. I fix it myself, but I am wondering that it worked on your
side.
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 3/4] novena: Move the DCD settings to spl code
2014-11-14 11:37 ` [U-Boot] [PATCH v2 3/4] novena: " Fabio Estevam
2014-11-14 20:07 ` Marek Vasut
@ 2014-11-20 9:37 ` Stefano Babic
1 sibling, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2014-11-20 9:37 UTC (permalink / raw)
To: u-boot
On 14/11/2014 12:37, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> mx6sabresd_spl.cfg configures CCM registers, GPR registers and CCM_CCOSR.
>
> Move the configuration to the spl code.
>
> CCM_CCOSR setting is no longer required to get audio functionality in the
> kernel, so remove such setting.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
After a small fix (include crm_regs.h):
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 4/4] mx6: Use a common SPL configuration file
2014-11-14 11:36 [U-Boot] [PATCH v2 1/4] mx6sabresd: Move the DCD settings to spl code Fabio Estevam
2014-11-14 11:37 ` [U-Boot] [PATCH v2 2/4] gw_ventana: " Fabio Estevam
2014-11-14 11:37 ` [U-Boot] [PATCH v2 3/4] novena: " Fabio Estevam
@ 2014-11-14 11:37 ` Fabio Estevam
2014-11-17 13:18 ` Stefano Babic
2014-11-20 9:37 ` Stefano Babic
2014-11-20 9:36 ` [U-Boot] [PATCH v2 1/4] mx6sabresd: Move the DCD settings to spl code Stefano Babic
3 siblings, 2 replies; 12+ messages in thread
From: Fabio Estevam @ 2014-11-14 11:37 UTC (permalink / raw)
To: u-boot
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
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 4/4] mx6: Use a common SPL configuration file
2014-11-14 11:37 ` [U-Boot] [PATCH v2 4/4] mx6: Use a common SPL configuration file Fabio Estevam
@ 2014-11-17 13:18 ` Stefano Babic
2014-11-20 9:37 ` Stefano Babic
1 sibling, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2014-11-17 13:18 UTC (permalink / raw)
To: u-boot
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
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 4/4] mx6: Use a common SPL configuration file
2014-11-14 11:37 ` [U-Boot] [PATCH v2 4/4] mx6: Use a common SPL configuration file Fabio Estevam
2014-11-17 13:18 ` Stefano Babic
@ 2014-11-20 9:37 ` Stefano Babic
1 sibling, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2014-11-20 9:37 UTC (permalink / raw)
To: u-boot
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
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 1/4] mx6sabresd: Move the DCD settings to spl code
2014-11-14 11:36 [U-Boot] [PATCH v2 1/4] mx6sabresd: Move the DCD settings to spl code Fabio Estevam
` (2 preceding siblings ...)
2014-11-14 11:37 ` [U-Boot] [PATCH v2 4/4] mx6: Use a common SPL configuration file Fabio Estevam
@ 2014-11-20 9:36 ` Stefano Babic
3 siblings, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2014-11-20 9:36 UTC (permalink / raw)
To: u-boot
On 14/11/2014 12:36, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> mx6sabresd_spl.cfg configures CCM registers, GPR registers and CCM_CCOSR.
>
> Move the configuration to the spl code.
>
> CCM_CCOSR setting is no longer required to get audio functionality in the
> kernel, so remove such setting.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 12+ messages in thread