October 2015 - U-Boot

[U-Boot] [PATCH] armv8/fsl-lsch3: fdt: Check the pointer returned from call to a function may be NULL
by Alison Wang 30 Oct '15

30 Oct '15

Pointer 'reg' returned from call to function 'fdt_getprop' may be NULL, will be passed to function and may be dereferenced there by passing argument 1 to function 'of_read_number'. So check pointer 'reg' first. Signed-off-by: Alison Wang <alison.wang(a)freescale.com> --- arch/arm/cpu/armv8/fsl-lsch3/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/fsl-lsch3/fdt.c b/arch/arm/cpu/armv8/fsl-lsch3/fdt.c index 567c419..922e8a0 100644 --- a/arch/arm/cpu/armv8/fsl-lsch3/fdt.c +++ b/arch/arm/cpu/armv8/fsl-lsch3/fdt.c @@ -33,8 +33,8 @@ void ft_fixup_cpu(void *blob) off = fdt_node_offset_by_prop_value(blob, -1, "device_type", "cpu", 4); while (off != -FDT_ERR_NOTFOUND) { reg = (fdt32_t *)fdt_getprop(blob, off, "reg", 0); - core_id = of_read_number(reg, addr_cells); if (reg) { + core_id = of_read_number(reg, addr_cells); if (core_id == 0 || (is_core_online(core_id))) { val = spin_tbl_addr; val += id_to_core(core_id) * -- 2.1.0.27.g96db324

2 1

[U-Boot] [PATCH 1/2] arm/fsl-ls: Add CONFIG_OF_STDOUT_VIA_ALIAS
by Scott Wood 30 Oct '15

30 Oct '15

This will allow OF-based earlycon to be used once the appropriate aliases are added to the device tree and kernel support is fixed. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- include/configs/ls1021aqds.h | 1 + include/configs/ls1021atwr.h | 1 + include/configs/ls2085a_common.h | 1 + 3 files changed, 3 insertions(+) diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index dfaffa1..a7d12b8 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -654,6 +654,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_OF_LIBFDT #define CONFIG_OF_BOARD_SETUP +#define CONFIG_OF_STDOUT_VIA_ALIAS #define CONFIG_CMD_BOOTZ #define CONFIG_MISC_INIT_R diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 3299a9f..f318162 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -496,6 +496,7 @@ #define CONFIG_OF_LIBFDT #define CONFIG_OF_BOARD_SETUP +#define CONFIG_OF_STDOUT_VIA_ALIAS #define CONFIG_CMD_BOOTZ #define CONFIG_MISC_INIT_R diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h index 39fb464..96abb92 100644 --- a/include/configs/ls2085a_common.h +++ b/include/configs/ls2085a_common.h @@ -47,6 +47,7 @@ /* Flat Device Tree Definitions */ #define CONFIG_OF_LIBFDT #define CONFIG_OF_BOARD_SETUP +#define CONFIG_OF_STDOUT_VIA_ALIAS /* new uImage format support */ #define CONFIG_FIT -- 2.1.4

3 14

[U-Boot] [PATCH 1/2] zynq-common: Define CONFIG_SYS_I2C_ZYNQ based on board config
by Michal Simek 30 Oct '15

30 Oct '15

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Enable CONFIG_SYS_I2C_ZYNQ only if it has either I2C0 or I2C1 enabled in a board config.This fixes the issue of i2c error during board init if board specific doesnt have either I2C0 or I2C1. Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- include/configs/zynq-common.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index ca5ef0430234..2d98cd27a986 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -179,7 +179,10 @@ # define CONFIG_CMD_FS_GENERIC #endif +#if defined(CONFIG_ZYNQ_I2C0) || defined(CONFIG_ZYNQ_I2C1) #define CONFIG_SYS_I2C_ZYNQ +#endif + /* I2C */ #if defined(CONFIG_SYS_I2C_ZYNQ) # define CONFIG_CMD_I2C -- 2.5.0

1 1

[U-Boot] [PATCH v3 01/10] imx: cpu: move common chip revision id's
by Adrian Alonso 30 Oct '15

30 Oct '15

Move common chip revision id's to main cpu header file mx25 generic include cpu header for chip revision Signed-off-by: Adrian Alonso <aalonso(a)freescale.com> --- Chages for V2: Resend Chages for V3: Resend arch/arm/cpu/arm926ejs/mx25/generic.c | 1 + arch/arm/include/asm/arch-imx/cpu.h | 12 ++++++++++++ arch/arm/include/asm/arch-mx25/imx-regs.h | 4 ---- arch/arm/include/asm/arch-mx5/imx-regs.h | 11 ----------- arch/arm/include/asm/arch-mx6/imx-regs.h | 4 ---- 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c index 8912098..0b1a8f4 100644 --- a/arch/arm/cpu/arm926ejs/mx25/generic.c +++ b/arch/arm/cpu/arm926ejs/mx25/generic.c @@ -13,6 +13,7 @@ #include <div64.h> #include <netdev.h> #include <asm/io.h> +#include <asm/arch-imx/cpu.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h index 7e681e9..8a75902 100644 --- a/arch/arm/include/asm/arch-imx/cpu.h +++ b/arch/arm/include/asm/arch-imx/cpu.h @@ -27,6 +27,18 @@ #define MXC_SOC_MX6 0x60 #define MXC_SOC_MX7 0x70 +#define CHIP_REV_1_0 0x10 +#define CHIP_REV_1_1 0x11 +#define CHIP_REV_1_2 0x12 +#define CHIP_REV_1_5 0x15 +#define CHIP_REV_2_0 0x20 +#define CHIP_REV_2_5 0x25 +#define CHIP_REV_3_0 0x30 + +#define BOARD_REV_1_0 0x0 +#define BOARD_REV_2_0 0x1 +#define BOARD_VER_OFFSET 0x8 + #define CS0_128 0 #define CS0_64M_CS1_64M 1 #define CS0_64M_CS1_32M_CS2_32M 2 diff --git a/arch/arm/include/asm/arch-mx25/imx-regs.h b/arch/arm/include/asm/arch-mx25/imx-regs.h index 78c4e9b..1b00ed7 100644 --- a/arch/arm/include/asm/arch-mx25/imx-regs.h +++ b/arch/arm/include/asm/arch-mx25/imx-regs.h @@ -526,8 +526,4 @@ struct cspi_regs { IMX_CSPI2_BASE, \ IMX_CSPI3_BASE -#define CHIP_REV_1_0 0x10 -#define CHIP_REV_1_1 0x11 -#define CHIP_REV_1_2 0x12 - #endif /* _IMX_REGS_H */ diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h index 5f0e1e6..e73cc07 100644 --- a/arch/arm/include/asm/arch-mx5/imx-regs.h +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -291,17 +291,6 @@ #define DP_MFD_216 (4 - 1) #define DP_MFN_216 3 -#define CHIP_REV_1_0 0x10 -#define CHIP_REV_1_1 0x11 -#define CHIP_REV_2_0 0x20 -#define CHIP_REV_2_5 0x25 -#define CHIP_REV_3_0 0x30 - -#define BOARD_REV_1_0 0x0 -#define BOARD_REV_2_0 0x1 - -#define BOARD_VER_OFFSET 0x8 - #define IMX_IIM_BASE (IIM_BASE_ADDR) #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index 74512ac..6249b33 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -325,10 +325,6 @@ #define WDOG3_BASE_ADDR (is_cpu_type(MXC_CPU_MX6UL) ? \ MX6UL_WDOG3_BASE_ADDR : MX6SX_WDOG3_BASE_ADDR) -#define CHIP_REV_1_0 0x10 -#define CHIP_REV_1_2 0x12 -#define CHIP_REV_1_5 0x15 -#define CHIP_REV_2_0 0x20 #if !(defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL)) #define IRAM_SIZE 0x00040000 #else -- 2.1.4

2 10

[U-Boot] [PATCH 1/1] imx: mx6sabresd discard PHYS_SDRAM_SIZE
by Peng Fan 30 Oct '15

30 Oct '15

This macro is not needed, since gd->ram_size is assigned value using function imx_ddr_size(). Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> --- include/configs/mx6sabresd.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index e9e3b27..bfc4f61 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -19,7 +19,6 @@ #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_CONSOLE_DEV "ttymxc0" #define CONFIG_MMCROOT "/dev/mmcblk1p2" -#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -- 1.8.4

3 5

[U-Boot] [PATCH] imx35, flea3: add FIT image support
by Heiko Schocher 30 Oct '15

30 Oct '15

add FIT image support for the flea3 board. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- include/configs/flea3.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/configs/flea3.h b/include/configs/flea3.h index f646fee..a096071 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -251,4 +251,8 @@ "else echo U-Boot not downloaded..exiting;fi\0" \ "bootcmd=run net_nfs\0" +/* Enable FIT images support */ +#define CONFIG_CMD_FDT +#define CONFIG_FIT + #endif /* __CONFIG_H */ -- 2.1.0

2 1

[U-Boot] [PATCH] ts4800: add CONFIG_OF_LIBFDT
by Damien Riegel 30 Oct '15

30 Oct '15

Linux only boots IMX.51-based boards with device tree, so this board would benefit from supporting it. Signed-off-by: Damien Riegel <damien.riegel(a)savoirfairelinux.com> Cc: Stefano Babic <sbabic(a)denx.de> --- include/configs/ts4800.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index 21f1555..1624a1b 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -24,6 +24,8 @@ #define CONFIG_HW_WATCHDOG +#define CONFIG_OF_LIBFDT + #define CONFIG_MACH_TYPE MACH_TYPE_TS48XX /* text base address used when linking */ -- 2.1.4

2 1

[U-Boot] [PATCH v2 00/14] dm: arm: zynq: Convert serial driver to driver model
by Simon Glass 30 Oct '15

30 Oct '15

This series updates the Zynq serial driver to use driver model. Along the way several problems are fixed: - Support for /chosen/stdout-path using an alias - Fix to fdtgrep which is currently breaking alias building - Avoid building u-boot-spl-dtb.bin when it is not requested - Deal with boards which have BSS in SDRAM For zynq this series makes a few changes: - Use the new SPL init procedure, which just involves a few tweaks for zynq - Add debug UART support - Move to using a separate device tree instead of embedded Only zybo has been tested. Testing on other zynq boards is welcome. They are all set up roughly the same so I expect only minor problems. This serial includes Michal's zynqmp device tree patch. Changes in v2: - Extend list of compatible strings with cadence compatible string. Michal Simek (1): ARM: zynqmp: Enable DM and OF binding Simon Glass (13): fdt: Add a function to look up a /chosen property fdt: Correct handling of alias regions fdtgrep: Simplify the alias generation code dm: serial: Deal with stdout-path with an alias dm: spl: Generate u-boot-spl-dtb.bin only when enabled dm: spl: Support device tree when BSS is in a different section arm: zynq: Use separate device tree instead of embedded arm: zynq: Drop unnecessary code in SPL board_init_f() arm: zynq: Support the debug UART dm: arm: zynq: Enable device tree control in SPL arm: zynq: dts: Add U-Boot device tree additions arm: zynq: serial: Drop non-device-tree serial driver portions arm: zynq: Move serial driver to driver model Kconfig | 10 + arch/arm/Kconfig | 7 + arch/arm/dts/Makefile | 2 +- arch/arm/dts/zynq-7000.dtsi | 1 + arch/arm/dts/zynq-microzed.dts | 5 + arch/arm/dts/zynq-picozed.dts | 5 + arch/arm/dts/zynq-zc702.dts | 1 + arch/arm/dts/zynq-zc706.dts | 1 + arch/arm/dts/zynq-zc770-xm010.dts | 1 + arch/arm/dts/zynq-zc770-xm011.dts | 1 + arch/arm/dts/zynq-zc770-xm012.dts | 1 + arch/arm/dts/zynq-zc770-xm013.dts | 1 + arch/arm/dts/zynq-zed.dts | 1 + arch/arm/dts/zynq-zybo.dts | 1 + arch/arm/dts/zynqmp-ep108.dts | 164 ++++++++++++++++ arch/arm/dts/zynqmp.dtsi | 385 +++++++++++++++++++++++++++++++++++++ arch/arm/mach-zynq/spl.c | 12 +- arch/arm/mach-zynq/u-boot-spl.lds | 10 +- configs/xilinx_zynqmp_ep_defconfig | 3 +- configs/zynq_microzed_defconfig | 2 +- configs/zynq_picozed_defconfig | 2 +- configs/zynq_zc702_defconfig | 2 +- configs/zynq_zc706_defconfig | 2 +- configs/zynq_zc70x_defconfig | 2 +- configs/zynq_zc770_xm010_defconfig | 2 +- configs/zynq_zc770_xm011_defconfig | 2 +- configs/zynq_zc770_xm012_defconfig | 2 +- configs/zynq_zc770_xm013_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- configs/zynq_zybo_defconfig | 6 +- drivers/serial/Kconfig | 7 + drivers/serial/serial-uclass.c | 30 ++- drivers/serial/serial_zynq.c | 203 ++++++++++--------- include/asm-generic/sections.h | 1 + include/configs/xilinx_zynqmp.h | 4 +- include/configs/xilinx_zynqmp_ep.h | 1 - include/configs/zynq-common.h | 6 +- include/configs/zynq_microzed.h | 1 - include/configs/zynq_picozed.h | 1 - include/configs/zynq_zc70x.h | 1 - include/configs/zynq_zc770.h | 6 - include/configs/zynq_zed.h | 1 - include/configs/zynq_zybo.h | 1 - include/fdtdec.h | 11 +- lib/fdtdec.c | 22 ++- lib/libfdt/fdt_region.c | 2 +- scripts/Makefile.spl | 2 + tools/fdtgrep.c | 32 +-- 48 files changed, 796 insertions(+), 174 deletions(-) create mode 100644 arch/arm/dts/zynqmp-ep108.dts create mode 100644 arch/arm/dts/zynqmp.dtsi -- 2.6.0.rc2.230.g3dd15c0

2 17

[U-Boot] [PATCH 00/10][v2] driver: net: ldpaa: Add support of new architeture
by Prabhakar Kushwaha 30 Oct '15

30 Oct '15

Current architecture of Freescale's DPAA2 framework is as below - Management complex Firmware, DPL and DPC are depolyed during u-boot boot sequence. - DPAA2 ethernet driver depends upon the static DPL for the DPRC, DPNI, DPBP, DPIO objects Now new architecture will support - New DPAA2 commands to manage Management Complex (MC) i.e. start mc, aiop and apply DPL from u-boot command prompt. - Create DPNI, DPBP, DPIO objects at run-time, before DPL deployement - Destroy all objects during DPL deployment. - boot Linux. Linux will use objects defined in static DPL file Prabhakar Kushwaha (10): armv8: lsch3: Fix lane protocol parsing logic driver: net: fsl-mc: Add create, destroy APIs in flibs driver: net: fsl-mc: Add APIs for DPMAC objects in FLIB armv8: ls2085aqds: Print function name during SerDes error driver: ldpaa: Add api to return linked PHY ID of DPMAC driver: net: fsl-mc: Increase MC command timeout driver: net: fsl-mc: Add DPAA2 commands to manage MC driver: net: fsl-mc: Create DPAA2 object at run-time driver: net: ldpaa: Use DPMAC as net device driver: net: ldpaa: Add debug information arch/arm/cpu/armv8/fsl-lsch3/README | 30 ++ arch/arm/cpu/armv8/fsl-lsch3/fsl_lsch3_serdes.c | 2 +- board/freescale/ls2085aqds/eth.c | 16 +- board/freescale/ls2085aqds/ls2085aqds.c | 1 - board/freescale/ls2085ardb/ls2085ardb.c | 1 - drivers/net/fsl-mc/Makefile | 3 +- drivers/net/fsl-mc/dpbp.c | 41 ++ drivers/net/fsl-mc/dpio/dpio.c | 40 ++ drivers/net/fsl-mc/dpmac.c | 222 ++++++++ drivers/net/fsl-mc/dpni.c | 40 ++ drivers/net/fsl-mc/dprc.c | 46 ++ drivers/net/fsl-mc/mc.c | 652 +++++++++++++++++------- drivers/net/fsl-mc/mc_sys.c | 2 +- drivers/net/ldpaa_eth/ldpaa_eth.c | 274 ++++++++-- drivers/net/ldpaa_eth/ldpaa_eth.h | 17 +- drivers/net/ldpaa_eth/ldpaa_wriop.c | 12 + include/configs/ls2085aqds.h | 12 - include/configs/ls2085ardb.h | 12 - include/fsl-mc/fsl_dpbp.h | 48 ++ include/fsl-mc/fsl_dpio.h | 60 +++ include/fsl-mc/fsl_dpmac.h | 468 +++++++++++++++++ include/fsl-mc/fsl_dpni.h | 189 +++++++ include/fsl-mc/fsl_dprc.h | 84 +++ include/fsl-mc/fsl_mc.h | 6 +- include/fsl-mc/fsl_mc_private.h | 26 +- include/fsl-mc/ldpaa_wriop.h | 3 +- 26 files changed, 2026 insertions(+), 281 deletions(-) create mode 100644 drivers/net/fsl-mc/dpmac.c create mode 100644 include/fsl-mc/fsl_dpmac.h -- 1.9.1

1 10

[U-Boot] [PATCH 1/3] dm: spi: Add support for all targets which requires MANUAL_RELOC
by Michal Simek 30 Oct '15

30 Oct '15

It is follow up patch based on "dm: Add support for all targets which requires MANUAL_RELOC" (sha1: 484fdf5ba058b07be5ca82763aa2b72063540ef3) to update function pointers for DM. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/spi/spi-uclass.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index d666272e39ce..27409fb088ea 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -118,6 +118,26 @@ static int spi_post_probe(struct udevice *bus) spi->max_hz = fdtdec_get_int(gd->fdt_blob, bus->of_offset, "spi-max-frequency", 0); +#if defined(CONFIG_NEEDS_MANUAL_RELOC) + struct dm_spi_ops *ops = spi_get_ops(bus); + + + if (ops->claim_bus) + ops->claim_bus += gd->reloc_off; + if (ops->release_bus) + ops->release_bus += gd->reloc_off; + if (ops->set_wordlen) + ops->set_wordlen += gd->reloc_off; + if (ops->xfer) + ops->xfer += gd->reloc_off; + if (ops->set_speed) + ops->set_speed += gd->reloc_off; + if (ops->set_mode) + ops->set_mode += gd->reloc_off; + if (ops->cs_info) + ops->cs_info += gd->reloc_off; +#endif + return 0; } -- 2.5.0

3 6