January 2018 - U-Boot

[U-Boot] [PATCH 1/3] arm: zynq: Moved ethernet PHY configs of Zynq boards to defconfig
by Michal Simek 24 Jan '18

24 Jan '18

From: Vipul Kumar <vipul.kumar(a)xilinx.com> This patch moved ethernet PHY configs of Zynq boards to respective defconfig. Signed-off-by: Vipul Kumar <vipulk(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/syzygy_hub_defconfig | 3 +++ configs/zynq_cc108_defconfig | 3 +++ configs/zynq_microzed_defconfig | 3 +++ configs/zynq_picozed_defconfig | 3 +++ configs/zynq_z_turn_defconfig | 3 +++ configs/zynq_zc702_defconfig | 3 +++ configs/zynq_zc706_defconfig | 3 +++ configs/zynq_zc770_xm010_defconfig | 3 +++ configs/zynq_zc770_xm012_defconfig | 3 +++ configs/zynq_zc770_xm013_defconfig | 3 +++ configs/zynq_zed_defconfig | 3 +++ configs/zynq_zybo_defconfig | 3 +++ include/configs/zynq-common.h | 3 --- 13 files changed, 36 insertions(+), 3 deletions(-) diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig index f4ae8e0f25eb..c4c1e9381232 100644 --- a/configs/syzygy_hub_defconfig +++ b/configs/syzygy_hub_defconfig @@ -36,6 +36,9 @@ CONFIG_FPGA_XILINX=y CONFIG_DM_GPIO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_BASE=0xe0000000 diff --git a/configs/zynq_cc108_defconfig b/configs/zynq_cc108_defconfig index 02445ac4ab7d..5082208b9ce0 100644 --- a/configs/zynq_cc108_defconfig +++ b/configs/zynq_cc108_defconfig @@ -35,6 +35,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_BASE=0xe0000000 diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index c9829ade0209..c1762b07c2db 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -42,6 +42,9 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y CONFIG_ZYNQ_SERIAL=y CONFIG_ZYNQ_QSPI=y diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index 40befdaf8d43..0c7006a5e9d8 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -32,6 +32,9 @@ CONFIG_FPGA_XILINX=y CONFIG_DM_GPIO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y CONFIG_ZYNQ_SERIAL=y CONFIG_USB=y diff --git a/configs/zynq_z_turn_defconfig b/configs/zynq_z_turn_defconfig index dd12f7c8155b..c315b917dc81 100644 --- a/configs/zynq_z_turn_defconfig +++ b/configs/zynq_z_turn_defconfig @@ -38,6 +38,9 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_BASE=0xe0001000 diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 09584db67cea..5fadf5074e02 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -48,6 +48,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_BASE=0xe0001000 diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index e9f701dce7fa..f024147f2fba 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -48,6 +48,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_BASE=0xe0001000 diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index 0503715768df..125f97d0044b 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -41,6 +41,9 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_BASE=0xe0001000 diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig index 205d2c5f7bac..09ae04be3487 100644 --- a/configs/zynq_zc770_xm012_defconfig +++ b/configs/zynq_zc770_xm012_defconfig @@ -37,5 +37,8 @@ CONFIG_FPGA_XILINX=y CONFIG_DM_GPIO=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y CONFIG_ZYNQ_SERIAL=y diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig index 856470d4d188..36922ffcd4cd 100644 --- a/configs/zynq_zc770_xm013_defconfig +++ b/configs/zynq_zc770_xm013_defconfig @@ -41,6 +41,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y CONFIG_ZYNQ_SERIAL=y CONFIG_ZYNQ_QSPI=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index da93c9688faa..a1403a34ef0f 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -42,6 +42,9 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y CONFIG_ZYNQ_SERIAL=y CONFIG_ZYNQ_QSPI=y diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index ba5c50393fc0..50b28d85183e 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -44,6 +44,9 @@ CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_BASE=0xe0001000 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 82690132732e..371788064d4e 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -38,9 +38,6 @@ #if defined(CONFIG_ZYNQ_GEM) # define CONFIG_MII # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# define CONFIG_PHY_MARVELL -# define CONFIG_PHY_REALTEK -# define CONFIG_PHY_XILINX # define CONFIG_BOOTP_BOOTPATH # define CONFIG_BOOTP_GATEWAY # define CONFIG_BOOTP_HOSTNAME -- 1.9.1

1 2

[U-Boot] [PATCH] arm: zynq: Remove ethernet alias for topic-miami
by Michal Simek 24 Jan '18

24 Jan '18

Ethernet is not enabled that's why this alias should be completely unused. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/dts/zynq-topic-miami.dts | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/dts/zynq-topic-miami.dts b/arch/arm/dts/zynq-topic-miami.dts index 79a3671a8eb6..bf421f6653e9 100644 --- a/arch/arm/dts/zynq-topic-miami.dts +++ b/arch/arm/dts/zynq-topic-miami.dts @@ -13,7 +13,6 @@ compatible = "topic,miami", "xlnx,zynq-7000"; aliases { - ethernet0 = &gem0; serial0 = &uart0; spi0 = &qspi; i2c0 = &i2c0; -- 1.9.1

1 0

[U-Boot] [PATCH] mmc: fix to assign to corret clock value when clock is enabling
by Jaehoon Chung 24 Jan '18

24 Jan '18

When clock is enabling, it's assigned to 0 as mmc->clock. Then it can't initialize any card. Fix to assign to correct clock value as mmc->cfg->f_min or f_max. Fixes: 9546eb92cb6 ("mmc: fix the wrong disabling clock") Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- drivers/mmc/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 311f51f237..2d0e7bb3a2 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1501,7 +1501,7 @@ static int mmc_set_ios(struct mmc *mmc) int mmc_set_clock(struct mmc *mmc, uint clock, bool disable) { - if (!disable && clock != 0) { + if (!disable) { if (clock > mmc->cfg->f_max) clock = mmc->cfg->f_max; -- 2.15.1

4 4

[U-Boot] [PATCH] mmc: Poll for broken card detection case
by Jun Nie 24 Jan '18

24 Jan '18

Poll for broken card detection case instead of return no card detected. Signed-off-by: Jun Nie <jun.nie(a)linaro.org> --- drivers/mmc/Kconfig | 5 +++++ drivers/mmc/mmc.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 8fbeaa7..ed194a3 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -10,6 +10,11 @@ config MMC If you want MMC/SD/SDIO support, you should say Y here and also to your specific host controller driver. +config MMC_BROKEN_CD + bool "Poll for broken card detection case" + help + If card detection feature is broken, just poll to detect. + config DM_MMC bool "Enable MMC controllers using Driver Model" depends on DM diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 38d2e07..13c5bf5 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1650,8 +1650,12 @@ int mmc_start_init(struct mmc *mmc) bool no_card; int err; +#if !defined(CONFIG_MMC_BROKEN_CD) /* we pretend there's no card when init is NULL */ no_card = mmc_getcd(mmc) == 0; +#else + no_card = 0; +#endif #if !CONFIG_IS_ENABLED(DM_MMC) no_card = no_card || (mmc->cfg->ops->init == NULL); #endif -- 1.9.1

2 6

[U-Boot] [PATCH 0/3] power: s2mps11: Support the DM regulator
by Jaehoon Chung 24 Jan '18

24 Jan '18

3 15

[U-Boot] [PATCH v6 0/2] Generic firmware loader
by tien.fong.chee＠intel.com 24 Jan '18

24 Jan '18

From: Tien Fong Chee <tien.fong.chee(a)intel.com> This patchset contains generic firmware loader which is very close to Linux firmware loader but for U-Boot framework. Generic firmware loader can be used load whatever into target location, and then consumer driver would use it to program whatever, ie. the FPGA. This version mainly resolved comments from Lothar Waßmann in [v5]. This series is working on top of u-boot.git - http://git.denx.de/u-boot.git . [v5]: https://www.mail-archive.com/u-boot@lists.denx.de/msg272771.html v5 -> v6 changes: ----------------- - Return error code when fs_read is fail. - Return actual read size when fs_read is success. Patchset history ---------------- [v1]: https://www.mail-archive.com/u-boot@lists.denx.de/msg271905.html [v2]: https://www.mail-archive.com/u-boot@lists.denx.de/msg271979.html [v3]: https://www.mail-archive.com/u-boot@lists.denx.de/msg272039.html [v4]: https://www.mail-archive.com/u-boot@lists.denx.de/msg272432.html Tien Fong Chee (2): spl: Remove static declaration on spl_mmc_find_device function common: Generic firmware loader for file system common/Makefile | 1 + common/fs_loader.c | 309 +++++++++++++++++++++++++++++++++++++++++++++ common/spl/spl_mmc.c | 2 +- doc/README.firmware_loader | 76 +++++++++++ include/fs_loader.h | 28 ++++ include/spl.h | 2 + 6 files changed, 417 insertions(+), 1 deletion(-) create mode 100644 common/fs_loader.c create mode 100644 doc/README.firmware_loader create mode 100644 include/fs_loader.h -- 2.2.0

6 31

[U-Boot] [PATCH V2] Convert CONFIG_CMD_NAND to Kconfig
by Adam Ford 24 Jan '18

24 Jan '18

This converts the following to Kconfig: CONFIG_CMD_NAND Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V2: Remove SUNXI default since this is selected when NAND_SUNXI is Since they cannot both recursively check each other. This was causing some trouble. V1: Several boards check for the presence of CONFIG_CMD_NAND instead of CONFIG_NAND when setting up their NAND parameters. This will now define CONFIG_NAND if CMD_NAND is set. cmd/Kconfig | 2 +- configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088aqds_qspi_defconfig | 1 + configs/ls1088aqds_sdcard_qspi_defconfig | 1 + configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_qspi_defconfig | 1 + configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_sdcard_qspi_defconfig | 1 + configs/pfla02_defconfig | 1 + include/configs/ls1088aqds.h | 1 - include/configs/ls1088ardb.h | 1 - include/configs/pfla02.h | 1 - include/configs/sama5d27_som1_ek.h | 1 - 13 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 35fe9d5..a16cf74 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -763,7 +763,7 @@ config CMD_MMC config CMD_NAND bool "nand" - default y if NAND_SUNXI + select NAND help NAND support. diff --git a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig index e464951..28c9029 100644 --- a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT" CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/ls1088aqds_qspi_defconfig b/configs/ls1088aqds_qspi_defconfig index 1e368d7..7acd747 100644 --- a/configs/ls1088aqds_qspi_defconfig +++ b/configs/ls1088aqds_qspi_defconfig @@ -11,6 +11,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT" CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/ls1088aqds_sdcard_qspi_defconfig b/configs/ls1088aqds_sdcard_qspi_defconfig index 659bc4f..cb8b426 100644 --- a/configs/ls1088aqds_sdcard_qspi_defconfig +++ b/configs/ls1088aqds_sdcard_qspi_defconfig @@ -22,6 +22,7 @@ CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig index 19c76b6..5cc652c 100644 --- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig index 8a08846..62128ed 100644 --- a/configs/ls1088ardb_qspi_defconfig +++ b/configs/ls1088ardb_qspi_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig index a7466f1..ccba0fc 100644 --- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig @@ -26,6 +26,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_sdcard_qspi_defconfig index 2e3c287..c72992e 100644 --- a/configs/ls1088ardb_sdcard_qspi_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_defconfig @@ -23,6 +23,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig index 029c9de..59ee623 100644 --- a/configs/pfla02_defconfig +++ b/configs/pfla02_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 8fbf890..f7d08c1 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -156,7 +156,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index d0066e3..fcc08f5 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -142,7 +142,6 @@ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index ae03310..9f18519 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -54,7 +54,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 #ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_NAND /* Enable NAND support */ #define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_NAND_MXS diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index fdf19ad..3c3ddfe 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ /* NAND flash */ -#undef CONFIG_CMD_NAND /* SPI flash */ #define CONFIG_SF_DEFAULT_SPEED 66000000 -- 2.7.4

1 1

[U-Boot] [PATCH] cmd: Kconfig: Make CMD_NAND select NAND
by Adam Ford 24 Jan '18

24 Jan '18

Many boards check for CONFIG_CMD_NAND instead of CONFIG_NAND, so let's make CMD_NAND select NAND to make some Kconfig migration easier Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/cmd/Kconfig b/cmd/Kconfig index 35fe9d5..9f6b351 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -764,6 +764,7 @@ config CMD_MMC config CMD_NAND bool "nand" default y if NAND_SUNXI + select NAND help NAND support. -- 2.7.4

2 4

[U-Boot] [PATCH 1/1] efi_loader: always call Exit after an image returns.
by Heinrich Schuchardt 24 Jan '18

24 Jan '18

If an application or driver started via StartImage returns without calling Exit, StartImage has to call Exit. This is mandated by the UEFI spec and we do the same in efi_do_enter(). The patch looks bigger than it is. To avoid a forward declaration function efi_exit() was moved up. Only one (void*) was replaced by (void *). The only real change is in efi_start_image(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- Without this patch on Ubuntu 16.04 a crash could be observed in efi_selftest_startimage_return.c. With the patch it is gone. But this could be coincidence. --- lib/efi_loader/efi_boottime.c | 99 ++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 0ac5b44..62a24bf 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1519,6 +1519,54 @@ failure: } /* + * Leave an EFI application or driver. + * + * This function implements the Exit service. + * See the Unified Extensible Firmware Interface (UEFI) specification + * for details. + * + * @image_handle handle of the application or driver that is exiting + * @exit_status status code + * @exit_data_size size of the buffer in bytes + * @exit_data buffer with data describing an error + * @return status code + */ +static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, + efi_status_t exit_status, unsigned long exit_data_size, + int16_t *exit_data) +{ + /* + * We require that the handle points to the original loaded + * image protocol interface. + * + * For getting the longjmp address this is safer than locating + * the protocol because the protocol may have been reinstalled + * pointing to another memory location. + * + * TODO: We should call the unload procedure of the loaded + * image protocol. + */ + struct efi_loaded_image *loaded_image_info = (void *)image_handle; + + EFI_ENTRY("%p, %ld, %ld, %p", image_handle, exit_status, + exit_data_size, exit_data); + + /* Make sure entry/exit counts for EFI world cross-overs match */ + EFI_EXIT(exit_status); + + /* + * But longjmp out with the U-Boot gd, not the application's, as + * the other end is a setjmp call inside EFI context. + */ + efi_restore_gd(); + + loaded_image_info->exit_status = exit_status; + longjmp(&loaded_image_info->exit_jmp, 1); + + panic("EFI application exited"); +} + +/* * Call the entry point of an image. * * This function implements the StartImage service. @@ -1575,59 +1623,14 @@ static efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, ret = EFI_CALL(entry(image_handle, &systab)); + /* Clean up the image */ + ret = EFI_CALL(efi_exit(image_handle, ret, 0, NULL)); + /* Should usually never get here */ return EFI_EXIT(ret); } /* - * Leave an EFI application or driver. - * - * This function implements the Exit service. - * See the Unified Extensible Firmware Interface (UEFI) specification - * for details. - * - * @image_handle handle of the application or driver that is exiting - * @exit_status status code - * @exit_data_size size of the buffer in bytes - * @exit_data buffer with data describing an error - * @return status code - */ -static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, - efi_status_t exit_status, unsigned long exit_data_size, - int16_t *exit_data) -{ - /* - * We require that the handle points to the original loaded - * image protocol interface. - * - * For getting the longjmp address this is safer than locating - * the protocol because the protocol may have been reinstalled - * pointing to another memory location. - * - * TODO: We should call the unload procedure of the loaded - * image protocol. - */ - struct efi_loaded_image *loaded_image_info = (void*)image_handle; - - EFI_ENTRY("%p, %ld, %ld, %p", image_handle, exit_status, - exit_data_size, exit_data); - - /* Make sure entry/exit counts for EFI world cross-overs match */ - EFI_EXIT(exit_status); - - /* - * But longjmp out with the U-Boot gd, not the application's, as - * the other end is a setjmp call inside EFI context. - */ - efi_restore_gd(); - - loaded_image_info->exit_status = exit_status; - longjmp(&loaded_image_info->exit_jmp, 1); - - panic("EFI application exited"); -} - -/* * Unload an EFI image. * * This function implements the UnloadImage service. -- 2.7.4

2 3

Re: [U-Boot] [PATCH v4 13/18] efi_loader: fix StartImage bootservice
by Heinrich Schuchardt 24 Jan '18

24 Jan '18

On 01/19/2018 09:16 PM, xypron.glpk(a)gmx.de wrote: > From: Heinrich Schuchardt <xypron.glpk(a)gmx.de> > > The calling convention for the entry point of an EFI image > is always 'asmlinkage'. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> > --- > v4 > rebase according to https://github.com/agraf/efi_next > v3 > Use efi_handle_t as type of the image handle. > v2 > no change > --- > > lib/efi_loader/efi_boottime.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c > index 7c61dfb3a7..324abe4d48 100644 > --- a/lib/efi_loader/efi_boottime.c > +++ b/lib/efi_loader/efi_boottime.c > @@ -1530,7 +1530,8 @@ static efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, > unsigned long *exit_data_size, > s16 **exit_data) > { > - ulong (*entry)(efi_handle_t image_handle, struct efi_system_table *st); > + asmlinkage ulong (*entry)(efi_handle_t image_handle, > + struct efi_system_table *st); Alex, could you once again carefully review this change. Have a look at the definition of EFIAPI in include/efi.h In cmd/bootefi.c we assume the entry point is asmlinkage. In lib/efi_loader/helloworld.c we assume it is EFIAPI. The definition of EFIAPI depends on CONFIG_EFI_STUB_64BIT, which is only defined in configs/qemu-x86_efi_payload64_defconfig. Why should the definition of EFIAPI depend on whether we are consuming or offering the API? Shouldn't EFIAPI have the same definition when compiling qemu-x86_64_defconfig? Am I right that the entry point should in cmd/bootefi.c, helloworld.c, efi_start_image() should always be defined as EFIAPI efi_status_t (*entry)(efi_handle_t image_handle and further when compiling for x86_64 we should always define EFIAPI as __attribute__((ms_abi)) and on other systems as asmlinkage Best regards Heinrich > struct efi_loaded_image *info = image_handle; > efi_status_t ret; > >

2 3