January 2017 - U-Boot

[U-Boot] [PATCH] armv8/layerscape: remove unnecessary function declares
by Minghuan Lian 19 Jan '17

19 Jan '17

For the function alloc_stream_ids() append_mmu_masters() and fdt_fixup_smmu_pcie() there are no related definitions and they are never called. So the patch removes the unnecessary declares. Signed-off-by: Minghuan Lian <Minghuan.Lian(a)nxp.com> --- arch/arm/include/asm/arch-fsl-layerscape/fdt.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fdt.h b/arch/arm/include/asm/arch-fsl-layerscape/fdt.h index 099563e..537486d 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/fdt.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/fdt.h @@ -7,9 +7,5 @@ #ifndef _ASM_ARMV8_FSL_LAYERSCAPE_FDT_H_ #define _ASM_ARMV8_FSL_LAYERSCAPE_FDT_H_ -void alloc_stream_ids(int start_id, int count, u32 *stream_ids, int max_cnt); -void append_mmu_masters(void *blob, const char *smmu_path, - const char *master_name, u32 *stream_ids, int count); -void fdt_fixup_smmu_pcie(void *blob); void fdt_fixup_board_enet(void *fdt); #endif /* _ASM_ARMV8_FSL_LAYERSCAPE_FDT_H_ */ -- 1.9.1

2 1

[U-Boot] [PATCH] armv8: fsl-layerscape, ccn504: Set forced-order mode in RNI-6, RNI-20
by Priyanka Jain 19 Jan '17

19 Jan '17

It is recommended to set forced-order mode in RNI-6, RNI-20 for performance optimization in LS2088A. Both LS2080A, LS2088A families has CONFIG_LS2080A define. As above update is required only for LS2088A, skip this for LS2080A SoC family Signed-off-by: Priyanka Jain <priyanka.jain(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S index d7440ac..7d741b8 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S +++ b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S @@ -28,6 +28,26 @@ ENTRY(lowlevel_init) ldr x0, =CCI_AUX_CONTROL_BASE(20) ldr x1, =0x00000010 bl ccn504_set_aux + + /* + * Set forced-order mode in RNI-6, RNI-20 + * This is required for performance optimization on LS2088A + * LS2080A family does not support setting forced-order mode, + * so skip this operation for LS2080A family + */ + bl get_svr + lsr w0, w0, #16 + ldr w1, =SVR_DEV_LS2080A + cmp w0, w1 + b.eq 1f + + ldr x0, =CCI_AUX_CONTROL_BASE(6) + ldr x1, =0x00000020 + bl ccn504_set_aux + ldr x0, =CCI_AUX_CONTROL_BASE(20) + ldr x1, =0x00000020 + bl ccn504_set_aux +1: #endif /* Add fully-coherent masters to DVM domain */ -- 1.7.4.1

2 1

[U-Boot] [PATCH] fsl/usb: enable usb feature for ls1046ardb
by jerry.huang＠nxp.com 19 Jan '17

19 Jan '17

Enable usb feature for ls1046ardb Signed-off-by: Changming Huang <jerry.huang(a)nxp.com> --- include/configs/ls1046ardb.h | 12 ++++++++++++ include/linux/usb/xhci-fsl.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 2fe8fc1..f0719ad 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -211,6 +211,18 @@ #define CONFIG_SPI_FLASH_BAR #endif +/* USB */ +#define CONFIG_HAS_FSL_XHCI_USB +#ifdef CONFIG_HAS_FSL_XHCI_USB +#define CONFIG_USB_XHCI_HCD +#define CONFIG_USB_XHCI_FSL +#define CONFIG_USB_XHCI_DWC3 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 +#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 +#define CONFIG_CMD_USB +#define CONFIG_USB_STORAGE +#endif + /* SATA */ #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index 15cac40..1fa3161 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -62,7 +62,7 @@ struct fsl_xhci { #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR #define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 -#elif defined(CONFIG_LS1043A) +#elif defined(CONFIG_LS1043A) || defined(CONFIG_ARCH_LS1046A) #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR #define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR #define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_XHCI_USB3_ADDR -- 1.7.9.5

2 1

[U-Boot] [PATCH] sunxi: Add defconfig for the Sinovoip BPI-M2+ board
by Mark Kettenis 19 Jan '17

19 Jan '17

The Sinovoip BPI-M2+ is a SBC board based on the H3 SoC. It has 1G of RAM, 8G eMMC, a microSD slot, USB, gigabit Ethernet, AP6212 WiFi, HDMI, etc. --- configs/Sinovoip_BPI_M2_plus_defconfig | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 configs/Sinovoip_BPI_M2_plus_defconfig diff --git a/configs/Sinovoip_BPI_M2_plus_defconfig b/configs/Sinovoip_BPI_M2_plus_defconfig new file mode 100644 index 0000000000..4733151db4 --- /dev/null +++ b/configs/Sinovoip_BPI_M2_plus_defconfig @@ -0,0 +1,18 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN8I_H3=y +CONFIG_DRAM_CLK=672 +CONFIG_DRAM_ZQ=3881979 +CONFIG_DRAM_ODT_EN=y +CONFIG_MMC0_CD_PIN="PF6" +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-bananapi-m2-plus" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SYS_EXTRA_OPTIONS="MACPWR=SUNXI_GPD(6)" +CONFIG_CONSOLE_MUX=y +CONFIG_SPL=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +CONFIG_SUN8I_EMAC=y +CONFIG_USB_EHCI_HCD=y -- 2.11.0

2 1

[U-Boot] [PATCH] fpga: Use enum for bitstream command types
by Michal Simek 19 Jan '17

19 Jan '17

Using enum simplify handling of different bitstream command types. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- cmd/fpga.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/cmd/fpga.c b/cmd/fpga.c index 8956eb1b654a..016349f56086 100644 --- a/cmd/fpga.c +++ b/cmd/fpga.c @@ -18,15 +18,17 @@ static int fpga_get_op(char *opstr); /* Local defines */ -#define FPGA_NONE -1 -#define FPGA_INFO 0 -#define FPGA_LOAD 1 -#define FPGA_LOADB 2 -#define FPGA_DUMP 3 -#define FPGA_LOADMK 4 -#define FPGA_LOADP 5 -#define FPGA_LOADBP 6 -#define FPGA_LOADFS 7 +enum { + FPGA_NONE = -1, + FPGA_INFO, + FPGA_LOAD, + FPGA_LOADB, + FPGA_DUMP, + FPGA_LOADMK, + FPGA_LOADP, + FPGA_LOADBP, + FPGA_LOADFS, +}; /* ------------------------------------------------------------------------- */ /* command form: -- 1.9.1

2 1

[U-Boot] [PATCH V3 0/7] dm: universal_c210: support the DM_PMIC
by Jaehoon Chung 19 Jan '17

19 Jan '17

This patchset is for supporting pmic driver-mode on universal_c210 board. It's using i2c-s3c24x0.c file. (Fixes some complier error issue.) Remove the soft_i2c codes in universal.c. It seems a deadcode because of no usage. Before time, it had used the soft-i2c as gpio_request(), not using s3c24x0-i2c.c (gpb6/7 were used the sda/scl.) There is no reason not to use the s3c24x0-i2c.c *dm tree i2c [ + ] |-- i2c@138b0000 pmic [ + ] | `-- max8998-pmic@66 *dm uclass uclass 20: i2c - i2c@13860000 @ 5ae652d8, seq -1, (req 0) - i2c@13870000 @ 5ae65330, seq -1, (req 1) - i2c@13880000 @ 5ae65388, seq -1, (req 2) - i2c@13890000 @ 5ae653e0, seq -1, (req 3) - i2c@138a0000 @ 5ae65438, seq -1, (req 4) - * i2c@138b0000 @ 5ae65490, seq 5, (req 5) - i2c@138c0000 @ 5ae65570, seq -1, (req 6) - i2c@138d0000 @ 5ae655c8, seq -1, (req 7) i2c [ + ] |-- i2c@138b0000 pmic [ + ] | `-- max8998-pmic@66 *After using pmic command. Universal # pmic list | Name | Parent name | Parent uclass @ seq | max8998-pmic@66 | i2c@138b0000 | i2c @ 5 Changelog on V3: - Changes the patches sequence for fixing the buildman error - Adds the commit message in more details. Changelog on V2: - Changes to "depends on ARCH_EXYNOS4" in Kconfig (fixes buildman error.) Jaehoon Chung (7): ARM: dts: exynos4: use the node's name for i2c ARM: dts: exnyos4210-universl_c210: add i2c_5 and pmic nodes configs: s5pc210_universal: enable the DM_PMIC and MAX8998 board: samsung: universal_210: use the driver model for max8998 i2c: s3c24x0: fix the compiler error for exynos4 i2c: Kconfig: Add SYS_I2C_S3C24X0 entry board: samsung: universal_c210: remove the codes relevant to soft_i2c arch/arm/dts/exynos4.dtsi | 27 +++-- arch/arm/dts/exynos4210-universal_c210.dts | 164 ++++++++++++++++++++++++++ board/samsung/universal_c210/universal.c | 180 +++++++++++++++-------------- configs/s5pc210_universal_defconfig | 3 + drivers/i2c/Kconfig | 5 + drivers/i2c/s3c24x0_i2c.c | 8 +- 6 files changed, 292 insertions(+), 95 deletions(-) -- 2.10.2

3 15

[U-Boot] [PATCH 1/2] spl: Move check for SPL_LIBCOMMON support to header
by Andrew F. Davis 19 Jan '17

19 Jan '17

Print statements in SPL depend on lib/common support, so many such statements are ifdef'd, move the check to the common.h header and remove these inline checks. Signed-off-by: Andrew F. Davis <afd(a)ti.com> --- common/spl/spl.c | 2 -- common/spl/spl_ext.c | 8 -------- common/spl/spl_fat.c | 6 ------ common/spl/spl_fit.c | 4 ---- common/spl/spl_mmc.c | 18 ------------------ common/spl/spl_sata.c | 2 -- common/spl/spl_usb.c | 2 -- drivers/mmc/mmc.c | 10 ---------- drivers/mmc/mmc_legacy.c | 2 -- include/common.h | 3 ++- 10 files changed, 2 insertions(+), 55 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index b7ec333c8a..30b540797f 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -404,9 +404,7 @@ static int spl_load_image(u32 boot_device) return spl_board_load_image(); #endif default: -#if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT) puts("SPL: Unsupported Boot Device!\n"); -#endif return -ENODEV; } diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index a85dc85ffe..9fe1c026bf 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -31,9 +31,7 @@ int spl_load_image_ext(struct blk_desc *block_dev, err = ext4fs_mount(0); if (!err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: ext4fs mount err - %d\n", __func__, err); -#endif goto end; } @@ -57,11 +55,9 @@ int spl_load_image_ext(struct blk_desc *block_dev, err = ext4fs_read((char *)spl_image.load_addr, filelen, &actlen); end: -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT if (err < 0) printf("%s: error reading image %s, err - %d\n", __func__, filename, err); -#endif return err < 0; } @@ -83,9 +79,7 @@ int spl_load_image_ext_os(struct blk_desc *block_dev, int partition) err = ext4fs_mount(0); if (!err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: ext4fs mount err - %d\n", __func__, err); -#endif return -1; } #if defined(CONFIG_SPL_ENV_SUPPORT) @@ -127,10 +121,8 @@ defaults: err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen); if (err < 0) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: error reading image %s, err - %d\n", __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err); -#endif return -1; } diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 73d33f54fc..bb78445d6a 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -29,9 +29,7 @@ static int spl_register_fat_device(struct blk_desc *block_dev, int partition) err = fat_register_device(block_dev, partition); if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: fat register err - %d\n", __func__, err); -#endif return err; } @@ -93,11 +91,9 @@ int spl_load_image_fat(struct blk_desc *block_dev, } end: -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT if (err <= 0) printf("%s: error reading image %s, err - %d\n", __func__, filename, err); -#endif return (err <= 0); } @@ -141,10 +137,8 @@ defaults: err = file_fat_read(CONFIG_SPL_FS_LOAD_ARGS_NAME, (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0); if (err <= 0) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: error reading image %s, err - %d\n", __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err); -#endif return -1; } diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index be86072c24..372eae85ce 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -40,10 +40,8 @@ static int spl_fit_select_fdt(const void *fdt, int images, int *fdt_offsetp) node = fdt_next_subnode(fdt, node)) { name = fdt_getprop(fdt, node, "description", &len); if (!name) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: Missing FDT description in DTB\n", __func__); -#endif return -EINVAL; } if (board_fit_config_name_match(name)) @@ -72,7 +70,6 @@ static int spl_fit_select_fdt(const void *fdt, int images, int *fdt_offsetp) return len; } -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("No matching DT out of these options:\n"); for (node = fdt_first_subnode(fdt, conf); node >= 0; @@ -80,7 +77,6 @@ static int spl_fit_select_fdt(const void *fdt, int images, int *fdt_offsetp) name = fdt_getprop(fdt, node, "description", &len); printf(" %s\n", name); } -#endif return -ENOENT; } diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 7c7f32959b..0c561513c0 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -86,9 +86,7 @@ static int mmc_load_image_raw_sector(struct mmc *mmc, unsigned long sector) end: if (ret) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT puts("mmc_load_image_raw_sector: mmc block read error\n"); -#endif return -1; } @@ -105,9 +103,7 @@ int spl_mmc_get_device_index(u32 boot_device) return 1; } -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: unsupported mmc boot device.\n"); -#endif return -ENODEV; } @@ -125,9 +121,7 @@ static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device) err = mmc_initialize(NULL); if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: could not initialize mmc. error: %d\n", err); -#endif return err; } @@ -140,9 +134,7 @@ static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device) err = *mmcp ? 0 : -ENODEV; #endif if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: could not find mmc device. error: %d\n", err); -#endif return err; } @@ -157,9 +149,7 @@ static int mmc_load_image_raw_partition(struct mmc *mmc, int partition) err = part_get_info(mmc_get_blk_desc(mmc), partition, &info); if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT puts("spl: partition error\n"); -#endif return -1; } @@ -189,9 +179,7 @@ static int mmc_load_image_raw_os(struct mmc *mmc) CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS, (void *) CONFIG_SYS_SPL_ARGS_ADDR); if (count == 0) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT puts("mmc_load_image_raw_os: mmc block read error\n"); -#endif return -1; } @@ -280,9 +268,7 @@ int spl_mmc_load_image(u32 boot_device) err = mmc_init(mmc); if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: mmc init failed with error: %d\n", err); -#endif return err; } @@ -302,9 +288,7 @@ int spl_mmc_load_image(u32 boot_device) err = blk_dselect_hwpart(mmc_get_blk_desc(mmc), part); if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT puts("spl: mmc partition switch failed\n"); -#endif return err; } /* Fall through */ @@ -337,10 +321,8 @@ int spl_mmc_load_image(u32 boot_device) break; case MMCSD_MODE_UNDEFINED: -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT default: puts("spl: mmc: wrong boot mode\n"); -#endif } return err; diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 9d8cc7c2dd..d91cc724be 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -27,9 +27,7 @@ int spl_sata_load_image(void) err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE); if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: sata init failed: err - %d\n", err); -#endif return err; } else { /* try to recognize storage devices immediately */ diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index 04fa66758c..05dc06a2db 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -30,9 +30,7 @@ int spl_usb_load_image(void) usb_stop(); err = usb_init(); if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: usb init failed: err - %d\n", __func__, err); -#endif return err; } diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 43ea0bba76..d7b2b6e21a 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -148,10 +148,8 @@ int mmc_send_status(struct mmc *mmc, int timeout) MMC_STATE_PRG) break; else if (cmd.response[0] & MMC_STATUS_MASK) { -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) printf("Status Error: 0x%08X\n", cmd.response[0]); -#endif return -ECOMM; } } else if (--retries < 0) @@ -165,9 +163,7 @@ int mmc_send_status(struct mmc *mmc, int timeout) mmc_trace_state(mmc, &cmd); if (timeout <= 0) { -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) printf("Timeout waiting card ready\n"); -#endif return -ETIMEDOUT; } @@ -219,9 +215,7 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start, cmd.cmdarg = 0; cmd.resp_type = MMC_RSP_R1b; if (mmc_send_cmd(mmc, &cmd, NULL)) { -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) printf("mmc fail to send stop cmd\n"); -#endif return 0; } } @@ -1526,9 +1520,7 @@ int mmc_start_init(struct mmc *mmc) #endif if (no_card) { mmc->has_init = 0; -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) printf("MMC: no card present\n"); -#endif return -ENOMEDIUM; } @@ -1572,9 +1564,7 @@ int mmc_start_init(struct mmc *mmc) err = mmc_send_op_cond(mmc); if (err) { -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) printf("Card did not respond to voltage select!\n"); -#endif return -EOPNOTSUPP; } } diff --git a/drivers/mmc/mmc_legacy.c b/drivers/mmc/mmc_legacy.c index 25361d10f6..e57a065f73 100644 --- a/drivers/mmc/mmc_legacy.c +++ b/drivers/mmc/mmc_legacy.c @@ -25,9 +25,7 @@ struct mmc *find_mmc_device(int dev_num) return m; } -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) printf("MMC Device %d not found\n", dev_num); -#endif return NULL; } diff --git a/include/common.h b/include/common.h index e9f0dea308..0336917cc9 100644 --- a/include/common.h +++ b/include/common.h @@ -866,7 +866,8 @@ int getc(void); int tstc(void); /* stdout */ -#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_SERIAL_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && !(defined(CONFIG_SPL_SERIAL_SUPPORT) && + defined(CONFIG_SPL_LIBCOMMON_SUPPORT)) #define putc(...) do { } while (0) #define puts(...) do { } while (0) #define printf(...) do { } while (0) -- 2.11.0

2 3

[U-Boot] [PATCH] armv8: release slave cores from CPU_RELEASE_ADDR
by Oded Gabbay 19 Jan '17

19 Jan '17

When using ARMv8 with ARMV8_SPIN_TABLE=y, we want the slave cores to wait on spin_table_cpu_release_addr, until the Linux kernel will "wake" them by writing to that location. The address of spin_table_cpu_release_addr is transferred to the kernel using the device tree that is updated by spin_table_update_dt(). However, if we also use SPL, then the slave cores are stuck at CPU_RELEASE_ADDR instead and as a result, never wake up. This patch releases the slave cores by writing spl_image->entry_point to CPU_RELEASE_ADDR location before the end of the SPL code (at jump_to_image_no_args()). That way, the slave cores will start to execute the u-boot and will get to the spin-table code and wait on the correct address (spin_table_cpu_release_addr). Signed-off-by: Oded Gabbay <oded.gabbay(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> --- common/spl/spl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/spl/spl.c b/common/spl/spl.c index f7df834..63d7db9 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -167,6 +167,14 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) (image_entry_noargs_t)(unsigned long)spl_image->entry_point; debug("image entry point: 0x%X\n", spl_image->entry_point); +#if defined(CONFIG_ARMV8_SPIN_TABLE) && defined(CONFIG_ARMV8_MULTIENTRY) + /* + * Release all slave cores from CPU_RELEASE_ADDR so they could + * arrive to the spin-table code in start.S of the u-boot + */ + *(ulong *)CPU_RELEASE_ADDR = (ulong)spl_image->entry_point; +#endif + image_entry(); } -- 2.7.4

4 7

[U-Boot] [PATCH] arm64: spin-table: add more information in Kconfig help
by Masahiro Yamada 19 Jan '17

19 Jan '17

This feature seems to be sometimes misunderstood. The intention is [1] Bring the slaves into U-Boot proper image, not SPL (unless you have a special reason). [2] The operation must be done in a board (SoC) specific manner since how to wake the slaves from the Boot ROM is SoC specific. [3] The slaves must enter U-Boot proper after U-Boot relocates itself because the "cpu-release-addr" property points to the relocated memory area. [2] is already explained in the help. We can make [1] even clearer by mentioning "U-Boot proper" instead of "U-Boot". [3] is missing, so I am adding it to the list. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/cpu/armv8/Kconfig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index 22dce88..7388eca 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -12,8 +12,11 @@ config ARMV8_SPIN_TABLE To use this feature, you must do: - Specify enable-method = "spin-table" in each CPU node in the Device Tree you are using to boot the kernel - - Let secondary CPUs in U-Boot (in a board specific manner) - before the master CPU jumps to the kernel + - Bring secondary CPUs into U-Boot proper (in a board specific + manner) before the master CPU jumps to the kernel, but *after* + relocation. Otherwise, the master CPU will see a different copy + of the spin code, then the secondary CPUs will spin in the + unprotected memory area. U-Boot automatically does: - Set "cpu-release-addr" property of each CPU node -- 2.7.4

2 1

[U-Boot] [PATCH 14/20] mmc: Print error code for mmc_complete_init failure
by Jagan Teki 19 Jan '17

19 Jan '17

From: Jagan Teki <jagan(a)amarulasolutions.com> Print the error code for non-zero (failure case) instead of making debug statement without any condition, this usually gives proper clue in failure condition. Log: --- MMC: FSL_SDHC: 0 mmc_init: -70, time 38 *** Warning - MMC init failed, using default environment Cc: Jaehoon Chung <jh80.chung(a)samsung.com> Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- drivers/mmc/mmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 9f8368a..3648950 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1751,7 +1751,9 @@ int mmc_init(struct mmc *mmc) if (!err) err = mmc_complete_init(mmc); - debug("%s: %d, time %lu\n", __func__, err, get_timer(start)); + if (err) + printf("%s: %d, time %lu\n", __func__, err, get_timer(start)); + return err; } -- 1.9.1

2 1