May 2015 - U-Boot

[U-Boot] [PATCH v2 1/1] Fix musl build
by Jörg Krause 10 May '15

10 May '15

This patch fixes cross-compiling U-Boot tools with the musl C library: * including <sys/types.h> is needed for ulong * defining _GNU_SOURCE is needed for loff_t Tested for target at91sam9261ek_dataflash_cs3. Signed-off-by: Jörg Krause <joerg.krause(a)embedded.rocks> Cc: Tom Rini <trini(a)konsulko.com> --- Changes v1 -> v2: - Fix header include in image.h (reported by Tom Rini) --- include/image.h | 1 + tools/env/fw_env.c | 2 ++ tools/imagetool.h | 1 + tools/proftool.c | 1 + 4 files changed, 5 insertions(+) diff --git a/include/image.h b/include/image.h index 3844be6..60b924a 100644 --- a/include/image.h +++ b/include/image.h @@ -23,6 +23,7 @@ struct lmb; #ifdef USE_HOSTCC +#include <sys/types.h> /* new uImage format support enabled on host */ #define CONFIG_FIT 1 diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 1173eea..daa02a7 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -8,6 +8,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#define _GNU_SOURCE + #include <errno.h> #include <env_flags.h> #include <fcntl.h> diff --git a/tools/imagetool.h b/tools/imagetool.h index 3e15b4e..b7874f4 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -16,6 +16,7 @@ #include <stdlib.h> #include <string.h> #include <sys/stat.h> +#include <sys/types.h> #include <time.h> #include <unistd.h> #include <u-boot/sha1.h> diff --git a/tools/proftool.c b/tools/proftool.c index 3482951..9ce7a77 100644 --- a/tools/proftool.c +++ b/tools/proftool.c @@ -16,6 +16,7 @@ #include <string.h> #include <unistd.h> #include <sys/param.h> +#include <sys/types.h> #include <compiler.h> #include <trace.h> -- 2.3.5

2 1

[U-Boot] [PATCH] ti: am335x/am437x/omap5 devices: Unify network environment variables
by Franklin S Cooper Jr 10 May '15

10 May '15

Across several devices network environment variables are duplicated. Move these variables to a common include file which insures the environment variables are reused and insures devices across product lines share the same values. Signed-off-by: Franklin S Cooper Jr <fcooper(a)ti.com> --- include/configs/am335x_evm.h | 17 +---------------- include/configs/am43xx_evm.h | 1 + include/configs/ti_armv7_common.h | 25 +++++++++++++++++++++++++ include/configs/ti_omap5_common.h | 13 +------------ 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index a87059c..8da3325 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -83,10 +83,6 @@ "mmcdev=0\0" \ "mmcroot=/dev/mmcblk0p2 ro\0" \ "mmcrootfstype=ext4 rootwait\0" \ - "rootpath=/export/rootfs\0" \ - "nfsopts=nolock\0" \ - "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ - "::off\0" \ "ramroot=/dev/ram0 rw\0" \ "ramrootfstype=ext2\0" \ "mmcargs=setenv bootargs console=${console} " \ @@ -102,11 +98,6 @@ "${optargs} " \ "root=${spiroot} " \ "rootfstype=${spirootfstype}\0" \ - "netargs=setenv bootargs console=${console} " \ - "${optargs} " \ - "root=/dev/nfs " \ - "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ - "ip=dhcp\0" \ "bootenv=uEnv.txt\0" \ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ @@ -159,13 +150,6 @@ "sf probe ${spibusno}:0; " \ "sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \ "bootz ${loadaddr}\0" \ - "netboot=echo Booting from network ...; " \ - "setenv autoload no; " \ - "dhcp; " \ - "tftp ${loadaddr} ${bootfile}; " \ - "tftp ${fdtaddr} ${fdtfile}; " \ - "run netargs; " \ - "bootz ${loadaddr} - ${fdtaddr}\0" \ "ramboot=echo Booting from ramdisk ...; " \ "run ramargs; " \ "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ @@ -181,6 +165,7 @@ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ NANDARGS \ + NETARGS \ DFUARGS #endif diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 6eb31e2..331fdac 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -295,6 +295,7 @@ "setenv fdtfile am437x-idk-evm.dtb; fi; " \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree; fi; \0" \ + NETARGS \ DFUARGS \ #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 110a4f8..f882942 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -279,4 +279,29 @@ #endif #endif /* !CONFIG_NOR_BOOT */ +/* Generic Environment Variables */ + +#ifdef CONFIG_CMD_NET +#define NETARGS \ + "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ + "::off\0" \ + "nfsopts=nolock\0" \ + "rootpath=/export/rootfs\0" \ + "netloadimage=tftp ${loadaddr} ${bootfile}\0" \ + "netloadfdt=tftp ${fdtaddr} ${fdtfile}\0" \ + "netargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "root=/dev/nfs " \ + "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ + "ip=dhcp\0" \ + "netboot=echo Booting from network ...; " \ + "setenv autoload no; " \ + "dhcp; " \ + "run netloadimage; " \ + "run netloadfdt; " \ + "run netargs; " \ + "bootz ${loadaddr} - ${fdtaddr}\0" + +#endif + #endif /* __CONFIG_TI_ARMV7_COMMON_H__ */ diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 7957a73..791eade 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -92,11 +92,6 @@ "vram=${vram} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ - "netargs=setenv bootargs console=${console} " \ - "${optargs} " \ - "root=/dev/nfs " \ - "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ - "ip=dhcp\0" \ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ "source ${loadaddr}\0" \ @@ -123,13 +118,6 @@ "bootz ${loadaddr} - ${fdtaddr}; " \ "fi;" \ "fi;\0" \ - "netboot=echo Booting from network ...; " \ - "set env autoload no; " \ - "dhcp; " \ - "tftp ${loadaddr} ${bootfile}; " \ - "tftp ${fdtaddr} ${fdtfile}; " \ - "run netargs; " \ - "bootz ${loadaddr} - ${fdtaddr}\0" \ "findfdt="\ "if test $board_name = omap5_uevm; then " \ "setenv fdtfile omap5-uevm.dtb; fi; " \ @@ -143,6 +131,7 @@ "echo WARNING: Could not determine device tree to use; fi; \0" \ "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \ DFUARGS \ + NETARGS \ #define CONFIG_BOOTCOMMAND \ "run findfdt; " \ -- 2.3.5

2 2

[U-Boot] [PATCH v2] misc: led: Add PCA9551 LED driver
by Stefan Roese 10 May '15

10 May '15

This patch adds a driver for the PCA9551 LED controller. Originated-by: Timo Herbrecher <t.herbrecher(a)gateware.de> Signed-off-by: Stefan Roese <sr(a)denx.de> Reviewed-by: Tom Rini <trini(a)konsulko.com> Cc: Fabio Estevam <festevam(a)gmail.com> --- v2: - Removed __packed fromstruct pca9551_blink_rate as it doesn't seem to be needed - Removed PCA9551 dependency from Kconfig to allow usage with other boards - Better handling of return codes as suggested by Fabio drivers/misc/Kconfig | 13 ++++ drivers/misc/Makefile | 1 + drivers/misc/pca9551_led.c | 155 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+) create mode 100644 drivers/misc/pca9551_led.c diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 36a8f0d..4114be3 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -61,3 +61,16 @@ config CONFIG_FSL_SEC_MON system states. Security Monitor can be transitioned on any security failures, like software violations or hardware security violations. + +config PCA9551_LED + bool "Enable PCA9551 LED driver" + help + Enable driver for PCA9551 LED controller. This controller + is connected via I2C. So I2C needs to be enabled. + +config PCA9551_I2C_ADDR + hex "I2C address of PCA9551 LED controller" + depends on PCA9551_LED + default 0x60 + help + The I2C address of the PCA9551 LED controller. diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 6028cd4..149e686 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -29,3 +29,4 @@ obj-$(CONFIG_STATUS_LED) += status_led.o obj-$(CONFIG_TWL4030_LED) += twl4030_led.o obj-$(CONFIG_FSL_IFC) += fsl_ifc.o obj-$(CONFIG_FSL_SEC_MON) += fsl_sec_mon.o +obj-$(CONFIG_PCA9551_LED) += pca9551_led.o diff --git a/drivers/misc/pca9551_led.c b/drivers/misc/pca9551_led.c new file mode 100644 index 0000000..79b1e20 --- /dev/null +++ b/drivers/misc/pca9551_led.c @@ -0,0 +1,155 @@ +/* + * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <errno.h> +#include <i2c.h> + +#ifndef CONFIG_PCA9551_I2C_ADDR +#error "CONFIG_PCA9551_I2C_ADDR not defined!" +#endif + +#define PCA9551_REG_INPUT 0x00 /* Input register (read only) */ +#define PCA9551_REG_PSC0 0x01 /* Frequency prescaler 0 */ +#define PCA9551_REG_PWM0 0x02 /* PWM0 */ +#define PCA9551_REG_PSC1 0x03 /* Frequency prescaler 1 */ +#define PCA9551_REG_PWM1 0x04 /* PWM1 */ +#define PCA9551_REG_LS0 0x05 /* LED0 to LED3 selector */ +#define PCA9551_REG_LS1 0x06 /* LED4 to LED7 selector */ + +#define PCA9551_CTRL_AI (1 << 4) /* Auto-increment flag */ + +#define PCA9551_LED_STATE_ON 0x00 +#define PCA9551_LED_STATE_OFF 0x01 +#define PCA9551_LED_STATE_BLINK0 0x02 +#define PCA9551_LED_STATE_BLINK1 0x03 + +struct pca9551_blink_rate { + u8 psc; /* Frequency preescaler, see PCA9551_7.pdf p. 6 */ + u8 pwm; /* Pulse width modulation, see PCA9551_7.pdf p. 6 */ +}; + +static int freq0, freq1; + +static int pca9551_led_get_state(int led, int *state) +{ + unsigned int reg; + u8 shift, buf; + int ret; + + if (led < 0 || led > 7) { + return -EINVAL; + } else if (led < 4) { + reg = PCA9551_REG_LS0; + shift = led << 1; + } else { + reg = PCA9551_REG_LS1; + shift = (led - 4) << 1; + } + + ret = i2c_read(CONFIG_PCA9551_I2C_ADDR, reg, 1, &buf, 1); + if (ret) + return ret; + + *state = (buf >> shift) & 0x03; + return 0; +} + +static int pca9551_led_set_state(int led, int state) +{ + unsigned int reg; + u8 shift, buf, mask; + int ret; + + if (led < 0 || led > 7) { + return -EINVAL; + } else if (led < 4) { + reg = PCA9551_REG_LS0; + shift = led << 1; + } else { + reg = PCA9551_REG_LS1; + shift = (led - 4) << 1; + } + mask = 0x03 << shift; + + ret = i2c_read(CONFIG_PCA9551_I2C_ADDR, reg, 1, &buf, 1); + if (ret) + return ret; + + buf = (buf & ~mask) | ((state & 0x03) << shift); + + ret = i2c_write(CONFIG_PCA9551_I2C_ADDR, reg, 1, &buf, 1); + if (ret) + return ret; + + return 0; +} + +static int pca9551_led_set_blink_rate(int idx, struct pca9551_blink_rate rate) +{ + unsigned int reg; + int ret; + + switch (idx) { + case 0: + reg = PCA9551_REG_PSC0; + break; + case 1: + reg = PCA9551_REG_PSC1; + break; + default: + return -EINVAL; + } + reg |= PCA9551_CTRL_AI; + + ret = i2c_write(CONFIG_PCA9551_I2C_ADDR, reg, 1, (u8 *)&rate, 2); + if (ret) + return ret; + + return 0; +} + +/* + * Functions referenced by cmd_led.c + */ +void __led_set(led_id_t mask, int state) +{ + if (state == STATUS_LED_OFF) + pca9551_led_set_state(mask, PCA9551_LED_STATE_OFF); + else + pca9551_led_set_state(mask, PCA9551_LED_STATE_ON); +} + +void __led_toggle(led_id_t mask) +{ + int state = 0; + + pca9551_led_get_state(mask, &state); + pca9551_led_set_state(mask, !state); +} + +void __led_blink(led_id_t mask, int freq) +{ + struct pca9551_blink_rate rate; + int mode; + int blink; + + if ((freq0 == 0) || (freq == freq0)) { + blink = 0; + mode = PCA9551_LED_STATE_BLINK0; + freq0 = freq; + } else { + blink = 1; + mode = PCA9551_LED_STATE_BLINK1; + freq1 = freq; + } + + rate.psc = ((freq * 38) / 1000) - 1; + rate.pwm = 128; /* 50% duty cycle */ + + pca9551_led_set_blink_rate(blink, rate); + pca9551_led_set_state(mask, mode); +} -- 2.3.2

3 3

[U-Boot] [PATCH 1/2] sunxi: Set SYS_MALLOC_CLEAR_ON_INIT to n
by Hans de Goede 10 May '15

10 May '15

We don't need this on sunxi, and not having is shaves some time of out boot time. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- board/sunxi/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index bd1e988..940b6c7 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -549,6 +549,9 @@ config GMAC_TX_DELAY ---help--- Set the GMAC Transmit Clock Delay Chain value. +config SYS_MALLOC_CLEAR_ON_INIT + default n + config NET default y -- 2.3.6

3 5

[U-Boot] Please pull u-boot-dm
by Simon Glass 10 May '15

10 May '15

Hi Tom, This includes the real-time-clock uclass, a driver model test suite speed-up and part of Han's USB work (the rest need to wait for some patch respins). The following changes since commit 905e8f9e53766e606bd4a0ed46d804889e613f32: Prepare v2015.07-rc1 (2015-05-05 19:52:15 -0400) are available in the git repository at: http://git.denx.de/u-boot-dm.git for you to fetch changes up to a5e1bcdeebebabdc5d013fbd488f87a4e62ff411: dm: sf: Update default name of spi flash in structure udevice (2015-05-06 14:00:35 -0600) ---------------------------------------------------------------- Axel Lin (1): dm: i2c-gpio: Remove redundant dm_gpio_set_value() call Haikun.Wang(a)freescale.com (1): dm: sf: Update default name of spi flash in structure udevice Hans de Goede (16): dm: usb: Do not use bus->seq before device_probe(bus) dm: usb: Make usb_get_bus easier to use for callers dm: usb: Copy over usb_device values from usb_scan_device() to final usb_device dm: usb: Use usb_get_bus in dm ehci code dm: usb: Fix finding of first upstream usb-2 hub in the ehci dm code dm: usb: Set desc_before_addr from ehci dm code usb: Fix maxpacketsize for first descriptor read for low-speed usb devs usb: ohci: Remove unused devgone global variable usb: ohci: Pass around a pointer to ohci_t rather then accessing global vars usb: ohci: Move the ohci_dev struct to inside the main ohci struct usb: ohci: Move the td array struct to inside the ohci_dev struct usb: ohci: Remove unnecessary phcca variable usb: ohci: Move static func and var declarations from ohci.h to ohci-hcd.c usb: ohci: Fix ctrl in messages with a data-len of 0 usb: ohci: Add proper cache flushing / invalidating for non cache coherent cpus usb: ohci: Don't log an error on interrupt packet timeout Joe Hershberger (3): sandbox: Add test function to advance time sandbox: eth: Add a function to skip ping timeouts test: dm: eth: Skip timeouts on ping tests Simon Glass (26): dm: spi: Avoid setting the speed with every transfer cros_ec: Show the protocol version in the debug message cros_ec: Handle the single duplex requirement in cros_ec dm: spi: Correct the comment on spi_get_ops() dm: i2c: sandbox: Add debugging to the speed limit dm: i2c: Add functions to read and write a register dm: i2c: Add an explicit test mode to the sandbox I2C driver fdt: Correct warning in fdt_setup_simplefb_node() dm: rtc: Rename gregorian day function dm: rtc: Rename to_tm() to rtc_to_tm() and add error code dm: rtc: Rename mktime() and reduce the number of parameters dm: Remove unnecessary types in bcd.h dm: rtc: Split structure definition into its own file dm: sandbox: Add os_localtime() to obtain the system time dm: rtc: Add a uclass for real-time clocks dm: rtc: sandbox: Add an emulated I2C RTC device dm: rtc: sandbox: Add a driver for the sandbox I2C RTC dm: rtc: Convert 'date' command to support driver model dm: net: rtc: Support using driver model for rtc in sntp dm: sandbox: dts: Add a real-time clock attached to I2C dm: rtc: sandbox: Enable real-time clock support dm: test: dts: Sort the aliases in the test device tree file dm: rtc: Add tests for real-time clocks test: Add a simple time test sandbox: Enable time unit test command dm: usb: exynos: Drop legacy USB code Sjoerd Simons (1): sandbox: Don't try distro_bootcmd by default arch/sandbox/cpu/cpu.c | 5 - arch/sandbox/cpu/os.c | 18 +++ arch/sandbox/cpu/start.c | 20 ++- arch/sandbox/dts/sandbox.dts | 12 +- arch/sandbox/include/asm/eth.h | 2 + arch/sandbox/include/asm/rtc.h | 28 ++++ arch/sandbox/include/asm/state.h | 1 + arch/sandbox/include/asm/test.h | 39 +++++ board/sandbox/sandbox.c | 11 +- common/cmd_date.c | 57 +++++-- common/fdt_support.c | 2 +- common/image.c | 2 +- common/usb.c | 17 +- configs/sandbox_defconfig | 2 + drivers/i2c/i2c-gpio.c | 13 +- drivers/i2c/i2c-uclass.c | 19 +++ drivers/i2c/sandbox_i2c.c | 34 ++-- drivers/misc/cros_ec.c | 3 +- drivers/misc/cros_ec_spi.c | 23 ++- drivers/mtd/spi/sf-uclass.c | 4 +- drivers/net/sandbox.c | 17 ++ drivers/rtc/Kconfig | 8 + drivers/rtc/Makefile | 4 + drivers/rtc/at91sam9_rtt.c | 5 +- drivers/rtc/bfin_rtc.c | 5 +- drivers/rtc/date.c | 38 +++-- drivers/rtc/ds1306.c | 5 +- drivers/rtc/ds1374.c | 6 +- drivers/rtc/ftrtc010.c | 5 +- drivers/rtc/i2c_rtc_emul.c | 236 ++++++++++++++++++++++++++++ drivers/rtc/imxdi.c | 5 +- drivers/rtc/mc13xxx-rtc.c | 5 +- drivers/rtc/mcfrtc.c | 2 +- drivers/rtc/mpc8xx.c | 5 +- drivers/rtc/mx27rtc.c | 5 +- drivers/rtc/mxsrtc.c | 5 +- drivers/rtc/pl031.c | 5 +- drivers/rtc/rtc-uclass.c | 96 ++++++++++++ drivers/rtc/sandbox_rtc.c | 106 +++++++++++++ drivers/spi/spi-uclass.c | 9 +- drivers/usb/host/ehci-exynos.c | 117 -------------- drivers/usb/host/ehci-hcd.c | 46 +++--- drivers/usb/host/ohci-hcd.c | 327 +++++++++++++++++++++++++++------------ drivers/usb/host/ohci.h | 136 ++++------------ drivers/usb/host/usb-uclass.c | 63 ++++---- drivers/usb/host/xhci-exynos5.c | 108 ------------- include/bcd.h | 8 +- include/configs/sandbox.h | 3 + include/dm/uclass-id.h | 1 + include/fdtdec.h | 2 - include/i2c.h | 22 +++ include/os.h | 11 ++ include/rtc.h | 197 +++++++++++++++++++---- include/rtc_def.h | 36 +++++ include/spi.h | 5 +- include/usb.h | 24 +-- lib/fdtdec.c | 2 - net/sntp.c | 14 +- post/drivers/rtc.c | 28 +++- test/Kconfig | 8 + test/Makefile | 1 + test/dm/Makefile | 1 + test/dm/eth.c | 2 + test/dm/i2c.c | 8 + test/dm/rtc.c | 175 +++++++++++++++++++++ test/dm/test.dts | 26 +++- test/time_ut.c | 137 ++++++++++++++++ 67 files changed, 1743 insertions(+), 649 deletions(-) create mode 100644 arch/sandbox/include/asm/rtc.h create mode 100644 drivers/rtc/i2c_rtc_emul.c create mode 100644 drivers/rtc/rtc-uclass.c create mode 100644 drivers/rtc/sandbox_rtc.c create mode 100644 include/rtc_def.h create mode 100644 test/dm/rtc.c create mode 100644 test/time_ut.c Regards, Simon

2 1

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 10 May '15

10 May '15

The following changes since commit 905e8f9e53766e606bd4a0ed46d804889e613f32: Prepare v2015.07-rc1 (2015-05-05 19:52:15 -0400) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git HEAD for you to fetch changes up to 57cc4e64c13bc5f42cb5e8572d2c46e25cf7aea1: git-mailrc: add Dinh Nguyen as a contact for SoCFPGA (2015-05-08 00:57:31 +0200) ---------------------------------------------------------------- Dinh Nguyen (1): git-mailrc: add Dinh Nguyen as a contact for SoCFPGA Masahiro Yamada (7): ARM: socfpga: do not add board directory to header search path ARM: socfpga: remove redundant config.mk ARM: socfpga: move board select into mach-socfpga/Kconfig ARM: socfpga: move SoC sources to mach-socfpga ARM: socfpga: move SoC headers to mach-socfpga/include/mach ARM: socfpga: abolish CONFIG_SOCFPGA git-mailrc: add Marek as SOCFPGA maintainer arch/arm/Kconfig | 15 ++++----------- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/Makefile | 3 +-- arch/arm/cpu/armv7/socfpga/config.mk | 11 ----------- arch/arm/dts/Makefile | 2 +- arch/arm/mach-socfpga/Kconfig | 27 +++++++++++++++++++++++++++ arch/arm/{cpu/armv7/socfpga => mach-socfpga}/Makefile | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/clock_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/fpga_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/freeze_controller.c | 0 arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/clock_manager.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/dwmmc.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/fpga_manager.h | 0 arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/freeze_controller.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/gpio.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/nic301.h | 0 arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/reset_manager.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/scan_manager.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/scu.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/sdram.h | 0 arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/socfpga_base_addrs.h | 0 arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/system_manager.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/timer.h | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/misc.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/reset_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/scan_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/spl.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/system_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/timer.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/u-boot-spl.lds | 0 board/altera/socfpga/Kconfig | 31 ------------------------------- board/altera/socfpga/iocsr_config.c | 2 +- configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + doc/git-mailrc | 1 + include/configs/socfpga_common.h | 4 +--- 37 files changed, 40 insertions(+), 60 deletions(-) delete mode 100644 arch/arm/cpu/armv7/socfpga/config.mk create mode 100644 arch/arm/mach-socfpga/Kconfig rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/Makefile (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/clock_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/fpga_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/freeze_controller.c (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/clock_manager.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/dwmmc.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/fpga_manager.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/freeze_controller.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/nic301.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/reset_manager.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/scan_manager.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/scu.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/sdram.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/socfpga_base_addrs.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/system_manager.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/timer.h (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/misc.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/reset_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/scan_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/spl.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/system_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/timer.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/u-boot-spl.lds (100%) delete mode 100644 board/altera/socfpga/Kconfig

2 1

[U-Boot] [PATCH] sunxi: add support for UART2 on A23/A33
by Laurent Itti 10 May '15

10 May '15

Add support for UART2 (2-pin version but note that RTS/CTS pins are available pn that port for possible future use), can be selected in config by using CONFIG_CONS_INDEX=3 Signed-off-by: Laurent Itti <laurentitti(a)gmail.com> --- arch/arm/cpu/armv7/sunxi/board.c | 4 ++++ arch/arm/dts/sun8i-a23.dtsi | 7 +++++++ arch/arm/include/asm/arch-sunxi/gpio.h | 1 + include/configs/sunxi-common.h | 2 ++ 4 files changed, 14 insertions(+) diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c index 76a52ac..550ea46 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c @@ -72,6 +72,10 @@ static int gpio_init(void) sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG_UART1); sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG_UART1); sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP); +#elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I) + sunxi_gpio_set_cfgpin(SUNXI_GPB(0), SUN8I_GPB_UART2); + sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_GPB_UART2); + sunxi_gpio_set_pull(SUNXI_GPB(1), SUNXI_GPIO_PULL_UP); #elif CONFIG_CONS_INDEX == 5 && defined(CONFIG_MACH_SUN8I) sunxi_gpio_set_cfgpin(SUNXI_GPL(2), SUN8I_GPL_R_UART); sunxi_gpio_set_cfgpin(SUNXI_GPL(3), SUN8I_GPL_R_UART); diff --git a/arch/arm/dts/sun8i-a23.dtsi b/arch/arm/dts/sun8i-a23.dtsi index 6d6eda3..19f851d 100644 --- a/arch/arm/dts/sun8i-a23.dtsi +++ b/arch/arm/dts/sun8i-a23.dtsi @@ -359,6 +359,13 @@ allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; }; + uart2_pins_a: uart0@2 { + allwinner,pins = "PB0", "PB1"; + allwinner,function = "uart2"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; + mmc0_pins_a: mmc0@0 { allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; allwinner,function = "mmc0"; diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h index 081e7d1..496295d 100644 --- a/arch/arm/include/asm/arch-sunxi/gpio.h +++ b/arch/arm/include/asm/arch-sunxi/gpio.h @@ -155,6 +155,7 @@ enum sunxi_gpio_number { #define SUN5I_GPB_TWI2 2 #define SUN4I_GPB_UART0 2 #define SUN5I_GPB_UART0 2 +#define SUN8I_GPB_UART2 2 #define SUNXI_GPC_SDC2 3 #define SUN6I_GPC_SDC3 4 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 5d77e71..c7b4bd4 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -306,6 +306,8 @@ extern int soft_i2c_gpio_scl; #endif #elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I) #define OF_STDOUT_PATH "/soc@01c00000/serial@01c28400:115200" +#elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I) +#define OF_STDOUT_PATH "/soc@01c00000/serial@01c28800:115200" #elif CONFIG_CONS_INDEX == 5 && defined(CONFIG_MACH_SUN8I) #define OF_STDOUT_PATH "/soc@01c00000/serial@01f02800:115200" #else -- 2.1.0

2 1

[U-Boot] [PATCH 00/16] usb core fixes + ohci fixes + ohci dm support
by Hans de Goede 10 May '15

10 May '15

Hi Marek and Simon, Here is a series with a few usb core fixes, a lot of ohci fixes and ohci dm support (tested on sunxi). This series sits on top of the series adding companion controller support to the dm usb code and 2 ehci fixes which I send earlier today. Regards, Hans

4 54

[U-Boot] [spl framework] how spl framework resolve one .config for 2 different compiles?
by yuanlinyu 10 May '15

10 May '15

hi, I have a question that how spl framework resolve one .config for 2 different compiles. Maybe i am not fully understand SPL framework, for example, CONFIG_SPL_BUILD=y will be defined in both compiles, but i think it's only needed for SPL image build, no need for the other image.

1 0

Re: [U-Boot] Intel Galileo on u-boot
by Bin Meng 09 May '15

09 May '15

Hi Fei, On Sun, May 3, 2015 at 9:41 AM, WANG FEI <wangfei.jimei(a)gmail.com> wrote: > Meng Bin, I'm downloading the u-boot-2015.04 source code and build with > "make galileo_defconfig" and "make all" after "export BUILD_ROM=y", but I > got an error as below, > > IFDTOOL u-boot.rom > Output file is too small. (1048576 < -2146061305) > make: *** [u-boot.rom] Error 1 > > do you know why? > Can you debug this? Looks like you are seeing the same problem of http://lists.denx.de/pipermail/u-boot/2015-April/210643.html. > BTW, I also realized the root cause that why coreboot halt on Galileo board, > it's because coreboot has CMOVcc instructions exist after compiled, I've > added some parameters trying to bound CMOVcc instructions, but it looks most > of them have disappeared, still few left, I need find out the root cause. > CMOVcc is not supported by Quark, as indicated by CPUID 01H result EDX bit15. Regards, Bin

2 1