June 2014 - U-Boot

[U-Boot] [PATCH v1 0/2] Add CONFIG_SYS_GENERIC_BOARD to all gdsys boards
by dirk.eibach＠gdsys.cc 24 Jul '14

24 Jul '14

From: Dirk Eibach <dirk.eibach(a)gdsys.cc> Dirk Eibach (2): ppc: Make ppc4xx ready for CONFIG_SYS_GENERIC_BOARD board: Add CONFIG_SYS_GENERIC_BOARD to all gdsys boards arch/powerpc/cpu/ppc4xx/cpu_init.c | 2 ++ include/configs/controlcenterd.h | 2 ++ include/configs/dlvision-10g.h | 1 + include/configs/dlvision.h | 1 + include/configs/gdppc440etx.h | 1 + include/configs/intip.h | 1 + include/configs/io.h | 1 + include/configs/io64.h | 1 + include/configs/iocon.h | 1 + include/configs/neo.h | 1 + 10 files changed, 12 insertions(+) -- 1.8.3

3 4

[U-Boot] [PATCH] sunxi: use random parts of SID to set ethaddr
by Hans de Goede 23 Jul '14

23 Jul '14

From: Jonathan Liu <net147(a)gmail.com> Similar to the USB NIC found on OMAP5uEVM, PandaBoard and BeagleBoard-XM boards, the sunxi SoCs have a NIC onboard without an embedded MAC address. Just like the omap used on these boards, the sunxi SoCs do have a unique chip id, in the form of the 128 bit SID register: http://linux-sunxi.org/SID_Register_Guide So mimick the BeagleBoard-XM board code (commit 548a64d8) and use the chip id to generate a unique fixed MAC address. We check for the SID not being all 0, since some early A20 batches shipped without having there SID programmed. Note we use specific parts of the 128 bits, since some parts indicate the SoC family / revision, and thus are fixed. The algorithm for this was taken from the linux-sunxi.org kernels. Signed-off-by: Jonathan Liu <net147(a)gmail.com> [hdegoede(a)redhat.com: Expanded the commit message with some more info] Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- board/sunxi/board.c | 28 ++++++++++++++++++++++++++++ include/configs/sunxi-common.h | 2 ++ 2 files changed, 30 insertions(+) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 8607eb3..2179e23 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -19,9 +19,12 @@ #include <axp209.h> #endif #include <asm/arch/clock.h> +#include <asm/arch/cpu.h> #include <asm/arch/dram.h> #include <asm/arch/gpio.h> #include <asm/arch/mmc.h> +#include <asm/io.h> +#include <net.h> DECLARE_GLOBAL_DATA_PTR; @@ -157,3 +160,28 @@ void sunxi_board_init(void) printf("Failed to set core voltage! Can't set CPU frequency\n"); } #endif + +#ifdef CONFIG_MISC_INIT_R +int misc_init_r(void) +{ + if (!getenv("ethaddr")) { + uint32_t reg_val = readl(SUNXI_SID_BASE); + + if (reg_val) { + uint8_t mac_addr[6]; + + mac_addr[0] = 0x02; /* Non OUI / registered MAC address */ + mac_addr[1] = (reg_val >> 0) & 0xff; + reg_val = readl(SUNXI_SID_BASE + 0x0c); + mac_addr[2] = (reg_val >> 24) & 0xff; + mac_addr[3] = (reg_val >> 16) & 0xff; + mac_addr[4] = (reg_val >> 8) & 0xff; + mac_addr[5] = (reg_val >> 0) & 0xff; + + eth_setenv_enetaddr("ethaddr", mac_addr); + } + } + + return 0; +} +#endif diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 4083388..13e72d5 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -207,6 +207,8 @@ #define CONFIG_ENV_IS_NOWHERE #endif +#define CONFIG_MISC_INIT_R + #ifndef CONFIG_SPL_BUILD #include <config_distro_defaults.h> #endif -- 2.0.0

3 2

[U-Boot] [PATCH v2 0/5] sunxi: i2c and pmic support
by Hans de Goede 23 Jul '14

23 Jul '14

Hi Albert, Heiko, Here is v2 of my standalone i2c and pmic support for sunxi series. I think it would be best for this series to go upstream through the u-boot-arm tree, since most changes are sunxi specific. Note patch 5/5 is an unrelated sunxi bugfix for a bug I found while testing the i2c + pmic support. Changes since v1: -"mvtwsi: convert to CONFIG_SYS_I2C framework" Use CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE when instantiating the controller with the U_BOOT_I2C_ADAP_COMPLETE macro -Add Acked-by tags from Ian / Heiko / Prafulla to all patches Regards, Hans

3 13

[U-Boot] sunxi: Bug fixes, sun4i and sun5i support, pmic support and network improvements
by Hans de Goede 23 Jul '14

23 Jul '14

Hi All, Here is a patch series to be applied on top of Ian's recently merged series which added basic sun7i support. This patch series begins with a few bug fixes found while working on preparing the rest of the series, adds sun4i and sun5i support, pmic support (which is necessary to clock the CPU at its max speed), and rounds things of with some networking fixes / additions. Regards, Hans

3 38

[U-Boot] [PATCH v2] zynq: disable -Wstrict-prototypes option for ps7_init.c
by Masahiro Yamada 23 Jul '14

23 Jul '14

The files ps7_init.c and ps7_init.h are supposed to be generated by hw projects such as Vivado, PlanAhead and then to be copied into board/xilinx/zynq directory. But some prototypes in them cause annoying warning messages: CC spl/board/xilinx/zynq/ps7_init.o In file included from board/xilinx/zynq/ps7_init.c:50:0: board/xilinx/zynq/ps7_init.h:137:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.h:138:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.h:139:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.h:145:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.c:12602:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.c:12723:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.c:12742:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.c:12761:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.c:12854:6: warning: function declaration isn't a prototype [-Wstrict-prototypes] The prototypes should be int ps7_init(void); int ps7_post_config(void); int ps7_debug(void); rather than int ps7_init(); int ps7_post_config(); int ps7_debug(); We do not want to be bothered because of automatically generated files. But we cannot touch the external projects for now. What we can do is to disable -Wstrict-prototypes for ps7_init.c Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Michal Simek <michal.simek(a)xilinx.com> Tested-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: No change in code. Some changes in git-log - Fix a typo: s/causes/cause/ - Add Tested-by credit board/xilinx/zynq/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index fd93f63..71c0c35 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -10,3 +10,6 @@ obj-y := board.o # Please copy ps7_init.c/h from hw project to this directory obj-$(CONFIG_SPL_BUILD) += \ $(if $(wildcard $(srctree)/$(src)/ps7_init.c), ps7_init.o) + +# Suppress "warning: function declaration isn't a prototype" +CFLAGS_REMOVE_ps7_init.o := -Wstrict-prototypes -- 1.9.1

2 2

[U-Boot] [PATCH] ARM: zynq: Show ECC status on the same line as DRAM size
by Michal Simek 23 Jul '14

23 Jul '14

Without this patch is DRAM size one line below DRAM: which is not nice Origin: I2C: ready DRAM: ECC disabled 1 GiB Now running in RAM - U-Boot at: 3ff59000 MMC: zynq_sdhci: 0 Fixed by this patch: I2C: ready DRAM: ECC disabled 1 GiB Now running in RAM - U-Boot at: 3ff59000 MMC: zynq_sdhci: 0 Using default environment Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Based on http://patchwork.ozlabs.org/patch/347048/ --- arch/arm/cpu/armv7/zynq/ddrc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/zynq/ddrc.c b/arch/arm/cpu/armv7/zynq/ddrc.c index e0ed3bfb4350..1ea086d52079 100644 --- a/arch/arm/cpu/armv7/zynq/ddrc.c +++ b/arch/arm/cpu/armv7/zynq/ddrc.c @@ -34,7 +34,7 @@ void zynq_ddrc_init(void) /* ECC is enabled when memory is in 16bit mode and it is enabled */ if ((ecctype == ZYNQ_DDRC_ECC_SCRUBREG_ECCMODE_SECDED) && (width == ZYNQ_DDRC_CTRLREG_BUSWIDTH_16BIT)) { - puts("Memory: ECC enabled\n"); + puts("ECC enabled "); /* * Clear the first 1MB because it is not initialized from * first stage bootloader. To get ECC to work all memory has @@ -42,6 +42,6 @@ void zynq_ddrc_init(void) */ memset((void *)0, 0, 1 * 1024 * 1024); } else { - puts("Memory: ECC disabled\n"); + puts("ECC disabled "); } } -- 1.8.2.3

3 2

[U-Boot] WIP for SPI
by Simon Glass 23 Jul '14

23 Jul '14

Hi Jon, I thought I should mention that I spent time on a flight to look at SPI with driver model. I have put the WIP code in branch 'working' in u-boot-dm.git. Note it doesn't work, and is very early. Also note that many of the patches have not been posted - I just want to make it clear what I am up to. In doing this I had to sort out the numbering of devices. U-Boot has the concept of SPI bus 2 on its command line, and for now at lest we need to keep that working. So I have added sequence numbers to devices - so a device can be considered 'child number 3' of its parent, for example. The numbers don't need to be sequential. I suppose we could generalise this to GPIOs if it works out. My approach for scanning the SPI bus in the device tree is similar to what I suggested a week or so ago - I took the code from dm_scan_fdt() and put it in a function with a udevice parent and node parameters. It seems to work OK for this simple case. I'll continue to update 'working' as I get closer to making this run. So far you can do this: ./b/sandbox/u-boot -d b/sandbox/u-boot.dtb -c "sspi 0:0 48 9f000000" U-Boot 2014.07-rc3-00064-ga8af843-dirty (Jun 10 2014 - 21:43:51) DRAM: 128 MiB No match for node 'host@0' No match for node 'lcd' No match for node 'cros-ec-keyb' Using default environment In: cros-ec-keyb Out: lcd Err: lcd sandbox_sf: state:0(CMD) bytes:6 sandbox_sf: CS activated; state is fresh! cmd: transition to ID state id: off:0 tx:0 20 id: off:1 tx:1 20 id: off:2 tx:2 15 id: off:3 tx:3 00 id: off:4 tx:4 00 sandbox_sf: CS deactivated; cmd done processing! FF2020150000 Regards, Simon

2 4

[U-Boot] [PATCH] embestmx6boards: convert to generic board
by Iain Paton 23 Jul '14

23 Jul '14

Enable CONFIG_SYS_GENERIC_BOARD to remove warning on boot. Signed-off-by: Iain Paton <ipaton0(a)gmail.com> --- diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index fbf47a7..2d4332b 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -19,6 +19,8 @@ #include "mx6_common.h" #include <linux/sizes.h> +#define CONFIG_SYS_GENERIC_BOARD + #define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_CONSOLE_DEV "ttymxc0" #define CONFIG_MMCROOT "/dev/mmcblk1p2" -- 1.8.5.1

2 1

[U-Boot] [PATCH] ARM: zynq: Enable generic board for Xilinx Zynq
by Michal Simek 23 Jul '14

23 Jul '14

Enable CONFIG_SYS_GENERIC_BOARD for all Zynq boards. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- include/configs/zynq-common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 8e0f93599fc4..153f3fe73d70 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -334,4 +334,6 @@ #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_GENERIC_BOARD + #endif /* __CONFIG_ZYNQ_COMMON_H */ -- 1.8.2.3

2 1

[U-Boot] [RFC PATCH] Fix bug in T4240QDS code. Don't access nonexistent registers
by Vasili Galka 23 Jul '14

23 Jul '14

The code in misc_init_r() verifies actual SERDES clocks versus expected. It supposes that the number of clocks is MAX_SERDES. However, the number of pllcr0 registers is only SRDS_MAX_BANK. This clearly results in access to wrong memory. I don't have the datasheet to design a correct solution, but at least let's change it to access only the existing registers. Signed-off-by: Vasili Galka <vvv444(a)gmail.com> Cc: York Sun <yorksun(a)freescale.com> --- board/freescale/t4qds/t4240qds.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c index fe1bc7f..6646042 100644 --- a/board/freescale/t4qds/t4240qds.c +++ b/board/freescale/t4qds/t4240qds.c @@ -662,7 +662,7 @@ int misc_init_r(void) } } - for (i = 0; i < MAX_SERDES; i++) { + for (i = 0; i < SRDS_MAX_BANK; i++) { u32 pllcr0 = srds_regs->bank[i].pllcr0; u32 expected = pllcr0 & SRDS_PLLCR0_RFCK_SEL_MASK; if (expected != actual[i]) { -- 1.7.9

3 4