Re: [PATCH 0/3] Socfpga: update preloader files - The missing link
On Mon, Dec 09, 2013 at 03:10:11PM +0100, Steffen Trumtrar wrote: > Hi! > > This is an addon to the series > > SOCFPGA: update to v13.1 preloader files > > The last series was actually missing a rather important update to the > iocsr setup. > The current barebox version produces a (memory?)setup, that leads to > an unstable linux kernel. Namely: page alloc errors, kmemleaks and > NULL pointer dereferences on the Terasic SoCkit. The EBV Socrates didn't > show these errors. > > Something in those magic numbers in patch 2/3 seems to fix this, > as these problems haven't been seen as of yet with this new setup. > > Regards, > Steffen > > Steffen Trumtrar (3): > ARM: socfpga: sockit: update sdram config > ARM: socfpga: update iocsr config > ARM: socfpga: sockit: reconfigure src for sdmmc Applied, thanks Sascha > > arch/arm/boards/terasic-sockit/pll_config.h | 2 +- > arch/arm/boards/terasic-sockit/sdram_config.h | 21 +- > arch/arm/mach-socfpga/iocsr-config-cyclone5.c | 418 > +- > 3 files changed, 223 insertions(+), 218 deletions(-) > > -- > 1.8.4.3 > > > ___ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
RE: [PATCH] scripts: add arch/x86/lib/barebox.lds to gitignore
I want to say "thank you" to Alex, :) I copied his commit log. … Du Huanpeng -Original Message- From: Sascha Hauer [mailto:s.ha...@pengutronix.de] Sent: Tuesday, December 10, 2013 3:41 PM To: Du Huanpeng Cc: barebox@lists.infradead.org Subject: Re: [PATCH] scripts: add arch/x86/lib/barebox.lds to gitignore On Mon, Dec 09, 2013 at 01:38:58AM -0800, Du Huanpeng wrote: > Signed-off-by: Du Huanpeng Applied, thanks Sascha > --- > arch/x86/lib/.gitignore |2 ++ > 1 file changed, 2 insertions(+) > create mode 100644 arch/x86/lib/.gitignore > > diff --git a/arch/x86/lib/.gitignore b/arch/x86/lib/.gitignore new > file mode 100644 index 000..542522e > --- /dev/null > +++ b/arch/x86/lib/.gitignore > @@ -0,0 +1,2 @@ > +barebox.lds > + > -- > 1.7.9.5 > > > ___ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH] scripts: add arch/x86/lib/barebox.lds to gitignore
On Mon, Dec 09, 2013 at 01:38:58AM -0800, Du Huanpeng wrote: > Signed-off-by: Du Huanpeng Applied, thanks Sascha > --- > arch/x86/lib/.gitignore |2 ++ > 1 file changed, 2 insertions(+) > create mode 100644 arch/x86/lib/.gitignore > > diff --git a/arch/x86/lib/.gitignore b/arch/x86/lib/.gitignore > new file mode 100644 > index 000..542522e > --- /dev/null > +++ b/arch/x86/lib/.gitignore > @@ -0,0 +1,2 @@ > +barebox.lds > + > -- > 1.7.9.5 > > > ___ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 5/7] atmel_nand: make chip_delay configurable
On Mon, Dec 09, 2013 at 06:15:49PM +0100, Eric Bénard wrote: > Le Mon, 9 Dec 2013 17:32:52 +0100, > Jean-Christophe PLAGNIOL-VILLARD a écrit : > > > On 15:54 Mon 09 Dec , Eric B??nard wrote: > > > Le Mon, 9 Dec 2013 14:30:01 +0100, > > > Jean-Christophe PLAGNIOL-VILLARD a écrit : > > > > > > > On 10:36 Sat 07 Dec , Eric B??nard wrote: > > > > > this is usefull for custom boards with different NAND flashs > > > > > (for informations u-boot defaults chip_delay to 75) > > > > drop this comment on u-boot as in barebox we use the kernel driver > > > > > > that's an information which can be usefull for other users on custom > > > boards. Sorry if you don't like to read the word "u-boot" ;-) > > > > so this part is useless > > > I think it's useful to tell the default value used by the other > reference bootloader. I for once have nothing against using the word U-Boot in commit messages. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH] MIPS: csrc-r4k: use CLOCKSOURCE_MASK() macro
Signed-off-by: Antony Pavlov
---
arch/mips/lib/csrc-r4k.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/lib/csrc-r4k.c b/arch/mips/lib/csrc-r4k.c
index 2978fcf..c699f2b 100644
--- a/arch/mips/lib/csrc-r4k.c
+++ b/arch/mips/lib/csrc-r4k.c
@@ -32,7 +32,7 @@ static uint64_t c0_hpt_read(void)
static struct clocksource cs = {
.read = c0_hpt_read,
- .mask = 0x,
+ .mask = CLOCKSOURCE_MASK(32),
};
static int clocksource_init(void)
--
1.8.5
___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 5/7] atmel_nand: make chip_delay configurable
Le Mon, 9 Dec 2013 17:32:52 +0100, Jean-Christophe PLAGNIOL-VILLARD a écrit : > On 15:54 Mon 09 Dec , Eric B??nard wrote: > > Le Mon, 9 Dec 2013 14:30:01 +0100, > > Jean-Christophe PLAGNIOL-VILLARD a écrit : > > > > > On 10:36 Sat 07 Dec , Eric B??nard wrote: > > > > this is usefull for custom boards with different NAND flashs > > > > (for informations u-boot defaults chip_delay to 75) > > > drop this comment on u-boot as in barebox we use the kernel driver > > > > that's an information which can be usefull for other users on custom > > boards. Sorry if you don't like to read the word "u-boot" ;-) > > so this part is useless > I think it's useful to tell the default value used by the other reference bootloader. Eric ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 5/7] atmel_nand: make chip_delay configurable
Le Mon, 9 Dec 2013 17:32:52 +0100, Jean-Christophe PLAGNIOL-VILLARD a écrit : > On 15:54 Mon 09 Dec , Eric B??nard wrote: > > Le Mon, 9 Dec 2013 14:30:01 +0100, > > Jean-Christophe PLAGNIOL-VILLARD a écrit : > > > > > On 10:36 Sat 07 Dec , Eric B??nard wrote: > > > > this is usefull for custom boards with different NAND flashs > > > > (for informations u-boot defaults chip_delay to 75) > > > drop this comment on u-boot as in barebox we use the kernel driver > > > > that's an information which can be usefull for other users on custom > > boards. Sorry if you don't like to read the word "u-boot" ;-) > > so this part is useless > why ? Eric ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 7/7] samsa5d3xek: update defconfig
On Mon, Dec 09, 2013 at 03:53:51PM +0100, Eric Bénard wrote: > Hi Jean-Christophe, > > Le Mon, 9 Dec 2013 14:31:25 +0100, > Jean-Christophe PLAGNIOL-VILLARD a écrit : > > > more comment here > > On 10:37 Sat 07 Dec , Eric B??nard wrote: > > > Signed-off-by: Eric Bénard > > > --- > > > arch/arm/configs/sama5d3xek_defconfig | 9 ++--- > > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > > > diff --git a/arch/arm/configs/sama5d3xek_defconfig > > > b/arch/arm/configs/sama5d3xek_defconfig > > > index 970ded5..bd331c3 100644 > > > --- a/arch/arm/configs/sama5d3xek_defconfig > > > +++ b/arch/arm/configs/sama5d3xek_defconfig > > > @@ -41,8 +41,7 @@ CONFIG_CMD_UIMAGE=y > > > CONFIG_CMD_RESET=y > > > CONFIG_CMD_GO=y > > > CONFIG_CMD_OFTREE=y > > > -CONFIG_CMD_MTEST=y > > > -CONFIG_CMD_MTEST_ALTERNATIVE=y > > > +CONFIG_CMD_MEMTEST=y > > why? > > because MTEST became MEMTEST so as you initialy enabled it, I updated > the defconfig to keep the same functionnality. > mtest was removed in : > 47f9da43801d7a345569a35d23cd49eb355a891a > memtest was added in : > 842308e29774c577291cae09a8a71ecc3b708b92 > oh damn, and I though the it's because the new memtest command is just a cool command which everybody needs. :-) - Alex ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 7/7] samsa5d3xek: update defconfig
On 15:53 Mon 09 Dec , Eric B??nard wrote: > Hi Jean-Christophe, > > Le Mon, 9 Dec 2013 14:31:25 +0100, > Jean-Christophe PLAGNIOL-VILLARD a écrit : > > > more comment here > > On 10:37 Sat 07 Dec , Eric B??nard wrote: > > > Signed-off-by: Eric Bénard > > > --- > > > arch/arm/configs/sama5d3xek_defconfig | 9 ++--- > > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > > > diff --git a/arch/arm/configs/sama5d3xek_defconfig > > > b/arch/arm/configs/sama5d3xek_defconfig > > > index 970ded5..bd331c3 100644 > > > --- a/arch/arm/configs/sama5d3xek_defconfig > > > +++ b/arch/arm/configs/sama5d3xek_defconfig > > > @@ -41,8 +41,7 @@ CONFIG_CMD_UIMAGE=y > > > CONFIG_CMD_RESET=y > > > CONFIG_CMD_GO=y > > > CONFIG_CMD_OFTREE=y > > > -CONFIG_CMD_MTEST=y > > > -CONFIG_CMD_MTEST_ALTERNATIVE=y > > > +CONFIG_CMD_MEMTEST=y > > why? > > because MTEST became MEMTEST so as you initialy enabled it, I updated > the defconfig to keep the same functionnality. > mtest was removed in : > 47f9da43801d7a345569a35d23cd49eb355a891a > memtest was added in : > 842308e29774c577291cae09a8a71ecc3b708b92 so put this in the commit messasge Best Regards, J. > > > > CONFIG_CMD_SPLASH=y > > > CONFIG_CMD_TIMEOUT=y > > > CONFIG_CMD_PARTITION=y > > > @@ -65,13 +64,17 @@ CONFIG_I2C_GPIO=y > > > CONFIG_MTD=y > > > # CONFIG_MTD_OOB_DEVICE is not set > > > CONFIG_MTD_M25P80=y > > > +CONFIG_DRIVER_CFI=y > > > +# CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set > > > +# CONFIG_DRIVER_CFI_BANK_WIDTH_4 is not set > > > +CONFIG_CFI_BUFFER_WRITE=y > > > CONFIG_NAND=y > > > # CONFIG_NAND_ECC_SOFT is not set > > > # CONFIG_NAND_ECC_HW_SYNDROME is not set > > > # CONFIG_NAND_ECC_HW_NONE is not set > > > CONFIG_NAND_ATMEL=y > > > CONFIG_NAND_ATMEL_PMECC=y > > > -CONFIG_UBI=y > > > +CONFIG_MTD_UBI=y > > same thing here. > > Eric ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 5/7] atmel_nand: make chip_delay configurable
On 15:54 Mon 09 Dec , Eric B??nard wrote: > Le Mon, 9 Dec 2013 14:30:01 +0100, > Jean-Christophe PLAGNIOL-VILLARD a écrit : > > > On 10:36 Sat 07 Dec , Eric B??nard wrote: > > > this is usefull for custom boards with different NAND flashs > > > (for informations u-boot defaults chip_delay to 75) > > drop this comment on u-boot as in barebox we use the kernel driver > > that's an information which can be usefull for other users on custom > boards. Sorry if you don't like to read the word "u-boot" ;-) so this part is useless Best Regards, J. > > Eric ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 7/7] samsa5d3xek: update defconfig
Hi Jean-Christophe, Le Mon, 9 Dec 2013 14:31:25 +0100, Jean-Christophe PLAGNIOL-VILLARD a écrit : > more comment here > On 10:37 Sat 07 Dec , Eric B??nard wrote: > > Signed-off-by: Eric Bénard > > --- > > arch/arm/configs/sama5d3xek_defconfig | 9 ++--- > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm/configs/sama5d3xek_defconfig > > b/arch/arm/configs/sama5d3xek_defconfig > > index 970ded5..bd331c3 100644 > > --- a/arch/arm/configs/sama5d3xek_defconfig > > +++ b/arch/arm/configs/sama5d3xek_defconfig > > @@ -41,8 +41,7 @@ CONFIG_CMD_UIMAGE=y > > CONFIG_CMD_RESET=y > > CONFIG_CMD_GO=y > > CONFIG_CMD_OFTREE=y > > -CONFIG_CMD_MTEST=y > > -CONFIG_CMD_MTEST_ALTERNATIVE=y > > +CONFIG_CMD_MEMTEST=y > why? because MTEST became MEMTEST so as you initialy enabled it, I updated the defconfig to keep the same functionnality. mtest was removed in : 47f9da43801d7a345569a35d23cd49eb355a891a memtest was added in : 842308e29774c577291cae09a8a71ecc3b708b92 > > CONFIG_CMD_SPLASH=y > > CONFIG_CMD_TIMEOUT=y > > CONFIG_CMD_PARTITION=y > > @@ -65,13 +64,17 @@ CONFIG_I2C_GPIO=y > > CONFIG_MTD=y > > # CONFIG_MTD_OOB_DEVICE is not set > > CONFIG_MTD_M25P80=y > > +CONFIG_DRIVER_CFI=y > > +# CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set > > +# CONFIG_DRIVER_CFI_BANK_WIDTH_4 is not set > > +CONFIG_CFI_BUFFER_WRITE=y > > CONFIG_NAND=y > > # CONFIG_NAND_ECC_SOFT is not set > > # CONFIG_NAND_ECC_HW_SYNDROME is not set > > # CONFIG_NAND_ECC_HW_NONE is not set > > CONFIG_NAND_ATMEL=y > > CONFIG_NAND_ATMEL_PMECC=y > > -CONFIG_UBI=y > > +CONFIG_MTD_UBI=y same thing here. Eric ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 5/7] atmel_nand: make chip_delay configurable
Le Mon, 9 Dec 2013 14:30:01 +0100, Jean-Christophe PLAGNIOL-VILLARD a écrit : > On 10:36 Sat 07 Dec , Eric B??nard wrote: > > this is usefull for custom boards with different NAND flashs > > (for informations u-boot defaults chip_delay to 75) > drop this comment on u-boot as in barebox we use the kernel driver that's an information which can be usefull for other users on custom boards. Sorry if you don't like to read the word "u-boot" ;-) Eric ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH 2/3] ARM: socfpga: update iocsr config
Update the IO configuration to the Quartus v13.1 version. This seems to fix a
stability issue under the linux kernel when started with barebox.
As this is undocumented, autogenerated stuff, one can not be sure what it really
does nor if it really fixes the problem or just relocates it.
Signed-off-by: Steffen Trumtrar
---
arch/arm/mach-socfpga/iocsr-config-cyclone5.c | 418 +-
1 file changed, 209 insertions(+), 209 deletions(-)
diff --git a/arch/arm/mach-socfpga/iocsr-config-cyclone5.c
b/arch/arm/mach-socfpga/iocsr-config-cyclone5.c
index 4b44c29..44238b3 100644
--- a/arch/arm/mach-socfpga/iocsr-config-cyclone5.c
+++ b/arch/arm/mach-socfpga/iocsr-config-cyclone5.c
@@ -10,119 +10,119 @@ const unsigned long
iocsr_scan_chain0_table[((CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH
0xC000,
0x003F,
0x8000,
- 0x4824,
- 0x01209000,
- 0x8240,
- 0x00018004,
+ 0x00060180,
+ 0x1806,
+ 0x1800,
+ 0x00018060,
0x,
0x4000,
- 0x2412,
- 0x00904800,
- 0x4120,
- 0x8002,
- 0x0904,
+ 0x000300C0,
+ 0x0C03,
+ 0x0C00,
+ 0x0030,
+ 0xC030,
0x2000,
- 0x1209,
- 0x00482400,
- 0x2090,
- 0x4001,
- 0x0482,
+ 0x00018060,
+ 0x06018000,
+ 0x0600,
+ 0x0018,
+ 0x6018,
0x1000,
};
const unsigned long
iocsr_scan_chain1_table[((CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH / 32) + 1)] = {
- 0x9048,
- 0x02412000,
- 0x048000C0,
- 0x0009,
- 0x2412,
+ 0x0010,
+ 0x300C,
+ 0x30C0,
+ 0x00C0,
+ 0x000300C0,
0x8000,
- 0x4824,
- 0x01209000,
- 0x8240,
- 0x0004,
- 0x1209,
+ 0x0008,
+ 0x2000,
+ 0x,
+ 0x0080,
+ 0x0002,
0x4000,
- 0x2412,
- 0x00904800,
- 0x4120,
- 0x8002,
- 0x0904,
+ 0x000300C0,
+ 0x1000,
+ 0x0C00,
+ 0x0030,
+ 0xC030,
0x2000,
- 0x06001209,
- 0x00482400,
+ 0x06018060,
+ 0x06018000,
0x01FE,
0xF800,
0x0007,
- 0x80001000,
- 0x0904,
- 0x00241200,
- 0x9048,
- 0x20003000,
- 0x0241,
+ 0x1000,
+ 0xC030,
+ 0x0300C000,
+ 0x0300,
+ 0x300C,
+ 0x300C,
0x0800,
0x,
0x,
- 0x4824,
- 0x9000,
- 0x0120,
+ 0x0180,
+ 0x0006,
+ 0x2000,
0x0400,
0x,
- 0x00090480,
+ 0x00C03000,
0x0003,
0x,
0x,
- 0x9200,
- 0x00600120,
+ 0x0200,
+ 0x00601806,
0x,
- 0x1209,
- 0x24000600,
- 0x0048,
- 0x48000100,
- 0x00300090,
- 0xC0024120,
- 0x09048000,
- 0x12000300,
- 0x000C0024,
+ 0x8060,
+ 0x8601,
+ 0x0601,
+ 0x0100,
+ 0x00300C03,
+ 0xC0300C00,
+ 0xC030,
+ 0xC300,
+ 0x000C0300,
0x0080,
};
const unsigned long
iocsr_scan_chain2_table[((CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH / 32) + 1)] = {
- 0x30009048,
+ 0x300C0300,
0x,
0x0FF0,
0x,
- 0x0C002412,
+ 0x0C0300C0,
0x8000,
- 0x18004824,
- 0x,
- 0x8240,
- 0x00018004,
- 0x06001209,
+ 0x18060180,
+ 0x1806,
+ 0x1800,
+ 0x00018060,
+ 0x00018060,
0x4000,
- 0x20002412,
- 0x00904800,
+ 0x000300C0,
+ 0x0C03,
0x0030,
- 0x8000,
- 0x03000904,
+ 0x,
+ 0x0300C030,
0x2000,
- 0x10001209,
- 0x00482400,
- 0x2090,
- 0x40010001,
- 0x0482,
- 0x80001000,
- 0x0904,
+ 0x00018060,
+ 0x06018000,
+ 0x0600,
+ 0x0018,
+ 0x6018,
+ 0x1000,
+ 0xC030,
0x,
- 0x9048,
- 0x20008000,
- 0x00C00241,
+ 0x0300,
+ 0x000C,
+ 0x00C0300C,
0x0800,
};
const unsigned long
iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH / 32) + 1)] = {
- 0x0CC20D80,
- 0x0C3000FF,
+ 0x0C420D80,
+ 0x882000FF,
0x0A804001,
0x0790,
0x0802,
@@ -131,9 +131,9 @@ const unsigned long
iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
0x0790,
0x0802,
0x0010,
- 0x2043000
[PATCH 1/3] ARM: socfpga: sockit: update sdram config
This updates/changes the sdram config for the sockit to the quartus v13.1 autogenerated version. Signed-off-by: Steffen Trumtrar --- arch/arm/boards/terasic-sockit/sdram_config.h | 21 + 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/arch/arm/boards/terasic-sockit/sdram_config.h b/arch/arm/boards/terasic-sockit/sdram_config.h index 3d6f938..2c04b02 100644 --- a/arch/arm/boards/terasic-sockit/sdram_config.h +++ b/arch/arm/boards/terasic-sockit/sdram_config.h @@ -1,3 +1,6 @@ +#ifndef __SDRAM_CONFIG_H +#define __SDRAM_CONFIG_H + #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE (2) #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL (8) #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER (0) @@ -58,12 +61,14 @@ #define CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD2_3_0 (0) #define CONFIG_HPS_SDR_CTRLCFG_MPPACING_2_THRESHOLD2_35_4 (0x41041041) #define CONFIG_HPS_SDR_CTRLCFG_MPPACING_3_THRESHOLD2_59_36 (0x410410) -#define CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 (0x80808080) -#define CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 (0x80808080) -#define CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64 (0x8080) +#define CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 (0x01010101) +#define CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 (0x01010101) +#define CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64 (0x0101) +#define CONFIG_HPS_SDR_CTRLCFG_DRAMODT_READ(0) +#define CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE (1) +#define CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST_READ_PORT_USED (0x0) +#define CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST_WRITE_PORT_USED (0x0) +#define CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST_COMMAND_PORT_USED (0x0) +#define CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST (0x0) -#define CONFIG_HPS_SDR_CTRLCFG_DRAMODT_READ(0) -#define CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE (1) -#define CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST_READ_PORT_USED (0) -#define CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST_WRITE_PORT_USED (0) -#define CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST_COMMAND_PORT_USED (0) +#endif /*#ifndef__SDRAM_CONFIG_H*/ -- 1.8.4.3 ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH 3/3] ARM: socfpga: sockit: reconfigure src for sdmmc
Update to Quartus v13.1 autogenerated version. Signed-off-by: Steffen Trumtrar --- arch/arm/boards/terasic-sockit/pll_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boards/terasic-sockit/pll_config.h b/arch/arm/boards/terasic-sockit/pll_config.h index 732f241..672ce41 100644 --- a/arch/arm/boards/terasic-sockit/pll_config.h +++ b/arch/arm/boards/terasic-sockit/pll_config.h @@ -54,7 +54,7 @@ * 1 = MAIN_CLK * 2 = PERIPH_CLK */ -#define CONFIG_HPS_PERPLLGRP_SRC_SDMMC (1) +#define CONFIG_HPS_PERPLLGRP_SRC_SDMMC (2) #define CONFIG_HPS_PERPLLGRP_SRC_NAND (2) #define CONFIG_HPS_PERPLLGRP_SRC_QSPI (1) -- 1.8.4.3 ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH 0/3] Socfpga: update preloader files - The missing link
Hi! This is an addon to the series SOCFPGA: update to v13.1 preloader files The last series was actually missing a rather important update to the iocsr setup. The current barebox version produces a (memory?)setup, that leads to an unstable linux kernel. Namely: page alloc errors, kmemleaks and NULL pointer dereferences on the Terasic SoCkit. The EBV Socrates didn't show these errors. Something in those magic numbers in patch 2/3 seems to fix this, as these problems haven't been seen as of yet with this new setup. Regards, Steffen Steffen Trumtrar (3): ARM: socfpga: sockit: update sdram config ARM: socfpga: update iocsr config ARM: socfpga: sockit: reconfigure src for sdmmc arch/arm/boards/terasic-sockit/pll_config.h | 2 +- arch/arm/boards/terasic-sockit/sdram_config.h | 21 +- arch/arm/mach-socfpga/iocsr-config-cyclone5.c | 418 +- 3 files changed, 223 insertions(+), 218 deletions(-) -- 1.8.4.3 ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 6/7] sama5d3xek: add NOR CFI support
On 10:36 Sat 07 Dec , Eric B??nard wrote:
> log is now :
> cfi_flash cfi_flash0: found cfi flash at 1000, size 16777216
>
> Signed-off-by: Eric Bénard
> ---
> arch/arm/boards/sama5d3xek/init.c | 35 +++
> 1 file changed, 35 insertions(+)
>
> diff --git a/arch/arm/boards/sama5d3xek/init.c
> b/arch/arm/boards/sama5d3xek/init.c
> index ff62550..f7dfea0 100644
> --- a/arch/arm/boards/sama5d3xek/init.c
> +++ b/arch/arm/boards/sama5d3xek/init.c
> @@ -118,6 +118,40 @@ static void ek_add_device_nand(void)
> static void ek_add_device_nand(void) {}
> #endif
>
> +#if defined(CONFIG_DRIVER_CFI)
> +static struct sama5_smc_config __initdata cm_nor_smc_config = {
drop the __initdata
> + .ncs_read_setup = 10,
> + .nrd_setup = 10,
> + .ncs_write_setup= 10,
> + .nwe_setup = 10,
> +
> + .ncs_read_pulse = 11,
> + .nrd_pulse = 11,
> + .ncs_write_pulse= 11,
> + .nwe_pulse = 11,
> +
> + .read_cycle = 22,
> + .write_cycle= 22,
> +
> + .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
> AT91_SMC_DBW_16,
> + .tdf_cycles = 6,
> +};
> +
> +static void ek_add_device_norcfi(void)
> +{
> + struct clk *clk = clk_get(NULL, "smc_clk");
> +
> + clk_enable(clk);
> +
> + /* configure chip-select 0 (NOR) */
> + sama5_smc_configure(0, 0, &cm_nor_smc_config);
> +
> + add_cfi_flash_device(0, AT91_CHIPSELECT_0, 256 * 1024 * 1024, 0);
no put the right size or 0 for auto detect not 256MiB
Best Regards,
J.
> +}
> +#else
> +static void ek_add_device_norcfi(void) {}
> +#endif
> +
> #if defined(CONFIG_DRIVER_NET_MACB)
> static struct macb_platform_data gmac_pdata = {
> .phy_interface = PHY_INTERFACE_MODE_RGMII,
> @@ -413,6 +447,7 @@ static int at91sama5d3xek_devices_init(void)
> ek_add_device_w1();
> ek_add_device_hdmi();
> ek_add_device_nand();
> + ek_add_device_norcfi();
> ek_add_led();
> ek_add_device_eth();
> ek_add_device_spi();
> --
> 1.8.3.1
>
>
> ___
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 1/7] atmel_nand: check gpio validity before using it
On 10:36 Sat 07 Dec , Eric B??nard wrote:
> else we get : "invalid GPIO -22"
> (as enable_pin is EINVAL)
>
> tested on SAMA5D35
Acked-by: Jean-Christophe PLAGNIOL-VILLARD
>
> Signed-off-by: Eric Bénard
> ---
> drivers/mtd/nand/atmel_nand.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
> index a0f0966..658ae52 100644
> --- a/drivers/mtd/nand/atmel_nand.c
> +++ b/drivers/mtd/nand/atmel_nand.c
> @@ -107,7 +107,7 @@ static struct nand_ecclayout atmel_pmecc_oobinfo;
> */
> static void atmel_nand_enable(struct atmel_nand_host *host)
> {
> - if (host->board->enable_pin)
> + if (gpio_is_valid(host->board->enable_pin))
> gpio_set_value(host->board->enable_pin, 0);
> }
>
> @@ -116,7 +116,7 @@ static void atmel_nand_enable(struct atmel_nand_host
> *host)
> */
> static void atmel_nand_disable(struct atmel_nand_host *host)
> {
> - if (host->board->enable_pin)
> + if (gpio_is_valid(host->board->enable_pin))
> gpio_set_value(host->board->enable_pin, 1);
> }
>
> --
> 1.8.3.1
>
>
> ___
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 1/7] atmel_nand: check gpio validity before using it
On 09:36 Mon 09 Dec , Sascha Hauer wrote:
>
> The series looks fine for me. Jean-Christophe?
small issues
>
> Sascha
>
> On Sat, Dec 07, 2013 at 10:36:54AM +0100, Eric Bénard wrote:
> > else we get : "invalid GPIO -22"
> > (as enable_pin is EINVAL)
> >
> > tested on SAMA5D35
> >
> > Signed-off-by: Eric Bénard
> > ---
> > drivers/mtd/nand/atmel_nand.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
> > index a0f0966..658ae52 100644
> > --- a/drivers/mtd/nand/atmel_nand.c
> > +++ b/drivers/mtd/nand/atmel_nand.c
> > @@ -107,7 +107,7 @@ static struct nand_ecclayout atmel_pmecc_oobinfo;
> > */
> > static void atmel_nand_enable(struct atmel_nand_host *host)
> > {
> > - if (host->board->enable_pin)
> > + if (gpio_is_valid(host->board->enable_pin))
> > gpio_set_value(host->board->enable_pin, 0);
> > }
> >
> > @@ -116,7 +116,7 @@ static void atmel_nand_enable(struct atmel_nand_host
> > *host)
> > */
> > static void atmel_nand_disable(struct atmel_nand_host *host)
> > {
> > - if (host->board->enable_pin)
> > + if (gpio_is_valid(host->board->enable_pin))
> > gpio_set_value(host->board->enable_pin, 1);
> > }
> >
> > --
> > 1.8.3.1
> >
> >
> > ___
> > barebox mailing list
> > barebox@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/barebox
>
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 7/7] samsa5d3xek: update defconfig
more comment here On 10:37 Sat 07 Dec , Eric B??nard wrote: > Signed-off-by: Eric Bénard > --- > arch/arm/configs/sama5d3xek_defconfig | 9 ++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/configs/sama5d3xek_defconfig > b/arch/arm/configs/sama5d3xek_defconfig > index 970ded5..bd331c3 100644 > --- a/arch/arm/configs/sama5d3xek_defconfig > +++ b/arch/arm/configs/sama5d3xek_defconfig > @@ -41,8 +41,7 @@ CONFIG_CMD_UIMAGE=y > CONFIG_CMD_RESET=y > CONFIG_CMD_GO=y > CONFIG_CMD_OFTREE=y > -CONFIG_CMD_MTEST=y > -CONFIG_CMD_MTEST_ALTERNATIVE=y > +CONFIG_CMD_MEMTEST=y why? > CONFIG_CMD_SPLASH=y > CONFIG_CMD_TIMEOUT=y > CONFIG_CMD_PARTITION=y > @@ -65,13 +64,17 @@ CONFIG_I2C_GPIO=y > CONFIG_MTD=y > # CONFIG_MTD_OOB_DEVICE is not set > CONFIG_MTD_M25P80=y > +CONFIG_DRIVER_CFI=y > +# CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set > +# CONFIG_DRIVER_CFI_BANK_WIDTH_4 is not set > +CONFIG_CFI_BUFFER_WRITE=y > CONFIG_NAND=y > # CONFIG_NAND_ECC_SOFT is not set > # CONFIG_NAND_ECC_HW_SYNDROME is not set > # CONFIG_NAND_ECC_HW_NONE is not set > CONFIG_NAND_ATMEL=y > CONFIG_NAND_ATMEL_PMECC=y > -CONFIG_UBI=y > +CONFIG_MTD_UBI=y > CONFIG_VIDEO=y > CONFIG_DRIVER_VIDEO_ATMEL_HLCD=y > CONFIG_MCI=y > -- > 1.8.3.1 > > > ___ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 5/7] atmel_nand: make chip_delay configurable
On 10:36 Sat 07 Dec , Eric B??nard wrote:
> this is usefull for custom boards with different NAND flashs
> (for informations u-boot defaults chip_delay to 75)
drop this comment on u-boot as in barebox we use the kernel driver
>
> Signed-off-by: Eric Bénard
> ---
> arch/arm/mach-at91/include/mach/board.h | 1 +
> drivers/mtd/nand/atmel_nand.c | 5 -
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-at91/include/mach/board.h
> b/arch/arm/mach-at91/include/mach/board.h
> index aa0fdae..4e6fa8b 100644
> --- a/arch/arm/mach-at91/include/mach/board.h
> +++ b/arch/arm/mach-at91/include/mach/board.h
> @@ -64,6 +64,7 @@ struct atmel_nand_data {
> u8 ecc_mode; /* NAND_ECC_* */
> u8 on_flash_bbt; /* Use flash based bbt */
> u8 bus_on_d0;
> + int chip_delay;
>
> u8 pmecc_corr_cap;
> u16 pmecc_sector_size;
> diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
> index 658ae52..2ff7427 100644
> --- a/drivers/mtd/nand/atmel_nand.c
> +++ b/drivers/mtd/nand/atmel_nand.c
> @@ -1161,7 +1161,10 @@ static int __init atmel_nand_probe(struct device_d
> *dev)
> nand_chip->ecc.mode = NAND_ECC_HW;
> }
>
> - nand_chip->chip_delay = 20; /* 20us command delay time */
> + if (host->board->chip_delay > 0)
> + nand_chip->chip_delay = host->board->chip_delay;
> + else
> + nand_chip->chip_delay = 20; /* 20us command delay
> time */
>
> if (host->board->bus_width_16) {/* 16-bit bus width */
> nand_chip->options |= NAND_BUSWIDTH_16;
> --
> 1.8.3.1
>
>
> ___
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 2/7] at91: introduce sama5d3's SMC support
On 10:36 Sat 07 Dec , Eric B??nard wrote: > there is a new register (timings) vs SAM9 and thus a new mapping > > Signed-off-by: Eric Bénard > --- > arch/arm/mach-at91/generic.h| 7 ++ > arch/arm/mach-at91/include/mach/sama5_smc.h | 124 + > arch/arm/mach-at91/sama5_smc.c | 161 > > 3 files changed, 292 insertions(+) > create mode 100644 arch/arm/mach-at91/include/mach/sama5_smc.h > create mode 100644 arch/arm/mach-at91/sama5_smc.c nack the sama5 smc share part of the same IP as the sam9 do not duplicate code share it Best Regards, J. ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 3/7] at91: sama5d3: use the sama5 smc instead of the sam9 one
On 10:36 Sat 07 Dec , Eric B??nard wrote: > Signed-off-by: Eric Bénard > --- > arch/arm/mach-at91/Kconfig | 1 - > arch/arm/mach-at91/Makefile | 2 +- > arch/arm/mach-at91/sama5d3.c | 2 +- > 3 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig > index 6ab374e..d411edc 100644 > --- a/arch/arm/mach-at91/Kconfig > +++ b/arch/arm/mach-at91/Kconfig > @@ -24,7 +24,6 @@ config SOC_AT91SAM9 > config SOC_SAMA5 > bool > select CPU_V7 > - select AT91SAM9_SMC select here I do not want to hack it again when having a new smc or a new SoC > select AT91SAM9_TIMER > > config ARCH_TEXT_BASE > diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile > index ab80e5f..18d156c 100644 > --- a/arch/arm/mach-at91/Makefile > +++ b/arch/arm/mach-at91/Makefile > @@ -30,4 +30,4 @@ obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o > at91sam9260_devices.o > obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45.o at91sam9g45_devices.o > obj-$(CONFIG_ARCH_AT91SAM9X5)+= at91sam9x5.o at91sam9x5_devices.o > obj-$(CONFIG_ARCH_AT91SAM9N12) += at91sam9n12.o at91sam9n12_devices.o > -obj-$(CONFIG_ARCH_SAMA5D3) += sama5d3.o sama5d3_devices.o > +obj-$(CONFIG_ARCH_SAMA5D3) += sama5d3.o sama5d3_devices.o sama5_smc.o > diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c > index aa681aa..acbf018 100644 > --- a/arch/arm/mach-at91/sama5d3.c > +++ b/arch/arm/mach-at91/sama5d3.c > @@ -386,7 +386,7 @@ static void sama5d3_initialize(void) > at91_add_sam9x5_gpio(4, SAMA5D3_BASE_PIOE); > > at91_add_pit(SAMA5D3_BASE_PIT); > - at91_add_sam9_smc(DEVICE_ID_SINGLE, SAMA5D3_BASE_HSMC + 0x600, 0xa0); > + at91_add_sama5_smc(DEVICE_ID_SINGLE, SAMA5D3_BASE_HSMC + 0x600, 0xa0); > } > > AT91_SOC_START(sama5d3) > -- > 1.8.3.1 > > > ___ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH] memtest: add missing newline at usagestring
All other commands have a newline at the end of usagestring. Add this for memtest as well. Signed-off-by: Alexander Aring --- commands/memtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/memtest.c b/commands/memtest.c index c82badc..e988132 100644 --- a/commands/memtest.c +++ b/commands/memtest.c @@ -244,7 +244,7 @@ static const __maybe_unused char cmd_memtest_help[] = "Usage: memtest [OPTION]...\n" "memtest related commands\n" " -i iterations [default=1, endless=0].\n" -" -b perform only a test on buslines."; +" -b perform only a test on buslines.\n"; BAREBOX_CMD_START(memtest) .cmd= do_memtest, -- 1.8.5.1 ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH] scripts: add arch/x86/lib/barebox.lds to gitignore
Signed-off-by: Du Huanpeng --- arch/x86/lib/.gitignore |2 ++ 1 file changed, 2 insertions(+) create mode 100644 arch/x86/lib/.gitignore diff --git a/arch/x86/lib/.gitignore b/arch/x86/lib/.gitignore new file mode 100644 index 000..542522e --- /dev/null +++ b/arch/x86/lib/.gitignore @@ -0,0 +1,2 @@ +barebox.lds + -- 1.7.9.5 ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 1/7] atmel_nand: check gpio validity before using it
The series looks fine for me. Jean-Christophe?
Sascha
On Sat, Dec 07, 2013 at 10:36:54AM +0100, Eric Bénard wrote:
> else we get : "invalid GPIO -22"
> (as enable_pin is EINVAL)
>
> tested on SAMA5D35
>
> Signed-off-by: Eric Bénard
> ---
> drivers/mtd/nand/atmel_nand.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
> index a0f0966..658ae52 100644
> --- a/drivers/mtd/nand/atmel_nand.c
> +++ b/drivers/mtd/nand/atmel_nand.c
> @@ -107,7 +107,7 @@ static struct nand_ecclayout atmel_pmecc_oobinfo;
> */
> static void atmel_nand_enable(struct atmel_nand_host *host)
> {
> - if (host->board->enable_pin)
> + if (gpio_is_valid(host->board->enable_pin))
> gpio_set_value(host->board->enable_pin, 0);
> }
>
> @@ -116,7 +116,7 @@ static void atmel_nand_enable(struct atmel_nand_host
> *host)
> */
> static void atmel_nand_disable(struct atmel_nand_host *host)
> {
> - if (host->board->enable_pin)
> + if (gpio_is_valid(host->board->enable_pin))
> gpio_set_value(host->board->enable_pin, 1);
> }
>
> --
> 1.8.3.1
>
>
> ___
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH] scripts: add kernel-install-target to gitignore
On Sun, Dec 08, 2013 at 07:06:14PM +0100, Alexander Aring wrote: > Signed-off-by: Alexander Aring Applied, thanks Sascha > --- > scripts/.gitignore | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/scripts/.gitignore b/scripts/.gitignore > index 3cb3a0b..fddc04b 100644 > --- a/scripts/.gitignore > +++ b/scripts/.gitignore > @@ -4,6 +4,7 @@ fix_size > gen_netx_image > kallsyms > kernel-install > +kernel-install-target > kwbimage > kwboot > mk-am35xx-spi-image > -- > 1.8.5.1 > > > ___ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 1/3] ARM: i.MX6: tqma6x: dts: move FEC enablement to baseboard
On Fri, Dec 06, 2013 at 08:17:46PM +0100, Robert Schwebel wrote:
> The definition if the FEC is used is made by the baseboard (MBa6x), not
> by the module (TQMa6x). Move it there.
>
> Signed-off-by: Robert Schwebel
> ---
> arch/arm/dts/imx6q-mba6x.dts | 4
> arch/arm/dts/imx6q-tqma6x.dts | 2 +-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/dts/imx6q-mba6x.dts b/arch/arm/dts/imx6q-mba6x.dts
> index 69d46b4..e057fc4 100644
> --- a/arch/arm/dts/imx6q-mba6x.dts
> +++ b/arch/arm/dts/imx6q-mba6x.dts
> @@ -26,6 +26,10 @@
> };
> };
>
> +&fec {
> + status = "okay";
> +};
> +
This is the wrong file, it's the baseboard for the i.MX6q module only.
Added it to imx6qdl-mba6x.dtsi instead.
> &iomuxc {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_hog>;
> diff --git a/arch/arm/dts/imx6q-tqma6x.dts b/arch/arm/dts/imx6q-tqma6x.dts
> index 597388e..f556381 100644
> --- a/arch/arm/dts/imx6q-tqma6x.dts
> +++ b/arch/arm/dts/imx6q-tqma6x.dts
> @@ -81,7 +81,7 @@
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_enet_1>;
> phy-mode = "rgmii";
> - status = "okay";
> + status = "disabled";
This is the file you remove in 3/3. Applied this change to
imx6qdl-tqma6x.dtsi instead.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
