July 2017 - U-Boot

[U-Boot] [PATCH 0/6] board: atmel: Add new board: SAMA5D27-SOM1-EK board.
by Wenyou Yang 31 Jul '17

31 Jul '17

It is based on [PATCH v2 0/8] sf: improve support of (Q)SPI flash memories https://lists.denx.de/pipermail/u-boot/2017-July/298806.html Wenyou Yang (6): ARM: at91: spl: Adjust switching to oscillator for SAMA5D2 ARM: at91: spl: Add mck function to lower rate while switching ARM: at91: spl: Add boot device for boot from QSPI ARM: at91: mach: Add missing defines of MPDDRC ARM: at91: Get the Chip ID of SAMA5D2 SiP board: atmel: Add SAMA5D27 SOM1 EK board arch/arm/dts/Makefile | 3 + arch/arm/dts/at91-sama5d27_som1_ek.dts | 155 ++++++++++++++++++ arch/arm/dts/sama5d2.dtsi | 20 +++ arch/arm/dts/sama5d27_som1.dtsi | 154 ++++++++++++++++++ arch/arm/mach-at91/Kconfig | 7 + arch/arm/mach-at91/armv7/clock.c | 36 +++++ arch/arm/mach-at91/armv7/sama5d2_devices.c | 26 ++- arch/arm/mach-at91/include/mach/at91_common.h | 1 + arch/arm/mach-at91/include/mach/at91_pmc.h | 2 + arch/arm/mach-at91/include/mach/atmel_mpddrc.h | 4 + arch/arm/mach-at91/include/mach/sama5d2.h | 7 +- arch/arm/mach-at91/spl.c | 2 + arch/arm/mach-at91/spl_atmel.c | 18 ++- board/atmel/sama5d27_som1_ek/Kconfig | 15 ++ board/atmel/sama5d27_som1_ek/MAINTAINERS | 6 + board/atmel/sama5d27_som1_ek/Makefile | 8 + board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 206 ++++++++++++++++++++++++ configs/sama5d27_som1_ek_mmc_defconfig | 82 ++++++++++ configs/sama5d27_som1_ek_spiflash_defconfig | 82 ++++++++++ include/configs/sama5d27_som1_ek.h | 100 ++++++++++++ 20 files changed, 930 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/at91-sama5d27_som1_ek.dts create mode 100644 arch/arm/dts/sama5d27_som1.dtsi create mode 100644 board/atmel/sama5d27_som1_ek/Kconfig create mode 100644 board/atmel/sama5d27_som1_ek/MAINTAINERS create mode 100644 board/atmel/sama5d27_som1_ek/Makefile create mode 100644 board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c create mode 100644 configs/sama5d27_som1_ek_mmc_defconfig create mode 100644 configs/sama5d27_som1_ek_spiflash_defconfig create mode 100644 include/configs/sama5d27_som1_ek.h -- 2.13.0

3 14

[U-Boot] [PATCH v2 0/3] board: atmel: Set the ethernet mac address from eeprom
by Wenyou Yang 31 Jul '17

31 Jul '17

Create board/$(VENDOR)/common folder to accommodate the common code for the boards from atmel. Now put the code to set the ethernet mac address here, using the function to set the ethernet mac address on sama5d2 and sama5d4 Xplained boards. Changes in v2: - Add a new patch to create board/$(VENDOR)/common folder to accommodate the common code and put the code to set the ethernet mac address from eeprom here. - Use the i2c_eeprom driver to read the mac address, instead of the dm i2c API directly. Wenyou Yang (3): board: atmel: Create board/$(VENDOR)/common folder board: sama5d2_xplained: Replace code to set mac address board: sama5d4_xplained: Set mac address from eeprom arch/arm/dts/at91-sama5d2_xplained.dts | 5 +++ arch/arm/dts/at91-sama5d4_xplained.dts | 5 +++ arch/arm/mach-at91/include/mach/at91_common.h | 2 ++ board/atmel/common/Makefile | 11 ++++++ board/atmel/common/board.c | 12 +++++++ board/atmel/common/mac_eeprom.c | 36 +++++++++++++++++++ board/atmel/sama5d2_xplained/sama5d2_xplained.c | 47 +++---------------------- board/atmel/sama5d4_xplained/sama5d4_xplained.c | 12 +++++++ configs/sama5d2_xplained_mmc_defconfig | 2 ++ configs/sama5d2_xplained_spiflash_defconfig | 2 ++ configs/sama5d4_xplained_mmc_defconfig | 4 +++ configs/sama5d4_xplained_nandflash_defconfig | 4 +++ configs/sama5d4_xplained_spiflash_defconfig | 4 +++ include/configs/sama5d2_xplained.h | 4 --- include/configs/sama5d4_xplained.h | 2 ++ 15 files changed, 105 insertions(+), 47 deletions(-) create mode 100644 board/atmel/common/Makefile create mode 100644 board/atmel/common/board.c create mode 100644 board/atmel/common/mac_eeprom.c -- 2.13.0

1 3

[U-Boot] [PATCH 0/3] usb: xhci: Add interrupt transfer support
by Bin Meng 31 Jul '17

31 Jul '17

6 24

[U-Boot] Please pull u-boot-x86
by Bin Meng 30 Jul '17

30 Jul '17

Hi Tom, The following changes since commit 19d1f1a2f3ccfbf85125150f7876ce22714b38bd: Merge git://git.denx.de/u-boot-socfpga (2017-07-29 11:44:08 -0400) are available in the git repository at: git://git.denx.de/u-boot-x86.git for you to fetch changes up to 55f228b07e2d84938a88737445441e736de41340: x86: minnowmax: Remove CONFIG_SMSC_LPC47M (2017-07-30 10:30:25 +0800) ---------------------------------------------------------------- Andy Shevchenko (10): arch/x86: Select USB before selecting host driver x86: Add dma-mapping.h to architectural code x86: Add Intel Edison board files Makefile: Don't shadow actual error when compile ASL Makefile: Export build date as integer x86: acpi: Fill OEM revision x86: acpi: Name fields in FADT in accordance with specification x86: acpi: Deduplicate acpi_fill_madt() implementation x86: acpi: Export acpi_fill_mcfg() with __weak attribute x86: acpi: Don't touch hardware on HW reduced platforms Bin Meng (1): x86: minnowmax: Remove CONFIG_SMSC_LPC47M Felipe Balbi (2): watchdog: Introduce watchdog driver for Intel Tangier x86: Add Intel Tangier support Stefan Roese (4): x86: theadorable-x86-dfi-bt700: Add Spansion SPI support and move VIDEO blob x86: conga-qeval20-qa3-e3845: Select CONFIG_BOARD_LATE_INIT x86: dfi-bt700: Add xHCI USB support x86: conga-qeval20-qa3-e3845.dts: Enable xHCI support in dts Makefile | 2 ++ arch/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/Makefile | 1 + arch/x86/cpu/baytrail/acpi.c | 29 --------------- arch/x86/cpu/quark/acpi.c | 29 --------------- arch/x86/cpu/tangier/Kconfig | 24 +++++++++++++ arch/x86/cpu/tangier/Makefile | 7 ++++ arch/x86/cpu/tangier/car.S | 13 +++++++ arch/x86/cpu/tangier/sdram.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/x86/cpu/tangier/tangier.c | 34 ++++++++++++++++++ arch/x86/dts/Makefile | 1 + arch/x86/dts/conga-qeval20-qa3-e3845.dts | 3 ++ arch/x86/dts/dfi-bt700.dtsi | 12 +++++++ arch/x86/dts/edison.dts | 89 ++++++++++++++++++++++++++++++++++++++++++++++ arch/x86/include/asm/acpi_table.h | 8 +++-- arch/x86/include/asm/dma-mapping.h | 41 ++++++++++++++++++++++ arch/x86/include/asm/sfi.h | 19 ++++++++++ arch/x86/lib/acpi_table.c | 41 ++++++++++++++++++++-- board/congatec/conga-qeval20-qa3-e3845/Kconfig | 1 + board/dfi/dfi-bt700/Kconfig | 1 + board/dfi/dfi-bt700/dfi-bt700.c | 27 ++++++++++++++ board/intel/Kconfig | 8 +++++ board/intel/edison/Kconfig | 26 ++++++++++++++ board/intel/edison/MAINTAINERS | 6 ++++ board/intel/edison/Makefile | 7 ++++ board/intel/edison/config.mk | 18 ++++++++++ board/intel/edison/edison.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/intel/edison/start.S | 13 +++++++ configs/bayleybay_defconfig | 1 - configs/chromebook_link64_defconfig | 1 - configs/chromebook_link_defconfig | 1 - configs/chromebook_samus_defconfig | 1 - configs/chromebox_panther_defconfig | 1 - configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 - configs/conga-qeval20-qa3-e3845_defconfig | 1 - configs/coreboot-x86_defconfig | 1 - configs/cougarcanyon2_defconfig | 1 - configs/crownbay_defconfig | 1 - configs/dfi-bt700-q7x-151_defconfig | 1 - configs/edison_defconfig | 53 ++++++++++++++++++++++++++++ configs/efi-x86_defconfig | 1 - configs/galileo_defconfig | 1 - configs/minnowmax_defconfig | 1 - configs/qemu-x86_64_defconfig | 1 - configs/qemu-x86_defconfig | 1 - configs/qemu-x86_efi_payload32_defconfig | 1 - configs/qemu-x86_efi_payload64_defconfig | 1 - configs/som-db5800-som-6867_defconfig | 1 - configs/theadorable-x86-dfi-bt700_defconfig | 3 +- doc/README.x86 | 39 +++++++++++++++++++++ drivers/watchdog/Kconfig | 11 +++++- drivers/watchdog/Makefile | 1 + drivers/watchdog/tangier_wdt.c | 71 +++++++++++++++++++++++++++++++++++++ include/configs/edison.h | 61 ++++++++++++++++++++++++++++++++ include/configs/minnowmax.h | 1 - scripts/Makefile.lib | 2 +- 57 files changed, 946 insertions(+), 87 deletions(-) create mode 100644 arch/x86/cpu/tangier/Kconfig create mode 100644 arch/x86/cpu/tangier/Makefile create mode 100644 arch/x86/cpu/tangier/car.S create mode 100644 arch/x86/cpu/tangier/sdram.c create mode 100644 arch/x86/cpu/tangier/tangier.c create mode 100644 arch/x86/dts/edison.dts create mode 100644 arch/x86/include/asm/dma-mapping.h create mode 100644 board/intel/edison/Kconfig create mode 100644 board/intel/edison/MAINTAINERS create mode 100644 board/intel/edison/Makefile create mode 100644 board/intel/edison/config.mk create mode 100644 board/intel/edison/edison.c create mode 100644 board/intel/edison/start.S create mode 100644 configs/edison_defconfig create mode 100644 drivers/watchdog/tangier_wdt.c create mode 100644 include/configs/edison.h Regards, Bin

2 1

[U-Boot] [PATCH 01/17] arch/arm/cpu/arm926ejs/omap: Remove
by Tom Rini 30 Jul '17

30 Jul '17

This code has been unused since the removal of the "omap2" platforms, remove. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/arm/cpu/arm926ejs/omap/Makefile | 10 -- arch/arm/cpu/arm926ejs/omap/cpuinfo.c | 242 ---------------------------------- arch/arm/cpu/arm926ejs/omap/reset.S | 29 ---- arch/arm/cpu/arm926ejs/omap/timer.c | 152 --------------------- 4 files changed, 433 deletions(-) delete mode 100644 arch/arm/cpu/arm926ejs/omap/Makefile delete mode 100644 arch/arm/cpu/arm926ejs/omap/cpuinfo.c delete mode 100644 arch/arm/cpu/arm926ejs/omap/reset.S delete mode 100644 arch/arm/cpu/arm926ejs/omap/timer.c diff --git a/arch/arm/cpu/arm926ejs/omap/Makefile b/arch/arm/cpu/arm926ejs/omap/Makefile deleted file mode 100644 index add923276c9c..000000000000 --- a/arch/arm/cpu/arm926ejs/omap/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y = timer.o -obj-$(CONFIG_DISPLAY_CPUINFO) += cpuinfo.o -obj-y += reset.o diff --git a/arch/arm/cpu/arm926ejs/omap/cpuinfo.c b/arch/arm/cpu/arm926ejs/omap/cpuinfo.c deleted file mode 100644 index 587d99a2bb02..000000000000 --- a/arch/arm/cpu/arm926ejs/omap/cpuinfo.c +++ /dev/null @@ -1,242 +0,0 @@ -/* - * OMAP1 CPU identification code - * - * Copyright (C) 2004 Nokia Corporation - * Written by Tony Lindgren <tony(a)atomide.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#include <common.h> -#include <command.h> -#include <linux/compiler.h> - -#if defined(CONFIG_OMAP) - -#define omap_readw(x) *(volatile unsigned short *)(x) -#define omap_readl(x) *(volatile unsigned long *)(x) - -#define OMAP_DIE_ID_0 0xfffe1800 -#define OMAP_DIE_ID_1 0xfffe1804 -#define OMAP_PRODUCTION_ID_0 0xfffe2000 -#define OMAP_PRODUCTION_ID_1 0xfffe2004 -#define OMAP32_ID_0 0xfffed400 -#define OMAP32_ID_1 0xfffed404 - -struct omap_id { - u16 jtag_id; /* Used to determine OMAP type */ - u8 die_rev; /* Processor revision */ - u32 omap_id; /* OMAP revision */ - u32 type; /* Cpu id bits [31:08], cpu class bits [07:00] */ -}; - -/* Register values to detect the OMAP version */ -static struct omap_id omap_ids[] = { - { .jtag_id = 0xb574, .die_rev = 0x2, .omap_id = 0x03310315, .type = 0x03100000}, - { .jtag_id = 0x355f, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x07300100}, - { .jtag_id = 0xb55f, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x07300300}, - { .jtag_id = 0xb470, .die_rev = 0x0, .omap_id = 0x03310100, .type = 0x15100000}, - { .jtag_id = 0xb576, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x16100000}, - { .jtag_id = 0xb576, .die_rev = 0x2, .omap_id = 0x03320100, .type = 0x16110000}, - { .jtag_id = 0xb576, .die_rev = 0x3, .omap_id = 0x03320100, .type = 0x16100c00}, - { .jtag_id = 0xb576, .die_rev = 0x0, .omap_id = 0x03320200, .type = 0x16100d00}, - { .jtag_id = 0xb613, .die_rev = 0x0, .omap_id = 0x03320300, .type = 0x1610ef00}, - { .jtag_id = 0xb613, .die_rev = 0x0, .omap_id = 0x03320300, .type = 0x1610ef00}, - { .jtag_id = 0xb576, .die_rev = 0x1, .omap_id = 0x03320100, .type = 0x16110000}, - { .jtag_id = 0xb58c, .die_rev = 0x2, .omap_id = 0x03320200, .type = 0x16110b00}, - { .jtag_id = 0xb58c, .die_rev = 0x3, .omap_id = 0x03320200, .type = 0x16110c00}, - { .jtag_id = 0xb65f, .die_rev = 0x0, .omap_id = 0x03320400, .type = 0x16212300}, - { .jtag_id = 0xb65f, .die_rev = 0x1, .omap_id = 0x03320400, .type = 0x16212300}, - { .jtag_id = 0xb65f, .die_rev = 0x1, .omap_id = 0x03320500, .type = 0x16212300}, - { .jtag_id = 0xb5f7, .die_rev = 0x0, .omap_id = 0x03330000, .type = 0x17100000}, - { .jtag_id = 0xb5f7, .die_rev = 0x1, .omap_id = 0x03330100, .type = 0x17100000}, - { .jtag_id = 0xb5f7, .die_rev = 0x2, .omap_id = 0x03330100, .type = 0x17100000}, -}; - -/* - * Get OMAP type from PROD_ID. - * 1710 has the PROD_ID in bits 15:00, not in 16:01 as documented in TRM. - * 1510 PROD_ID is empty, and 1610 PROD_ID does not make sense. - * Undocumented register in TEST BLOCK is used as fallback; This seems to - * work on 1510, 1610 & 1710. The official way hopefully will work in future - * processors. - */ -static u16 omap_get_jtag_id(void) -{ - u32 prod_id, omap_id; - - prod_id = omap_readl(OMAP_PRODUCTION_ID_1); - omap_id = omap_readl(OMAP32_ID_1); - - /* Check for unusable OMAP_PRODUCTION_ID_1 on 1611B/5912 and 730 */ - if (((prod_id >> 20) == 0) || (prod_id == omap_id)) - prod_id = 0; - else - prod_id &= 0xffff; - - if (prod_id) - return prod_id; - - /* Use OMAP32_ID_1 as fallback */ - prod_id = ((omap_id >> 12) & 0xffff); - - return prod_id; -} - -/* - * Get OMAP revision from DIE_REV. - * Early 1710 processors may have broken OMAP_DIE_ID, it contains PROD_ID. - * Undocumented register in the TEST BLOCK is used as fallback. - * REVISIT: This does not seem to work on 1510 - */ -static u8 omap_get_die_rev(void) -{ - u32 die_rev; - - die_rev = omap_readl(OMAP_DIE_ID_1); - - /* Check for broken OMAP_DIE_ID on early 1710 */ - if (((die_rev >> 12) & 0xffff) == omap_get_jtag_id()) - die_rev = 0; - - die_rev = (die_rev >> 17) & 0xf; - if (die_rev) - return die_rev; - - die_rev = (omap_readl(OMAP32_ID_1) >> 28) & 0xf; - - return die_rev; -} - -static unsigned long dpll1(void) -{ - unsigned short pll_ctl_val = omap_readw(DPLL_CTL_REG); - unsigned long rate; - - rate = CONFIG_SYS_CLK_FREQ; /* Base xtal rate */ - if (pll_ctl_val & 0x10) { - /* PLL enabled, apply multiplier and divisor */ - if (pll_ctl_val & 0xf80) - rate *= (pll_ctl_val & 0xf80) >> 7; - rate /= ((pll_ctl_val & 0x60) >> 5) + 1; - } else { - /* PLL disabled, apply bypass divisor */ - switch (pll_ctl_val & 0xc) { - case 0: - break; - case 0x4: - rate /= 2; - break; - default: - rate /= 4; - break; - } - } - - return rate; -} - -static unsigned long armcore(void) -{ - unsigned short arm_ckctl = omap_readw(ARM_CKCTL); - - return (dpll1() >> ((arm_ckctl & 0x0030) >> 4)); -} - -int print_cpuinfo (void) -{ - int i; - u16 jtag_id; - u8 die_rev; - u32 omap_id; - u8 cpu_type; - __maybe_unused u32 system_serial_high; - __maybe_unused u32 system_serial_low; - u32 system_rev = 0; - - jtag_id = omap_get_jtag_id(); - die_rev = omap_get_die_rev(); - omap_id = omap_readl(OMAP32_ID_0); - -#ifdef DEBUG - printf("OMAP_DIE_ID_0: 0x%08x\n", omap_readl(OMAP_DIE_ID_0)); - printf("OMAP_DIE_ID_1: 0x%08x DIE_REV: %i\n", - omap_readl(OMAP_DIE_ID_1), - (omap_readl(OMAP_DIE_ID_1) >> 17) & 0xf); - printf("OMAP_PRODUCTION_ID_0: 0x%08x\n", omap_readl(OMAP_PRODUCTION_ID_0)); - printf("OMAP_PRODUCTION_ID_1: 0x%08x JTAG_ID: 0x%04x\n", - omap_readl(OMAP_PRODUCTION_ID_1), - omap_readl(OMAP_PRODUCTION_ID_1) & 0xffff); - printf("OMAP32_ID_0: 0x%08x\n", omap_readl(OMAP32_ID_0)); - printf("OMAP32_ID_1: 0x%08x\n", omap_readl(OMAP32_ID_1)); - printf("JTAG_ID: 0x%04x DIE_REV: %i\n", jtag_id, die_rev); -#endif - - system_serial_high = omap_readl(OMAP_DIE_ID_0); - system_serial_low = omap_readl(OMAP_DIE_ID_1); - - /* First check only the major version in a safe way */ - for (i = 0; i < ARRAY_SIZE(omap_ids); i++) { - if (jtag_id == (omap_ids[i].jtag_id)) { - system_rev = omap_ids[i].type; - break; - } - } - - /* Check if we can find the die revision */ - for (i = 0; i < ARRAY_SIZE(omap_ids); i++) { - if (jtag_id == omap_ids[i].jtag_id && die_rev == omap_ids[i].die_rev) { - system_rev = omap_ids[i].type; - break; - } - } - - /* Finally check also the omap_id */ - for (i = 0; i < ARRAY_SIZE(omap_ids); i++) { - if (jtag_id == omap_ids[i].jtag_id - && die_rev == omap_ids[i].die_rev - && omap_id == omap_ids[i].omap_id) { - system_rev = omap_ids[i].type; - break; - } - } - - /* Add the cpu class info (7xx, 15xx, 16xx, 24xx) */ - cpu_type = system_rev >> 24; - - switch (cpu_type) { - case 0x07: - system_rev |= 0x07; - break; - case 0x03: - case 0x15: - system_rev |= 0x15; - break; - case 0x16: - case 0x17: - system_rev |= 0x16; - break; - case 0x24: - system_rev |= 0x24; - break; - default: - printf("Unknown OMAP cpu type: 0x%02x\n", cpu_type); - } - - printf("CPU: OMAP%04x", system_rev >> 16); - if ((system_rev >> 8) & 0xff) - printf("%x", (system_rev >> 8) & 0xff); -#ifdef DEBUG - printf(" revision %i handled as %02xxx id: %08x%08x", - die_rev, system_rev & 0xff, system_serial_low, system_serial_high); -#endif - printf(" at %ld.%01ld MHz (DPLL1=%ld.%01ld MHz)\n", - armcore() / 1000000, (armcore() / 100000) % 10, - dpll1() / 1000000, (dpll1() / 100000) % 10); - - return 0; -} - -#endif /* #if defined(CONFIG_OMAP) */ diff --git a/arch/arm/cpu/arm926ejs/omap/reset.S b/arch/arm/cpu/arm926ejs/omap/reset.S deleted file mode 100644 index 1c557b0d9106..000000000000 --- a/arch/arm/cpu/arm926ejs/omap/reset.S +++ /dev/null @@ -1,29 +0,0 @@ -/* - * armboot - Startup Code for ARM926EJS CPU-core - * - * Copyright (c) 2003 Texas Instruments - * - * ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------ - * - * Copyright (c) 2001 Marius Gröger <mag(a)sysgo.de> - * Copyright (c) 2002 Alex Züpke <azu(a)sysgo.de> - * Copyright (c) 2002 Gary Jennejohn <garyj(a)denx.de> - * Copyright (c) 2003 Richard Woodruff <r-woodruff2(a)ti.com> - * Copyright (c) 2003 Kshitij <kshitij(a)ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ - */ - - .align 5 -.globl reset_cpu -reset_cpu: - ldr r1, rstctl1 /* get clkm1 reset ctl */ - mov r3, #0x0 - strh r3, [r1] /* clear it */ - mov r3, #0x8 - strh r3, [r1] /* force dsp+arm reset */ -_loop_forever: - b _loop_forever - -rstctl1: - .word 0xfffece10 diff --git a/arch/arm/cpu/arm926ejs/omap/timer.c b/arch/arm/cpu/arm926ejs/omap/timer.c deleted file mode 100644 index b9715656c8f3..000000000000 --- a/arch/arm/cpu/arm926ejs/omap/timer.c +++ /dev/null @@ -1,152 +0,0 @@ -/* - * (C) Copyright 2003 - * Texas Instruments <www.ti.com> - * - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger <mgroeger(a)sysgo.de> - * - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Alex Zuepke <azu(a)sysgo.de> - * - * (C) Copyright 2002-2004 - * Gary Jennejohn, DENX Software Engineering, <garyj(a)denx.de> - * - * (C) Copyright 2004 - * Philippe Robin, ARM Ltd. <philippe.robin(a)arm.com> - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> -#include <asm/io.h> - -#define TIMER_CLOCK (CONFIG_SYS_CLK_FREQ / (2 << CONFIG_SYS_PTV)) -#define TIMER_LOAD_VAL 0xffffffff - -/* macro to read the 32 bit timer */ -#define READ_TIMER readl(CONFIG_SYS_TIMERBASE+8) \ - / (TIMER_CLOCK / CONFIG_SYS_HZ) - -DECLARE_GLOBAL_DATA_PTR; - -#define timestamp gd->arch.tbl -#define lastdec gd->arch.lastinc - -int timer_init (void) -{ - int32_t val; - - /* Start the decrementer ticking down from 0xffffffff */ - *((int32_t *) (CONFIG_SYS_TIMERBASE + LOAD_TIM)) = TIMER_LOAD_VAL; - val = MPUTIM_ST | MPUTIM_AR | MPUTIM_CLOCK_ENABLE | (CONFIG_SYS_PTV << MPUTIM_PTV_BIT); - *((int32_t *) (CONFIG_SYS_TIMERBASE + CNTL_TIMER)) = val; - - /* init the timestamp and lastdec value */ - reset_timer_masked(); - - return 0; -} - -/* - * timer without interrupts - */ -ulong get_timer (ulong base) -{ - return get_timer_masked () - base; -} - -/* delay x useconds AND preserve advance timestamp value */ -void __udelay (unsigned long usec) -{ - ulong tmo, tmp; - - if(usec >= 1000){ /* if "big" number, spread normalization to seconds */ - tmo = usec / 1000; /* start to normalize for usec to ticks per sec */ - tmo *= CONFIG_SYS_HZ; /* find number of "ticks" to wait to achieve target */ - tmo /= 1000; /* finish normalize. */ - }else{ /* else small number, don't kill it prior to HZ multiply */ - tmo = usec * CONFIG_SYS_HZ; - tmo /= (1000*1000); - } - - tmp = get_timer (0); /* get current timestamp */ - if( (tmo + tmp + 1) < tmp ) /* if setting this fordward will roll time stamp */ - reset_timer_masked (); /* reset "advancing" timestamp to 0, set lastdec value */ - else - tmo += tmp; /* else, set advancing stamp wake up time */ - - while (get_timer_masked () < tmo)/* loop till event */ - /*NOP*/; -} - -void reset_timer_masked (void) -{ - /* reset time */ - lastdec = READ_TIMER; /* capure current decrementer value time */ - timestamp = 0; /* start "advancing" time stamp from 0 */ -} - -ulong get_timer_masked (void) -{ - ulong now = READ_TIMER; /* current tick value */ - - if (lastdec >= now) { /* normal mode (non roll) */ - /* normal mode */ - timestamp += lastdec - now; /* move stamp fordward with absoulte diff ticks */ - } else { /* we have overflow of the count down timer */ - /* nts = ts + ld + (TLV - now) - * ts=old stamp, ld=time that passed before passing through -1 - * (TLV-now) amount of time after passing though -1 - * nts = new "advancing time stamp"...it could also roll and cause problems. - */ - timestamp += lastdec + (TIMER_LOAD_VAL / (TIMER_CLOCK / - CONFIG_SYS_HZ)) - now; - } - lastdec = now; - - return timestamp; -} - -/* waits specified delay value and resets timestamp */ -void udelay_masked (unsigned long usec) -{ - ulong tmo; - ulong endtime; - signed long diff; - - if (usec >= 1000) { /* if "big" number, spread normalization to seconds */ - tmo = usec / 1000; /* start to normalize for usec to ticks per sec */ - tmo *= CONFIG_SYS_HZ; /* find number of "ticks" to wait to achieve target */ - tmo /= 1000; /* finish normalize. */ - } else { /* else small number, don't kill it prior to HZ multiply */ - tmo = usec * CONFIG_SYS_HZ; - tmo /= (1000*1000); - } - - endtime = get_timer_masked () + tmo; - - do { - ulong now = get_timer_masked (); - diff = endtime - now; - } while (diff >= 0); -} - -/* - * This function is derived from PowerPC code (read timebase as long long). - * On ARM it just returns the timer value. - */ -unsigned long long get_ticks(void) -{ - return get_timer(0); -} - -/* - * This function is derived from PowerPC code (timebase clock frequency). - * On ARM it returns the number of timer ticks per second. - */ -ulong get_tbclk (void) -{ - return CONFIG_SYS_HZ; -} -- 1.9.1

4 40

[U-Boot] [PATCH 1/1] efi_loader: debug messages for protocol interfaces
by Heinrich Schuchardt 30 Jul '17

30 Jul '17

Write debug messages with the adresses of the protocol interfaces. This information is needed to understand the debug messages for efi_open_protocol and other functions. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/bootefi.c | 5 +++++ lib/efi_loader/efi_console.c | 4 ++++ lib/efi_loader/efi_gop.c | 2 ++ lib/efi_loader/efi_net.c | 2 ++ 4 files changed, 13 insertions(+) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index d20775eccd..cbee84dbe2 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -111,6 +111,11 @@ static void efi_init_obj_list(void) { efi_obj_list_initalized = 1; + debug("EFI: loaded_image_info: 0x%p\n", + &loaded_image_info); + debug("EFI: bootefi_device_path: 0x%p\n", + bootefi_device_path); + list_add_tail(&loaded_image_info_obj.link, &efi_obj_list); list_add_tail(&bootefi_device_obj.link, &efi_obj_list); efi_console_register(); diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index f8567eb597..feee6dbf44 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -463,6 +463,10 @@ int efi_console_register(void) { efi_status_t r; + debug("EFI: console_control: 0x%p\n", &efi_console_control); + debug("EFI: console_output: 0x%p\n", &efi_con_out); + debug("EFI: console_input: 0x%p\n", &efi_con_in); + /* Hook up to the device list */ list_add_tail(&efi_console_control_obj.link, &efi_obj_list); list_add_tail(&efi_console_output_obj.link, &efi_obj_list); diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c index 806cfaeea1..c5d057dc5a 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c @@ -174,6 +174,8 @@ int efi_gop_register(void) gopobj = calloc(1, sizeof(*gopobj)); + debug("EFI: gobobj: 0x%p\n", &gopobj->ops); + /* Fill in object data */ gopobj->parent.protocols[0].guid = &efi_gop_guid; gopobj->parent.protocols[0].protocol_interface = &gopobj->ops; diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c index 0b949d86e8..1822880168 100644 --- a/lib/efi_loader/efi_net.c +++ b/lib/efi_loader/efi_net.c @@ -232,6 +232,8 @@ int efi_net_register(void **handle) /* We only expose the "active" eth device, so one is enough */ netobj = calloc(1, sizeof(*netobj)); + debug("EFI: netobj: 0x%p\n", &netobj->net); + /* Fill in object data */ netobj->parent.protocols[0].guid = &efi_net_guid; netobj->parent.protocols[0].protocol_interface = &netobj->net; -- 2.13.2

1 0

[U-Boot] [PATCH 1/1] efi_loader: write protocol GUID in OpenProtocol
by Heinrich Schuchardt 30 Jul '17

30 Jul '17

To understand what happens in OpenProtol it is necessary to know the protocol interface GUID. Let's write a debug message. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/efi_loader.h | 14 ++++++++++++++ lib/efi_loader/efi_boottime.c | 2 ++ 2 files changed, 16 insertions(+) diff --git a/include/efi_loader.h b/include/efi_loader.h index fb91d72afd..a08dfa26f9 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -51,6 +51,20 @@ const char *__efi_nesting_dec(void); debug("%sEFI: Return From: %s\n", __efi_nesting_dec(), #exp); \ } while(0) +/* + * Write GUID + */ +#define EFI_PRINT_GUID(txt, guid) ({ \ + debug("EFI: %s %02x%02x%02x%02x-%02x%02x-%02x%02x-" \ + "%02x%02x%02x%02x%02x%02x%02x%02x\n", \ + txt, ((u8 *)guid)[3], \ + ((u8 *)guid)[2], ((u8 *)guid)[1], ((u8 *)guid)[0], \ + ((u8 *)guid)[5], ((u8 *)guid)[4], ((u8 *)guid)[7], \ + ((u8 *)guid)[6], ((u8 *)guid)[8], ((u8 *)guid)[9], \ + ((u8 *)guid)[10], ((u8 *)guid)[11], ((u8 *)guid)[12], \ + ((u8 *)guid)[13], ((u8 *)guid)[14], ((u8 *)guid)[15]); \ + }) + extern struct efi_runtime_services efi_runtime_services; extern struct efi_system_table systab; diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index c29a9b0ad0..2a58c29998 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1314,6 +1314,8 @@ static efi_status_t EFIAPI efi_open_protocol( goto out; } + EFI_PRINT_GUID("protocol:", protocol); + switch (attributes) { case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL: case EFI_OPEN_PROTOCOL_GET_PROTOCOL: -- 2.13.2

1 0

[U-Boot] [PATCH] arm: omap3: Detect boot mode very early
by Adam Ford 30 Jul '17

30 Jul '17

Fixes 4bd754d8abef ("arm: omap: Detect boot mode very early") where the intent was to store the boot params information in a known location and pass it to SPL very early. Unfortunately it didn't account for OMAP3 boards. This patch adds adds this functionality back into OMAP3 boards. Reviewed-by: Lokesh Vutla <lokeshvutla(a)ti.com> Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index cd8e302..a61b933 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -212,6 +212,12 @@ void board_init_f(ulong dummy) { early_system_init(); mem_init(); + /* + * Save the boot parameters passed from romcode. + * We cannot delay the saving further than this, + * to prevent overwrites. + */ + save_omap_boot_params(); } #endif -- 2.7.4

5 7

[U-Boot] OMAP35xx boards working on master?
by Derald Woods 30 Jul '17

30 Jul '17

Are any OMAP35xx boards/systems working since this commit: "arm: omap: Unify get_device_type() function" http://git.denx.de/?p=u-boot.git;a=commit;h=00bbe96ebabbc83777cd8d6c6fd2791… I have an OMAP3EVM (3530) system which stopped booting, with the default config, at this commit. The commit seems to have been tested on newer SOC boards (37xx+). I am trying to put together some patches for this board against the current master, but this is the point where things stopped. At least in my setup. Any suggestions would be appreciated. Derald D. Woods

1 0

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 30 Jul '17

30 Jul '17

The following changes since commit 609bf924117950b88987a5fa477acf1239bfdbc1: Convert CONFIG_ENV_IS_IN_ONENAND to Kconfig (2017-07-25 21:34:39 -0400) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git master for you to fetch changes up to 9af91b7c4041a455de5f3e3da4e36644768bff68: arm: socfpga: Enable all FPGA config support for Arria 10 (2017-07-26 10:31:44 +0200) ---------------------------------------------------------------- Tien Fong Chee (8): arm: socfpga: Remove unused passing parameter of socfpga_bridges_reset arm: socfpga: Restructure FPGA driver in the preparation to support A10 kconfig: Convert FPGA and FPGA_ALTERA configuration to Kconfig kconfig: Convert FPGA_SOCFPGA configuration to Kconfig drivers: Enable FPGA driver build on SPL configs: Add FPGA driver config for Arria 10 arm: socfpga: Add FPGA driver support for Arria 10 arm: socfpga: Enable all FPGA config support for Arria 10 arch/arm/mach-socfpga/Makefile | 2 +- arch/arm/mach-socfpga/include/mach/fpga_manager.h | 70 +++--------- arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h | 100 ++++++++++++++++ arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h | 68 +++++++++++ arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h | 2 +- arch/arm/mach-socfpga/reset_manager_arria10.c | 4 +- configs/astro_mcf5373l_defconfig | 1 + configs/socfpga_arria10_defconfig | 2 + configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_de10_nano_defconfig | 1 + configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/socfpga_mcvevk_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/theadorable_defconfig | 1 + drivers/Makefile | 1 + drivers/fpga/Kconfig | 8 ++ drivers/fpga/Makefile | 2 + drivers/fpga/socfpga.c | 235 +------------------------------------- drivers/fpga/socfpga_arria10.c | 479 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/fpga/socfpga_gen5.c | 252 ++++++++++++++++++++++++++++++++++++++++ include/configs/astro_mcf5373l.h | 2 - include/configs/socfpga_common.h | 6 +- include/configs/theadorable.h | 2 - 30 files changed, 947 insertions(+), 302 deletions(-) create mode 100644 arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h create mode 100644 arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h create mode 100644 drivers/fpga/socfpga_arria10.c create mode 100644 drivers/fpga/socfpga_gen5.c

2 1