January 2018 - U-Boot

[U-Boot] [PATCH 1/4] ARC: read pae_exist bit from MMU BCR
by Eugeniy Paltsev 16 Jan '18

16 Jan '18

ARC_AUX_SLC_RGN_START1 and ARC_AUX_SLC_RGN_END1 register exist only if PAE exists in current HW. So we had to check pae_exist bit before using them. Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> --- arch/arc/include/asm/arcregs.h | 3 +++ arch/arc/lib/cache.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h index ba1f7ba..53e83c7 100644 --- a/arch/arc/include/asm/arcregs.h +++ b/arch/arc/include/asm/arcregs.h @@ -65,6 +65,9 @@ #define ARC_AUX_SLC_FLDL 0x912 #define ARC_BCR_CLUSTER 0xcf +/* MMU Management regs */ +#define ARC_AUX_MMU_BCR 0x06f + /* IO coherency related auxiliary registers */ #define ARC_AUX_IO_COH_ENABLE 0x500 #define ARC_AUX_IO_COH_PARTIAL 0x501 diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c index 1073e15..0a41dc4 100644 --- a/arch/arc/lib/cache.c +++ b/arch/arc/lib/cache.c @@ -41,6 +41,32 @@ bool icache_exists __section(".data") = false; int slc_line_sz __section(".data"); bool slc_exists __section(".data") = false; bool ioc_exists __section(".data") = false; +bool pae_exists __section(".data") = false; + +void read_decode_mmu_bcr(void) +{ + /* TODO: should we compare mmu version from BCR and from CONFIG? */ +#if (CONFIG_ARC_MMU_VER >= 4) + u32 tmp; + + tmp = read_aux_reg(ARC_AUX_MMU_BCR); + + struct bcr_mmu_4 { +#ifdef CONFIG_CPU_BIG_ENDIAN + unsigned int ver:8, sasid:1, sz1:4, sz0:4, res:2, pae:1, + n_ways:2, n_entry:2, n_super:2, u_itlb:3, u_dtlb:3; +#else + /* DTLB ITLB JES JE JA */ + unsigned int u_dtlb:3, u_itlb:3, n_super:2, n_entry:2, n_ways:2, + pae:1, res:2, sz0:4, sz1:4, sasid:1, ver:8; +#endif /* CONFIG_CPU_BIG_ENDIAN */ + } *mmu4; + + mmu4 = (struct bcr_mmu_4 *)&tmp; + + pae_exists = !!mmu4->pae; +#endif /* (CONFIG_ARC_MMU_VER >= 4) */ +} static unsigned int __before_slc_op(const int op) { @@ -244,6 +270,8 @@ void cache_init(void) write_aux_reg(ARC_AUX_IO_COH_ENABLE, 1); } + + read_decode_mmu_bcr(); #endif } -- 2.9.3

1 3

[U-Boot] [PATCH v2 1/3] arm64: zynqmp: Call psu_init() only when ZYNQMP_PSU_INIT_ENABLED
by Michal Simek 16 Jan '18

16 Jan '18

Remove SPL_BUILD dependency from zynqmp.c and move it to header file. Use only one symbol for including psu_init. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - New patch in this series board/xilinx/zynqmp/zynqmp.c | 2 +- include/configs/xilinx_zynqmp.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index db557e880674..6c8254b9824b 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -242,7 +242,7 @@ int board_early_init_f(void) zynqmp_pmufw_version(); #endif -#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED) +#if defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED) ret = psu_init(); #endif diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 0cb6ba8de08e..3f4738afe20f 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -80,6 +80,10 @@ # define CONFIG_MTD_DEVICE #endif +#if defined(CONFIG_SPL_BUILD) +#define CONFIG_ZYNQMP_PSU_INIT_ENABLED +#endif + /* Miscellaneous configurable options */ #define CONFIG_SYS_LOAD_ADDR 0x8000000 -- 1.9.1

1 2

[U-Boot] [PATCH v4 1/1] vsprintf.c: add EFI device path printing
by Heinrich Schuchardt 16 Jan '18

16 Jan '18

For debugging efi_loader we need the capability to print EFI device paths. With this patch we can write: debug("device path: %pD", dp); A possible output would be device path: /MemoryMapped(0x0,0x3ff93a82,0x3ff93a82) This enhancement is not available when building without EFI support and neither in the SPL nor in the API example. A test is provided. It can be executed in the sandbox with command ut_print. The development for EFI support in the sandbox is currently in branch u-boot-dm/efi-working. The branch currently lacks commit 6ea8b580f06b ("efi_loader: correct DeviceNodeToText for media types"). Ater rebasing the aforementioned branch on U-Boot v2018.01 the test is executed successfully. Without EFI support in the sandbox the test is simply skipped. Cc: Wolfgang Denk <wd(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> Suggested-by: Rob Clark <robdclark(a)gmail.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- I propose Alex picks up this patch for the EFI tree. v4: Add unit test. v3: Return -ENOMEM if out of memory. Avoid missing dependency error when building the SPL of the API example. v2: Panic if out of memory. Wolfgang suggested not to silently ignore an out of memory situation. --- examples/api/Makefile | 3 +++ lib/vsprintf.c | 47 +++++++++++++++++++++++++++++++++++++++++------ test/print_ut.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 6 deletions(-) diff --git a/examples/api/Makefile b/examples/api/Makefile index 899527267d..9068727b98 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -4,6 +4,9 @@ # SPDX-License-Identifier: GPL-2.0+ # +# Provide symbol API_BUILD to signal that the API example is being built. +KBUILD_CPPFLAGS += -DAPI_BUILD + ifeq ($(ARCH),powerpc) LOAD_ADDR = 0x40000 endif diff --git a/lib/vsprintf.c b/lib/vsprintf.c index dd572d2868..226f4eb3e5 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -11,16 +11,17 @@ * from hush: simple_itoa() was lifted from boa-0.93.15 */ -#include <stdarg.h> -#include <linux/types.h> -#include <linux/string.h> -#include <linux/ctype.h> - #include <common.h> #include <charset.h> +#include <efi_loader.h> +#include <div64.h> #include <uuid.h> +#include <stdarg.h> +#include <linux/ctype.h> +#include <linux/err.h> +#include <linux/types.h> +#include <linux/string.h> -#include <div64.h> #define noinline __attribute__((noinline)) /* we use this so that we can do without the ctype library */ @@ -292,6 +293,26 @@ static char *string16(char *buf, char *end, u16 *s, int field_width, return buf; } +#if defined(CONFIG_EFI_LOADER) && \ + !defined(CONFIG_SPL_BUILD) && !defined(API_BUILD) +static char *device_path_string(char *buf, char *end, void *dp, int field_width, + int precision, int flags) +{ + u16 *str; + + if (!dp) + return "<NULL>"; + + str = efi_dp_str((struct efi_device_path *)dp); + if (!str) + return ERR_PTR(-ENOMEM); + + buf = string16(buf, end, str, field_width, precision, flags); + efi_free_pool(str); + return buf; +} +#endif + #ifdef CONFIG_CMD_NET static const char hex_asc[] = "0123456789abcdef"; #define hex_asc_lo(x) hex_asc[((x) & 0x0f)] @@ -435,6 +456,12 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, #endif switch (*fmt) { +#if defined(CONFIG_EFI_LOADER) && \ + !defined(CONFIG_SPL_BUILD) && !defined(API_BUILD) + case 'D': + return device_path_string(buf, end, ptr, field_width, + precision, flags); +#endif #ifdef CONFIG_CMD_NET case 'a': flags |= SPECIAL | ZEROPAD; @@ -604,6 +631,8 @@ repeat: str = pointer(fmt + 1, str, end, va_arg(args, void *), field_width, precision, flags); + if (IS_ERR(str)) + return PTR_ERR(str); /* Skip all alphanumeric pointer suffixes */ while (isalnum(fmt[1])) fmt++; @@ -768,6 +797,9 @@ int printf(const char *fmt, ...) i = vscnprintf(printbuffer, sizeof(printbuffer), fmt, args); va_end(args); + /* Handle error */ + if (i <= 0) + return i; /* Print the string */ puts(printbuffer); return i; @@ -784,6 +816,9 @@ int vprintf(const char *fmt, va_list args) */ i = vscnprintf(printbuffer, sizeof(printbuffer), fmt, args); + /* Handle error */ + if (i <= 0) + return i; /* Print the string */ puts(printbuffer); return i; diff --git a/test/print_ut.c b/test/print_ut.c index a42c554bef..d10ed8695b 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -7,12 +7,46 @@ #define DEBUG #include <common.h> +#if defined(CONFIG_EFI_LOADER) && \ + !defined(CONFIG_SPL_BUILD) && !defined(API_BUILD) +#include <efi_api.h> +#endif #include <display_options.h> #include <version.h> #define FAKE_BUILD_TAG "jenkins-u-boot-denx_uboot_dm-master-build-aarch64" \ "and a lot more text to come" +/* Test efi_loader specific printing */ +static void efi_ut_print(void) +{ +#if defined(CONFIG_EFI_LOADER) && \ + !defined(CONFIG_SPL_BUILD) && !defined(API_BUILD) + char str[10]; + u8 buf[sizeof(struct efi_device_path_sd_mmc_path) + + sizeof(struct efi_device_path)]; + u8 *pos = buf; + struct efi_device_path *dp_end; + struct efi_device_path_sd_mmc_path *dp_sd = + (struct efi_device_path_sd_mmc_path *)pos; + + /* Create a device path for an SD card */ + dp_sd->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; + dp_sd->dp.sub_type = DEVICE_PATH_SUB_TYPE_MSG_SD; + dp_sd->dp.length = sizeof(struct efi_device_path_sd_mmc_path); + dp_sd->slot_number = 3; + pos += sizeof(struct efi_device_path_sd_mmc_path); + /* Append end node */ + dp_end = (struct efi_device_path *)pos; + dp_end->type = DEVICE_PATH_TYPE_END; + dp_end->sub_type = DEVICE_PATH_SUB_TYPE_END; + dp_end->length = sizeof(struct efi_device_path); + + snprintf(str, sizeof(str), "_%pD_", buf); + assert(!strcmp("_/SD(3)_", str)); +#endif +} + static int do_ut_print(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { @@ -75,6 +109,9 @@ static int do_ut_print(cmd_tbl_t *cmdtp, int flag, int argc, assert(!strncmp(FAKE_BUILD_TAG, s + 9 + len, 12)); assert(!strcmp("\n\n", s + big_str_len - 3)); + /* Test efi_loader specific printing */ + efi_ut_print(); + printf("%s: Everything went swimmingly\n", __func__); return 0; } -- 2.11.0

2 1

[U-Boot] [PATCH V3 00/31] imx: add i.MX8M support and i.MX8MQ EVK
by Peng Fan 16 Jan '18

16 Jan '18

This patchset is to add i.MX8M and i.MX8MQ-EVK support V3: This patchset based on https://patchwork.ozlabs.org/patch/855027/ "arm: imx: Rework i.MX specific commands to be excluded from SPL" from Tom to avoid this patchset fail apply after Tom's patch merged. Previously "power: pmic/regulator allow dm be omited by SPL" broke other boards, in V3 patchset, only touch pfuze100 related options. Sharing code about get mac from fuse between mx7/mx8m Sharing code about bootaux between mx6/7/mx8m Sharing code about cpu speed grade between mx7/mx8m Sharing code about get boot device between mx7/mx8m Sharding code about mmc env between mx7/mx8m Introduce wait_mask_set/clr_timeout to avoid deadloop in clock pll configuration Correct authorship of fix building warning on fec arm64, patch 27/31. Switch to use structure for DDR Controller. For DDR PHY registers, there are about more than 10 thousands registers, I could not convert them with detailed register name, and the script is generated from IC team, So I use regs[0xxxxx] arrays here fo easily converting between IC team released script and uboot ddr phy cod. Improve REAMME file to include where to download firmware and imx-mkimage and how to build Add review tags on the V2 patchset. Hope this patchset could catch up next release :) V2: patch 02/23: convert to structure, drop is_boot_from_usb and disconnect_from_usb patch 04/23: conver to use structure for the clock driver, removed the CCM_xxx macros. Add static for local functons. Add init_usdhc_clk, init_uart_clk and etc to not enable them all at default. patch 05/23: Add more commit msg for the sip part. patch 08/23: Merge the spl boot device with i.MX7 patch 12/23: Typo fix and return error fix from Heiko for the SoC related part patch 22/23: Use a weak function ddr_init. If patch 23/23 could not be accepted at current stage, to make others still be could be compiled. The patchset depends on https://patchwork.ozlabs.org/patch/841934/ https://patchwork.ozlabs.org/patch/841958/ to be tested on real hardware. V1: patch: "power: pmic.h: include dm/ofnode.h" and "power: pmic/regulator allow dm be omited by SPL" is previously reviewed in mailist to not merged. If no issue, you may pick it up. The board support is a large patch because of the ddr related code. If it is not good, please first review/pick-up other patches if they are ok. Peng Fan (30): imx: add i.MX8M into Kconfig imx: mx8m: add register definition header file imx: mx8m: add pin header file time: add wait_mask_set/clr_timeout helper functions imx: mx8m: add clock driver imx: add sip function imx: boot_mode: add USB_BOOT entry imx: cpu: update cpu file to support i.MX8M imx: spl: implement spl_boot_device for i.MX8M imx: add i.MX8MQ SoC Revision and is_mx8m helper imx: add pad settings bit definition for i.MX8M imx: cpu: move speed/temp to common cpu imx: cpu: add cpu speed/grade for i.MX8M imx: refactor imx_get_mac_from_fuse imx: cleanup bootaux imx: bootaux: support i.MX8M imx: mx7: move get_boot_device to cpu.c imx: cpu: support get_boot_device for i.MX8M imx: mx7: move mmc env code to mmc_env.c imx: mx8m: add soc related settings and files imx: makefile: compile files for i.MX8M misc: ocotp: add i.MX8M support mmc: fsl_esdhc: support i.MX8M imx: lcdif: include i.MX8M gpio: mxc: add i.MX8M support net: fec: do not access reserved register for i.MX8M imx: imx8mq: add dtsi file power: pmic/regulator allow dm be omitted by SPL imx: mx8m: add ddr controller memory map imx: add i.MX8MQ EVK support Ye Li (1): net: fec: fix build warnings for 64bits support arch/arm/Kconfig | 14 +- arch/arm/Makefile | 4 +- arch/arm/dts/Makefile | 2 + arch/arm/dts/fsl-imx8-ca53.dtsi | 92 ++ arch/arm/dts/fsl-imx8mq-evk.dts | 424 +++++++++ arch/arm/dts/fsl-imx8mq.dtsi | 429 +++++++++ arch/arm/include/asm/arch-imx/cpu.h | 6 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 9 +- arch/arm/include/asm/arch-mx7/imx-regs.h | 18 +- arch/arm/include/asm/arch-mx8m/clock.h | 657 ++++++++++++++ arch/arm/include/asm/arch-mx8m/crm_regs.h | 10 + arch/arm/include/asm/arch-mx8m/ddr.h | 365 ++++++++ arch/arm/include/asm/arch-mx8m/gpio.h | 12 + arch/arm/include/asm/arch-mx8m/imx-regs.h | 468 ++++++++++ arch/arm/include/asm/arch-mx8m/mx8mq_pins.h | 623 +++++++++++++ arch/arm/include/asm/arch-mx8m/sys_proto.h | 18 + arch/arm/include/asm/mach-imx/boot_mode.h | 10 + arch/arm/include/asm/mach-imx/iomux-v3.h | 22 +- arch/arm/include/asm/mach-imx/regs-lcdif.h | 10 +- arch/arm/include/asm/mach-imx/sys_proto.h | 4 + arch/arm/mach-imx/Makefile | 21 +- arch/arm/mach-imx/cpu.c | 130 ++- arch/arm/mach-imx/imx_bootaux.c | 46 +- arch/arm/mach-imx/mac.c | 61 ++ arch/arm/mach-imx/mmc_env.c | 30 + arch/arm/mach-imx/mx6/soc.c | 72 -- arch/arm/mach-imx/mx7/soc.c | 195 ---- arch/arm/mach-imx/mx8m/Kconfig | 22 + arch/arm/mach-imx/mx8m/Makefile | 8 + arch/arm/mach-imx/mx8m/clock.c | 795 ++++++++++++++++ arch/arm/mach-imx/mx8m/clock_slice.c | 742 +++++++++++++++ arch/arm/mach-imx/mx8m/lowlevel_init.S | 63 ++ arch/arm/mach-imx/mx8m/soc.c | 227 +++++ arch/arm/mach-imx/sip.c | 23 + arch/arm/mach-imx/spl.c | 10 +- board/freescale/mx8mq_evk/Kconfig | 12 + board/freescale/mx8mq_evk/Makefile | 12 + board/freescale/mx8mq_evk/README | 46 + board/freescale/mx8mq_evk/ddr/ddr_init.c | 238 +++++ board/freescale/mx8mq_evk/ddr/ddrphy_train.c | 1253 ++++++++++++++++++++++++++ board/freescale/mx8mq_evk/ddr/helper.c | 101 +++ board/freescale/mx8mq_evk/mx8mq_evk.c | 156 ++++ board/freescale/mx8mq_evk/spl.c | 230 +++++ configs/mx8mq_evk_defconfig | 27 + drivers/gpio/mxc_gpio.c | 22 +- drivers/misc/mxc_ocotp.c | 7 + drivers/mmc/fsl_esdhc.c | 12 +- drivers/net/fec_mxc.c | 78 +- drivers/power/pmic/Makefile | 2 +- drivers/power/regulator/Makefile | 2 +- include/configs/mx8mq_evk.h | 269 ++++++ include/dt-bindings/clock/imx8mq-clock.h | 612 +++++++++++++ include/dt-bindings/pinctrl/pins-imx8mq.h | 632 +++++++++++++ include/imx_sip.h | 14 + include/linux/delay.h | 4 + lib/time.c | 30 + 56 files changed, 9044 insertions(+), 357 deletions(-) create mode 100644 arch/arm/dts/fsl-imx8-ca53.dtsi create mode 100644 arch/arm/dts/fsl-imx8mq-evk.dts create mode 100644 arch/arm/dts/fsl-imx8mq.dtsi create mode 100644 arch/arm/include/asm/arch-mx8m/clock.h create mode 100644 arch/arm/include/asm/arch-mx8m/crm_regs.h create mode 100644 arch/arm/include/asm/arch-mx8m/ddr.h create mode 100644 arch/arm/include/asm/arch-mx8m/gpio.h create mode 100644 arch/arm/include/asm/arch-mx8m/imx-regs.h create mode 100644 arch/arm/include/asm/arch-mx8m/mx8mq_pins.h create mode 100644 arch/arm/include/asm/arch-mx8m/sys_proto.h create mode 100644 arch/arm/mach-imx/mac.c create mode 100644 arch/arm/mach-imx/mmc_env.c create mode 100644 arch/arm/mach-imx/mx8m/Kconfig create mode 100644 arch/arm/mach-imx/mx8m/Makefile create mode 100644 arch/arm/mach-imx/mx8m/clock.c create mode 100644 arch/arm/mach-imx/mx8m/clock_slice.c create mode 100644 arch/arm/mach-imx/mx8m/lowlevel_init.S create mode 100644 arch/arm/mach-imx/mx8m/soc.c create mode 100644 arch/arm/mach-imx/sip.c create mode 100644 board/freescale/mx8mq_evk/Kconfig create mode 100644 board/freescale/mx8mq_evk/Makefile create mode 100644 board/freescale/mx8mq_evk/README create mode 100644 board/freescale/mx8mq_evk/ddr/ddr_init.c create mode 100644 board/freescale/mx8mq_evk/ddr/ddrphy_train.c create mode 100644 board/freescale/mx8mq_evk/ddr/helper.c create mode 100644 board/freescale/mx8mq_evk/mx8mq_evk.c create mode 100644 board/freescale/mx8mq_evk/spl.c create mode 100644 configs/mx8mq_evk_defconfig create mode 100644 include/configs/mx8mq_evk.h create mode 100644 include/dt-bindings/clock/imx8mq-clock.h create mode 100644 include/dt-bindings/pinctrl/pins-imx8mq.h create mode 100644 include/imx_sip.h -- 2.14.1

5 39

[U-Boot] [PATCH 1/1] efi_loader: memory reservations according to e820 table
by Heinrich Schuchardt 16 Jan '18

16 Jan '18

On the x86 architecture the e820 BIOS table defines reserved memory. Mark it as EFI reserved memory. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_memory.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index aaf64421a3..bee0a0c97d 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -10,6 +10,9 @@ #include <efi_loader.h> #include <malloc.h> #include <asm/global_data.h> +#ifdef CONFIG_X86 +#include <asm/e820.h> +#endif #include <libfdt_env.h> #include <linux/list_sort.h> #include <inttypes.h> @@ -493,6 +496,30 @@ __weak void efi_add_known_memory(void) } } +/* + * Create reservations according to the BIOS e820 table. + */ +static void e820_memory_reservation(void) +{ +#ifdef CONFIG_X86 + struct e820entry e820[32]; + unsigned int i, num; + unsigned long start, pages; + + num = install_e820_map(ARRAY_SIZE(e820), e820); + + for (i = 0; i < num; ++i) { + if (e820[i].type == E820_RESERVED) { + start = e820[i].addr; + pages = ALIGN(e820[i].size, EFI_PAGE_SIZE) >> + EFI_PAGE_SHIFT; + efi_add_memory_map(start, pages, + EFI_RESERVED_MEMORY_TYPE, false); + } + } +#endif +} + int efi_memory_init(void) { unsigned long runtime_start, runtime_end, runtime_pages; @@ -525,6 +552,7 @@ int efi_memory_init(void) efi_bounce_buffer = (void*)(uintptr_t)efi_bounce_buffer_addr; #endif + e820_memory_reservation(); return 0; } -- 2.15.1

2 2

[U-Boot] [PATCH] nand: arasan: Select CONFIG_SYS_NAND_SELF_INIT
by Ezequiel Garcia 16 Jan '18

16 Jan '18

The Arasan NFC driver requires the self-init mode, so it should select it. Instead of having the config header define the macro, it's cleaner to select the option at the Kconfig level. Signed-off-by: Ezequiel Garcia <ezequiel(a)vanguardiasur.com.ar> --- drivers/mtd/nand/Kconfig | 1 + include/configs/xilinx_zynqmp.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 78a39abf7542..97ec6cf5f9c3 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -123,6 +123,7 @@ endif config NAND_ARASAN bool "Configure Arasan Nand" + select SYS_NAND_SELF_INIT imply CMD_NAND help This enables Nand driver support for Arasan nand flash diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 9997fd095982..d883897c6cc2 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -76,7 +76,6 @@ #ifdef CONFIG_NAND_ARASAN # define CONFIG_SYS_MAX_NAND_DEVICE 1 -# define CONFIG_SYS_NAND_SELF_INIT # define CONFIG_SYS_NAND_ONFI_DETECTION # define CONFIG_MTD_DEVICE #endif -- 2.15.1

2 1

[U-Boot] [PATCH 1/3] nand: arasan_nfc: Move common ecc struct initialization init routine
by Siva Durga Prasad Paladugu 16 Jan '18

16 Jan '18

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Move common part of ecc structure initialization to arasan_nand_init() routine. Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/mtd/nand/arasan_nfc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/nand/arasan_nfc.c b/drivers/mtd/nand/arasan_nfc.c index 14b2733..dc956f8 100644 --- a/drivers/mtd/nand/arasan_nfc.c +++ b/drivers/mtd/nand/arasan_nfc.c @@ -1038,13 +1038,6 @@ static int arasan_nand_ecc_init(struct mtd_info *mtd) u32 regval, eccpos_start, i; struct nand_chip *nand_chip = mtd_to_nand(mtd); - nand_chip->ecc.mode = NAND_ECC_HW; - nand_chip->ecc.hwctl = NULL; - nand_chip->ecc.read_page = arasan_nand_read_page_hwecc; - nand_chip->ecc.write_page = arasan_nand_write_page_hwecc; - nand_chip->ecc.read_oob = arasan_nand_read_oob; - nand_chip->ecc.write_oob = arasan_nand_write_oob; - for (i = 0; i < ARRAY_SIZE(ecc_matrix); i++) { if ((ecc_matrix[i].pagesize == mtd->writesize) && (ecc_matrix[i].ecc_codeword_size >= @@ -1126,6 +1119,13 @@ static int arasan_nand_init(struct nand_chip *nand_chip, int devnum) goto fail; } + nand_chip->ecc.mode = NAND_ECC_HW; + nand_chip->ecc.hwctl = NULL; + nand_chip->ecc.read_page = arasan_nand_read_page_hwecc; + nand_chip->ecc.write_page = arasan_nand_write_page_hwecc; + nand_chip->ecc.read_oob = arasan_nand_read_oob; + nand_chip->ecc.write_oob = arasan_nand_write_oob; + if (arasan_nand_ecc_init(mtd)) { printf("%s: nand_ecc_init failed\n", __func__); goto fail; -- 2.7.4

2 3

[U-Boot] [PATCH 0/3] Add new targets for Xilinx ZynqMP SoC
by Siva Durga Prasad Paladugu 16 Jan '18

16 Jan '18

This series adds new targets for Xilinx ZynqMP SoC. These targets are mainly meant for u-boot with minimal set of required functionality for each of flash devices such as qspi, nand and emmc. These are used in places where u-boot is supposed to run in memory with smaller footprints and with dedicated flash device. Siva Durga Prasad Paladugu (3): xilinx: zynqmp: Add new target with only qspi enabled xilinx: zynqmp: Add new target with only nand enabled xilinx: zynqmp: Add new target with only emmc enabled arch/arm/dts/Makefile | 3 + arch/arm/dts/zynqmp-mini-emmc.dts | 76 +++++++++++++++++++++ arch/arm/dts/zynqmp-mini-nand.dts | 109 ++++++++++++++++++++++++++++++ arch/arm/dts/zynqmp-mini-qspi-single.dts | 13 ++++ arch/arm/dts/zynqmp-mini-qspi.dtsi | 96 ++++++++++++++++++++++++++ configs/xilinx_zynqmp_mini_emmc_defconfig | 44 ++++++++++++ configs/xilinx_zynqmp_mini_nand_defconfig | 44 ++++++++++++ configs/xilinx_zynqmp_mini_qspi_defconfig | 56 +++++++++++++++ include/configs/xilinx_zynqmp_mini.h | 45 ++++++++++++ include/configs/xilinx_zynqmp_mini_emmc.h | 23 +++++++ include/configs/xilinx_zynqmp_mini_nand.h | 24 +++++++ include/configs/xilinx_zynqmp_mini_qspi.h | 25 +++++++ 12 files changed, 558 insertions(+) create mode 100644 arch/arm/dts/zynqmp-mini-emmc.dts create mode 100644 arch/arm/dts/zynqmp-mini-nand.dts create mode 100644 arch/arm/dts/zynqmp-mini-qspi-single.dts create mode 100644 arch/arm/dts/zynqmp-mini-qspi.dtsi create mode 100644 configs/xilinx_zynqmp_mini_emmc_defconfig create mode 100644 configs/xilinx_zynqmp_mini_nand_defconfig create mode 100644 configs/xilinx_zynqmp_mini_qspi_defconfig create mode 100644 include/configs/xilinx_zynqmp_mini.h create mode 100644 include/configs/xilinx_zynqmp_mini_emmc.h create mode 100644 include/configs/xilinx_zynqmp_mini_nand.h create mode 100644 include/configs/xilinx_zynqmp_mini_qspi.h -- 2.7.4

2 6

[U-Boot] [PATCH] i2c: mxc_i2c: Use or operation
by Peng Fan 16 Jan '18

16 Jan '18

The operation should be OR, not BIT OR. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Heiko Schocher <hs(a)denx.de> Cc: Stefano Babic <sbabic(a)denx.de> --- drivers/i2c/mxc_i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 205274e..79228c2 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -784,9 +784,9 @@ static int mxc_i2c_probe(struct udevice *bus) ret2 = gpio_request_by_name_nodev(offset_to_ofnode(node), "sda-gpios", 0, &i2c_bus->sda_gpio, GPIOD_IS_OUT); - if (!dm_gpio_is_valid(&i2c_bus->sda_gpio) | - !dm_gpio_is_valid(&i2c_bus->scl_gpio) | - ret | ret2) { + if (!dm_gpio_is_valid(&i2c_bus->sda_gpio) || + !dm_gpio_is_valid(&i2c_bus->scl_gpio) || + ret || ret2) { dev_err(dev, "i2c bus %d at %lu, fail to request scl/sda gpio\n", bus->seq, i2c_bus->base); return -EINVAL; } -- 1.9.1

2 1

[U-Boot] [PATCH 1/2] i2c: lpi2c: do not add 4 for bus seq
by Peng Fan 16 Jan '18

16 Jan '18

The number 4 is dedicated on i.MX7ULP, but lpi2c will be reused on i.MX8, 4 is not valid. The seq number could be configured by alias node. The following patch will use i2c4 as the begin for i.MX7ULP. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- drivers/i2c/imx_lpi2c.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c index e7ec17f..de74e89 100644 --- a/drivers/i2c/imx_lpi2c.c +++ b/drivers/i2c/imx_lpi2c.c @@ -258,7 +258,7 @@ static int bus_i2c_set_bus_speed(struct udevice *bus, int speed) int i; regs = (struct imx_lpi2c_reg *)devfdt_get_addr(bus); - clock_rate = imx_get_i2cclk(bus->seq + 4); + clock_rate = imx_get_i2cclk(bus->seq); if (!clock_rate) return -EPERM; @@ -419,14 +419,14 @@ static int imx_lpi2c_probe(struct udevice *bus) i2c_bus->bus = bus; /* power up i2c resource */ - ret = init_i2c_power(bus->seq + 4); + ret = init_i2c_power(bus->seq); if (ret) { debug("init_i2c_power err = %d\n", ret); return ret; } - /* Enable clk, only i2c4-7 can be handled by A7 core */ - ret = enable_i2c_clk(1, bus->seq + 4); + /* To i.MX7ULP, only i2c4-7 can be handled by A7 core */ + ret = enable_i2c_clk(1, bus->seq); if (ret < 0) return ret; -- 1.9.1

2 3