April 2016 - U-Boot

[U-Boot] [PATCH] fastboot: allow retrieving fastboot variables from env
by Boris Brezillon 02 Apr '16

02 Apr '16

From: Rob Herring <rob.herring(a)linaro.org> Some boards need to expose device specific variable through fastboot (to adpat the flashing script depending on hardware revision for example). Provide a way to expose custom fastboot variables. Note that all variables meant to be exposed through fastboot should be be prefixed with 'fastboot.', the variable should not exceed 32 bytes (including the prefix and the trailing '\0') and the variable content should fit in the response buffer (60 bytes excluding the 'OKAY' prefix and the trailing '\0'). Signed-off-by: Rob Herring <rob.herring(a)linaro.org> [Boris Brezillon: add a commit message] Signed-off-by: Boris Brezillon <boris.brezillon(a)free-electrons.com> Signed-off-by: Boris Brezillon <boris.brezillon(a)free-electrons.com> --- 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 a54b4ee..2e87fee 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -413,8 +413,16 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req) else strcpy(response, "FAILValue not set"); } else { - printf("WARNING: unknown variable: %s\n", cmd); - strcpy(response, "FAILVariable not implemented"); + char envstr[32]; + + snprintf(envstr, sizeof(envstr) - 1, "fastboot.%s", cmd); + s = getenv(envstr); + if (s) { + strncat(response, s, chars_left); + } else { + printf("WARNING: unknown variable: %s\n", cmd); + strcpy(response, "FAILVariable not implemented"); + } } fastboot_tx_write_str(response); } -- 2.5.0

4 5

[U-Boot] [PATCH] arm: clang: Update support slightly
by Tom Rini 02 Apr '16

02 Apr '16

- Move most of the flags required into LLVM_RELFLAGS to test at build time instead of requiring them to be passed in. - Update doc/README.clang to reflect this - Switch to rpi_2 as the example as it's closer to working out of the box than rpi is. Cc: Jeroen Hofstee <jeroen(a)myspectrum.nl> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/arm/Makefile | 3 ++- arch/arm/config.mk | 6 ++++++ doc/README.clang | 15 +++++++-------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6defdfb..797f00c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -16,7 +16,8 @@ arch-$(CONFIG_CPU_SA1100) =-march=armv4 arch-$(CONFIG_CPU_PXA) = arch-$(CONFIG_CPU_ARM1136) =-march=armv5 arch-$(CONFIG_CPU_ARM1176) =-march=armv5t -arch-$(CONFIG_CPU_V7) =$(call cc-option, -march=armv7-a, -march=armv5) +arch-$(CONFIG_CPU_V7) =$(call cc-option, -march=armv7-a, \ + $(call cc-option, -march=armv7, -march=armv5)) arch-$(CONFIG_ARM64) =-march=armv8-a # Evaluate arch cc-option calls now diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 9af6c37..9a5a974 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -19,6 +19,12 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections \ PLATFORM_RELFLAGS += $(call cc-option, -msoft-float) \ $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) +# LLVM support +LLVMS_RELFLAGS := $(call cc-option,-mllvm,) \ + $(call cc-option,-target arm-none-eabi,) \ + $(call cc-option,-arm-use-movt=0,) +PLATFORM_RELFLAGS += $(LLVM_RELFLAGS) + PLATFORM_CPPFLAGS += -D__ARM__ # Choose between ARM/Thumb instruction sets diff --git a/doc/README.clang b/doc/README.clang index 7ce5ae4..b4ba653 100644 --- a/doc/README.clang +++ b/doc/README.clang @@ -26,10 +26,10 @@ Debian (based) Binary packages can be installed as usual, e.g.: sudo apt-get install clang -To compile U-Boot with clang on linux without IAS use e.g.: -export TRIPLET=arm-linux-gnueabi && export CROSS_COMPILE="$TRIPLET-" -make HOSTCC=clang CC="clang -target $TRIPLET -mllvm -arm-use-movt=0 -no-integrated-as" rpi_defconfig -make HOSTCC=clang CC="clang -target $TRIPLET -mllvm -arm-use-movt=0 -no-integrated-as" all V=1 -j8 +Note that we still use binutils for some tools so we must continue to set +CROSS_COMPILE. To compile U-Boot with clang on linux without IAS use e.g.: +make HOSTCC=clang rpi_2_defconfig +make HOSTCC=clang CROSS_COMPILE=arm-linux-gnueabi- CC=clang -j8 FreeBSD 11 (Current): -------------------- @@ -42,8 +42,8 @@ ln -s /usr/local/bin/arm-gnueabi-freebsd-as /usr/bin/arm-freebsd-eabi-as # The following commands compile U-Boot using the clang xdev toolchain. # NOTE: CROSS_COMPILE and target differ on purpose! export CROSS_COMPILE=arm-gnueabi-freebsd- -gmake CC="clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd -no-integrated-as -mllvm -arm-use-movt=0" rpi_defconfig -gmake CC="clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd -no-integrated-as -mllvm -arm-use-movt=0" -j8 +gmake rpi_2_defconfig +gmake CC="clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd" -j8 Given that U-Boot will default to gcc, above commands can be simplified with a simple wrapper script, listed below. @@ -52,5 +52,4 @@ simplified with a simple wrapper script, listed below. --- #!/bin/sh -exec clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd -no-integrated-as -mllvm -arm-use-movt=0 "$@" - +exec clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd "$@" -- 1.7.9.5

1 1

[U-Boot] [PATCH] MAINTAINERS: Update Scott Wood's email address
by Scott Wood 02 Apr '16

02 Apr '16

Freescale is now NXP. I still work there, but I won't be using their mail system for U-Boot development. Signed-off-by: Scott Wood <oss(a)buserror.net> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 32f97b2..8f371fe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -348,7 +348,7 @@ F: drivers/net/ F: net/ NAND FLASH -M: Scott Wood <scottwood(a)freescale.com> +M: Scott Wood <oss(a)buserror.net> S: Maintained T: git git://git.denx.de/u-boot-nand-flash.git F: drivers/mtd/nand/ -- 2.5.0

2 1

[U-Boot] [PATCH] image-fit: Change FIT prefix for configurations
by Sáreník Ján 01 Apr '16

01 Apr '16

Instead of `bootm ${loadaddr}#conf@1` one uses `bootm ${loadaddr}_conf@1` This fixes the bug with using just `bootm #conf@2` without $loadaddr where text starting with # is interpreted as a comment. --- cmd/bootm.c | 2 +- common/image-fit.c | 2 +- doc/uImage.FIT/command_syntax_extensions.txt | 2 +- include/configs/baltos.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/bootm.c b/cmd/bootm.c index 555ccbc..23740c5 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -124,7 +124,7 @@ int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * * Right now we assume the first arg should never be '-' */ -if ((*endp != 0) && (*endp != ':') && (*endp != '#')) +if ((*endp != 0) && (*endp != ':') && (*endp != '_')) return do_bootm_subcommand(cmdtp, flag, argc, argv); } diff --git a/common/image-fit.c b/common/image-fit.c index 25f8a11..e23796f 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -75,7 +75,7 @@ static int fit_parse_spec(const char *spec, char sepc, ulong addr_curr, int fit_parse_conf(const char *spec, ulong addr_curr, ulong *addr, const char **conf_name) { -return fit_parse_spec(spec, '#', addr_curr, addr, conf_name); +return fit_parse_spec(spec, '_', addr_curr, addr, conf_name); } /** diff --git a/doc/uImage.FIT/command_syntax_extensions.txt b/doc/uImage.FIT/command_syntax_extensions.txt index 6c99b1c..ef4db80 100644 --- a/doc/uImage.FIT/command_syntax_extensions.txt +++ b/doc/uImage.FIT/command_syntax_extensions.txt @@ -36,7 +36,7 @@ Old uImage: New uImage: 8. bootm <addr1> 9. bootm [<addr1>]:<subimg1> -10. bootm [<addr1>]#<conf> +10. bootm [<addr1>]_<conf> 11. bootm [<addr1>]:<subimg1> [<addr2>]:<subimg2> 12. bootm [<addr1>]:<subimg1> [<addr2>]:<subimg2> [<addr3>]:<subimg3> 13. bootm [<addr1>]:<subimg1> [<addr2>]:<subimg2> <addr3> diff --git a/include/configs/baltos.h b/include/configs/baltos.h index b8c915c..8a01fe8 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -80,7 +80,7 @@ "ubifsmount ubi0:kernel; " \ "ubifsload $loadaddr kernel-fit.itb;" \ "ubifsumount; " \ -"bootm ${loadaddr}#conf${board_name}; " \ +"bootm ${loadaddr}_conf${board_name}; " \ "if test $? -ne 0; then echo Using default FIT config; " \ "bootm ${loadaddr}; fi;\0" #else -- 2.7.3 ________________________________ CONFIDENTIALITY NOTICE This message is for the named person's use only. It may contain confidential, proprietary or legally privileged information. If you receive this message in error, please immediately delete it and all copies of it from your system, destroy any hard copies of it and notify us by email to info(a)ysoft.com with a copy of this message. You must not, directly or indirectly, use, disclose, distribute, print or copy any part of this message if you are not the intended recipient. Y Soft and any of its subsidiaries each reserves the right to monitor all e-mail communications through its networks. Y Soft is neither liable for the proper, complete transmission of the information contained in this communication nor any delay in its receipt. This email was scanned for the presence of computer viruses. In the unfortunate event of infection Y Soft does not accept liability. Any views expressed in this message are those of the individual sender, except where the message states otherwise and the sender is authorised to state them.

2 1

[U-Boot] [RFC] setenv() and variable flags, especially "read-only"
by Bernhard Nortmann 01 Apr '16

01 Apr '16

Hi everybody! I'm wondering what the correct / official way of setting a "read-only" environment variable is. It's simple enough to declare some #define CONFIG_ENV_FLAGS_LIST_STATIC "myvar:sr" to begin with, but this backfires - i.e. prevents write access - as soon as I try to set a value programmatically via setenv() (from within U-Boot code). A workaround is to use the "write-once" flag instead, but this leaves an undesired loop-hole in case "myvar" is supposed to remain empty/unset - where "write-once" would still allow the user to set a value interactively. U-Boot already has a clear distinction between programmatic access via setenv(), resulting in _do_env_set(..., H_PROGRAMMATIC), and user interaction (from U-Boot prompt or scripts) ending up as _do_env_set(..., H_INTERACTIVE). Looking at env_flags_validate() in env_flags.c I notice that it handles H_FORCE, but doesn't make any use of H_PROGRAMMATIC. The second (and more basic) question therefore is: Is programmatic access from within U-Boot via setenv() supposed to always respect the flags of variables (when even the user might possibly circumvent them with "setenv -f" resulting in H_FORCE), or might it be more sensible to allow all 'internal' setenv() access, disregarding any flags (treating H_PROGRAMMATIC as "always force")? I'm aware that changing this behaviour might have broad consequences. The use case I have in mind is "locking down" (user) access to the fel_* variables used by sunxi - see http://git.denx.de/?p=u-boot.git;a=blob;f=board/sunxi/board.c;h=2d5335f9531… . The questions/discussion in http://lists.denx.de/pipermail/u-boot/2015-September/227611.html might also be relevant. Regards, B. Nortmann

1 0

[U-Boot] [PATCH] block: Add support for Ceva sata
by Michal Simek 01 Apr '16

01 Apr '16

Initial Ceva Sata init code. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/zynqmp/zynqmp.c | 4 ++ drivers/block/Makefile | 1 + drivers/block/sata_ceva.c | 113 ++++++++++++++++++++++++++++++++++++++++ include/configs/xilinx_zynqmp.h | 2 +- 4 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 drivers/block/sata_ceva.c diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 0f44b04c1efa..087578cb6b9c 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -7,6 +7,7 @@ #include <common.h> #include <netdev.h> +#include <sata.h> #include <ahci.h> #include <scsi.h> #include <asm/arch/clk.h> @@ -185,6 +186,9 @@ void reset_cpu(ulong addr) #ifdef CONFIG_SCSI_AHCI_PLAT void scsi_init(void) { +#if defined(CONFIG_SATA_CEVA) + init_sata(0); +#endif ahci_init((void __iomem *)ZYNQMP_SATA_BASEADDR); scsi_scan(1); } diff --git a/drivers/block/Makefile b/drivers/block/Makefile index b5c7ae1124d1..57bff5f9de26 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_LIBATA) += libata.o obj-$(CONFIG_MVSATA_IDE) += mvsata_ide.o obj-$(CONFIG_MX51_PATA) += mxc_ata.o obj-$(CONFIG_PATA_BFIN) += pata_bfin.o +obj-$(CONFIG_SATA_CEVA) += sata_ceva.o obj-$(CONFIG_SATA_DWC) += sata_dwc.o obj-$(CONFIG_SATA_MV) += sata_mv.o obj-$(CONFIG_SATA_SIL3114) += sata_sil3114.o diff --git a/drivers/block/sata_ceva.c b/drivers/block/sata_ceva.c new file mode 100644 index 000000000000..dcc3b90b17f1 --- /dev/null +++ b/drivers/block/sata_ceva.c @@ -0,0 +1,113 @@ +/* + * (C) Copyright 2015 - 2016 Xilinx, Inc. + * Michal Simek <michal.simek(a)xilinx.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#include <common.h> +#include <netdev.h> +#include <ahci.h> +#include <scsi.h> +#include <asm/arch/hardware.h> + +#include <asm/io.h> + +/* Vendor Specific Register Offsets */ +#define AHCI_VEND_PCFG 0xA4 +#define AHCI_VEND_PPCFG 0xA8 +#define AHCI_VEND_PP2C 0xAC +#define AHCI_VEND_PP3C 0xB0 +#define AHCI_VEND_PP4C 0xB4 +#define AHCI_VEND_PP5C 0xB8 +#define AHCI_VEND_PAXIC 0xC0 +#define AHCI_VEND_PTC 0xC8 + +/* Vendor Specific Register bit definitions */ +#define PAXIC_ADBW_BW64 0x1 +#define PAXIC_MAWIDD (1 << 8) +#define PAXIC_MARIDD (1 << 16) +#define PAXIC_OTL (0x4 << 20) + +#define PCFG_TPSS_VAL (0x32 << 16) +#define PCFG_TPRS_VAL (0x2 << 12) +#define PCFG_PAD_VAL 0x2 + +#define PPCFG_TTA 0x1FFFE +#define PPCFG_PSSO_EN (1 << 28) +#define PPCFG_PSS_EN (1 << 29) +#define PPCFG_ESDF_EN (1 << 31) + +#define PP2C_CIBGMN 0x0F +#define PP2C_CIBGMX (0x25 << 8) +#define PP2C_CIBGN (0x18 << 16) +#define PP2C_CINMP (0x29 << 24) + +#define PP3C_CWBGMN 0x04 +#define PP3C_CWBGMX (0x0B << 8) +#define PP3C_CWBGN (0x08 << 16) +#define PP3C_CWNMP (0x0F << 24) + +#define PP4C_BMX 0x0a +#define PP4C_BNM (0x08 << 8) +#define PP4C_SFD (0x4a << 16) +#define PP4C_PTST (0x06 << 24) + +#define PP5C_RIT 0x60216 +#define PP5C_RCT (0x7f0 << 20) + +#define PTC_RX_WM_VAL 0x40 +#define PTC_RSVD (1 << 27) + +#define PORT0_BASE 0x100 +#define PORT1_BASE 0x180 + +/* Port Control Register Bit Definitions */ +#define PORT_SCTL_SPD_GEN3 (0x3 << 4) +#define PORT_SCTL_SPD_GEN2 (0x2 << 4) +#define PORT_SCTL_SPD_GEN1 (0x1 << 4) +#define PORT_SCTL_IPM (0x3 << 8) + +#define PORT_BASE 0x100 +#define PORT_OFFSET 0x80 +#define NR_PORTS 2 +#define DRV_NAME "ahci-ceva" +#define CEVA_FLAG_BROKEN_GEN2 1 + +int init_sata(int dev) +{ + ulong tmp; + ulong mmio = ZYNQMP_SATA_BASEADDR; + int i; + + /* + * AXI Data bus width to 64 + * Set Mem Addr Read, Write ID for data transfers + * Transfer limit to 72 DWord + */ + tmp = PAXIC_ADBW_BW64 | PAXIC_MAWIDD | PAXIC_MARIDD | PAXIC_OTL; + writel(tmp, mmio + AHCI_VEND_PAXIC); + + /* Set AHCI Enable */ + tmp = readl(mmio + HOST_CTL); + tmp |= HOST_AHCI_EN; + writel(tmp, mmio + HOST_CTL); + + for (i = 0; i < NR_PORTS; i++) { + /* TPSS TPRS scalars, CISE and Port Addr */ + tmp = PCFG_TPSS_VAL | PCFG_TPRS_VAL | (PCFG_PAD_VAL + i); + writel(tmp, mmio + AHCI_VEND_PCFG); + + /* Port Phy Cfg register enables */ + tmp = PPCFG_TTA | PPCFG_PSS_EN | PPCFG_ESDF_EN; + writel(tmp, mmio + AHCI_VEND_PPCFG); + + /* Rx Watermark setting */ + tmp = PTC_RX_WM_VAL | PTC_RSVD; + writel(tmp, mmio + AHCI_VEND_PTC); + + /* Default to Gen 2 Speed and Gen 1 if Gen2 is broken */ + tmp = PORT_SCTL_SPD_GEN3 | PORT_SCTL_IPM; + writel(tmp, mmio + PORT_SCR_CTL + PORT_BASE + PORT_OFFSET * i); + } + return 0; +} diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 4062e01824e3..8c760967f6d6 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -226,7 +226,7 @@ #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 +#define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -- 1.9.1

2 1

[U-Boot] Please pull u-boot-sunxi master
by Hans de Goede 01 Apr '16

01 Apr '16

Hi Tom, Here is a sunxi pull-req for v2016.05, it contains: - A few bugfixes, including a fix for the gigabit ethernet problems on the Lime2 ! - Support for USB on the A83t SoC - Support for A64 SoCs (u-boot.bin only, no SPL) The A64 support involves moving a bunch of files from arch/arm/cpu/armv7/sunxi to /arch/arm/mach-sunxi. The following changes since commit 080c499df689e8c42df70de44502c0d71533dda8: Merge branch 'master' of git://git.denx.de/u-boot-tegra (2016-03-29 13:33:13 -0400) are available in the git repository at: http://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to 3ffe39ed2b66af71c7271d0cef2a248b5bf7dfdb: sunxi: Reserve ATF memory space on A64 (2016-04-01 09:52:28 +0200) ---------------------------------------------------------------- Alexander Graf (4): sunxi: Move cpu independent code to mach directory sunxi: Depend SPL configs on SUPPORT_SPL sunxi: Explicitly cast u32 pointer conversions sunxi: Reserve ATF memory space on A64 Chen-Yu Tsai (17): power: axp818: Remove undefined axp818_init() musb: sunxi: Add support for A83T sunxi: axp: Generalize register macros for VBUS drive GPIO sunxi: axp: Support VBUS drive GPIO on AXP818 power: axp818: Fix DCDC5 default voltage power: axp818: Add support for FLDOs sunxi: h8_homlet_v2: Set DCDC1 to default voltage (3.3V) sunxi: h8_homlet_v2: Set DLDO4 to 3.3V sunxi: usb_phy: Add support for A83T USB PHYs sunxi: clk: Fix USB PHY clock macros for A83T sunxi: ehci: Add A83T compatible sunxi: ohci: Add A83T compatible sunxi: h8_homlet_v2: Enable USB Kconfig options in defconfig sunxi: Cubietruck Plus: Enable USB Kconfig options in defconfig sunxi: Add USB and R_PIO nodes to sun8i-a83t.dtsi sunxi: Enable USB on Cubietruck Plus sunxi: Enable USB nodes for H8Homlet v2 Hans de Goede (3): sunxi: Add conditional magic sram poke for A33 sunxi: Print soc-id from sram controller for sun8i boards sunxi: Enable LDO3 and LDO4 at 2.8V on OLinuxIno Lime boards Michael Haas (3): net: phy: Optionally force master mode for RTL PHY sunxi: A20-Olimex-SOM-EVB: Force 8211CL to master sunxi: A20-OLinuXino-Lime2: Force 8211CL to master Siarhei Siamashka (2): sunxi: Add support for Allwinner A64 SoCs sunxi: Add Pine64+ support arch/arm/Kconfig | 4 +- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/sunxi/Makefile | 38 +- arch/arm/dts/Makefile | 2 + arch/arm/dts/a64.dtsi | 564 +++++++++++++++++++++ arch/arm/dts/pine64.dts | 62 +++ arch/arm/dts/pine64_common.dtsi | 76 +++ arch/arm/dts/pine64_plus.dts | 63 +++ arch/arm/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 12 + arch/arm/dts/sun8i-a83t-cubietruck-plus.dts | 12 + arch/arm/dts/sun8i-a83t.dtsi | 34 ++ arch/arm/include/asm/arch-sunxi/clock.h | 3 +- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 8 +- arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h | 6 +- arch/arm/include/asm/arch-sunxi/gpio.h | 1 + arch/arm/include/asm/arch-sunxi/spl.h | 5 +- arch/arm/mach-sunxi/Makefile | 51 ++ arch/arm/{cpu/armv7/sunxi => mach-sunxi}/board.c | 50 +- arch/arm/{cpu/armv7/sunxi => mach-sunxi}/clock.c | 0 .../{cpu/armv7/sunxi => mach-sunxi}/clock_sun4i.c | 0 .../{cpu/armv7/sunxi => mach-sunxi}/clock_sun6i.c | 0 .../armv7/sunxi => mach-sunxi}/clock_sun8i_a83t.c | 0 .../{cpu/armv7/sunxi => mach-sunxi}/clock_sun9i.c | 0 .../arm/{cpu/armv7/sunxi => mach-sunxi}/cpu_info.c | 28 +- .../{cpu/armv7/sunxi => mach-sunxi}/dram_helpers.c | 4 +- .../{cpu/armv7/sunxi => mach-sunxi}/dram_sun4i.c | 0 .../{cpu/armv7/sunxi => mach-sunxi}/dram_sun6i.c | 0 .../armv7/sunxi => mach-sunxi}/dram_sun8i_a23.c | 0 .../armv7/sunxi => mach-sunxi}/dram_sun8i_a33.c | 0 .../armv7/sunxi => mach-sunxi}/dram_sun8i_a83t.c | 0 .../armv7/sunxi => mach-sunxi}/dram_sun8i_h3.c | 0 arch/arm/{cpu/armv7/sunxi => mach-sunxi}/p2wi.c | 0 arch/arm/{cpu/armv7/sunxi => mach-sunxi}/pinmux.c | 0 .../arm/{cpu/armv7/sunxi => mach-sunxi}/pmic_bus.c | 0 arch/arm/{cpu/armv7/sunxi => mach-sunxi}/prcm.c | 0 arch/arm/{cpu/armv7/sunxi => mach-sunxi}/rsb.c | 0 arch/arm/{cpu/armv7/sunxi => mach-sunxi}/usb_phy.c | 50 +- board/sunxi/Kconfig | 9 +- board/sunxi/MAINTAINERS | 2 + board/sunxi/board.c | 50 +- configs/A10-OLinuXino-Lime_defconfig | 2 + configs/A20-OLinuXino-Lime2_defconfig | 3 + configs/A20-OLinuXino-Lime_defconfig | 2 + configs/A20-Olimex-SOM-EVB_defconfig | 1 + configs/Cubietruck_plus_defconfig | 10 +- configs/h8_homlet_v2_defconfig | 8 +- configs/pine64_plus_defconfig | 12 + drivers/gpio/axp_gpio.c | 25 +- drivers/mmc/sunxi_mmc.c | 6 +- drivers/net/Kconfig | 21 + drivers/net/phy/realtek.c | 13 +- drivers/power/Kconfig | 32 +- drivers/power/axp818.c | 34 ++ drivers/usb/host/ehci-sunxi.c | 1 + drivers/usb/host/ohci-sunxi.c | 1 + drivers/usb/musb-new/musb_regs.h | 2 +- include/axp221.h | 8 +- include/axp818.h | 9 +- include/axp_pmic.h | 1 + include/configs/sun50i.h | 25 + include/configs/sun6i.h | 1 - include/configs/sun7i.h | 1 - include/configs/sun8i.h | 4 +- include/configs/sunxi-common.h | 21 +- 64 files changed, 1275 insertions(+), 103 deletions(-) create mode 100644 arch/arm/dts/a64.dtsi create mode 100644 arch/arm/dts/pine64.dts create mode 100644 arch/arm/dts/pine64_common.dtsi create mode 100644 arch/arm/dts/pine64_plus.dts create mode 100644 arch/arm/mach-sunxi/Makefile rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/board.c (85%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/clock.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/clock_sun4i.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/clock_sun6i.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/clock_sun8i_a83t.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/clock_sun9i.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/cpu_info.c (77%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_helpers.c (87%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_sun4i.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_sun6i.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_sun8i_a23.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_sun8i_a33.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_sun8i_a83t.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_sun8i_h3.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/p2wi.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/pinmux.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/pmic_bus.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/prcm.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/rsb.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/usb_phy.c (86%) create mode 100644 configs/pine64_plus_defconfig create mode 100644 include/configs/sun50i.h Regards, Hans

2 1

[U-Boot] pull request: u-boot-uniphier/master
by Masahiro Yamada 01 Apr '16

01 Apr '16

Hi Tom, Please pull u-boot-uniphier once again for u-boot-2016.05-rc1. Mostly driver updates for UniPhier ARMv8 SoC support, plus misc fixes. The following changes since commit 080c499df689e8c42df70de44502c0d71533dda8: Merge branch 'master' of git://git.denx.de/u-boot-tegra (2016-03-29 13:33:13 -0400) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to 7f5b1e9bd952ebdac917264f03522371a473b60c: ARM: uniphier: remove CONFIG_ARP_TIMEOUT define (2016-04-01 00:59:47 +0900) ---------------------------------------------------------------- Graham Moore (1): mtd: nand: denali: max_banks calculation changed in revision 5.1 Masahiro Yamada (21): ARM: uniphier: make u-boot-with-spl.bin really available ARM: uniphier: add sramupdate command serial: uniphier: use devm_get_addr() to get base address clk: uniphier: use devm_get_addr() to get base address i2c: uniphier: use devm_get_addr() to get base address gpio: uniphier: use devm_get_addr() to get base address mmc: uniphier: use devm_get_addr() to get base address pinctrl: uniphier: use devm_get_addr() to get base address pinctrl: uniphier: introduce capability flag pinctrl: uniphier: support per-pin input enable for new SoCs pinctrl: uniphier: support UniPhier PH1-LD20 pinctrl driver pinctrl: uniphier: support UniPhier PH1-LD11 pinctrl driver ARM: dts: uniphier: add clock-frequency to serial nodes of LD11/LD20 ARM: dts: uniphier: add NAND pinmux node ARM: uniphier: drop unneeded defines related to legacy serial driver ARM: uniphier: adjust dram_init() and dram_init_banksize() for ARM64 ARM: uniphier: enable eMMC on PH1-sLD3 reference board ARM: uniphier: add pin-mux settings for NAND, eMMC, SD of PH1-sLD3 ARM: uniphier: rename function names ph1_* to uniphier_* cosmetic: Fix typos "privide" ARM: uniphier: remove CONFIG_ARP_TIMEOUT define arch/arm/dts/uniphier-ph1-ld11.dtsi | 4 + arch/arm/dts/uniphier-ph1-ld20.dtsi | 4 + arch/arm/dts/uniphier-ph1-sld3-ref.dts | 4 + arch/arm/dts/uniphier-pinctrl.dtsi | 5 ++ arch/arm/mach-uniphier/arm32/debug_ll.S | 28 +++---- arch/arm/mach-uniphier/bcu/bcu-ld4.c | 2 +- arch/arm/mach-uniphier/bcu/bcu-sld3.c | 2 +- arch/arm/mach-uniphier/board_early_init_f.c | 28 +++---- arch/arm/mach-uniphier/boards.c | 34 ++++---- arch/arm/mach-uniphier/boot-mode/boot-device.h | 16 ++-- arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c | 4 +- arch/arm/mach-uniphier/boot-mode/boot-mode-pro5.c | 4 +- arch/arm/mach-uniphier/boot-mode/boot-mode-pxs2.c | 4 +- arch/arm/mach-uniphier/boot-mode/boot-mode-sld3.c | 4 +- arch/arm/mach-uniphier/boot-mode/boot-mode.c | 8 +- arch/arm/mach-uniphier/boot-mode/cmd_pinmon.c | 8 +- arch/arm/mach-uniphier/clk/clk-ld4.c | 4 +- arch/arm/mach-uniphier/clk/clk-pro4.c | 4 +- arch/arm/mach-uniphier/clk/clk-pro5.c | 4 +- arch/arm/mach-uniphier/clk/clk-pxs2.c | 4 +- arch/arm/mach-uniphier/dram/ddrphy-ld4.c | 3 +- arch/arm/mach-uniphier/dram/ddrphy-regs.h | 3 +- arch/arm/mach-uniphier/dram/umc-ld4.c | 4 +- arch/arm/mach-uniphier/dram/umc-pro4.c | 4 +- arch/arm/mach-uniphier/dram/umc-pxs2.c | 2 +- arch/arm/mach-uniphier/dram/umc-sld8.c | 4 +- arch/arm/mach-uniphier/dram_init.c | 45 ++++++++--- arch/arm/mach-uniphier/early-clk/early-clk-ld4.c | 4 +- arch/arm/mach-uniphier/early-clk/early-clk-pro5.c | 4 +- arch/arm/mach-uniphier/early-clk/early-clk-pxs2.c | 4 +- arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c | 2 +- arch/arm/mach-uniphier/init.h | 94 +++++++++++----------- arch/arm/mach-uniphier/init/init-ld4.c | 14 ++-- arch/arm/mach-uniphier/init/init-pro4.c | 12 +-- arch/arm/mach-uniphier/init/init-pro5.c | 6 +- arch/arm/mach-uniphier/init/init-pxs2.c | 10 +-- arch/arm/mach-uniphier/init/init-sld3.c | 16 ++-- arch/arm/mach-uniphier/init/init-sld8.c | 14 ++-- arch/arm/mach-uniphier/init/init.c | 12 +-- arch/arm/mach-uniphier/memconf/memconf-pxs2.c | 2 +- arch/arm/mach-uniphier/memconf/memconf-sld3.c | 2 +- arch/arm/mach-uniphier/pinctrl/pinctrl-ld4.c | 2 +- arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c | 2 +- arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c | 2 +- arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c | 2 +- arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c | 2 +- arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c | 25 +++++- arch/arm/mach-uniphier/pinctrl/pinctrl-sld8.c | 2 +- arch/arm/mach-uniphier/pll/pll-init-ld4.c | 2 +- arch/arm/mach-uniphier/pll/pll-init-pro4.c | 2 +- arch/arm/mach-uniphier/pll/pll-init-sld3.c | 2 +- arch/arm/mach-uniphier/pll/pll-init-sld8.c | 2 +- arch/arm/mach-uniphier/pll/pll-spectrum-ld4.c | 2 +- arch/arm/mach-uniphier/pll/pll-spectrum-sld3.c | 2 +- arch/arm/mach-uniphier/sbc/sbc-admulti.c | 2 +- arch/arm/mach-uniphier/sbc/sbc-savepin.c | 2 +- drivers/clk/uniphier/clk-uniphier-core.c | 9 +-- drivers/gpio/gpio-uniphier.c | 8 +- drivers/i2c/i2c-uniphier-f.c | 12 ++- drivers/i2c/i2c-uniphier.c | 11 ++- drivers/mmc/uniphier-sd.c | 9 ++- drivers/mtd/nand/denali.c | 11 ++- drivers/mtd/nand/denali.h | 2 + drivers/pinctrl/uniphier/Kconfig | 6 ++ drivers/pinctrl/uniphier/Makefile | 1 + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 64 ++++++++++++--- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 114 +++++++++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 3 - drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 3 - drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 4 +- drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 4 +- drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 3 - drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 3 - drivers/pinctrl/uniphier/pinctrl-uniphier.h | 10 +-- drivers/serial/serial_uniphier.c | 8 +- include/configs/uniphier.h | 19 ++--- lib/Kconfig | 2 +- 77 files changed, 505 insertions(+), 290 deletions(-) create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c -- Best Regards Masahiro Yamada

2 1

[U-Boot] [PATCH] arm: socfpga: Nuke useless include
by Marek Vasut 01 Apr '16

01 Apr '16

The dwmmc.h include was forgotten during the migration of dwmmc probing to DM. Since the shiny DM is in place now, remove this relic of the past. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Dinh Nguyen <dinguyen(a)opensource.altera.com> Cc: Chin Liang See <clsee(a)altera.com> --- arch/arm/mach-socfpga/misc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index ce3ff0a..ebaa736 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -16,7 +16,6 @@ #include <asm/arch/reset_manager.h> #include <asm/arch/scan_manager.h> #include <asm/arch/system_manager.h> -#include <asm/arch/dwmmc.h> #include <asm/arch/nic301.h> #include <asm/arch/scu.h> #include <asm/pl310.h> -- 2.7.0

2 2

[U-Boot] [ANN] Minor patchwork cleaning
by Tom Rini 01 Apr '16

01 Apr '16

Hey all, It's been bothering me for a bit, and despite the day of the year it is today, I finally got around to doing something. Anything in patchwork that was from 2014 or older and still "New" (or "Under Review") but not actually merged in, I have marked as deferred. If there was something there of yours, please re-submit against current master (make sure you migrate things to Kconfig as appropriate!) and so forth, thanks and sorry. -- Tom

1 0