June 2014 - U-Boot

[U-Boot] [U-boot] [Patch v2] mtd: nand: davinci: add header file for driver definitions
by Ivan Khoronzhuk 06 Jun '14

06 Jun '14

The definitions inside emif_defs.h concern davinci nand driver and should be in it's header. So create header file for davinci nand driver and move definitions from emif_defs.h to it. Acked-by: Vitaly Andrianov <vitalya(a)ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk(a)ti.com> --- arch/arm/cpu/armv7/keystone/aemif.c | 2 +- arch/arm/include/asm/arch-keystone/emif_defs.h | 73 -------------------------- arch/arm/include/asm/arch-keystone/nand_defs.h | 23 -------- board/ti/k2hk_evm/board.c | 1 - drivers/mtd/nand/davinci_nand.c | 3 +- drivers/mtd/nand/davinci_nand.h | 66 +++++++++++++++++++++++ 6 files changed, 68 insertions(+), 100 deletions(-) delete mode 100644 arch/arm/include/asm/arch-keystone/emif_defs.h delete mode 100644 arch/arm/include/asm/arch-keystone/nand_defs.h create mode 100644 drivers/mtd/nand/davinci_nand.h diff --git a/arch/arm/cpu/armv7/keystone/aemif.c b/arch/arm/cpu/armv7/keystone/aemif.c index 9b26886..9ba1549 100644 --- a/arch/arm/cpu/armv7/keystone/aemif.c +++ b/arch/arm/cpu/armv7/keystone/aemif.c @@ -10,7 +10,7 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/clock.h> -#include <asm/arch/emif_defs.h> +#include <../drivers/mtd/nand/davinci_nand.h> #define AEMIF_CFG_SELECT_STROBE(v) ((v) ? 1 << 31 : 0) #define AEMIF_CFG_EXTEND_WAIT(v) ((v) ? 1 << 30 : 0) diff --git a/arch/arm/include/asm/arch-keystone/emif_defs.h b/arch/arm/include/asm/arch-keystone/emif_defs.h deleted file mode 100644 index a3378aa..0000000 --- a/arch/arm/include/asm/arch-keystone/emif_defs.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * emif definitions to re-use davinci emif driver on Keystone2 - * - * (C) Copyright 2012-2014 - * Texas Instruments Incorporated, <www.ti.com> - * (C) Copyright 2007 Sergey Kubushyn <ksi(a)koi8.net> - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#ifndef _EMIF_DEFS_H_ -#define _EMIF_DEFS_H_ - -#include <asm/arch/hardware.h> - -struct davinci_emif_regs { - uint32_t ercsr; - uint32_t awccr; - uint32_t sdbcr; - uint32_t sdrcr; - uint32_t abncr[4]; - uint32_t sdtimr; - uint32_t ddrsr; - uint32_t ddrphycr; - uint32_t ddrphysr; - uint32_t totar; - uint32_t totactr; - uint32_t ddrphyid_rev; - uint32_t sdsretr; - uint32_t eirr; - uint32_t eimr; - uint32_t eimsr; - uint32_t eimcr; - uint32_t ioctrlr; - uint32_t iostatr; - uint32_t rsvd0; - uint32_t one_nand_cr; - uint32_t nandfcr; - uint32_t nandfsr; - uint32_t rsvd1[2]; - uint32_t nandfecc[4]; - uint32_t rsvd2[15]; - uint32_t nand4biteccload; - uint32_t nand4bitecc[4]; - uint32_t nanderradd1; - uint32_t nanderradd2; - uint32_t nanderrval1; - uint32_t nanderrval2; -}; - -#define davinci_emif_regs \ - ((struct davinci_emif_regs *)DAVINCI_ASYNC_EMIF_CNTRL_BASE) - -#define DAVINCI_NANDFCR_NAND_ENABLE(n) (1 << ((n) - 2)) -#define DAVINCI_NANDFCR_4BIT_ECC_SEL_MASK (3 << 4) -#define DAVINCI_NANDFCR_4BIT_ECC_SEL(n) (((n) - 2) << 4) -#define DAVINCI_NANDFCR_1BIT_ECC_START(n) (1 << (8 + ((n) - 2))) -#define DAVINCI_NANDFCR_4BIT_ECC_START (1 << 12) -#define DAVINCI_NANDFCR_4BIT_CALC_START (1 << 13) - -/* Chip Select setup */ -#define DAVINCI_ABCR_STROBE_SELECT (1 << 31) -#define DAVINCI_ABCR_EXT_WAIT (1 << 30) -#define DAVINCI_ABCR_WSETUP(n) ((n) << 26) -#define DAVINCI_ABCR_WSTROBE(n) ((n) << 20) -#define DAVINCI_ABCR_WHOLD(n) ((n) << 17) -#define DAVINCI_ABCR_RSETUP(n) ((n) << 13) -#define DAVINCI_ABCR_RSTROBE(n) ((n) << 7) -#define DAVINCI_ABCR_RHOLD(n) ((n) << 4) -#define DAVINCI_ABCR_TA(n) ((n) << 2) -#define DAVINCI_ABCR_ASIZE_16BIT 1 -#define DAVINCI_ABCR_ASIZE_8BIT 0 - -#endif diff --git a/arch/arm/include/asm/arch-keystone/nand_defs.h b/arch/arm/include/asm/arch-keystone/nand_defs.h deleted file mode 100644 index 58417db..0000000 --- a/arch/arm/include/asm/arch-keystone/nand_defs.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * nand driver definitions to re-use davinci nand driver on Keystone2 - * - * (C) Copyright 2012-2014 - * Texas Instruments Incorporated, <www.ti.com> - * (C) Copyright 2007 Sergey Kubushyn <ksi(a)koi8.net> - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#ifndef _NAND_DEFS_H_ -#define _NAND_DEFS_H_ - -#include <asm/arch/hardware.h> -#include <linux/mtd/nand.h> - -#define MASK_CLE 0x4000 -#define MASK_ALE 0x2000 - -#define NAND_READ_START 0x00 -#define NAND_READ_END 0x30 -#define NAND_STATUS 0x70 - -#endif diff --git a/board/ti/k2hk_evm/board.c b/board/ti/k2hk_evm/board.c index dc39139..53f26b2 100644 --- a/board/ti/k2hk_evm/board.c +++ b/board/ti/k2hk_evm/board.c @@ -16,7 +16,6 @@ #include <asm/arch/clock.h> #include <asm/io.h> #include <asm/mach-types.h> -#include <asm/arch/nand_defs.h> #include <asm/arch/emac_defs.h> #include <asm/arch/psc_defs.h> diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 75b03a7..bacf1f1 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -32,8 +32,7 @@ #include <common.h> #include <asm/io.h> #include <nand.h> -#include <asm/arch/nand_defs.h> -#include <asm/arch/emif_defs.h> +#include "davinci_nand.h" /* Definitions for 4-bit hardware ECC */ #define NAND_TIMEOUT 10240 diff --git a/drivers/mtd/nand/davinci_nand.h b/drivers/mtd/nand/davinci_nand.h new file mode 100644 index 0000000..db8d896 --- /dev/null +++ b/drivers/mtd/nand/davinci_nand.h @@ -0,0 +1,66 @@ +/* + * NAND Flash Driver + * + * Copyright (C) 2006-2014 Texas Instruments. + * + * Based on Linux DaVinci NAND driver by TI. + */ + +#ifndef _DAVINCI_NAND_H_ +#define _DAVINCI_NAND_H_ + +#include <linux/mtd/nand.h> + +#define MASK_CLE 0x4000 +#define MASK_ALE 0x2000 + +#define NAND_READ_START 0x00 +#define NAND_READ_END 0x30 +#define NAND_STATUS 0x70 + +struct davinci_emif_regs { + uint32_t ercsr; + uint32_t awccr; + uint32_t sdbcr; + uint32_t sdrcr; + uint32_t abncr[4]; + uint32_t sdtimr; + uint32_t ddrsr; + uint32_t ddrphycr; + uint32_t ddrphysr; + uint32_t totar; + uint32_t totactr; + uint32_t ddrphyid_rev; + uint32_t sdsretr; + uint32_t eirr; + uint32_t eimr; + uint32_t eimsr; + uint32_t eimcr; + uint32_t ioctrlr; + uint32_t iostatr; + uint32_t rsvd0; + uint32_t one_nand_cr; + uint32_t nandfcr; + uint32_t nandfsr; + uint32_t rsvd1[2]; + uint32_t nandfecc[4]; + uint32_t rsvd2[15]; + uint32_t nand4biteccload; + uint32_t nand4bitecc[4]; + uint32_t nanderradd1; + uint32_t nanderradd2; + uint32_t nanderrval1; + uint32_t nanderrval2; +}; + +#define davinci_emif_regs \ + ((struct davinci_emif_regs *)DAVINCI_ASYNC_EMIF_CNTRL_BASE) + +#define DAVINCI_NANDFCR_NAND_ENABLE(n) (1 << ((n) - 2)) +#define DAVINCI_NANDFCR_4BIT_ECC_SEL_MASK (3 << 4) +#define DAVINCI_NANDFCR_4BIT_ECC_SEL(n) (((n) - 2) << 4) +#define DAVINCI_NANDFCR_1BIT_ECC_START(n) (1 << (8 + ((n) - 2))) +#define DAVINCI_NANDFCR_4BIT_ECC_START (1 << 12) +#define DAVINCI_NANDFCR_4BIT_CALC_START (1 << 13) + +#endif -- 1.8.3.2

2 2

Re: [U-Boot] Unable to boot the new FIT image
by Harsha Kiran 06 Jun '14

06 Jun '14

Hi Simon, I have added the next patch in the series i.e., (....../339610/) But the result is still the same. This particular patch just created a device tree In the arch/arm/dts folder For the beaglebone. I have already tried creating for am335x-evmsk and was able to build the u-boot-dtb.bin. I have noticed that MLO is configured to read only the u-boot.img not any other binaries (eg U-boot.bin or u-boot-dtb.bin). It gives me the following error.. spl_load_image_fat: error reading image u-boot.img, err - -1 Which part of the configuration I should change so that MLO tries to read the u-boot-dtb.bin as the third stage bootloader?? I tried loading MLO->u-boot.img first, but this time it reads the u-boot.img but gives the following error.. reading u-boot.img reading u-boot.img No valid FDT found - please append one to U-Boot binary, use u-boot-dtb.bin or define CONFIG_OF_EMBED. For sandbox, use -d <file.dtb> ### ERROR ### Please RESET the board ### I tried applying the next patch in the series to add that extra padding to the image size (ie., .......org/patch/339611) But could not successfully apply the patch.. harsha@harshakiran_kasha:/abb/Experiments/u-boot$ sudo patch -p1 -R < patch3.patch patching file tools/fit_image.c Hunk #1 FAILED at 35. Hunk #2 FAILED at 60. Hunk #3 succeeded at 38 (offset -137 lines). Hunk #4 FAILED at 210. Hunk #5 succeeded at 115 (offset -123 lines). 3 out of 5 hunks FAILED -- saving rejects to file tools/fit_image.c.rej patching file tools/image-host.c and then the compilation gave the following errors.. harsha@harshakiran_kasha:/abb/Experiments/u-boot$ sudo make ARCH=arm CROSS_COMPILE=/abb/compilers/gcc-linaro-arm-linux-gnueabihf-4.7-2013.04-20130415_linux/bin/arm-linux-gnueabihf- -j8 DEV_TREE_BIN=./am335x-boneblack.dtb CHK include/config/uboot.release CHK include/generated/timestamp_autogenerated.h UPD include/generated/timestamp_autogenerated.h CHK include/generated/version_autogenerated.h HOSTCC tools/dumpimage.o HOSTCC tools/fit_image.o HOSTCC tools/image-host.o HOSTCC tools/mkenvimage.o HOSTCC tools/mkimage.o tools/fit_image.c: In function ‘fit_handle_file’: tools/fit_image.c:74:3: error: ‘destfd’ undeclared (first use in this function) destfd = mmap_fdt(params->cmdname, params->keydest, tools/fit_image.c:74:3: note: each undeclared identifier is reported only once for each function it appears in tools/fit_image.c:75:8: error: ‘dest_blob’ undeclared (first use in this function) &dest_blob, &sbuf, 1); ^ tools/fit_image.c:75:20: error: ‘sbuf’ undeclared (first use in this function) &dest_blob, &sbuf, 1); ^ tools/fit_image.c:78:3: error: ‘destfd_size’ undeclared (first use in this function) destfd_size = sbuf.st_size; ^ tools/fit_image.c:81:2: error: ‘tfd’ undeclared (first use in this function) tfd = mmap_fdt(params->cmdname, tmpfile, &ptr, &sbuf, 1); ^ tools/fit_image.c:81:44: error: ‘ptr’ undeclared (first use in this function) tfd = mmap_fdt(params->cmdname, tmpfile, &ptr, &sbuf, 1); ^ tools/fit_image.c:98:3: error: label ‘err_add_timestamp’ used but not defined goto err_add_timestamp; ^ tools/fit_image.c:91:3: error: label ‘err_add_hashes’ used but not defined goto err_add_hashes; ^ tools/fit_image.c:83:3: error: label ‘err_mmap’ used but not defined goto err_mmap; ^ tools/fit_image.c:77:4: error: label ‘err_keydest’ used but not defined goto err_keydest; ^ tools/fit_image.c:42:6: warning: unused variable ‘ret’ [-Wunused-variable] int ret; ^ tools/fit_image.c:41:9: warning: unused variable ‘size_inc’ [-Wunused-variable] size_t size_inc; ^ make[1]: *** [tools/fit_image.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [tools] Error 2 Sorry for deleting the previous messages. U-boot mailing list is rejecting my emails If I include them Thanks, Harsha --

2 10

Re: [U-Boot] Building under Cygwin - "-ansi" flag?
by Vasili Galka 06 Jun '14

06 Jun '14

On Sun, May 11, 2014 at 1:27 PM, Vasili Galka <vvv444(a)gmail.com> wrote: > > On Fri, May 9, 2014 at 6:08 PM, Tom Rini <trini(a)ti.com> wrote: >> >> On Thu, May 08, 2014 at 02:49:35PM +0300, Vasili Galka wrote: >> > Hi, >> > >> > I'm building u-boot (am335x_evm config) using arm-none-eabi toolchain >> > under Cygwin. When trying to build unmodified v2014.04 tag I get some >> > errors. However, if I remove the "-ansi" flag from the Makefile, >> > everything builds fine: >> > >> > -ifeq ($(HOSTOS),cygwin) >> > -HOSTCFLAGS += -ansi >> > -endif >> > >> > I tried tracking down where those lines came from and why building >> > under Cygwin requires separate treatment. I found our this originates >> > from the following commit (dated Jan 2008): >> > >> > SHA-1: 883e3925d99a8dd69c5b0201cba5b1887f88f95c >> > >> > * Fix build problems under Cygwin >> > >> > This patch allows u-boot to build without error in a cygwin >> > environment. Cygwin does not define __u64 in it's >> > include/asm/types.h file. The -idirafter flag in the u-boot >> > build causes the inclusion of the cygwin types.h file as opposed >> > to u-bot/include/asm/types.h file which does define __u64. >> > Subsequently, sha1.c compile fails due to unknown symbol. >> > >> > Signed-off-by: Brian Miller <raptorbrino(a)netscape.net> >> > >> > This comment does not really explain why "-ansi" flag is required. >> >> -ansi changes include order perhaps? >> >> > Personally, I don't see any reason for it. >> > >> > Maybe it should be removed at all? >> >> Yes, but can you please test a few more builds? If you're able to use >> MAKEALL, please run MAKEALL -a arm >> >> -- >> Tom > > > Hi Tom, > > There are indeed some errors, I look into it later and keep you updated. > > Best, > Vasili Dear Tom, I've finally found time to look deeper into this problem. Let me outline the situation: 1. The problems with Cygwin build arise in code built for the "host" architecture i.e. stuff in "tools" sub-directory. 2. Along the years, there were several commits targeting the problems. All were related to include search paths/their order: a. e1a3f6b (July 2004): U-Boot include paths for "tools" build were changed to "-idirafter", i.e. host headers were given higher priority than headers in U-Boot tree. b. 883e392 (Jan 2008): The above patch caused "asm/types.h" shipped with Cygwin to be included. Turned out Cygwin does not define __u64, so this patch tried to workaround it by adding the "-ansi" flag. This flag dropped some include search paths effectively returning the use of "asm/types.h" from U-Boot tree. c. 669dfc2 (March 2013): Yet another header was included from the host paths and caused problems: "libfdt_env.h". This time it was worked around by adding the following flag to override it: "-include $(SRCTREE)/include/libfdt_env.h" 3. Currently all builds fine on Linux. However, on Cygwin some configs fail to build since not all the code complies with the ANSI standard. On the other hand, removing the "-ansi" flag causes build errors in other configs due to reasons explained above. Now my thoughts on the situation: 1. Requesting compliance of U-Boot code with the ANSI standard is an overshoot. It was used as a workaround to a problem and a different solution shall be found. There is already a code that does not compile with it. Speaking of it, is there a policy about U-Boot code compliance to some standard? C99? GNU99? If not, I think it's important to define one and stick to it. This will eliminate uncertainty and simplify things in the future. 2. I see a reoccurring pattern of some headers being used from the host, causing mismatches and arising build errors. Then some way is sought to include headers from U-Boot tree prior to them which solves the problem. This happens for both Linux and Cygwin. This pattern is a result of the original decision from 2004 to prioritize the host include paths over the paths from U-Boot tree. I see this happening again and again with different headers in the future. So here comes the question, is it really the right thing prioritize the include paths this way? Why do host paths MUST come first? I'll try reverting this locally and looking what breaks and what alternative solutions exist. P.S. I'm building all with arm-none-eabi toolchain. I set up powerpc-none-eabi toolchain under Linux and got some build errors. I'll open a separate thread about it. Best regards, Vasili

3 7

[U-Boot] [ANNOUNCE] U-Boot driver model repo
by Simon Glass 06 Jun '14

06 Jun '14

Hi, We now have a separate driver model tree at http://git.denx.de/u-boot-dm.git. This will be used to stage driver model patches. There is of course some overlap between these and architecture-specific and subsystem patches so it is not completely clear-cut whether patches will go through dm, arm, usb, etc. This will be worked out as time passes. I will follow the workflow at http://www.denx.de/wiki/U-Boot/CustodianGitTrees In particular there may be a 'testing' branch from time to time with the latest state of patches posted to the mailing list. My initial focus is to enable GPIO and serial uclasses, and encourage others to contribute patches to convert drivers over to this ready for the next release. My approach will be incremental so I am particularly interested in patches which advance particular boards, rather than glorious new frameworks that may be pressed into service in the indefinite future. All new uclasses should include comprehensive test cases - you should be able to follow the examples pretty easily. Also please note that my availability is highly variable so I cannot promise any particular response delay at present (sorry). Should this become a problem we can appoint another maintainer! You can use the 'dm:' prefix for driver model patches - please also add other tags as appropriate - e.g. 'dm: exynos:' or 'dm: net'. Thanks in advance for contributions. Regards, Simon

4 3

[U-Boot] Building under Cygwin - "-ansi" flag?
by Vasili Galka 06 Jun '14

06 Jun '14

Hi, I'm building u-boot (am335x_evm config) using arm-none-eabi toolchain under Cygwin. When trying to build unmodified v2014.04 tag I get some errors. However, if I remove the "-ansi" flag from the Makefile, everything builds fine: -ifeq ($(HOSTOS),cygwin) -HOSTCFLAGS += -ansi -endif I tried tracking down where those lines came from and why building under Cygwin requires separate treatment. I found our this originates from the following commit (dated Jan 2008): SHA-1: 883e3925d99a8dd69c5b0201cba5b1887f88f95c * Fix build problems under Cygwin This patch allows u-boot to build without error in a cygwin environment. Cygwin does not define __u64 in it's include/asm/types.h file. The -idirafter flag in the u-boot build causes the inclusion of the cygwin types.h file as opposed to u-bot/include/asm/types.h file which does define __u64. Subsequently, sha1.c compile fails due to unknown symbol. Signed-off-by: Brian Miller <raptorbrino(a)netscape.net> This comment does not really explain why "-ansi" flag is required. Personally, I don't see any reason for it. Maybe it should be removed at all? Best, Vasili

3 2

[U-Boot] [PATCH] MX25: fix build due to missing sys_proto.h
by Stefano Babic 06 Jun '14

06 Jun '14

THe mx25 arch does not have a sys_proto.h file. Instead of creating a dummy file, the file is not included for this SOC. Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- arch/arm/imx-common/iomux-v3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c index 306183a..c090b30 100644 --- a/arch/arm/imx-common/iomux-v3.c +++ b/arch/arm/imx-common/iomux-v3.c @@ -11,7 +11,9 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> +#ifndef CONFIG_MX25 #include <asm/arch/sys_proto.h> +#endif #include <asm/imx-common/iomux-v3.h> static void *base = (void *)IOMUXC_BASE_ADDR; -- 1.9.1

1 0

[U-Boot] [PATCH] mx25pdk: Add generic board support
by Fabio Estevam 06 Jun '14

06 Jun '14

Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- include/configs/mx25pdk.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index aff2419..cfaf6ca 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -26,6 +26,8 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG +#define CONFIG_SYS_GENERIC_BOARD + #define CONFIG_MACH_TYPE MACH_TYPE_MX25_3DS /* Size of malloc() pool */ -- 1.8.3.2

2 1

[U-Boot] [PATCH] mx6sabre_common: Avoid console hang due to small CONFIG_SYS_PBSIZE
by Fabio Estevam 06 Jun '14

06 Jun '14

From: Fabio Estevam <fabio.estevam(a)freescale.com> Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the characters of the error message: "Unknown command '' - try 'help'" Increase the size of CONFIG_SYS_PBSIZE so that it can store the error message and allows the error message to be printed correctly with no hang. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- This problem affects many boards. Maybe a global fix is to add a CONFIG_SYS_PBSIZE entry into config_fallbacks and remove its definition from the board config files when it is defined as: #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) or even when it is equal to CONFIG_SYS_CBSIZE. include/configs/mx6sabre_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index e59a3b4..6017a20 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -217,7 +217,7 @@ #define CONFIG_SYS_CBSIZE 256 /* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_PBSIZE 384 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -- 1.8.3.2

3 2

[U-Boot] [PATCH] dwc_ahsata: return failure for MX6 if not IMX6Q
by Tim Harvey 06 Jun '14

06 Jun '14

The IMX6QUAD/DUAL have SATA, but the IMX6SOLO/DL do not. Return an error indicating no such port instead of attempting a memory access that results in a data abort and reset. This dynamic detection is necessary for bootloaders that support multiple variants of the IMX6 SoC. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- drivers/block/dwc_ahsata.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/block/dwc_ahsata.c b/drivers/block/dwc_ahsata.c index 3569214..638a585 100644 --- a/drivers/block/dwc_ahsata.c +++ b/drivers/block/dwc_ahsata.c @@ -17,6 +17,7 @@ #include <asm/io.h> #include <linux/bitops.h> #include <asm/arch/clock.h> +#include <asm/arch/sys_proto.h> #include "dwc_ahsata.h" struct sata_port_regs { @@ -558,6 +559,12 @@ int init_sata(int dev) u32 linkmap; struct ahci_probe_ent *probe_ent = NULL; +#if defined(CONFIG_MX6) + if (!is_cpu_type(MXC_CPU_MX6Q)) { + printf("No device detected!\n"); + return 1; + } +#endif if (dev < 0 || dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) { printf("The sata index %d is out of ranges\n\r", dev); return -1; -- 1.8.3.2

3 10

[U-Boot] [PATCH v4 00/10] mx6: SPL NAND support
by Tim Harvey 06 Jun '14

06 Jun '14

This series adds some necessary framework for IMX6 SPL support. The series includes support for NAND SPL and has been tested with MMC as well. I have tested this on five differing Ventana baseboards with a variety of memory (32bit 512MB, 32bit 1024MB, 64bit 1024MB) and CPU configurations (IMX6Q, IMX6DL, IMX6S). This is based on top of Mashahiro Yamada's patch that consolidates arch/arm/include/asm/arch-*/spl.h [1] v4: - removed unnecessary parens from a return - removed patch 1 as it has been merged upstream v3: - re-ordered calls in board_init_f - replace imx_iomux_v3_setup_multiple_pads_array with additional intelligence in imx_iomux_v3_setup_multiple_pads - added ifdef's around cpu specific mmdc iocfg functions for code-reduction with single-variant board configs - added checks for IMX6D - added Freescale copyright to boot device support function - fixed typo s/IMX6SLD/IMX6SDL - encorporated cleanups in mxs_nand_spl.c per feedback v2: - use compatible linker script instead of creating new one - remove structure passing data from SPL to u-boot - remove dependence on mtdpart, mtdcore, nand_util, nand_ecc, nand_base and nand_bbt to bring SPL down in size. This reduced codesize by about 32k where now mxs_spl_nand is about 12k total - adjust CONFIG_SPL_TEXT_BASE, CONFIG_SPL_STACK and CONFIG_SPL_MAX_SIZE to accomodate the IMX6SOLO/DUALLITE which have half the iRAM of the IMX6DUAL/IMX6QUAD - move boot dev detection into imx-common/spl.c - move macros for using pinmux array into iomux-v3.h - remove missing/unnecessary include - revert mtdparts change - use get_ram_size() to detect memory - add support for MX6SOLO and MX6DUAL - set CS0_END for 4GB so get_ram_size() works - updated DDR3 calibration values for ventana boards - fixed build issue - only compile spl if doing spl build - fixed line length issue in README - remove CONFIG_SPL* conditions and conditionally compile instead - removed prints for CPU type and DRAM size/width - uboot will print these l - removed unused gw_ventana_spl.cfg - use common read_eeprom function - added MMC support to SPL - added Masahiro Yamada's boot mode consolidation patch http://patchwork.ozlabs.org/patch/341817 and rebase on top of it [1] http://patchwork.ozlabs.org/patch/341817/ Tim Harvey (10): spl: nand: add support for mxs nand mx6: add common SPL configuration mx6: add boot device support for SPL imx: add comments and remove unused struct fields mx6: add structs for mmdc and ddr iomux registers mx6: add mmdc configuration for MX6Q/MX6DL imx: iomux: add macros to setup iomux for multiple SoC types imx: ventana: split read_eeprom into standalone file imx: ventana: auto-configure for IMX6Q vs IMX6DL imx: ventana: switch to SPL arch/arm/cpu/armv7/mx6/Makefile | 1 + arch/arm/cpu/armv7/mx6/ddr.c | 490 +++++++++++++++++++++++ arch/arm/imx-common/Makefile | 1 + arch/arm/imx-common/cpu.c | 16 +- arch/arm/imx-common/iomux-v3.c | 16 +- arch/arm/imx-common/spl.c | 81 ++++ arch/arm/include/asm/arch-mx6/mx6-ddr.h | 231 +++++++++++ arch/arm/include/asm/imx-common/iomux-v3.h | 25 ++ board/gateworks/gw_ventana/Makefile | 3 +- board/gateworks/gw_ventana/README | 92 +++-- board/gateworks/gw_ventana/eeprom.c | 89 +++++ board/gateworks/gw_ventana/gw_ventana.c | 597 +++++++++++++++------------- board/gateworks/gw_ventana/gw_ventana.cfg | 15 - board/gateworks/gw_ventana/gw_ventana_spl.c | 419 +++++++++++++++++++ board/gateworks/gw_ventana/ventana_eeprom.h | 11 + boards.cfg | 6 +- drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/mxs_nand_spl.c | 231 +++++++++++ include/configs/gw_ventana.h | 11 + include/configs/imx6_spl.h | 71 ++++ 20 files changed, 2065 insertions(+), 342 deletions(-) create mode 100644 arch/arm/cpu/armv7/mx6/ddr.c create mode 100644 arch/arm/imx-common/spl.c create mode 100644 board/gateworks/gw_ventana/eeprom.c create mode 100644 board/gateworks/gw_ventana/gw_ventana_spl.c create mode 100644 drivers/mtd/nand/mxs_nand_spl.c create mode 100644 include/configs/imx6_spl.h -- 1.8.3.2

2 11