April 2017 - U-Boot

[U-Boot] [RESEND PATCH v2 0/6] MIPS Boston updates and fixes
by Daniel Schwierzeck 12 May '17

12 May '17

This series is a resend of selected MIPS Boston updates/fixes from the original patch series [1] which was blocked by rejected PCI core changes and the series for converting CONFIG_SYS_SDRAM_BASE on MIPS from a virtual address to a physical one. At least the patches not affected by the blocking patch series should be finally applied. [1] https://lists.denx.de/pipermail/u-boot/2016-September/268137.html Changes in v2: - also patch ARM specific code to get a consistent behaviour - move to menu "General setup" - set default value for Boston in arch/mips/Kconfig - rebased to current mainline - rebased to current mainline Paul Burton (6): image: Use ram_top, not bi_memsize, in getenv_bootm_size MIPS: Make CM GCR base configurable boston: Move CM GCRs away from flash boston: Setup memory ranges in FDT provided to Linux boston: Bump CONFIG_SYS_BOOTM_LEN to 64MiB boston: Enable CONFIG_DISTRO_DEFAULTS in defconfigs arch/mips/Kconfig | 21 ++++++++++++--------- board/imgtec/boston/Makefile | 1 + board/imgtec/boston/dt.c | 27 +++++++++++++++++++++++++++ common/image.c | 3 +-- configs/boston32r2_defconfig | 7 +------ configs/boston32r2el_defconfig | 7 +------ configs/boston64r2_defconfig | 7 +------ configs/boston64r2el_defconfig | 7 +------ include/configs/boston.h | 5 +++++ 9 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 board/imgtec/boston/dt.c -- 2.11.0

2 19

[U-Boot] [PATCH v7] usb: gadget: avoid variable name clipping in cb_getvar
by nicolas.le.bayon＠st.com 12 May '17

12 May '17

From: Nicolas Le Bayon <nicolas.le.bayon(a)st.com> Instead of using a fixed-size array to store variable name, preferring a dynamic allocation treats correctly all variable name lengths. Variable names are growing through releases and features. By this way, name clipping is prevented. Signed-off-by: Nicolas Le Bayon <nicolas.le.bayon(a)st.com> Reviewed-by: Marek Vasut <marex(a)denx.de> Acked-by: Lukasz Majewski <lukma(a)denx.de> --- Changes in v2: - instead of using a bigger fixed size, use malloc to fit with size needs Changes in v3: - v2 was an error (intermediate version), so propose a complete one Changes in v4: - be more explicit and detailed in label and description fields - remove intermediate variable only used one time - be more explicit in error message - fix indent issue Changes in v5: - drop an unuseful error() call Changes in v6: - add Marek review approval Changes in v7: - add Lukasz ack approval drivers/usb/gadget/f_fastboot.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 2160b1c..7cd6d24 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -432,9 +432,15 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req) else strcpy(response, "FAILValue not set"); } else { - char envstr[32]; + char *envstr; - snprintf(envstr, sizeof(envstr) - 1, "fastboot.%s", cmd); + envstr = malloc(strlen("fastboot.") + strlen(cmd) + 1); + if (!envstr) { + fastboot_tx_write_str("FAILmalloc error"); + return; + } + + sprintf(envstr, "fastboot.%s", cmd); s = getenv(envstr); if (s) { strncat(response, s, chars_left); @@ -442,6 +448,8 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req) printf("WARNING: unknown variable: %s\n", cmd); strcpy(response, "FAILVariable not implemented"); } + + free(envstr); } fastboot_tx_write_str(response); } -- 1.9.1

4 3

[U-Boot] [PATCH v2 0/6] arm: am335x: Enable SPL_DM
by Lokesh Vutla 12 May '17

12 May '17

Enable SPL_DM on all AM335x based TI platforms. Using board-data way instead of using DT as suggested by Tom here[1], mainly due to space constraints. This series depends on Adam Ford's patch[2]. Link to travis-ci build tests: https://travis-ci.org/lokeshvutla/u-boot/builds/225872244 [1] https://www.mail-archive.com/u-boot@lists.denx.de/msg238483.html [2] http://patchwork.ozlabs.org/patch/751300/ Lokesh Vutla (6): dm: mmc: omap_hsmmc: Update to support of-platdata dm: mmc: omap_hsmmc: Add pre-reloc flag to the driver configs: am335x_evm: Use omap2 generic spl load script am33xx: Provide platform data for mmc configs: am335x_evm: Enable SPL_DM arm: am335x: Enable tiny printf in SPL arch/arm/Kconfig | 1 + arch/arm/include/asm/omap_mmc.h | 9 +++++ arch/arm/mach-omap2/am33xx/Kconfig | 5 +++ arch/arm/mach-omap2/am33xx/u-boot-spl.lds | 56 ------------------------------- board/ti/am335x/board.c | 32 ++++++++++++++++++ drivers/mmc/omap_hsmmc.c | 25 ++++++++------ include/configs/am335x_evm.h | 3 +- include/configs/am335x_igep0033.h | 2 +- include/configs/am335x_shc.h | 2 +- include/configs/am335x_sl50.h | 2 +- include/configs/baltos.h | 2 +- include/configs/bav335x.h | 2 +- include/configs/bur_am335x_common.h | 2 +- include/configs/chiliboard.h | 2 +- include/configs/cm_t335.h | 2 +- include/configs/pcm051.h | 2 +- include/configs/pengwyn.h | 2 +- include/configs/pepper.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/ti_am335x_common.h | 2 ++ 20 files changed, 77 insertions(+), 80 deletions(-) delete mode 100644 arch/arm/mach-omap2/am33xx/u-boot-spl.lds -- 2.11.0

3 20

[U-Boot] [RFC PATCH] serial: omap: Support debug UART
by Lokesh Vutla 12 May '17

12 May '17

Add debug UART functions to permit omap specific ns16550 to provide an early debug UART. This is mostly in common with DEBUG_UART_NS16550 except for Mode definition register which is required for selecting UART mode(16x auto-baud or 13x mode). Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- - I understand it is duplication of code, but I guess the idea is not to use NS16550_init() as it has lot of ifdefs. Please advice if this can be improved. drivers/serial/Kconfig | 7 +++++++ drivers/serial/ns16550.c | 47 ++++++++++++++++++++++++++++++++++++----------- include/debug_uart.h | 11 +++++++++++ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index c0ec2ec2e4..5db9ec744e 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -238,6 +238,13 @@ config DEBUG_UART_UNIPHIER driver will be available until the real driver-model serial is running. +config DEBUG_UART_OMAP + bool "OMAP uart" + help + Select this to enable a debug UART using the omap ns16550 driver. + You will need to provide parameters to make this work. The driver + will be available until the real driver model serial is running. + endchoice config DEBUG_UART_BASE diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 4f86780cb1..ca55df78b7 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -246,17 +246,6 @@ int NS16550_tstc(NS16550_t com_port) #include <debug_uart.h> -#define serial_dout(reg, value) \ - serial_out_shift((char *)com_port + \ - ((char *)reg - (char *)com_port) * \ - (1 << CONFIG_DEBUG_UART_SHIFT), \ - CONFIG_DEBUG_UART_SHIFT, value) -#define serial_din(reg) \ - serial_in_shift((char *)com_port + \ - ((char *)reg - (char *)com_port) * \ - (1 << CONFIG_DEBUG_UART_SHIFT), \ - CONFIG_DEBUG_UART_SHIFT) - static inline void _debug_uart_init(void) { struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE; @@ -293,6 +282,42 @@ DEBUG_UART_FUNCS #endif +#ifdef CONFIG_DEBUG_UART_OMAP + +#include <debug_uart.h> + +static inline void _debug_uart_init(void) +{ + struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE; + int baud_divisor; + + baud_divisor = ns16550_calc_divisor(com_port, CONFIG_DEBUG_UART_CLOCK, + CONFIG_BAUDRATE); + serial_dout(&com_port->ier, CONFIG_SYS_NS16550_IER); + serial_dout(&com_port->mdr1, 0x7); + serial_dout(&com_port->mcr, UART_MCRVAL); + serial_dout(&com_port->fcr, UART_FCR_DEFVAL); + + serial_dout(&com_port->lcr, UART_LCR_BKSE | UART_LCRVAL); + serial_dout(&com_port->dll, baud_divisor & 0xff); + serial_dout(&com_port->dlm, (baud_divisor >> 8) & 0xff); + serial_dout(&com_port->lcr, UART_LCRVAL); + serial_dout(&com_port->mdr1, 0x0); +} + +static inline void _debug_uart_putc(int ch) +{ + struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE; + + while (!(serial_din(&com_port->lsr) & UART_LSR_THRE)) + ; + serial_dout(&com_port->thr, ch); +} + +DEBUG_UART_FUNCS + +#endif + #ifdef CONFIG_DM_SERIAL static int ns16550_serial_putc(struct udevice *dev, const char ch) { diff --git a/include/debug_uart.h b/include/debug_uart.h index 2980ae6200..6f0b0c5e15 100644 --- a/include/debug_uart.h +++ b/include/debug_uart.h @@ -111,6 +111,17 @@ void printhex8(uint value); #define _DEBUG_UART_ANNOUNCE #endif +#define serial_dout(reg, value) \ + serial_out_shift((char *)com_port + \ + ((char *)reg - (char *)com_port) * \ + (1 << CONFIG_DEBUG_UART_SHIFT), \ + CONFIG_DEBUG_UART_SHIFT, value) +#define serial_din(reg) \ + serial_in_shift((char *)com_port + \ + ((char *)reg - (char *)com_port) * \ + (1 << CONFIG_DEBUG_UART_SHIFT), \ + CONFIG_DEBUG_UART_SHIFT) + /* * Now define some functions - this should be inserted into the serial driver */ -- 2.11.0

3 3

[U-Boot] [PATCH v3] Add 16-bit single register pin controller support
by James Balean 12 May '17

12 May '17

Enables the pinctrl-single driver to support 16-bit registers. Only 32-bit registers were supported previously. Reduced width registers are required for some platforms, such as OMAP. Signed-off-by: James Balean <james(a)balean.com.au> Cc: Felix Brack <fb(a)ltec.ch> Cc: Simon Glass <sjg(a)chromium.org> --- Changes for v3: - Fixes incorrect v2 submission. - Inline rather than separate read/write function calls. drivers/pinctrl/pinctrl-single.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index d2dcec0..f19f779 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -47,27 +47,27 @@ static int single_configure_pins(struct udevice *dev, int n, reg; u32 val; - for (n = 0; n < count; n++) { + for (n = 0; n < count; n++, pins++) { reg = fdt32_to_cpu(pins->reg); if ((reg < 0) || (reg > pdata->offset)) { dev_dbg(dev, " invalid register offset 0x%08x\n", reg); - pins++; continue; } reg += pdata->base; + val = fdt32_to_cpu(pins->val) & pdata->mask; switch (pdata->width) { + case 16: + writew((readw(reg) & ~pdata->mask) | val, reg); + break; case 32: - val = readl(reg) & ~pdata->mask; - val |= fdt32_to_cpu(pins->val) & pdata->mask; - writel(val, reg); - dev_dbg(dev, " reg/val 0x%08x/0x%08x\n", - reg, val); + writel((readl(reg) & ~pdata->mask) | val, reg); break; default: dev_warn(dev, "unsupported register width %i\n", pdata->width); + continue; } - pins++; + dev_dbg(dev, " reg/val 0x%08x/0x%08x\n",reg, val); } return 0; } -- 2.7.4

4 3

[U-Boot] [PATCH 1/3] spl: spi: override CONFIG_SYS_SPI_U_BOOT_OFFS via /config-property
by Philipp Tomsich 12 May '17

12 May '17

For the RK3399-Q7, we need some flexibility (depending on the feature set we include in the SPL stage and how large our SPI flash is) in positioning the SPL payload (i.e. the FIT image containing U-Boot, ATF and the M0 payload) in our SPI flash. To avoid having to deal with this through different U-Boot images, we introduce a the '/config/u-boot,spl-payload-offset' property node allow it to override the default setting. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- common/spl/spl_spi.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 925a1b1..42880d5 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -15,6 +15,8 @@ #include <errno.h> #include <spl.h> +DECLARE_GLOBAL_DATA_PTR; + #ifdef CONFIG_SPL_OS_BOOT /* * Load the kernel, check for a valid header we can parse, and if found load @@ -70,6 +72,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { int err = 0; + unsigned payload_offs = CONFIG_SYS_SPI_U_BOOT_OFFS; struct spi_flash *flash; struct image_header *header; @@ -89,12 +92,18 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, /* use CONFIG_SYS_TEXT_BASE as temporary storage area */ header = (struct image_header *)(CONFIG_SYS_TEXT_BASE); +#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) + payload_offs = fdtdec_get_config_int(gd->fdt_blob, + "u-boot,spl-payload-offset", + payload_offs); +#endif + #ifdef CONFIG_SPL_OS_BOOT if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header)) #endif { /* Load u-boot, mkimage header is 64 bytes. */ - err = spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40, + err = spi_flash_read(flash, payload_offs, 0x40, (void *)header); if (err) { debug("%s: Failed to read from SPI flash (err=%d)\n", @@ -113,13 +122,13 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, load.bl_len = 1; load.read = spl_spi_fit_read; err = spl_load_simple_fit(spl_image, &load, - CONFIG_SYS_SPI_U_BOOT_OFFS, + payload_offs, header); } else { err = spl_parse_image_header(spl_image, header); if (err) return err; - err = spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS, + err = spi_flash_read(flash, payload_offs, spl_image->size, (void *)spl_image->load_addr); } -- 1.9.1

4 9

[U-Boot] [PATCH 1/2] arm: Correct signature for get_ticks()
by Simon Glass 12 May '17

12 May '17

This should be uint64_t to match its definition in common.h. Fix it. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/arm/cpu/armv8/generic_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c index cd92b2c761..a2dda333fe 100644 --- a/arch/arm/cpu/armv8/generic_timer.c +++ b/arch/arm/cpu/armv8/generic_timer.c @@ -43,7 +43,7 @@ unsigned long timer_read_counter(void) return cntpct; } -unsigned long long get_ticks(void) +uint64_t get_ticks(void) { unsigned long ticks = timer_read_counter(); -- 2.12.2.715.g7642488e1d-goog

3 4

[U-Boot] [PATCH 0/6] Android A/B Bootloader support
by Alex Deymo 12 May '17

12 May '17

An "Android Bootloader" has a lot of requirements about how it should behave which Android partners must implement. In particular, the new A/B updates [1] added more requirements and flows to the bootloader which are not common, on top of the existing flows. For example, a few uncommon requirements include: * Lookup in the BCB (boot control block) whether a "recovery" message is stored. This is used by the recovery environment when applying a multi-stage update in the legacy update model (recovery reboots to recovery again) and for interrumpted factory-reset (a reboot during the factory reset should continue to reboot into factory reset until it is done). * A new "repair" mode. In the A/B model, when none of the slots is bootable, the device would boot into repair mode, which is often the same as "bootloader" mode (fastboot). * Recovery as root: In newer version of AOSP, it is possible to mount the system image as / without an initramfs, which then frees up the initramfs in the "boot" partition to hold the "recovery" initramfs. This is the default for new devices and required for the A/B setup. This patchset updates the Android-related headers and introduces new commands to boot a recent Android build. This work is based on the bootloader used in the Raspberry Pi in Android Things and extensively tested there. [1] https://source.android.com/devices/tech/ota/ab_updates.html Alex Deymo (6): image: Update include/android_image.h image: Implement a function to load Android Images. cmd: Add 'load_android' command to load Android images. disk: Return the partition number in part_get_info_by_name() Initial support for the Android Bootloader flow cmd: Add "boot_android" command. README | 25 ++- cmd/Kconfig | 19 ++ cmd/Makefile | 2 + cmd/boot_android.c | 126 +++++++++++++ cmd/load_android.c | 56 ++++++ common/Kconfig | 19 ++ common/Makefile | 1 + common/android_bootloader.c | 350 +++++++++++++++++++++++++++++++++++ common/fb_mmc.c | 6 +- common/image-android.c | 60 ++++++ disk/part.c | 2 +- include/android_bootloader.h | 48 +++++ include/android_bootloader_message.h | 174 +++++++++++++++++ include/android_image.h | 24 ++- include/image.h | 19 ++ include/part.h | 3 +- 16 files changed, 920 insertions(+), 14 deletions(-) create mode 100644 cmd/boot_android.c create mode 100644 cmd/load_android.c create mode 100644 common/android_bootloader.c create mode 100644 include/android_bootloader.h create mode 100644 include/android_bootloader_message.h -- 2.12.2.564.g063fe858b8-goog

5 15

[U-Boot] [PATCH v3 00/31] ARM: i.MX6: SabreSD: Add dts support
by Jagan Teki 12 May '17

12 May '17

From: Jagan Teki <jagan(a)amarulasolutions.com> This series has full possible dts support for SabreSD DualLite, Quad and Quad Plus and DCD code for DualLite has added in SPL code. The main intention of this series is to add the dts node step by step and remove the legacy code at the end and to make the full functional dts. Changes for v3: - rebase on master - Added patch 'ARM: i.MX6: sabresd: Cleanup board code' - Added patch 'ARM: i.MX6DL: sabresd: Move DCD reginit on SPL' Changes for v2: - rebase on master - Added new-patches. U-Boot SPL 2017.03-33716-gcadc609 (Apr 06 2017 - 00:41:19) Trying to boot from MMC1 U-Boot 2017.03-33716-gcadc609 (Apr 06 2017 - 00:41:19 +0530) CPU: Freescale i.MX6QP rev1.0 996 MHz (running at 792 MHz) CPU: Automotive temperature grade (-40C to 125C) at 28C Reset cause: POR Model: Freescale i.MX6 Quad Plus SABRE Smart Device Board DRAM: 1 GiB MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 PCI: pcie phy link never came up No panel detected: default to Hannstar-XGA Display: Hannstar-XGA (1024x768) In: serial Out: serial Err: serial Net: eth0: ethernet@02188000 Hit any key to stop autoboot: 0 => => dm tree Class Probed Name ---------------------------------------- root [ + ] root_driver thermal [ ] |-- imx_thermal simple_bus [ + ] `-- soc simple_bus [ + ] |-- aips-bus@02000000 simple_bus [ ] | |-- spba-bus@02000000 gpio [ + ] | |-- gpio@0209c000 gpio [ + ] | |-- gpio@020a0000 gpio [ + ] | |-- gpio@020a4000 gpio [ + ] | |-- gpio@020a8000 gpio [ + ] | |-- gpio@020ac000 gpio [ + ] | |-- gpio@020b0000 gpio [ + ] | |-- gpio@020b4000 simple_bus [ ] | |-- anatop@020c8000 simple_bus [ ] | |-- snvs@020cc000 pinctrl [ + ] | `-- iomuxc@020e0000 pinconfig [ + ] | `-- imx6qdl-sabresd pinconfig [ + ] | |-- enetgrp pinconfig [ ] | |-- i2c1grp pinconfig [ ] | |-- i2c2grp pinconfig [ ] | |-- i2c3grp pinconfig [ ] | |-- uart1grp pinconfig [ ] | |-- usbotggrp pinconfig [ + ] | |-- usdhc2grp pinconfig [ + ] | |-- usdhc3grp pinconfig [ + ] | `-- usdhc4grp simple_bus [ + ] `-- aips-bus@02100000 usb [ ] |-- usb@02184000 usb [ ] |-- usb@02184200 eth [ + ] |-- ethernet@02188000 mmc [ + ] |-- usdhc@02194000 mmc [ + ] |-- usdhc@02198000 mmc [ + ] |-- usdhc@0219c000 i2c [ ] |-- i2c@021a0000 i2c [ ] |-- i2c@021a4000 pmic [ ] | `-- pfuze100@08 i2c [ ] `-- i2c@021a8000 Tested: UART, MMC, I2C, FEC(with basic ping) thanks! Jagan. Jagan Teki (31): ARM: i.MX6: sabresd: Fix README - s/of=/dev/sdbbs=1K/of=/dev/sdb bs=1K/ ARM: dts: i.MX6: Add imx6qdl-sabresd.dtsi ARM: dts: imx6qdl-sabresd: Add imx6q-sabresd.dts ARM: i.MX6: sabresd: Remove SPL_I2C_SUPPORT ARM: i.MX6Q: sabresd: Add initial devicetree support ARM: dts: imx6qdl-sabresd: Add imx6qp-sabresd.dts ARM: i.MX6QP: sabresd: Add initial devicetree support ARM: i.MX6: sabresd: Move CONFIG_SYS_I2C_MXC to defconfigs ARM: dts: imx6qdl-sabresd: Add I2C node's ARM: dts: imx6qdl-sabresd: Add PMIC pfuze100 node ARM: i.MX6: sabresd: Enable DM_I2C and DM_PMIC ARM: i.MX6: sabresd: defconfig move - CONFIG_USB_EHCI(_MX6) ARM: dts: imx6qdl-sabresd: Add usb host node ARM: dts: imx6qdl-sabresd: Add usb otg node ARM: i.MX6: sabresd: Enable CONFIG_DM_REGULATOR ARM: i.MX6: sabresd: Enable DM_USB ARM: dts: imx6qdl-sabresd: Add FEC node ARM: i.MX6: sabresd: Move CONFIG_FEC_MXC to defconfigs ARM: i.MX6: sabresd: Enable DM_ETH ARM: i.MX6: sabresd: Add dm_gpio_* for backlight ARM: i.MX6: sabresd: Add imx6_pcie_toggle_power ARM: i.MX6: sabresd: Add imx6_pcie_toggle_reset ARM: i.MX6DL: sabresd: Move DCD reginit on SPL ARM: dts: imx6qdl-sabresd: Add imx6dl-sabresd.dts ARM: i.MX6DL: sabresd: Add initial devicetree support ARM: i.MX6: sabresd: Drop legacy non-fdt code ARM: i.MX6: %s/mx6sabresd/imx6sabresd ARM: i.MX6: sabresd: Move DM_* and OF_CONTROL to arch Kconfig ARM: i.MX6: sabresd: Update README ARM: i.MX6: sabresd: Drop checkboard ARM: i.MX6: sabresd: Cleanup board code arch/arm/cpu/armv7/mx6/Kconfig | 10 +- arch/arm/dts/Makefile | 3 + arch/arm/dts/imx6dl-sabresd.dts | 17 + arch/arm/dts/imx6q-sabresd.dts | 21 + arch/arm/dts/imx6qdl-sabresd.dtsi | 235 ++++++ arch/arm/dts/imx6qp-sabresd.dts | 85 +++ .../freescale/{mx6sabresd => imx6sabresd}/Kconfig | 4 +- board/freescale/imx6sabresd/MAINTAINERS | 8 + .../freescale/{mx6sabresd => imx6sabresd}/Makefile | 2 +- board/freescale/imx6sabresd/README | 84 +++ .../mx6sabresd.c => imx6sabresd/imx6sabresd.c} | 785 ++++++++++----------- board/freescale/mx6sabresd/MAINTAINERS | 8 - board/freescale/mx6sabresd/README | 103 --- board/freescale/mx6sabresd/mx6dlsabresd.cfg | 131 ---- board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg | 169 ----- ...lsabresd_defconfig => imx6dl_sabresd_defconfig} | 26 +- ...bresd_spl_defconfig => imx6q_sabresd_defconfig} | 13 +- ...qsabresd_defconfig => imx6qp_sabresd_defconfig} | 27 +- include/configs/{mx6sabresd.h => imx6sabresd.h} | 25 +- include/configs/mx6sabre_common.h | 3 +- 20 files changed, 882 insertions(+), 877 deletions(-) create mode 100644 arch/arm/dts/imx6dl-sabresd.dts create mode 100644 arch/arm/dts/imx6q-sabresd.dts create mode 100644 arch/arm/dts/imx6qdl-sabresd.dtsi create mode 100644 arch/arm/dts/imx6qp-sabresd.dts rename board/freescale/{mx6sabresd => imx6sabresd}/Kconfig (70%) create mode 100644 board/freescale/imx6sabresd/MAINTAINERS rename board/freescale/{mx6sabresd => imx6sabresd}/Makefile (86%) create mode 100644 board/freescale/imx6sabresd/README rename board/freescale/{mx6sabresd/mx6sabresd.c => imx6sabresd/imx6sabresd.c} (69%) delete mode 100644 board/freescale/mx6sabresd/MAINTAINERS delete mode 100644 board/freescale/mx6sabresd/README delete mode 100644 board/freescale/mx6sabresd/mx6dlsabresd.cfg delete mode 100644 board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg rename configs/{mx6dlsabresd_defconfig => imx6dl_sabresd_defconfig} (59%) rename configs/{mx6sabresd_spl_defconfig => imx6q_sabresd_defconfig} (82%) rename configs/{mx6qsabresd_defconfig => imx6qp_sabresd_defconfig} (57%) rename include/configs/{mx6sabresd.h => imx6sabresd.h} (71%) -- 1.9.1

3 36

[U-Boot] [PATCH 1/2] imx: thermal: update imx6 thermal driver according new equation
by Peng Fan 11 May '17

11 May '17

>From IC guys: " After a thorough accuracy study of the Temp sense circuit, we found that with our current equation, an average part can read 7 degrees lower than a known forced temperature. We also found out that the standard variance was around 2C; which is the tightest distribution that we could create. We need to change the temp sense equation to center the average part around the target temperature. " New equation: Tmeas = (Nmeas - n1) / slope + t1 + offset n1= fused room count t1= 25 offset=3.580661 slope= 0.4148468 – 0.0015423*n1 According the new equation, update the thermal driver. c1 and c2 changed to u64 type and update comments. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> --- drivers/thermal/imx_thermal.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index 0509094..b159464 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -22,8 +22,9 @@ /* board will busyloop until this many degrees C below CPU max temperature */ #define TEMPERATURE_HOT_DELTA 5 /* CPU maxT - 5C */ #define FACTOR0 10000000 -#define FACTOR1 15976 -#define FACTOR2 4297157 +#define FACTOR1 15423 +#define FACTOR2 4148468 +#define OFFSET 3580661 #define MEASURE_FREQ 327 #define TEMPERATURE_MIN -40 #define TEMPERATURE_HOT 85 @@ -54,39 +55,42 @@ static int read_cpu_temperature(struct udevice *dev) struct thermal_data *priv = dev_get_priv(dev); u32 fuse = priv->fuse; int t1, n1; - u32 c1, c2; + u64 c1, c2; u64 temp64; /* * Sensor data layout: * [31:20] - sensor value @ 25C * We use universal formula now and only need sensor value @ 25C - * slope = 0.4297157 - (0.0015976 * 25C fuse) + * slope = 0.4445388 - (0.0016549 * 25C fuse) */ n1 = fuse >> 20; t1 = 25; /* t1 always 25C */ /* * Derived from linear interpolation: - * slope = 0.4297157 - (0.0015976 * 25C fuse) + * slope = 0.4445388 - (0.0016549 * 25C fuse) * slope = (FACTOR2 - FACTOR1 * n1) / FACTOR0 - * (Nmeas - n1) / (Tmeas - t1) = slope + * offset = 3.580661 + * offset = OFFSET / 1000000 + * (Nmeas - n1) / (Tmeas - t1 - offset) = slope * We want to reduce this down to the minimum computation necessary * for each temperature read. Also, we want Tmeas in millicelsius * and we don't want to lose precision from integer division. So... - * Tmeas = (Nmeas - n1) / slope + t1 - * milli_Tmeas = 1000 * (Nmeas - n1) / slope + 1000 * t1 - * milli_Tmeas = -1000 * (n1 - Nmeas) / slope + 1000 * t1 - * Let constant c1 = (-1000 / slope) - * milli_Tmeas = (n1 - Nmeas) * c1 + 1000 * t1 - * Let constant c2 = n1 *c1 + 1000 * t1 - * milli_Tmeas = c2 - Nmeas * c1 + * Tmeas = (Nmeas - n1) / slope + t1 + offset + * milli_Tmeas = 1000000 * (Nmeas - n1) / slope + 1000000 * t1 + OFFSET + * milli_Tmeas = -1000000 * (n1 - Nmeas) / slope + 1000000 * t1 + OFFSET + * Let constant c1 = (-1000000 / slope) + * milli_Tmeas = (n1 - Nmeas) * c1 + 1000000 * t1 + OFFSET + * Let constant c2 = n1 *c1 + 1000000 * t1 + * milli_Tmeas = (c2 - Nmeas * c1) + OFFSET + * Tmeas = ((c2 - Nmeas * c1) + OFFSET) / 1000000 */ temp64 = FACTOR0; - temp64 *= 1000; + temp64 *= 1000000; do_div(temp64, FACTOR1 * n1 - FACTOR2); c1 = temp64; - c2 = n1 * c1 + 1000 * t1; + c2 = n1 * c1 + 1000000 * t1; /* * now we only use single measure, every time we read @@ -118,8 +122,8 @@ static int read_cpu_temperature(struct udevice *dev) >> TEMPSENSE0_TEMP_CNT_SHIFT; writel(TEMPSENSE0_FINISHED, &anatop->tempsense0_clr); - /* milli_Tmeas = c2 - Nmeas * c1 */ - temperature = (long)(c2 - n_meas * c1)/1000; + /* Tmeas = (c2 - Nmeas * c1 + OFFSET) / 1000000 */ + temperature = lldiv(c2 - n_meas * c1 + OFFSET, 1000000); /* power down anatop thermal sensor */ writel(TEMPSENSE0_POWER_DOWN, &anatop->tempsense0_set); -- 2.6.2

2 3