June 2016 - U-Boot

[U-Boot] [PATCH v2] ARM64: zynqmp: Add support for standard distro boot commands
by Michal Simek 02 Jun '16

02 Jun '16

Nand and QSPI are not defined now but this will be extended. Based on selected bootmode boot_targets are rewritten. Patch also contains detection if variables are saved. If yes don't rewrite boot_targets variable. Also move variable setup to the end of file because SCSI needs to be defined before others macros are using it. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Append default boot_targets to the list Patch depends on "env: Setup GD_FLG_ENV_DEFAULT flag when default environment are used" --- board/xilinx/zynqmp/zynqmp.c | 27 ++++++++++++++----- include/configs/xilinx_zynqmp.h | 59 ++++++++++++++++++++++++++++++----------- 2 files changed, 64 insertions(+), 22 deletions(-) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 4623cd49e9c7..204f8c526ab4 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -215,6 +215,11 @@ int board_late_init(void) u32 reg = 0; u8 bootmode; + if (!(gd->flags & GD_FLG_ENV_DEFAULT)) { + debug("Saved variables - Skipping\n"); + return 0; + } + reg = readl(&crlapb_base->boot_mode); bootmode = reg & BOOT_MODES_MASK; @@ -222,31 +227,39 @@ int board_late_init(void) switch (bootmode) { case JTAG_MODE: puts("JTAG_MODE\n"); - setenv("modeboot", "jtagboot"); + setenv("boot_targets", strcat("pxe dhcp ", + getenv("boot_targets"))); break; case QSPI_MODE_24BIT: case QSPI_MODE_32BIT: - setenv("modeboot", "qspiboot"); + setenv("boot_targets", strcat("qspi0 ", + getenv("boot_targets"))); puts("QSPI_MODE\n"); break; case EMMC_MODE: puts("EMMC_MODE\n"); - setenv("modeboot", "sdboot"); + setenv("boot_targets", strcat("mmc0 ", + getenv("boot_targets"))); break; case SD_MODE: puts("SD_MODE\n"); - setenv("modeboot", "sdboot"); + setenv("boot_targets", strcat("mmc0 ", + getenv("boot_targets"))); break; case SD_MODE1: puts("SD_MODE1\n"); #if defined(CONFIG_ZYNQ_SDHCI0) && defined(CONFIG_ZYNQ_SDHCI1) - setenv("sdbootdev", "1"); + setenv("boot_targets", strcat("mmc1 ", + getenv("boot_targets"))); +#else + setenv("boot_targets", strcat("mmc0 ", + getenv("boot_targets"))); #endif - setenv("modeboot", "sdboot"); break; case NAND_MODE: puts("NAND_MODE\n"); - setenv("modeboot", "nandboot"); + setenv("boot_targets", strcat("nand0 ", + getenv("boot_targets"))); break; default: printf("Invalid Boot Mode:0x%x\n", bootmode); diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 795d58646e15..3fba87ac194e 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -147,21 +147,6 @@ # define DFU_ALT_INFO #endif -/* Initial environment variables */ -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_addr=0x80000\0" \ - "fdt_addr=0x7000000\0" \ - "fdt_high=0x10000000\0" \ - CONFIG_KERNEL_FDT_OFST_SIZE \ - "sdbootdev=0\0"\ - "sdboot=mmc dev $sdbootdev && mmcinfo && load mmc $sdbootdev:$partid $fdt_addr system.dtb && " \ - "load mmc $sdbootdev:$partid $kernel_addr Image && " \ - "booti $kernel_addr - $fdt_addr\0" \ - DFU_ALT_INFO -#endif - -#define CONFIG_BOOTCOMMAND "run $modeboot" #define CONFIG_BOOTDELAY 3 #define CONFIG_BOARD_LATE_INIT @@ -231,6 +216,50 @@ #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_CLOCKS +#define ENV_MEM_LAYOUT_SETTINGS \ + "fdt_high=10000000\0" \ + "initrd_high=10000000\0" \ + "fdt_addr_r=0x40000000\0" \ + "pxefile_addr_r=0x10000000\0" \ + "kernel_addr_r=0x18000000\0" \ + "scriptaddr=0x02000000\0" \ + "ramdisk_addr_r=0x02100000\0" \ + +#if defined(CONFIG_ZYNQ_SDHCI) +# define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1) +#else +# define BOOT_TARGET_DEVICES_MMC(func) +#endif + +#if defined(CONFIG_SATA_CEVA) +# define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) +#else +# define BOOT_TARGET_DEVICES_SCSI(func) +#endif + +#if defined(CONFIG_ZYNQMP_USB) +# define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) func(USB, usb, 1) +#else +# define BOOT_TARGET_DEVICES_USB(func) +#endif + +#define BOOT_TARGET_DEVICES(func) \ + BOOT_TARGET_DEVICES_MMC(func) \ + BOOT_TARGET_DEVICES_USB(func) \ + BOOT_TARGET_DEVICES_SCSI(func) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> + +/* Initial environment variables */ +#ifndef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + ENV_MEM_LAYOUT_SETTINGS \ + BOOTENV \ + DFU_ALT_INFO +#endif + #define CONFIG_SPL_TEXT_BASE 0xfffc0000 #define CONFIG_SPL_MAX_SIZE 0x20000 -- 1.9.1

2 2

[U-Boot] [PATCH] ARM64: zynqmp: Add support for standard distro boot commands
by Michal Simek 02 Jun '16

02 Jun '16

Nand and QSPI are not defined now but this will be extended. Based on selected bootmode boot_targets are rewritten. Patch also contains detection if variables are saved. If yes don't rewrite boot_targets variable. Also move variable setup to the end of file because SCSI needs to be defined before others macros are using it. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Patch depends on "env: Setup GD_FLG_ENV_DEFAULT flag when default environment are used" --- board/xilinx/zynqmp/zynqmp.c | 20 +++++++++----- include/configs/xilinx_zynqmp.h | 59 ++++++++++++++++++++++++++++++----------- 2 files changed, 57 insertions(+), 22 deletions(-) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 4623cd49e9c7..46c332215b6b 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -215,6 +215,11 @@ int board_late_init(void) u32 reg = 0; u8 bootmode; + if (!(gd->flags & GD_FLG_ENV_DEFAULT)) { + debug("Saved variables - Skipping\n"); + return 0; + } + reg = readl(&crlapb_base->boot_mode); bootmode = reg & BOOT_MODES_MASK; @@ -222,31 +227,32 @@ int board_late_init(void) switch (bootmode) { case JTAG_MODE: puts("JTAG_MODE\n"); - setenv("modeboot", "jtagboot"); + setenv("boot_targets", "pxe dhcp"); break; case QSPI_MODE_24BIT: case QSPI_MODE_32BIT: - setenv("modeboot", "qspiboot"); + setenv("boot_targets", "qspi0"); puts("QSPI_MODE\n"); break; case EMMC_MODE: puts("EMMC_MODE\n"); - setenv("modeboot", "sdboot"); + setenv("boot_targets", "mmc0"); break; case SD_MODE: puts("SD_MODE\n"); - setenv("modeboot", "sdboot"); + setenv("boot_targets", "mmc0"); break; case SD_MODE1: puts("SD_MODE1\n"); #if defined(CONFIG_ZYNQ_SDHCI0) && defined(CONFIG_ZYNQ_SDHCI1) - setenv("sdbootdev", "1"); + setenv("boot_targets", "mmc1"); +#else + setenv("boot_targets", "mmc0"); #endif - setenv("modeboot", "sdboot"); break; case NAND_MODE: puts("NAND_MODE\n"); - setenv("modeboot", "nandboot"); + setenv("boot_targets", "nand0"); break; default: printf("Invalid Boot Mode:0x%x\n", bootmode); diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 795d58646e15..3fba87ac194e 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -147,21 +147,6 @@ # define DFU_ALT_INFO #endif -/* Initial environment variables */ -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_addr=0x80000\0" \ - "fdt_addr=0x7000000\0" \ - "fdt_high=0x10000000\0" \ - CONFIG_KERNEL_FDT_OFST_SIZE \ - "sdbootdev=0\0"\ - "sdboot=mmc dev $sdbootdev && mmcinfo && load mmc $sdbootdev:$partid $fdt_addr system.dtb && " \ - "load mmc $sdbootdev:$partid $kernel_addr Image && " \ - "booti $kernel_addr - $fdt_addr\0" \ - DFU_ALT_INFO -#endif - -#define CONFIG_BOOTCOMMAND "run $modeboot" #define CONFIG_BOOTDELAY 3 #define CONFIG_BOARD_LATE_INIT @@ -231,6 +216,50 @@ #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_CLOCKS +#define ENV_MEM_LAYOUT_SETTINGS \ + "fdt_high=10000000\0" \ + "initrd_high=10000000\0" \ + "fdt_addr_r=0x40000000\0" \ + "pxefile_addr_r=0x10000000\0" \ + "kernel_addr_r=0x18000000\0" \ + "scriptaddr=0x02000000\0" \ + "ramdisk_addr_r=0x02100000\0" \ + +#if defined(CONFIG_ZYNQ_SDHCI) +# define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1) +#else +# define BOOT_TARGET_DEVICES_MMC(func) +#endif + +#if defined(CONFIG_SATA_CEVA) +# define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) +#else +# define BOOT_TARGET_DEVICES_SCSI(func) +#endif + +#if defined(CONFIG_ZYNQMP_USB) +# define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) func(USB, usb, 1) +#else +# define BOOT_TARGET_DEVICES_USB(func) +#endif + +#define BOOT_TARGET_DEVICES(func) \ + BOOT_TARGET_DEVICES_MMC(func) \ + BOOT_TARGET_DEVICES_USB(func) \ + BOOT_TARGET_DEVICES_SCSI(func) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> + +/* Initial environment variables */ +#ifndef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + ENV_MEM_LAYOUT_SETTINGS \ + BOOTENV \ + DFU_ALT_INFO +#endif + #define CONFIG_SPL_TEXT_BASE 0xfffc0000 #define CONFIG_SPL_MAX_SIZE 0x20000 -- 1.9.1

2 4

[U-Boot] arm: ti: SF commands raise watchdog reset
by Daniel Gorsulowski 02 Jun '16

02 Jun '16

Hello, I have an issue with sf commands. If a command takes longer than the defined HW Watchdog timeout, the board resets. My Platform is: Board: Custom CPU: Sitara AM3357ZCZ Flash: Micron N25Q256A13E1240F Serial NOR Flash U-Boot: repoduced on 2016.01 and 2016.03 Commands to reproduce the problem: => sf probe SF: Detected N25Q256 with page size 256 Bytes, erase size 4 KiB, total 32 MiB => sf erase 0 2000000 >>> board resets after 1 minute <<< If I do #undef CONFIG_HW_WATCHDOG in my board config, the board runs stable. The Watchdog ist set to 60 seconds. See drivers/watchdog/omap_wdt.c: ... #define WDT_HW_TIMEOUT 60 ... void hw_watchdog_init(void) { ... omap_wdt_set_timeout(WDT_HW_TIMEOUT); ... } I have no idea how to fix this, so I ask you. I guess, nobody has similar hardware to reproduce this. But maybe someone has an idea and can tell me what I could try out. Maybe the issue is related to http://lists.denx.de/pipermail/u-boot/2015-November/232844.html Kind regards Daniel

1 0

[U-Boot] [PATCH] arm: socfpga: Add missing ',' in CONFIG_BOOTARGS
by Stefan Roese 01 Jun '16

01 Jun '16

Somehow the sr1500 is missing this comma in the CONFIG_BOOTARGS definition. This patch adds it to. Signed-off-by: Stefan Roese <sr(a)denx.de> Reported-by: Pavel Machek <pavel(a)denx.de> Cc: Pavel Machek <pavel(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> --- include/configs/socfpga_sr1500.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index efa9e42..c097f47 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -22,7 +22,7 @@ /* Booting Linux */ #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyS0" __stringify(CONFIG_BAUDRATE) +#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) #define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -- 2.8.3

2 1

[U-Boot] [PATCH] arm: socfpga: improve raw MMC SPL boot
by Sylvain Lesne 01 Jun '16

01 Jun '16

Before this patch, when booting from MMC (no filesystem), the SPL loaded U-Boot from a fixed offset. It will now load U-Boot from an offset of 256kB (which is 4 times the padded SPL image) in the third partition. This behaviour is similar to what the vendor SPL (based on U-Boot 2013.01) does, and allows to directly 'dd' the u-boot-with-spl.sfp file to the A2 partition. Signed-off-by: Sylvain Lesne <lesne(a)alse-fr.com> --- As discussed previously, this change relies on a tiny sprintf() implementation to be provided to be able to build and boot correctly. Also, I removed CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS, but I plan to send a patch removing this obsolete define from all the configs, so there might be a merge conflict, sorry... I completely missed a previous occurrence of this problem (http://lists.denx.de/pipermail/u-boot/2016-May/254492.html), so I'm adding the previous reporter as Cc. include/configs/socfpga_common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index f657766..e5972e6 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -349,9 +349,9 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" #define CONFIG_SPL_LIBDISK_SUPPORT #else -#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 3 -#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xa00 /* offset 2560 sect (1M+256k) */ -#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 800 /* 400 KB */ +#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 3 +#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 /* offset 512 sect (256k) */ +#define CONFIG_SPL_LIBDISK_SUPPORT #endif #endif -- 1.9.1

2 1

[U-Boot] [PATCH 1/2] zynq: Add Adapteva Parallella board support
by Nathan Rossi 01 Jun '16

01 Jun '16

The Parallella is a single board computer showcasing the Epiphany multi-core processor from Adapteva. The board uses a Zynq-7000 SoC which interconnects to the Epiphany. This patch adds support for booting on the Zynq system of the board. More information on this board is available at: https://parallella.org/ Signed-off-by: Nathan Rossi <nathan(a)nathanrossi.com> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> Cc: Michal Simek <monstr(a)monstr.eu> --- arch/arm/dts/Makefile | 1 + arch/arm/dts/zynq-parallella.dts | 96 +++++++++++++++++++++++++++++++++++++++ configs/zynq_parallella_defconfig | 36 +++++++++++++++ include/configs/zynq_parallella.h | 17 +++++++ 4 files changed, 150 insertions(+) create mode 100644 arch/arm/dts/zynq-parallella.dts create mode 100644 configs/zynq_parallella_defconfig create mode 100644 include/configs/zynq_parallella.h diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 92c7545..de249a4 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -79,6 +79,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \ zynq-zed.dtb \ zynq-zybo.dtb \ zynq-microzed.dtb \ + zynq-parallella.dtb \ zynq-picozed.dtb \ zynq-zc770-xm010.dtb \ zynq-zc770-xm011.dtb \ diff --git a/arch/arm/dts/zynq-parallella.dts b/arch/arm/dts/zynq-parallella.dts new file mode 100644 index 0000000..2a8a805 --- /dev/null +++ b/arch/arm/dts/zynq-parallella.dts @@ -0,0 +1,96 @@ +/* + * Adapteva Parallella board DTS + * + * Copyright (C) 2011 - 2013 Xilinx + * Copyright (C) 2012 National Instruments Corp. + * Copyright (C) 2014 SUSE LINUX Products GmbH + * Copyright (C) 2016 Nathan Rossi + * + * SPDX-License-Identifier: GPL-2.0+ + */ +/dts-v1/; +/include/ "zynq-7000.dtsi" + +/ { + model = "Adapteva Parallella Board"; + compatible = "adapteva,parallella", "xlnx,zynq-7000"; + + aliases { + ethernet0 = &gem0; + serial0 = &uart1; + spi0 = &qspi; + mmc0 = &sdhci0; + }; + + memory { + device_type = "memory"; + reg = <0x0 0x40000000>; + }; + + chosen { + bootargs = "earlyprintk"; + stdout-path = "serial0:115200n8"; + }; +}; + +&clkc { + fclk-enable = <0xf>; + ps-clk-frequency = <33333333>; +}; + +&gem0 { + status = "okay"; + phy-mode = "rgmii-id"; + phy-handle = <&ethernet_phy>; + + ethernet_phy: ethernet-phy@0 { + /* Marvell 88E1318 */ + compatible = "ethernet-phy-id0141.0e90", + "ethernet-phy-ieee802.3-c22"; + reg = <0>; + marvell,reg-init = <0x3 0x10 0xff00 0x1e>, + <0x3 0x11 0xfff0 0xa>; + }; +}; + +&i2c0 { + status = "okay"; + + isl9305: isl9305@68 { + compatible = "isil,isl9305"; + reg = <0x68>; + + regulators { + dcd1 { + regulator-name = "VDD_DSP"; + regulator-always-on; + }; + dcd2 { + regulator-name = "1P35V"; + regulator-always-on; + }; + ldo1 { + regulator-name = "VDD_ADJ"; + }; + ldo2 { + regulator-name = "VDD_GPIO"; + regulator-always-on; + }; + }; + }; +}; + +&sdhci1 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&uart1 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&qspi { + u-boot,dm-pre-reloc; + status = "okay"; +}; diff --git a/configs/zynq_parallella_defconfig b/configs/zynq_parallella_defconfig new file mode 100644 index 0000000..fe05c82 --- /dev/null +++ b/configs/zynq_parallella_defconfig @@ -0,0 +1,36 @@ +CONFIG_ARM=y +CONFIG_SYS_CONFIG_NAME="zynq_parallella" +CONFIG_ARCH_ZYNQ=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-parallella" +CONFIG_SPL=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_FIT_SIGNATURE=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="Parallella> " +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_ZYNQ_SDHCI=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_ZYNQ_GEM=y +CONFIG_ZYNQ_QSPI=y diff --git a/include/configs/zynq_parallella.h b/include/configs/zynq_parallella.h new file mode 100644 index 0000000..f7d17b8 --- /dev/null +++ b/include/configs/zynq_parallella.h @@ -0,0 +1,17 @@ +/* + * (C) Copyright 2016 Nathan Rossi + * + * Configuration for Adapteva Parallella Board + * See zynq-common.h for Zynq common configs + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_ZYNQ_PARALLELLA_H +#define __CONFIG_ZYNQ_PARALLELLA_H + +#define CONFIG_SYS_NO_FLASH + +#include <configs/zynq-common.h> + +#endif /* __CONFIG_ZYNQ_PARALLELLA_H */ -- 2.8.1

1 1

[U-Boot] [PATCH] ARM64: zynqmp: Enable AHCI when CONFIG_SATA_CEVA is defined
by Michal Simek 01 Jun '16

01 Jun '16

Simplify zcu102 board file by moving CONFIG_AHCI enabling to common file. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- include/configs/xilinx_zynqmp.h | 3 ++- include/configs/xilinx_zynqmp_zcu102.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index c742f5d7d705..699afb862d6a 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -273,7 +273,8 @@ # define CONFIG_SYS_EEPROM_SIZE (64 * 1024) #endif -#ifdef CONFIG_AHCI +#ifdef CONFIG_SATA_CEVA +#define CONFIG_AHCI #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h index 81079fe7d8b2..09c4a51a2ec0 100644 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ b/include/configs/xilinx_zynqmp_zcu102.h @@ -41,7 +41,6 @@ #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO -#define CONFIG_AHCI #define CONFIG_SATA_CEVA #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR} -- 1.9.1

1 0

[U-Boot] socfpga sr1500: possible typo in console=
by Pavel Machek 01 Jun '16

01 Jun '16

Hi! It seems include/configs/socfpga_sr1500.h is missing a ","... -#define CONFIG_BOOTARGS "console=ttyS0" __stringify(CONFIG_BAUDRATE) +#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) Best regards, Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

1 0

[U-Boot] [PATCH] spl: fit: Fix load address of fit header
by Lokesh Vutla 01 Jun '16

01 Jun '16

When loading fit header, it should be loaded to a previous address aligned to ARCH_DMA_MINALIGN and not 8. Fixing the same. Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- common/spl/spl_fit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index a828f72..c9eb020 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -156,8 +156,8 @@ int spl_load_simple_fit(struct spl_load_info *info, ulong sector, void *fit) * In fact the FIT has its own load address, but we assume it cannot * be before CONFIG_SYS_TEXT_BASE. */ - fit = (void *)(CONFIG_SYS_TEXT_BASE - size - info->bl_len); - fit = (void *)ALIGN((ulong)fit, 8); + fit = (void *)((CONFIG_SYS_TEXT_BASE - size - info->bl_len - + align_len) & ~align_len); sectors = get_aligned_image_size(info, size, 0); count = info->read(info, sector, sectors, fit); debug("fit read sector %lx, sectors=%d, dst=%p, count=%lu\n", -- 2.8.2

2 1

[U-Boot] [PATCH 0/7] spl: nand: sunxi: implement auto-detection
by Boris Brezillon 01 Jun '16

01 Jun '16

Hello, This patch series aims at adding support for NAND auto-detection to the sunxi SPL NAND driver. As explained in patch 7, this auto-detection is nothing more than a dumb "trial and error" logic, but it allows one to use the same SPL binary for all kind of sunxi boards booting from NAND. Of course, this approach might increase a bit the boot-time, but this is something we could address by adding a "default NAND config", that would be tested before launching the auto-detection procedure. Now let's detail a bit what's inside this patch-set. Patch 1 is a cleanup removing support for BootROM configs, which in my opinion are not only inefficient but also not reliable (at least the current implementation does not guarantee that you'll be using the correct configuration when reading the NAND). Piotr, Hans, any comment? Is this a real problem if we get rid of syndrome/BootROM configs? I mean, are you really using this mode? If that's not the case, I'd prefer dropping support for this feature. ITOH, if you really need this mode, then I'd recommend adding Kconfig options to specify the exact config to be used rather than randomly testing configs (see my explanation in patch 1). Patch 2 is renaming the SYS_NAND_U_BOOT_OFFS Kconfig option to make it usable on all platforms (not only sunxi) and avoid conflicts when one board is defining CONFIG_SYS_NAND_U_BOOT_OFFS in its include/configs/<board>.h header. Patch 3 is adding generic support for redundant u-boot images, which is particularly useful on modern NANDs where corruptions is likely to happen. Patch 4 is just getting rid of the open-coded version of redundant u-boot image support in the sunxi NAND driver. Patch 5 is a simple improvement of the NAND controller status polling loop, which is really important to make the "trial and error" approach efficient (we try to limit the impact on boot-time here). Patch 6 and 7 are implementing the auto-detection logic. Best Regards, Boris Boris Brezillon (7): spl: nand: sunxi: remove support for so-called 'syndrome' mode spl: nand: rename the SYS_NAND_U_BOOT_OFFS Kconfig option spl: nand: support redundant u-boot image spl: nand: sunxi: stop guessing the redundant u-boot offset spl: nand: sunxi: rework status polling loop spl: nand: sunxi: split 'load page' and 'read page' logic spl: nand: sunxi: add support for NAND config auto-detection common/spl/spl_nand.c | 12 + drivers/mtd/nand/Kconfig | 15 +- drivers/mtd/nand/sunxi_nand_spl.c | 480 ++++++++++++++++++++++++-------------- 3 files changed, 332 insertions(+), 175 deletions(-) -- 2.7.4

2 9