October 2018 - U-Boot

[U-Boot] [PATCH] ARM: omap3logic: Specify DM serial driver as omap_serial
by Adam Ford 22 Oct '18

22 Oct '18

With the new omap_serial driver, this patch uses this instead from the former ns16550_serial driver. Even though the omap_serial driver is essentially the same. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 2f63e76a53..cd6dd72d44 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -50,7 +50,7 @@ static const struct ns16550_platdata omap3logic_serial = { }; U_BOOT_DEVICE(omap3logic_uart) = { - "ns16550_serial", + "omap_serial", &omap3logic_serial }; -- 2.17.1

2 1

[U-Boot] [PATCH] ARM: omap3logic: Encapsulate the MUSB functions in check for DM
by Adam Ford 22 Oct '18

22 Oct '18

With the DM_USB working for USB host features, encapsulate the USB gadget initialization in a precomiler check. If DM is enabled, we don't need to manually initialize the MUSB driver. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 0b827355a8..2f63e76a53 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -148,6 +148,7 @@ void spl_board_prepare_for_linux(void) } #endif +#if !CONFIG_IS_ENABLED(DM_USB) #ifdef CONFIG_USB_MUSB_OMAP2PLUS static struct musb_hdrc_config musb_config = { .multipoint = 1, @@ -201,7 +202,7 @@ int ehci_hcd_stop(int index) } #endif /* CONFIG_USB_EHCI_HCD */ - +#endif /* !DM_USB*/ /* * Routine: misc_init_r * Description: Configure board specific parts @@ -211,10 +212,11 @@ int misc_init_r(void) twl4030_power_init(); omap_die_id_display(); +#if !CONFIG_IS_ENABLED(DM_USB) #ifdef CONFIG_USB_MUSB_OMAP2PLUS musb_register(&musb_plat, &musb_board_data, (void *)MUSB_BASE); #endif - +#endif return 0; } -- 2.17.1

2 1

[U-Boot] [PATCH] ARM: omap3_logic.c: Optimize DDR timings based on OMAP35 or 36/37
by Adam Ford 22 Oct '18

22 Oct '18

The default timings are assumming an OMAP36 / AM37 / DM37, but the OMAP35 controller is a bit slower, so DDR may operate out of spec when under stress. This patch checks the processor type and sets the DDR timings according to processor type. Fixes: 5ad4212ce0d5 ("ARM: DTS: Add Logic PD OMAP35/DM37 SOM-LV and OMAP35 Torpedo") Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 4507b1ed99..0b827355a8 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -89,11 +89,21 @@ int spl_start_uboot(void) void get_board_mem_timings(struct board_sdrc_timings *timings) { timings->mr = MICRON_V_MR_165; - /* 256MB DDR */ - timings->mcfg = MICRON_V_MCFG_200(256 << 20); - timings->ctrla = MICRON_V_ACTIMA_200; - timings->ctrlb = MICRON_V_ACTIMB_200; - timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_200MHz; + + if (get_cpu_family() == CPU_OMAP36XX) { + /* 200 MHz works for OMAP36/DM37 */ + /* 256MB DDR */ + timings->mcfg = MICRON_V_MCFG_200(256 << 20); + timings->ctrla = MICRON_V_ACTIMA_200; + timings->ctrlb = MICRON_V_ACTIMB_200; + timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_200MHz; + } else { + /* 165 MHz works for OMAP35 */ + timings->mcfg = MICRON_V_MCFG_165(256 << 20); + timings->ctrla = MICRON_V_ACTIMA_165; + timings->ctrlb = MICRON_V_ACTIMB_165; + timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz; + } } #define GPMC_NAND_COMMAND_0 (OMAP34XX_GPMC_BASE + 0x7c) -- 2.17.1

2 1

[U-Boot] [PATCH V2] ARM: da850evm_direct_nor: Remove DM_I2C_COMPAT
by Adam Ford 22 Oct '18

22 Oct '18

The da850evm does not need this enabled, so this removes a notice that appears during compile time that says "Please remove" Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V2: Limit scope to da850evm_direct_nor_defconfig since the am18 version has an EEPROM diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index 8ea522af93..b7423034db 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -40,7 +40,6 @@ CONFIG_DM=y CONFIG_BLK=y CONFIG_DA8XX_GPIO=y CONFIG_DM_I2C=y -CONFIG_DM_I2C_COMPAT=y CONFIG_SYS_I2C_DAVINCI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -- 2.17.1

2 1

[U-Boot] [PATCH 00/10] arm: am654: Add r5 support for am654-evm
by Lokesh Vutla 22 Oct '18

22 Oct '18

This series adds r5 build support for booting am654 evm. There is still 1 step(loading system firmware) missing to complete the full boot. This will be posted as a separate series. Lokesh Vutla (10): ram: Introduce K3 AM654 DDR Sub System driver armv7R: K3: am654: Enable MPU regions armv7R: K3: am654: Add support for generating build targets armv7R: K3: am654: Add support to start ATF from R5 SPL armv7R: K3: am654: Add support for triggering ddr init from SPL board: ti: am654: r5: Add initial support for am654 arm: dts: k3: Sync dts from Linux armv7r: dts: am654: Add initial support configs: am65x_evm_r5: Add initial support board: ti: am65x: Update README to add R5 build support arch/arm/dts/Makefile | 2 +- arch/arm/dts/k3-am65-main.dtsi | 51 +- arch/arm/dts/k3-am65-mcu.dtsi | 18 + arch/arm/dts/k3-am65-wakeup.dtsi | 46 + arch/arm/dts/k3-am65.dtsi | 54 +- .../dts/k3-am654-base-board-ddr4-1333MHz.dtsi | 195 +++ arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 94 +- arch/arm/dts/k3-am654-ddr.dtsi | 241 ++++ arch/arm/dts/k3-am654-r5-base-board.dts | 139 ++ arch/arm/mach-k3/Kconfig | 18 + arch/arm/mach-k3/Makefile | 2 + arch/arm/mach-k3/am6_init.c | 16 + arch/arm/mach-k3/common.c | 52 + arch/arm/mach-k3/common.h | 11 + arch/arm/mach-k3/config.mk | 59 + arch/arm/mach-k3/include/mach/sys_proto.h | 15 + arch/arm/mach-k3/r5_mpu.c | 47 + board/ti/am65x/Kconfig | 24 + board/ti/am65x/MAINTAINERS | 1 + board/ti/am65x/README | 114 +- configs/am65x_evm_r5_defconfig | 87 ++ .../ram/k3-am654-ddrss.txt | 46 + drivers/ram/Kconfig | 11 + drivers/ram/Makefile | 2 + drivers/ram/k3-am654-ddrss.c | 779 +++++++++++ drivers/ram/k3-am654-ddrss.h | 1227 +++++++++++++++++ include/configs/am65x_evm.h | 6 + include/configs/ti_armv7_common.h | 2 + tools/k3_x509template.txt | 48 + 29 files changed, 3292 insertions(+), 115 deletions(-) create mode 100644 arch/arm/dts/k3-am65-mcu.dtsi create mode 100644 arch/arm/dts/k3-am65-wakeup.dtsi create mode 100644 arch/arm/dts/k3-am654-base-board-ddr4-1333MHz.dtsi create mode 100644 arch/arm/dts/k3-am654-ddr.dtsi create mode 100644 arch/arm/dts/k3-am654-r5-base-board.dts create mode 100644 arch/arm/mach-k3/common.c create mode 100644 arch/arm/mach-k3/common.h create mode 100644 arch/arm/mach-k3/include/mach/sys_proto.h create mode 100644 arch/arm/mach-k3/r5_mpu.c create mode 100644 configs/am65x_evm_r5_defconfig create mode 100644 doc/device-tree-bindings/ram/k3-am654-ddrss.txt create mode 100644 drivers/ram/k3-am654-ddrss.c create mode 100644 drivers/ram/k3-am654-ddrss.h create mode 100644 tools/k3_x509template.txt -- 2.19.1

2 20

[U-Boot] [PATCH] i2c: imx_lpi2c: fix typo and register base address format
by Anatolij Gustschin 22 Oct '18

22 Oct '18

Output the register base address in hex notation. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- drivers/i2c/imx_lpi2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c index 6c343072fb..4586d4331f 100644 --- a/drivers/i2c/imx_lpi2c.c +++ b/drivers/i2c/imx_lpi2c.c @@ -105,7 +105,7 @@ static int bus_i2c_send(struct udevice *bus, u8 *txbuf, int len) while (len--) { result = bus_i2c_wait_for_tx_ready(regs); if (result) { - debug("i2c: send wait fot tx ready: %d\n", result); + debug("i2c: send wait for tx ready: %d\n", result); return result; } writel(*txbuf++, &regs->mtdr); @@ -482,7 +482,7 @@ static int imx_lpi2c_probe(struct udevice *bus) if (ret < 0) return ret; - debug("i2c : controller bus %d at %lu , speed %d: ", + debug("i2c : controller bus %d at 0x%lx , speed %d: ", bus->seq, i2c_bus->base, i2c_bus->speed); -- 2.17.1

2 2

[U-Boot] [PATCH 0/7] Restructure the i.MX U-Boot documentation
by Breno Matheus Lima 22 Oct '18

22 Oct '18

This patch set is restructuring and cleaning up the current i.MX documentation included in the U-Boot doc directory. The current i.MX documentation is in the root directory so we cannot easily check which one is i.MX related: http://git.denx.de/?p=u-boot/u-boot-imx.git;a=tree;f=doc; This series is restructuring the documentation only relevant for i.MX devices in a new imx directory: doc └── imx ├── common │ ├── imx25.txt │ ├── imx27.txt │ ├── imx5.txt │ ├── imx6.txt │ └── mxs.txt ├── hab │ └── habv4 │ ├── encrypted_boot.txt │ └── secure_boot.txt ├── misc │ └── sdp.txt └── mkimage ├── imximage.txt └── mxsimage.txt Subsequent patches will include more content in HAB documentation. Breno Lima (7): doc: imx: reorganize i.MX documentation doc: imx: Move SPD related info to the appropriate doc doc: imx: mkimage: reorganize i.MX mkimage documentation doc: imx: Reorganize i.MX SoC common documentation doc: imx: hab: Reorganize High Assurance Boot documentation doc: imx: misc: Reorganize miscellaneous documentation doc: imx: Improve i.MX documentation naming doc/{README.imx25 => imx/common/imx25.txt} | 0 doc/{README.imx27 => imx/common/imx27.txt} | 0 doc/{README.imx5 => imx/common/imx5.txt} | 0 doc/{README.imx6 => imx/common/imx6.txt} | 25 ----------- doc/{README.mxs => imx/common/mxs.txt} | 0 doc/imx/hab/habv4/encrypted_boot.txt | 43 ++++++++++++++++++ .../hab/habv4/secure_boot.txt} | 44 ------------------- doc/{README.sdp => imx/misc/sdp.txt} | 22 +++++++++- .../mkimage/imximage.txt} | 0 .../mkimage/mxsimage.txt} | 0 10 files changed, 63 insertions(+), 71 deletions(-) rename doc/{README.imx25 => imx/common/imx25.txt} (100%) rename doc/{README.imx27 => imx/common/imx27.txt} (100%) rename doc/{README.imx5 => imx/common/imx5.txt} (100%) rename doc/{README.imx6 => imx/common/imx6.txt} (73%) rename doc/{README.mxs => imx/common/mxs.txt} (100%) create mode 100644 doc/imx/hab/habv4/encrypted_boot.txt rename doc/{README.mxc_hab => imx/hab/habv4/secure_boot.txt} (68%) rename doc/{README.sdp => imx/misc/sdp.txt} (82%) rename doc/{README.imximage => imx/mkimage/imximage.txt} (100%) rename doc/{README.mxsimage => imx/mkimage/mxsimage.txt} (100%) -- 2.17.1

3 9

[U-Boot] [PATCH] ARM: Samsung: Add Exynos5422-based Odroid HC2 support
by Meul, Dirk 22 Oct '18

22 Oct '18

Odroid HC2 board is based on Odroid XU4 board, like the Odroid HC1. The linux kernel does not provide a hc2 DTB so the hc1 DTB is also used for the Odroid HC2. Signed-off-by: Dirk Meul <dirk.meul(a)rwth-aachen.de> --- board/samsung/common/exynos5-dt-types.c | 16 +++++++++++++--- board/samsung/common/exynos5-dt.c | 4 ++-- configs/odroid-xu3_defconfig | 2 +- include/samsung/exynos5-dt-types.h | 2 ++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c index 4473968db6..7a86e91877 100644 --- a/board/samsung/common/exynos5-dt-types.c +++ b/board/samsung/common/exynos5-dt-types.c @@ -24,14 +24,15 @@ static const struct udevice_id board_ids[] = { }; /** - * Odroix XU3/XU4/HC1 board revisions (from HC1_MAIN_REV0.1_20170630.pdf): + * Odroix XU3/XU4/HC1/HC2 board revisions (from HC1+_HC2_MAIN_REV0.1_20171017.pdf): * Rev ADCmax Board * 0.1 0 XU3 0.1 * 0.2 372 XU3 0.2 | XU3L - no DISPLAYPORT (probe I2C0:0x40 / INA231) * 0.3 1280 XU4 0.1 * 0.4 739 XU4 0.2 * 0.5 1016 XU4+Air0.1 (Passive cooling) - * 0.6 1308 XU4S 0.1 (HC1) + * 0.6 1309 XU4-HC1 0.1 + * 0.7 1470 XU4-HC1+ 0.1 (HC2) * Use +1% for ADC value tolerance in the array below, the code loops until * the measured ADC value is lower than then ADCmax from the array. */ @@ -39,7 +40,8 @@ struct odroid_rev_info odroid_info[] = { { EXYNOS5_BOARD_ODROID_XU3_REV01, 1, 10, "xu3" }, { EXYNOS5_BOARD_ODROID_XU3_REV02, 2, 375, "xu3" }, { EXYNOS5_BOARD_ODROID_XU4_REV01, 1, 1293, "xu4" }, - { EXYNOS5_BOARD_ODROID_HC1_REV01, 1, 1321, "hc1" }, + { EXYNOS5_BOARD_ODROID_HC1_REV01, 1, 1322, "hc1" }, + { EXYNOS5_BOARD_ODROID_HC2_REV01, 1, 1484, "hc1" }, { EXYNOS5_BOARD_ODROID_UNKNOWN, 0, 4095, "unknown" }, }; @@ -144,6 +146,14 @@ bool board_is_odroidhc1(void) return false; } +bool board_is_odroidhc2(void) +{ + if (gd->board_type == EXYNOS5_BOARD_ODROID_HC2_REV01) + return true; + + return false; +} + bool board_is_generic(void) { if (gd->board_type == EXYNOS5_BOARD_GENERIC) diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c index 8c3a9ea564..c183965b92 100644 --- a/board/samsung/common/exynos5-dt.c +++ b/board/samsung/common/exynos5-dt.c @@ -179,7 +179,7 @@ char *get_dfu_alt_system(char *interface, char *devstr) { char *info = "Not supported!"; - if (board_is_odroidxu4() || board_is_odroidhc1()) + if (board_is_odroidxu4() || board_is_odroidhc1() || board_is_odroidhc2()) return info; return env_get("dfu_alt_system"); @@ -192,7 +192,7 @@ char *get_dfu_alt_boot(char *interface, char *devstr) char *alt_boot; int dev_num; - if (board_is_odroidxu4() || board_is_odroidhc1()) + if (board_is_odroidxu4() || board_is_odroidhc1() || board_is_odroidhc2()) return info; dev_num = simple_strtoul(devstr, NULL, 10); diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 258b9781cc..d5c7cc7129 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_SYS_TEXT_BASE=0x43E00000 CONFIG_ARCH_EXYNOS5=y -CONFIG_IDENT_STRING=" for ODROID-XU3/XU4/HC1" +CONFIG_IDENT_STRING=" for ODROID-XU3/XU4/HC1/HC2" CONFIG_DISTRO_DEFAULTS=y CONFIG_NR_DRAM_BANKS=8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git a/include/samsung/exynos5-dt-types.h b/include/samsung/exynos5-dt-types.h index 8e11af30d1..8fe08fe211 100644 --- a/include/samsung/exynos5-dt-types.h +++ b/include/samsung/exynos5-dt-types.h @@ -9,6 +9,7 @@ enum { EXYNOS5_BOARD_ODROID_XU3_REV02, EXYNOS5_BOARD_ODROID_XU4_REV01, EXYNOS5_BOARD_ODROID_HC1_REV01, + EXYNOS5_BOARD_ODROID_HC2_REV01, EXYNOS5_BOARD_ODROID_UNKNOWN, EXYNOS5_BOARD_COUNT, @@ -25,5 +26,6 @@ bool board_is_generic(void); bool board_is_odroidxu3(void); bool board_is_odroidxu4(void); bool board_is_odroidhc1(void); +bool board_is_odroidhc2(void); #endif -- 2.17.1

5 5

[U-Boot] [PATCH v2 00/14] x86: Bring qemu-x86_64 target in travis-ci build/testing
by Bin Meng 22 Oct '18

22 Oct '18

At present the QEMU x86_64 target is broken here and there, for example with newer compiler it even does not boot. EFI loader does not work either. This series is a combination of Heinrich's EFI loader fixes and my fixes to QEMU x86_64 target. To enable qemu-x86_64 target in travis-ci for build and testing, uboot-test-hooks needs to be updated and the PR is sent. The series is available at u-boot-x86/qemu-working for testing. Changes in v2: - some rewording in the doc per Heinrich's review comments - Change to use MHz instead of Hz for the early timer frequency - Change the config option value to 400 which indicates 400 MHz - new patch to generate grub_x64.efi for qemu-x86_64 for travis-ci - new patch to update to use QEMU 3.0.0 for travis-ci testing Bin Meng (10): x86: Specify -march=core2 to build 64-bit U-Boot proper x86: Ensure no instruction sets of MMX/SSE are generated in 64-bit build x86: doc: Mention qemu-x86_64 support x86: doc: Remove stale sections of 64-bit support x86: Fix the mystery of printch() during 64-bit boot x86: tsc: Introduce config option for early timer frequency x86: quark: Specify X86_TSC_TIMER_EARLY_FREQ travis: Generate grub_x64.efi for qemu-x86_64 travis: Update to use QEMU 3.0.0 for testing travis: Add qemu-x86_64 target for test.py testing Heinrich Schuchardt (4): x86: qemu: enable CONFIG_SPL_DM_RTC x86: detect unsupported relocation types x86: put global data pointer into the .data section efi_loader: fix relocation on x86_64 .travis.yml | 13 ++++++++++++- arch/x86/config.mk | 3 ++- arch/x86/cpu/quark/Kconfig | 4 ++++ arch/x86/cpu/start64.S | 1 + arch/x86/cpu/x86_64/cpu.c | 28 ++++++++-------------------- arch/x86/lib/relocate.c | 18 ++++++++++++++++++ configs/qemu-x86_64_defconfig | 1 + doc/README.x86 | 36 +++++++++++++++++------------------- drivers/timer/Kconfig | 10 ++++++++++ drivers/timer/tsc_timer.c | 6 +++--- lib/efi_loader/efi_runtime.c | 16 ++++++++++++---- 11 files changed, 88 insertions(+), 48 deletions(-) -- 2.7.4

3 25

[U-Boot] [PATCH] x86/bootm: fix error handling in boot_prep_linux(...)
by Hannes Schmelzer 22 Oct '18

22 Oct '18

Once we get a zero pointer from load_zimage(...) we must bunch out instead of continue boot. Signed-off-by: Hannes Schmelzer <hannes.schmelzer(a)br-automation.com> --- arch/x86/lib/bootm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 54c22fe..832b1f9 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -116,6 +116,10 @@ static int boot_prep_linux(bootm_headers_t *images) char *base_ptr; base_ptr = (char *)load_zimage(data, len, &load_address); + if (!base_ptr) { + puts("## Kernel loading failed ...\n"); + goto error; + } images->os.load = load_address; cmd_line_dest = base_ptr + COMMAND_LINE_OFFSET; images->ep = (ulong)base_ptr; -- 2.7.4

2 2