Re: [U-Boot] [PATCH 08/22] ppc: ppc440: ppc440-generic_flash_defconfig
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > Remove redundant defconfig file. Boot via flash can be configured via > Kconfig. > > Signed-off-by: Ricardo Ribalda Delgado > --- > configs/xilinx-ppc440-generic_flash_defconfig | 8 > 1 file changed, 8 deletions(-) > delete mode 100644 configs/xilinx-ppc440-generic_flash_defconfig > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 07/22] ppc: pp440-generic: Simplify Makefile
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > As a result of the specific board removal, the Makefiles can be > simplified. > > Signed-off-by: Ricardo Ribalda Delgado > --- > board/xilinx/ppc440-generic/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv3 3/9] arm: colibri-vf: Enable serial support
- Enable lpuart support on Toradex Colibri VF50/VF61 - Use UART0 for stdout. Signed-off-by: Bhuvanchandra DVAcked-by: Stefan Agner --- arch/arm/dts/vf-colibri.dtsi | 9 + 1 file changed, 9 insertions(+) diff --git a/arch/arm/dts/vf-colibri.dtsi b/arch/arm/dts/vf-colibri.dtsi index f005339..029b02c 100644 --- a/arch/arm/dts/vf-colibri.dtsi +++ b/arch/arm/dts/vf-colibri.dtsi @@ -5,6 +5,12 @@ */ #include "vf.dtsi" +/ { + chosen { + stdout-path = + }; +}; + { status = "okay"; bus-num = <1>; @@ -14,3 +20,6 @@ spi-max-frequency = <5000>; }; }; + { + status = "okay"; +}; -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv3 2/9] arm: vybrid: Update the license string
Since SPDX license is already there, drop the full one. Signed-off-by: Bhuvanchandra DV--- arch/arm/dts/vf-colibri.dtsi | 5 - arch/arm/dts/vf.dtsi | 5 - arch/arm/dts/vf500-colibri.dts | 5 - arch/arm/dts/vf610-colibri.dts | 5 - 4 files changed, 20 deletions(-) diff --git a/arch/arm/dts/vf-colibri.dtsi b/arch/arm/dts/vf-colibri.dtsi index 7a8e9bee..f005339 100644 --- a/arch/arm/dts/vf-colibri.dtsi +++ b/arch/arm/dts/vf-colibri.dtsi @@ -2,11 +2,6 @@ * Copyright 2014 Toradex AG * * SPDX-License-Identifier: GPL-2.0+ or X11 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include "vf.dtsi" diff --git a/arch/arm/dts/vf.dtsi b/arch/arm/dts/vf.dtsi index 7aa4c91..1530d2f 100644 --- a/arch/arm/dts/vf.dtsi +++ b/arch/arm/dts/vf.dtsi @@ -2,11 +2,6 @@ * Copyright 2013 Freescale Semiconductor, Inc. * * SPDX-License-Identifier: GPL-2.0+ or X11 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ /include/ "skeleton.dtsi" diff --git a/arch/arm/dts/vf500-colibri.dts b/arch/arm/dts/vf500-colibri.dts index e383306..02d0ce8 100644 --- a/arch/arm/dts/vf500-colibri.dts +++ b/arch/arm/dts/vf500-colibri.dts @@ -2,11 +2,6 @@ * Copyright 2014 Toradex AG * * SPDX-License-Identifier: GPL-2.0+ or X11 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ /dts-v1/; diff --git a/arch/arm/dts/vf610-colibri.dts b/arch/arm/dts/vf610-colibri.dts index 63bb3f4..24dfcbe 100644 --- a/arch/arm/dts/vf610-colibri.dts +++ b/arch/arm/dts/vf610-colibri.dts @@ -2,11 +2,6 @@ * Copyright 2014 Toradex AG * * SPDX-License-Identifier: GPL-2.0+ or X11 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ /dts-v1/; -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] fsl:usb: Make fsl usb device-tree fixup arch independent
On Tuesday, January 26, 2016 at 12:36:57 PM, Ramneek Mehresh wrote: > Move usb device-tree fixup from ehci drv so that it becomes > available to all ppc and arm platforms > > Signed-off-by: Ramneek Mehresh> --- > board/freescale/common/Makefile | 2 + > board/freescale/common/usb.c| 203 > board/freescale/corenet_ds/corenet_ds.c | > 1 - > drivers/usb/host/ehci-fsl.c | 196 > -- include/fdt_support.h | > 4 +- > 5 files changed, 207 insertions(+), 199 deletions(-) > create mode 100644 board/freescale/common/usb.c Use git format-patch -M -C and resubmit, I am not gonna review this. Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 20/22] ppc: xilinx_ppc440_generic: Remove uncalled functions
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > board_pre_init was not called because CONFIG_BOARD_EARLY_INIT_F was not > set. Remove unused function. > > Signed-off-by: Ricardo Ribalda Delgado > --- > board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 5 - > 1 file changed, 5 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 17/22] ppc: xilinx_ppc405_generic: Remove weak attributes
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > Now that the specific boards have been removed there is no need to > maintain the weak functions. > > Fix also CamelCase to make checkpatch happy > > Signed-off-by: Ricardo Ribalda Delgado > --- > .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 22 > -- > 1 file changed, 8 insertions(+), 14 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 19/22] ppc: xilinx_ppc405_generic: Remove uncalled functions
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > board_pre_init was not called because CONFIG_BOARD_EARLY_INIT_F was not > set. Remove unused function. > > Signed-off-by: Ricardo Ribalda Delgado > --- > board/xilinx/ppc405-generic/xilinx_ppc405_generic.c | 5 - > 1 file changed, 5 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 21/22] net: xilinx_ll_temac: Fix string overflow
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > Size of this snprintf "lltemac.%lx" is bigger than 16 characters. > Replacing it with "ll_tem.%lx" > > Signed-off-by: Ricardo Ribalda Delgado > --- > drivers/net/xilinx_ll_temac.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 2/2] imx: mx6sxsabreauto: Add support for mx6sx SABREAUTO board
Initial version for mx6sx SABREAUTO board support with features: PMIC, QSPI, NAND flash, SD/MMC, USB, Ethernet, I2C, IO Expander. Signed-off-by: Ye Li--- Changes for v2: - None arch/arm/cpu/armv7/mx6/Kconfig |6 + board/freescale/mx6sxsabreauto/Kconfig | 12 + board/freescale/mx6sxsabreauto/MAINTAINERS |6 + board/freescale/mx6sxsabreauto/Makefile |6 + board/freescale/mx6sxsabreauto/imximage.cfg | 136 ++ board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 508 +++ configs/mx6sxsabreauto_defconfig| 11 + include/configs/mx6sxsabreauto.h| 212 ++ 8 files changed, 897 insertions(+), 0 deletions(-) create mode 100644 board/freescale/mx6sxsabreauto/Kconfig create mode 100644 board/freescale/mx6sxsabreauto/MAINTAINERS create mode 100644 board/freescale/mx6sxsabreauto/Makefile create mode 100644 board/freescale/mx6sxsabreauto/imximage.cfg create mode 100644 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c create mode 100644 configs/mx6sxsabreauto_defconfig create mode 100644 include/configs/mx6sxsabreauto.h diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index 8489182..c72a150 100644 --- a/arch/arm/cpu/armv7/mx6/Kconfig +++ b/arch/arm/cpu/armv7/mx6/Kconfig @@ -96,6 +96,11 @@ config TARGET_MX6SXSABRESD select DM select DM_THERMAL +config TARGET_MX6SXSABREAUTO +bool "mx6sxsabreauto" +select DM +select DM_THERMAL + config TARGET_MX6UL_9X9_EVK bool "mx6ul_9x9_evk" select MX6UL @@ -166,6 +171,7 @@ source "board/freescale/mx6qsabreauto/Kconfig" source "board/freescale/mx6sabresd/Kconfig" source "board/freescale/mx6slevk/Kconfig" source "board/freescale/mx6sxsabresd/Kconfig" +source "board/freescale/mx6sxsabreauto/Kconfig" source "board/freescale/mx6ul_14x14_evk/Kconfig" source "board/gateworks/gw_ventana/Kconfig" source "board/kosagi/novena/Kconfig" diff --git a/board/freescale/mx6sxsabreauto/Kconfig b/board/freescale/mx6sxsabreauto/Kconfig new file mode 100644 index 000..ae2ea02 --- /dev/null +++ b/board/freescale/mx6sxsabreauto/Kconfig @@ -0,0 +1,12 @@ +if TARGET_MX6SXSABREAUTO + +config SYS_BOARD + default "mx6sxsabreauto" + +config SYS_VENDOR + default "freescale" + +config SYS_CONFIG_NAME + default "mx6sxsabreauto" + +endif diff --git a/board/freescale/mx6sxsabreauto/MAINTAINERS b/board/freescale/mx6sxsabreauto/MAINTAINERS new file mode 100644 index 000..6f2ff44 --- /dev/null +++ b/board/freescale/mx6sxsabreauto/MAINTAINERS @@ -0,0 +1,6 @@ +MX6SXSABREAUTO BOARD +M: Fabio Estevam +S: Maintained +F: board/freescale/mx6sxsabreauto/ +F: include/configs/mx6sxsabreauto.h +F: configs/mx6sxsabreauto_defconfig diff --git a/board/freescale/mx6sxsabreauto/Makefile b/board/freescale/mx6sxsabreauto/Makefile new file mode 100644 index 000..f0cd1ce --- /dev/null +++ b/board/freescale/mx6sxsabreauto/Makefile @@ -0,0 +1,6 @@ +# (C) Copyright 2014 Freescale Semiconductor, Inc. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y := mx6sxsabreauto.o diff --git a/board/freescale/mx6sxsabreauto/imximage.cfg b/board/freescale/mx6sxsabreauto/imximage.cfg new file mode 100644 index 000..529e555 --- /dev/null +++ b/board/freescale/mx6sxsabreauto/imximage.cfg @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2014 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#define __ASSEMBLY__ +#include + +/* image version */ + +IMAGE_VERSION 2 + +/* + * Boot Device : one of + * spi/sd/nand/onenand, qspi/nor + */ + +BOOT_FROM sd + +/* + * Device Configuration Data (DCD) + * + * Each entry must have the format: + * Addr-type AddressValue + * + * where: + * Addr-type register length (1,2 or 4 bytes) + * Address absolute address of the register + * value value to be stored in the register + */ + +/* Enable all clocks */ +DATA 4 0x020c4068 0x +DATA 4 0x020c406c 0x +DATA 4 0x020c4070 0x +DATA 4 0x020c4074 0x +DATA 4 0x020c4078 0x +DATA 4 0x020c407c 0x +DATA 4 0x020c4080 0x +DATA 4 0x020c4084 0x + +/* IOMUX - DDR IO Type */ +DATA 4 0x020e0618 0x000c +DATA 4 0x020e05fc 0x + +/* Clock */ +DATA 4 0x020e032c 0x0030 + +/* Address */ +DATA 4 0x020e0300 0x0030 +DATA 4 0x020e02fc 0x0030 +DATA 4 0x020e05f4 0x0030 + +/* Control */ +DATA 4 0x020e0340 0x0030 + +DATA 4 0x020e0320 0x +DATA 4 0x020e0310 0x0030 +DATA 4 0x020e0314 0x0030 +DATA 4 0x020e0614 0x0030 + +/* Data Strobe */ +DATA 4 0x020e05f8 0x0002 +DATA 4 0x020e0330 0x0030 +DATA 4 0x020e0334 0x0030 +DATA 4 0x020e0338 0x0030 +DATA 4 0x020e033c 0x0030 + +/* Data */ +DATA 4 0x020e0608 0x0002 +DATA 4 0x020e060c 0x0030 +DATA 4 0x020e0610 0x0030 +DATA 4 0x020e061c
[U-Boot] [PATCH v2 1/2] mx6: soc: Add ENET2 mac address support
The i.MX6SX and i.MX6UL has two ENET controllers, add support for reading MAC address from fuse for ENET2. Signed-off-by: Ye Li--- Changes for v2: - Add second MAC address to README.imx6. - Rename mac_addr_low and mac_addr_high fields to mac_addr0 and mac_addr1 to align with the reigster names in RM. arch/arm/cpu/armv7/mx6/soc.c | 32 + arch/arm/include/asm/arch-mx6/imx-regs.h | 23 ++-- doc/README.imx6 |5 +++- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index bf5ae8c..f83dfa0 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -364,15 +364,29 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) struct fuse_bank4_regs *fuse = (struct fuse_bank4_regs *)bank->fuse_regs; - u32 value = readl(>mac_addr_high); - mac[0] = (value >> 8); - mac[1] = value ; - - value = readl(>mac_addr_low); - mac[2] = value >> 24 ; - mac[3] = value >> 16 ; - mac[4] = value >> 8 ; - mac[5] = value ; + if ((is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL)) && + 1 == dev_id) { + u32 value = readl(>mac_addr2); + mac[0] = value >> 24 ; + mac[1] = value >> 16 ; + mac[2] = value >> 8 ; + mac[3] = value ; + + value = readl(>mac_addr1); + mac[4] = value >> 24 ; + mac[5] = value >> 16 ; + + } else { + u32 value = readl(>mac_addr1); + mac[0] = (value >> 8); + mac[1] = value ; + + value = readl(>mac_addr0); + mac[2] = value >> 24 ; + mac[3] = value >> 16 ; + mac[4] = value >> 8 ; + mac[5] = value ; + } } #endif diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index f24525e..5c45bf6 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -715,39 +715,22 @@ struct fuse_bank1_regs { u32 rsvd7[3]; }; -#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL)) struct fuse_bank4_regs { u32 sjc_resp_low; u32 rsvd0[3]; u32 sjc_resp_high; u32 rsvd1[3]; - u32 mac_addr_low; + u32 mac_addr0; u32 rsvd2[3]; - u32 mac_addr_high; + u32 mac_addr1; u32 rsvd3[3]; - u32 mac_addr2; + u32 mac_addr2; /*For i.MX6SX and i.MX6UL*/ u32 rsvd4[7]; u32 gp1; u32 rsvd5[3]; u32 gp2; u32 rsvd6[3]; }; -#else -struct fuse_bank4_regs { - u32 sjc_resp_low; - u32 rsvd0[3]; - u32 sjc_resp_high; - u32 rsvd1[3]; - u32 mac_addr_low; - u32 rsvd2[3]; - u32 mac_addr_high; - u32 rsvd3[0xb]; - u32 gp1; - u32 rsvd4[3]; - u32 gp2; - u32 rsvd5[3]; -}; -#endif struct aipstz_regs { u32 mprot0; diff --git a/doc/README.imx6 b/doc/README.imx6 index e26ab71..7c9a4ac 100644 --- a/doc/README.imx6 +++ b/doc/README.imx6 @@ -7,7 +7,10 @@ SoC. --- 1.1 MAC Address: It is stored in fuse bank 4, with the 32 lsbs in word 2 and the -16 msbs in word 3. +16 msbs in word 3[15:0]. +For i.MX6SX and i.MX6UL, they have two MAC addresses. The second MAC address +is stored in fuse bank 4, with the 16 lsb in word 3[31:16] and the 32 msbs in +word 4. Example: -- 1.7.4.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] env_mmc: support overriding mmc dev from board code
On Tue, Jan 26, 2016 at 10:53:58AM +0800, Peng Fan wrote: > Yeah. The patch I wrote include fix write_env, and a function prototype in > header file. > > If the current patch already applied, I can write a follow up patch. > > Thanks, > Peng. > Hi Peng, sorry, I did not know there was already a similar patch. However, now when looking over your patch, it tries to fix read_env and write_env, which is not necessary, because the device number is stored in struct mmc. What's missing though is the function prototype in the header. Tom, should I send a v2 of the patch or a follow-up? Or do you want to fix this up, Peng? Thanks. Clemens ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv3 9/9] dm: vybrid_gpio: Drop legacy code
All boards using this driver are with device tree support, hence drop the legacy code in driver to have a pure DT solution. Signed-off-by: Bhuvanchandra DVReviewed-by: Bin Meng --- drivers/gpio/vybrid_gpio.c | 18 -- 1 file changed, 18 deletions(-) diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c index 4d25f9a..a30ba5d 100644 --- a/drivers/gpio/vybrid_gpio.c +++ b/drivers/gpio/vybrid_gpio.c @@ -135,24 +135,6 @@ static int vybrid_gpio_bind(struct udevice *dev) return 0; } -#if !CONFIG_IS_ENABLED(OF_CONTROL) -static const struct vybrid_gpio_platdata vybrid_gpio[] = { - {0, GPIO0_BASE_ADDR, "GPIO0 "}, - {1, GPIO1_BASE_ADDR, "GPIO1 "}, - {2, GPIO2_BASE_ADDR, "GPIO2 "}, - {3, GPIO3_BASE_ADDR, "GPIO3 "}, - {4, GPIO4_BASE_ADDR, "GPIO4 "}, -}; - -U_BOOT_DEVICES(vybrid_gpio) = { - { "gpio_vybrid", _gpio[0] }, - { "gpio_vybrid", _gpio[1] }, - { "gpio_vybrid", _gpio[2] }, - { "gpio_vybrid", _gpio[3] }, - { "gpio_vybrid", _gpio[4] }, -}; -#endif - static const struct udevice_id vybrid_gpio_ids[] = { { .compatible = "fsl,vf610-gpio" }, { } -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 00/22] xilinx-ppc4xx: Cleanout and port to DM serial
Hello Michal Thanks for your fast review :). Usually my patches were through Stefan Roese (sorry, I forgot to add you as cc in the patchset :( ) In this case, as it depends on yuour patches I do not know what should be the right path. Tom, Stefan what do you propose? Regards! On Tue, Jan 26, 2016 at 12:55 PM, Michal Simekwrote: > On 26.1.2016 11:24, Ricardo Ribalda Delgado wrote: >> xilinx-ppc4xx made us of serial uartlite, which was ported to DM. >> This patch moves port these boards to DM. >> >> Now that Kconfig works really well, there is no need to maintain >> the specific boards (fx12mm, ml507 and v5fx30teval) or their flash >> version. >> >> The ppc440 boards have been wired to the ll_temac driver. >> >> A series of cleanouts have been done. >> >> This patchset sits on top of: >> http://git.denx.de/?p=u-boot/u-boot-microblaze.git;a=shortlog;h=refs/heads/mb >> >> It has been tested on a ppc440 bard. >> >> Hopefully Georg Schardt can test the changes on his fx12mm. >> >> These changes can also be browset at >> https://github.com/ribalda/u-boot/tree/xilinx-ppc4xx-generic-dm >> >> >> Regards (and thanks for your patience)! >> >> >> >> Ricardo Ribalda (22): >> ppc: xilinx-ppc440: Remove support for ml507 >> ppc: xilinx-ppc405: Remove support for fx12mm >> xilinx-ppc440: Remove support for v5fx30teval >> .mailmap: Add all the mail alias for Ricardo Ribalda >> mailaddr: Update mail address >> ppc: pp405-generic: Simplify Makefile >> ppc: pp440-generic: Simplify Makefile >> ppc: ppc440: ppc440-generic_flash_defconfig >> ppc: ppc405: ppc405-generic_flash_defconfig >> ppc: xilinx-ppc440-generic: Cleanout header files >> ppc: xilinx-ppc405-generic: Cleanout header files >> ppc: xilinx-ppc4xx-generic: Update xparameters.h >> ppc: dts: Add device tree for xilix-ppc4xx-generic >> configs/xilinx-ppc405-generic: Typos and size >> configs/xilinx-ppc440-generic: Typos and size >> ppc: xilinx-ppc4xx: Port to DM serial >> ppc: xilinx_ppc405_generic: Remove weak attributes >> ppc: xilinx_ppc440_generic: Remove weak attributes >> ppc: xilinx_ppc405_generic: Remove uncalled functions >> ppc: xilinx_ppc440_generic: Remove uncalled functions >> net: xilinx_ll_temac: Fix string overflow >> ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver >> >> .mailmap | 3 ++ >> arch/powerpc/cpu/ppc4xx/Kconfig| 20 - >> arch/powerpc/cpu/ppc4xx/interrupts.c | 2 +- >> arch/powerpc/cpu/ppc4xx/uic.c | 2 +- >> arch/powerpc/cpu/ppc4xx/xilinx_irq.c | 2 +- >> arch/powerpc/dts/Makefile | 2 + >> arch/powerpc/dts/xilinx-ppc405-generic.dts | 13 ++ >> arch/powerpc/dts/xilinx-ppc440-generic.dts | 13 ++ >> arch/powerpc/include/asm/interrupt.h | 2 +- >> arch/powerpc/include/asm/xilinx_irq.h | 2 +- >> board/avnet/fx12mm/Kconfig | 12 -- >> board/avnet/fx12mm/MAINTAINERS | 7 --- >> board/avnet/fx12mm/Makefile| 11 - >> board/avnet/fx12mm/fx12mm.c| 34 --- >> board/avnet/fx12mm/xparameters.h | 35 --- >> board/avnet/v5fx30teval/Kconfig| 12 -- >> board/avnet/v5fx30teval/MAINTAINERS| 7 --- >> board/avnet/v5fx30teval/Makefile | 11 - >> board/avnet/v5fx30teval/v5fx30teval.c | 17 >> board/avnet/v5fx30teval/xparameters.h | 22 -- >> board/xilinx/ml507/Kconfig | 12 -- >> board/xilinx/ml507/MAINTAINERS | 7 --- >> board/xilinx/ml507/Makefile| 11 - >> board/xilinx/ml507/ml507.c | 17 >> board/xilinx/ml507/xparameters.h | 23 -- >> board/xilinx/ppc405-generic/MAINTAINERS| 2 +- >> board/xilinx/ppc405-generic/Makefile | 4 +- >> .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 31 ++ >> board/xilinx/ppc405-generic/xparameters.h | 7 ++- >> board/xilinx/ppc440-generic/MAINTAINERS| 2 +- >> board/xilinx/ppc440-generic/Makefile | 6 +-- >> board/xilinx/ppc440-generic/init.S | 2 +- >> .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 49 >> ++--- >> board/xilinx/ppc440-generic/xparameters.h | 15 --- >> configs/fx12mm_defconfig | 10 - >> configs/fx12mm_flash_defconfig | 9 >> configs/ml507_defconfig| 9 >> configs/ml507_flash_defconfig | 8 >> configs/v5fx30teval_defconfig | 9 >> configs/v5fx30teval_flash_defconfig| 8
Re: [U-Boot] [PATCH 18/22] ppc: xilinx_ppc440_generic: Remove weak attributes
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > Now that the specific boards have been removed there is no need to > maintain the weak functions. > > Fix also CamelCase to make checkpatch happy > > Signed-off-by: Ricardo Ribalda Delgado > --- > board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 18 +++--- > 1 file changed, 7 insertions(+), 11 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 13/22] ppc: dts: Add device tree for xilix-ppc4xx-generic
Hi Ricardo, On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > Add device tree example file for xilinx-ppc440-generic and > xilinx-ppc405-generic > > Signed-off-by: Ricardo Ribalda Delgado > --- > arch/powerpc/dts/Makefile | 2 ++ > arch/powerpc/dts/xilinx-ppc405-generic.dts | 13 + > arch/powerpc/dts/xilinx-ppc440-generic.dts | 13 + > 3 files changed, 28 insertions(+) > create mode 100644 arch/powerpc/dts/xilinx-ppc405-generic.dts > create mode 100644 arch/powerpc/dts/xilinx-ppc440-generic.dts > > diff --git a/arch/powerpc/dts/Makefile b/arch/powerpc/dts/Makefile > index 5d9f5c2822b2..80b4c0c4e374 100644 > --- a/arch/powerpc/dts/Makefile > +++ b/arch/powerpc/dts/Makefile > @@ -3,6 +3,8 @@ > # > > dtb-$(CONFIG_TARGET_CANYONLANDS) += arches.dtb canyonlands.dtb glacier.dtb > +dtb-$(CONFIG_TARGET_XILINX_PPC440_GENERIC) += xilinx-ppc440-generic.dtb > +dtb-$(CONFIG_TARGET_XILINX_PPC405_GENERIC) += xilinx-ppc405-generic.dtb > > targets += $(dtb-y) > > diff --git a/arch/powerpc/dts/xilinx-ppc405-generic.dts > b/arch/powerpc/dts/xilinx-ppc405-generic.dts > new file mode 100644 > index ..23c89335831e > --- /dev/null > +++ b/arch/powerpc/dts/xilinx-ppc405-generic.dts > @@ -0,0 +1,13 @@ > +/dts-v1/; nits: should have a blank line here > +/ { > + #address-cells = <1>; > + #size-cells = <1>; nits: ditto > + aliases { > + console = > + } ; nits: ditto > + uart0: serial@8400 { > + compatible = "xlnx,xps-uartlite-1.00.a"; > + interrupts = <0 0>; > + reg = <0x8400 0x1>; > + }; > +} ; > diff --git a/arch/powerpc/dts/xilinx-ppc440-generic.dts > b/arch/powerpc/dts/xilinx-ppc440-generic.dts > new file mode 100644 > index ..faae9fffcd0e > --- /dev/null > +++ b/arch/powerpc/dts/xilinx-ppc440-generic.dts > @@ -0,0 +1,13 @@ > +/dts-v1/; > +/ { > + #address-cells = <1>; > + #size-cells = <1>; > + aliases { > + console = > + } ; > + uart0: serial@8b00 { > + compatible = "xlnx,xps-uartlite-1.00.a"; > + interrupts = <0 0>; > + reg = <0x8b00 0x1>; > + }; > +} ; > -- BTW no /chosen node? Regards, Bin ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 22/22] ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver
Hi Ricardo, On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > If the xparameters file contains a LL_TEMAC definition compile its > driver and the net commands. > > Signed-off-by: Ricardo Ribalda Delgado > --- > .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 22 > ++ > board/xilinx/ppc440-generic/xparameters.h | 4 > configs/xilinx-ppc440-generic_defconfig| 5 + > include/configs/xilinx-ppc440-generic.h| 10 ++ > 4 files changed, 41 insertions(+) > > diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c > b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c > index 0e3ab94e31ef..d8233529304d 100644 > --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c > +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c > @@ -8,6 +8,7 @@ > > #include > #include > +#include > #include > > int checkboard(void) > @@ -34,3 +35,24 @@ void get_sys_info(sys_info_t *sys_info) > int get_serial_clock(void){ > return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; > } > + > +int board_eth_init(bd_t *bis) > +{ > + int ret = 0; > + > + puts("Init xilinx temac\n"); > +#ifdef XPAR_LLTEMAC_0_BASEADDR > + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_0_BASEADDR, > + XILINX_LL_TEMAC_M_SDMA_DCR | > XILINX_LL_TEMAC_M_SDMA_PLB, > + XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR); > + > +#endif > + > +#ifdef XPAR_LLTEMAC_1_BASEADDR > + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_1_BASEADDR, > + XILINX_LL_TEMAC_M_SDMA_DCR | > XILINX_LL_TEMAC_M_SDMA_PLB, > + XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR); > +#endif No DM ethernet driver for LLTEMAC? > + > + return ret; > +} > diff --git a/board/xilinx/ppc440-generic/xparameters.h > b/board/xilinx/ppc440-generic/xparameters.h > index 9685560673ab..b45a6a1d7668 100644 > --- a/board/xilinx/ppc440-generic/xparameters.h > +++ b/board/xilinx/ppc440-generic/xparameters.h > @@ -18,5 +18,9 @@ > #define XPAR_CORE_CLOCK_FREQ_HZ4 > #define XPAR_INTC_MAX_NUM_INTR_INPUTS 32 > #define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 1 > +#define XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR 0x80 > +#define XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR 0x98 > +#define XPAR_LLTEMAC_0_BASEADDR0x8300 > +#define XPAR_LLTEMAC_1_BASEADDR0x8340 > > #endif > diff --git a/configs/xilinx-ppc440-generic_defconfig > b/configs/xilinx-ppc440-generic_defconfig > index c66357e08724..64b55ee1359e 100644 > --- a/configs/xilinx-ppc440-generic_defconfig > +++ b/configs/xilinx-ppc440-generic_defconfig > @@ -11,3 +11,8 @@ CONFIG_OF_CONTROL=y > CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" > +CONFIG_CMD_TFTPPUT=y > +CONFIG_CMD_DHCP=y > +CONFIG_CMD_PING=y > +CONFIG_NETCONSOLE=y > + > diff --git a/include/configs/xilinx-ppc440-generic.h > b/include/configs/xilinx-ppc440-generic.h > index 2af5f7fc1de5..8b9d37f42e03 100644 > --- a/include/configs/xilinx-ppc440-generic.h > +++ b/include/configs/xilinx-ppc440-generic.h > @@ -33,6 +33,16 @@ > #define MTDIDS_DEFAULT "nor0=flash" > #define MTDPARTS_DEFAULT "mtdparts=flash:-(user)" > > +/*Net*/ nits: /* Net */ > +#ifdef XPAR_LLTEMAC_0_BASEADDR > +#define CONFIG_XILINX_LL_TEMAC > +#define CONFIG_MII > +#define CONFIG_PHYLIB > +#define CONFIG_PHY_MARVELL > +#define CONFIG_NET_RANDOM_ETHADDR > +#define CONFIG_LIB_RAND I believe we can move part of these into boards' defconfig files, and if with DM ethernet plus OF control we can always enable the driver. > +#endif > + > /*Generic Configs*/ > #include > > -- Regards, Bin ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 10/22] ppc: xilinx-ppc440-generic: Cleanout header files
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > Now that there is only one header file for all ppc440 files, merge > header files. > > Signed-off-by: Ricardo Ribalda Delgado > --- > include/configs/xilinx-ppc440-generic.h | 3 ++- > include/configs/xilinx-ppc440.h | 17 - > 2 files changed, 2 insertions(+), 18 deletions(-) > delete mode 100644 include/configs/xilinx-ppc440.h > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv3 0/9] Migrate NXP/Freescale Vybrid based boards to support pure DT
Changes since v2: - Split the patch for updating the license string. - Reorder the patchset to avoid broken state. Changes since v1: - Update the license string in device tree's. - Update all lpuart's uart nodes in device tree. - Dropped *_dtb_defconfig and updated the default defconfig's with DT support. - Reordered defconfig's using defconfig via savedefconfig. - Use one patch to update all Vybrid based board defconfig's. - Dropped vybrid_gpio driver legacy code. Thanks! Stefan for pointing this. - Dropped the legacy way of enabling GPIO, UART and SPI on NXP/Freescale Vybrid based board's. - Compile checked for vf610twr and pcm052 since I don't have access to such hardware at my end. Reviewer's and tester's welcome! Bhuvanchandra DV (9): arm: vybrid: Enable lpuart support arm: vybrid: Update the license string arm: colibri-vf: Enable serial support arm: vybrid: Drop enabling GPIO, UART and SPI in legacy mode arm: vf610-twr: Add device tree file's arm: pcm052: Add device tree file's arm: vybrid: Update defconfig's dm: lpuart: Drop the legacy code dm: vybrid_gpio: Drop legacy code arch/arm/dts/Makefile| 4 +- arch/arm/dts/pcm052.dts | 22 + arch/arm/dts/vf-colibri.dtsi | 14 -- arch/arm/dts/vf.dtsi | 48 +-- arch/arm/dts/vf500-colibri.dts | 5 -- arch/arm/dts/vf610-colibri.dts | 5 -- arch/arm/dts/vf610-twr.dts | 22 + configs/colibri_vf_defconfig | 8 configs/colibri_vf_dtb_defconfig | 14 -- configs/pcm052_defconfig | 7 +++ configs/vf610twr_defconfig | 7 +++ configs/vf610twr_nand_defconfig | 7 +++ drivers/gpio/vybrid_gpio.c | 18 --- drivers/serial/serial_lpuart.c | 101 +-- include/configs/colibri_vf.h | 13 - include/configs/pcm052.h | 3 -- include/configs/vf610twr.h | 3 -- 17 files changed, 130 insertions(+), 171 deletions(-) create mode 100644 arch/arm/dts/pcm052.dts create mode 100644 arch/arm/dts/vf610-twr.dts delete mode 100644 configs/colibri_vf_dtb_defconfig -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv3 1/9] arm: vybrid: Enable lpuart support
Add device tree node's for lpuart on Vybrid platform Signed-off-by: Bhuvanchandra DV--- arch/arm/dts/vf.dtsi | 43 +++ 1 file changed, 43 insertions(+) diff --git a/arch/arm/dts/vf.dtsi b/arch/arm/dts/vf.dtsi index 78706e1..7aa4c91 100644 --- a/arch/arm/dts/vf.dtsi +++ b/arch/arm/dts/vf.dtsi @@ -17,6 +17,12 @@ gpio2 = gpio3 = gpio4 = + serial0 = + serial1 = + serial2 = + serial3 = + serial4 = + serial5 = spi0 = spi1 = }; @@ -33,6 +39,30 @@ #size-cells = <1>; ranges; + uart0: serial@40027000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x40027000 0x1000>; + status = "disabled"; + }; + + uart1: serial@40028000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x40028000 0x1000>; + status = "disabled"; + }; + + uart2: serial@40029000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x40029000 0x1000>; + status = "disabled"; + }; + + uart3: serial@4002a000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x4002a000 0x1000>; + status = "disabled"; + }; + dspi0: dspi0@4002c000 { #address-cells = <1>; #size-cells = <0>; @@ -95,6 +125,19 @@ #address-cells = <1>; #size-cells = <1>; ranges; + + uart4: serial@400a9000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x400a9000 0x1000>; + status = "disabled"; + }; + + uart5: serial@400aa000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x400aa000 0x1000>; + status = "disabled"; + }; + }; }; }; -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 22/22] ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver
If the xparameters file contains a LL_TEMAC definition compile its driver and the net commands. Signed-off-by: Ricardo Ribalda Delgado--- .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 22 ++ board/xilinx/ppc440-generic/xparameters.h | 4 configs/xilinx-ppc440-generic_defconfig| 5 + include/configs/xilinx-ppc440-generic.h| 10 ++ 4 files changed, 41 insertions(+) diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c index 0e3ab94e31ef..d8233529304d 100644 --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c @@ -8,6 +8,7 @@ #include #include +#include #include int checkboard(void) @@ -34,3 +35,24 @@ void get_sys_info(sys_info_t *sys_info) int get_serial_clock(void){ return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; } + +int board_eth_init(bd_t *bis) +{ + int ret = 0; + + puts("Init xilinx temac\n"); +#ifdef XPAR_LLTEMAC_0_BASEADDR + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_0_BASEADDR, + XILINX_LL_TEMAC_M_SDMA_DCR | XILINX_LL_TEMAC_M_SDMA_PLB, + XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR); + +#endif + +#ifdef XPAR_LLTEMAC_1_BASEADDR + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_1_BASEADDR, + XILINX_LL_TEMAC_M_SDMA_DCR | XILINX_LL_TEMAC_M_SDMA_PLB, + XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR); +#endif + + return ret; +} diff --git a/board/xilinx/ppc440-generic/xparameters.h b/board/xilinx/ppc440-generic/xparameters.h index 9685560673ab..b45a6a1d7668 100644 --- a/board/xilinx/ppc440-generic/xparameters.h +++ b/board/xilinx/ppc440-generic/xparameters.h @@ -18,5 +18,9 @@ #define XPAR_CORE_CLOCK_FREQ_HZ4 #define XPAR_INTC_MAX_NUM_INTR_INPUTS 32 #define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 1 +#define XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR 0x80 +#define XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR 0x98 +#define XPAR_LLTEMAC_0_BASEADDR0x8300 +#define XPAR_LLTEMAC_1_BASEADDR0x8340 #endif diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig index c66357e08724..64b55ee1359e 100644 --- a/configs/xilinx-ppc440-generic_defconfig +++ b/configs/xilinx-ppc440-generic_defconfig @@ -11,3 +11,8 @@ CONFIG_OF_CONTROL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_NETCONSOLE=y + diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h index 2af5f7fc1de5..8b9d37f42e03 100644 --- a/include/configs/xilinx-ppc440-generic.h +++ b/include/configs/xilinx-ppc440-generic.h @@ -33,6 +33,16 @@ #define MTDIDS_DEFAULT "nor0=flash" #define MTDPARTS_DEFAULT "mtdparts=flash:-(user)" +/*Net*/ +#ifdef XPAR_LLTEMAC_0_BASEADDR +#define CONFIG_XILINX_LL_TEMAC +#define CONFIG_MII +#define CONFIG_PHYLIB +#define CONFIG_PHY_MARVELL +#define CONFIG_NET_RANDOM_ETHADDR +#define CONFIG_LIB_RAND +#endif + /*Generic Configs*/ #include -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 18/22] ppc: xilinx_ppc440_generic: Remove weak attributes
Now that the specific boards have been removed there is no need to maintain the weak functions. Fix also CamelCase to make checkpatch happy Signed-off-by: Ricardo Ribalda Delgado--- board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c index f92a3033e14d..52c63f20583e 100644 --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c @@ -10,35 +10,31 @@ #include #include -int __board_pre_init(void) +int board_pre_init(void) { return 0; } -int board_pre_init(void) __attribute__((weak, alias("__board_pre_init"))); -int __checkboard(void) +int checkboard(void) { puts("Xilinx PPC440 Generic Board\n"); return 0; } -int checkboard(void) __attribute__((weak, alias("__checkboard"))); -phys_size_t __initdram(int board_type) +phys_size_t initdram(int board_type) { return get_ram_size(XPAR_DDR2_SDRAM_MEM_BASEADDR, CONFIG_SYS_SDRAM_SIZE_MB * 1024 * 1024); } -phys_size_t initdram(int) __attribute__((weak, alias("__initdram"))); -void __get_sys_info(sys_info_t *sysInfo) +void get_sys_info(sys_info_t *sys_info) { - sysInfo->freqProcessor = XPAR_CORE_CLOCK_FREQ_HZ; - sysInfo->freqPLB = XPAR_PLB_CLOCK_FREQ_HZ; - sysInfo->freqPCI = 0; + sys_info->freqProcessor = XPAR_CORE_CLOCK_FREQ_HZ; + sys_info->freqPLB = XPAR_PLB_CLOCK_FREQ_HZ; + sys_info->freqPCI = 0; return; } -void get_sys_info(sys_info_t *) __attribute__((weak, alias("__get_sys_info"))); int get_serial_clock(void){ return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 21/22] net: xilinx_ll_temac: Fix string overflow
Size of this snprintf "lltemac.%lx" is bigger than 16 characters. Replacing it with "ll_tem.%lx" Signed-off-by: Ricardo Ribalda Delgado--- drivers/net/xilinx_ll_temac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/xilinx_ll_temac.c b/drivers/net/xilinx_ll_temac.c index 7cc86571e495..ca09546ab59f 100644 --- a/drivers/net/xilinx_ll_temac.c +++ b/drivers/net/xilinx_ll_temac.c @@ -303,7 +303,8 @@ int xilinx_ll_temac_initialize(bd_t *bis, struct ll_temac_info *devinf) if (devinf->devname) { strncpy(dev->name, devinf->devname, sizeof(dev->name)); } else { - snprintf(dev->name, sizeof(dev->name), "lltemac.%lx", devinf->base_addr); + snprintf(dev->name, sizeof(dev->name), "ll_tem.%lx", +devinf->base_addr); devinf->devname = dev->name; } -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 17/22] ppc: xilinx_ppc405_generic: Remove weak attributes
Now that the specific boards have been removed there is no need to maintain the weak functions. Fix also CamelCase to make checkpatch happy Signed-off-by: Ricardo Ribalda Delgado--- .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 22 -- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c index 32105a823b0b..5c19ac0e6a34 100644 --- a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c +++ b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c @@ -10,42 +10,36 @@ #include #include -ulong __get_PCI_freq(void) +ulong get_PCI_freq(void) { return 0; } -ulong get_PCI_freq(void) __attribute__((weak, alias("__get_PCI_freq"))); - -int __board_pre_init(void) +int board_pre_init(void) { return 0; } -int board_pre_init(void) __attribute__((weak, alias("__board_pre_init"))); -int __checkboard(void) +int checkboard(void) { puts("Xilinx PPC405 Generic Board\n"); return 0; } -int checkboard(void) __attribute__((weak, alias("__checkboard"))); -phys_size_t __initdram(int board_type) +phys_size_t initdram(int board_type) { return get_ram_size(XPAR_DDR2_SDRAM_MEM_BASEADDR, CONFIG_SYS_SDRAM_SIZE_MB * 1024 * 1024); } -phys_size_t initdram(int) __attribute__((weak, alias("__initdram"))); -void __get_sys_info(sys_info_t *sysInfo) +void get_sys_info(sys_info_t *sys_info) { - sysInfo->freqProcessor = XPAR_CORE_CLOCK_FREQ_HZ; - sysInfo->freqPLB = XPAR_PLB_CLOCK_FREQ_HZ; - sysInfo->freqPCI = 0; + sys_info->freqProcessor = XPAR_CORE_CLOCK_FREQ_HZ; + sys_info->freqPLB = XPAR_PLB_CLOCK_FREQ_HZ; + sys_info->freqPCI = 0; return; } -void get_sys_info(sys_info_t *) __attribute__((weak, alias("__get_sys_info"))); int get_serial_clock(void){ return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 20/22] ppc: xilinx_ppc440_generic: Remove uncalled functions
board_pre_init was not called because CONFIG_BOARD_EARLY_INIT_F was not set. Remove unused function. Signed-off-by: Ricardo Ribalda Delgado--- board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 5 - 1 file changed, 5 deletions(-) diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c index 52c63f20583e..0e3ab94e31ef 100644 --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c @@ -10,11 +10,6 @@ #include #include -int board_pre_init(void) -{ - return 0; -} - int checkboard(void) { puts("Xilinx PPC440 Generic Board\n"); -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 11/22] ppc: xilinx-ppc405-generic: Cleanout header files
Now that there is only one header file for all ppc405 files, merge header files. Signed-off-by: Ricardo Ribalda Delgado--- include/configs/xilinx-ppc405-generic.h | 5 - include/configs/xilinx-ppc405.h | 22 -- 2 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 include/configs/xilinx-ppc405.h diff --git a/include/configs/xilinx-ppc405-generic.h b/include/configs/xilinx-ppc405-generic.h index bdb9372abc45..e2d189d0ac60 100644 --- a/include/configs/xilinx-ppc405-generic.h +++ b/include/configs/xilinx-ppc405-generic.h @@ -14,6 +14,9 @@ #include "../board/xilinx/ppc405-generic/xparameters.h" +#define CONFIG_405 1 +#define CONFIG_XILINX_405 1 + /* sdram */ #define CONFIG_SYS_SDRAM_SIZE_MB 256 @@ -37,5 +40,5 @@ #define MTDIDS_DEFAULT "nor0=ppc405-flash" #define MTDPARTS_DEFAULT "mtdpartsa=ppc405-flash:-(user)" -#include +#include #endif /* __CONFIG_H */ diff --git a/include/configs/xilinx-ppc405.h b/include/configs/xilinx-ppc405.h deleted file mode 100644 index dcfe56e0483b.. --- a/include/configs/xilinx-ppc405.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com - * This work has been supported by: QTechnology http://qtec.com/ - * - * (C) Copyright 2008 - * Georg Schardt - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* cpu parameter */ -#define CONFIG_405 1 -#define CONFIG_XILINX_405 1 - -#include - -#endif -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] include:configs: Add usb device-tree fixup for all fsl platforms
Add usb device-tree fixup for all relevant fsl ppc and arm platforms Signed-off-by: Ramneek Mehresh--- board/freescale/b4860qds/b4860qds.c | 2 +- board/freescale/bsc9131rdb/bsc9131rdb.c | 2 ++ board/freescale/bsc9132qds/bsc9132qds.c | 2 ++ board/freescale/corenet_ds/corenet_ds.c | 4 board/freescale/ls2080aqds/ls2080aqds.c | 4 board/freescale/ls2080ardb/ls2080ardb.c | 4 board/freescale/mpc8308rdb/mpc8308rdb.c | 4 board/freescale/mpc8315erdb/mpc8315erdb.c | 2 ++ board/freescale/mpc837xemds/mpc837xemds.c | 2 ++ board/freescale/mpc837xerdb/mpc837xerdb.c | 2 ++ board/freescale/mpc8536ds/mpc8536ds.c | 2 +- board/freescale/p1010rdb/p1010rdb.c | 2 +- board/freescale/p1022ds/p1022ds.c | 2 +- board/freescale/p1023rdb/p1023rdb.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- board/freescale/p1_twr/p1_twr.c | 3 +++ board/freescale/p2041rdb/p2041rdb.c | 2 +- board/freescale/t102xqds/t102xqds.c | 2 +- board/freescale/t102xrdb/t102xrdb.c | 3 +++ board/freescale/t1040qds/t1040qds.c | 2 +- board/freescale/t104xrdb/t104xrdb.c | 2 +- board/freescale/t208xqds/t208xqds.c | 3 +++ board/freescale/t208xrdb/t208xrdb.c | 3 +++ board/freescale/t4qds/t4240emu.c| 3 +++ board/freescale/t4qds/t4240qds.c| 3 +++ board/freescale/t4rdb/t4240rdb.c| 3 +++ include/configs/B4860QDS.h | 1 + include/configs/BSC9131RDB.h| 1 + include/configs/BSC9132QDS.h| 3 ++- include/configs/MPC8308RDB.h| 3 +++ include/configs/MPC8315ERDB.h | 1 + include/configs/MPC837XEMDS.h | 3 ++- include/configs/MPC837XERDB.h | 1 + include/configs/MPC8536DS.h | 1 + include/configs/P1010RDB.h | 1 + include/configs/P1022DS.h | 1 + include/configs/P1023RDB.h | 1 + include/configs/P2041RDB.h | 1 + include/configs/T102xQDS.h | 1 + include/configs/T102xRDB.h | 1 + include/configs/T1040QDS.h | 1 + include/configs/T104xRDB.h | 1 + include/configs/T208xQDS.h | 1 + include/configs/T208xRDB.h | 1 + include/configs/T4240QDS.h | 1 + include/configs/corenet_ds.h| 1 + include/configs/ls2080aqds.h| 1 + include/configs/ls2080ardb.h| 1 + include/configs/p1_p2_rdb_pc.h | 1 + include/configs/p1_twr.h| 1 + 50 files changed, 85 insertions(+), 12 deletions(-) diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c index 6a8fca6..0831cda 100644 --- a/board/freescale/b4860qds/b4860qds.c +++ b/board/freescale/b4860qds/b4860qds.c @@ -1213,7 +1213,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_liodn(blob); -#ifdef CONFIG_HAS_FSL_DR_USB +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); #endif diff --git a/board/freescale/bsc9131rdb/bsc9131rdb.c b/board/freescale/bsc9131rdb/bsc9131rdb.c index 75e1142..c3be910 100644 --- a/board/freescale/bsc9131rdb/bsc9131rdb.c +++ b/board/freescale/bsc9131rdb/bsc9131rdb.c @@ -73,7 +73,9 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); #endif +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif return 0; } diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c index 586dacc..61f96f8 100644 --- a/board/freescale/bsc9132qds/bsc9132qds.c +++ b/board/freescale/bsc9132qds/bsc9132qds.c @@ -394,7 +394,9 @@ int ft_board_setup(void *blob, bd_t *bd) /* remove dts usb node */ fdt_del_node_compat(blob, "fsl-usb2-dr"); } else { +#ifdef CONFIG_USB_DEVTREE_FIXUP fdt_fixup_dr_usb(blob, bd); +#endif fdt_del_node_and_alias(blob, "serial2"); } } diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c index 2945339..77f33c2 100644 --- a/board/freescale/corenet_ds/corenet_ds.c +++ b/board/freescale/corenet_ds/corenet_ds.c @@ -208,6 +208,10 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_liodn(blob); +#ifdef CONFIG_USB_DEVTREE_FIXUP + fdt_fixup_dr_usb(blob, bd); +#endif + #ifdef CONFIG_SYS_DPAA_FMAN fdt_fixup_fman_ethernet(blob); fdt_fixup_board_enet(blob); diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index aa256a2..6b3a15e 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -300,6 +300,10 @@ int
[U-Boot] [PATCH 1/2] fsl:usb: Make fsl usb device-tree fixup arch independent
Move usb device-tree fixup from ehci drv so that it becomes available to all ppc and arm platforms Signed-off-by: Ramneek Mehresh--- board/freescale/common/Makefile | 2 + board/freescale/common/usb.c| 203 board/freescale/corenet_ds/corenet_ds.c | 1 - drivers/usb/host/ehci-fsl.c | 196 -- include/fdt_support.h | 4 +- 5 files changed, 207 insertions(+), 199 deletions(-) create mode 100644 board/freescale/common/usb.c diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index 51d2814..4b83303 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -64,6 +64,8 @@ obj-$(CONFIG_POWER_PFUZE100) += pfuze.o obj-$(CONFIG_LS102XA_STREAM_ID)+= ls102xa_stream_id.o +obj-$(CONFIG_USB_DEVTREE_FIXUP)+= usb.o + # deal with common files for P-series corenet based devices obj-$(CONFIG_P2041RDB) += p_corenet/ obj-$(CONFIG_P3041DS) += p_corenet/ diff --git a/board/freescale/common/usb.c b/board/freescale/common/usb.c new file mode 100644 index 000..b99fa2b --- /dev/null +++ b/board/freescale/common/usb.c @@ -0,0 +1,203 @@ +/* + * (C) Copyright 2015 Freescale Semiconductor, Inc. + * + * Author: Ramneek Mehresh ramneek.mehr...@freescale.com + * + * SPDX-License-Identifier:GPL-2.0+ + * + * FSL board device-tree fix-up + */ +#include +#include +#include +#include + +#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT +#define CONFIG_USB_MAX_CONTROLLER_COUNT1 +#endif + +static const char *fdt_usb_get_node_type(void *blob, int start_offset, +int *node_offset) +{ + const char *compat_dr = "fsl-usb2-dr"; + const char *compat_mph = "fsl-usb2-mph"; + const char *compat_snps = "snps,dwc3"; + const char *node_type = NULL; + + *node_offset = fdt_node_offset_by_compatible(blob, start_offset, +compat_mph); + if (*node_offset < 0) { + *node_offset = fdt_node_offset_by_compatible(blob, +start_offset, +compat_dr); + if (*node_offset < 0) { + *node_offset = fdt_node_offset_by_compatible(blob, + start_offset, compat_snps); + if (*node_offset < 0) { + printf("ERROR:could not find node:%s", + fdt_strerror(*node_offset)); + } else { + node_type = compat_snps; + } + } else { + node_type = compat_dr; + } + } else { + node_type = compat_mph; + } + + return node_type; +} + +static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode, + const char *phy_type, int start_offset) +{ + const char *prop_mode = "dr_mode"; + const char *prop_type = "phy_type"; + const char *node_type = NULL; + int node_offset; + int err; + + node_type = fdt_usb_get_node_type(blob, start_offset, _offset); + if (!node_type) + return -1; + + if (mode) { + err = fdt_setprop(blob, node_offset, prop_mode, mode, + strlen(mode) + 1); + if (err < 0) + printf("WARNING: could not set %s for %s: %s.\n", + prop_mode, node_type, fdt_strerror(err)); + } + + if (phy_type) { + err = fdt_setprop(blob, node_offset, prop_type, phy_type, + strlen(phy_type) + 1); + if (err < 0) + printf("WARNING: could not set %s for %s: %s.\n", + prop_type, node_type, fdt_strerror(err)); + } + + return node_offset; +} + +static int fdt_fixup_usb_erratum(void *blob, const char *prop_erratum, +int start_offset) +{ + int node_offset, err; + const char *node_type = NULL; + + node_type = fdt_usb_get_node_type(blob, start_offset, _offset); + if (!node_type) + return -1; + + err = fdt_setprop(blob, node_offset, prop_erratum, NULL, 0); + if (err < 0) { + printf("%s: ERROR: could not set %s for %s: %s.\n", __func__, + prop_erratum, node_type, fdt_strerror(err)); + } + + return node_offset; +} + +void fdt_fixup_dr_usb(void *blob, bd_t *bd) +{ + static const char * const modes[] = { "host", "peripheral", "otg" }; + static const char * const phys[] = { "ulpi", "utmi", "utmi_dual" }; + int
Re: [U-Boot] [PATCH 02/22] ppc: xilinx-ppc405: Remove support for fx12mm
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > It is just a specialized version of the xilinx-ppc405 > > Signed-off-by: Ricardo Ribalda Delgado > --- > arch/powerpc/cpu/ppc4xx/Kconfig | 4 > board/avnet/fx12mm/Kconfig | 12 -- > board/avnet/fx12mm/MAINTAINERS | 7 -- > board/avnet/fx12mm/Makefile | 11 - > board/avnet/fx12mm/fx12mm.c | 34 --- > board/avnet/fx12mm/xparameters.h | 35 > configs/fx12mm_defconfig | 10 > configs/fx12mm_flash_defconfig | 9 > include/configs/fx12mm.h | 50 > > 9 files changed, 172 deletions(-) > delete mode 100644 board/avnet/fx12mm/Kconfig > delete mode 100644 board/avnet/fx12mm/MAINTAINERS > delete mode 100644 board/avnet/fx12mm/Makefile > delete mode 100644 board/avnet/fx12mm/fx12mm.c > delete mode 100644 board/avnet/fx12mm/xparameters.h > delete mode 100644 configs/fx12mm_defconfig > delete mode 100644 configs/fx12mm_flash_defconfig > delete mode 100644 include/configs/fx12mm.h > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 01/22] ppc: xilinx-ppc440: Remove support for ml507
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > ml507 is just a specialized version of the xilinx-ppc440-generic > > Signed-off-by: Ricardo Ribalda Delgado > --- > arch/powerpc/cpu/ppc4xx/Kconfig | 4 > board/xilinx/ml507/Kconfig | 12 > board/xilinx/ml507/MAINTAINERS | 7 --- > board/xilinx/ml507/Makefile | 11 --- > board/xilinx/ml507/ml507.c | 17 - > board/xilinx/ml507/xparameters.h | 23 --- > configs/ml507_defconfig | 9 - > configs/ml507_flash_defconfig| 8 > include/configs/ml507.h | 38 -- > 9 files changed, 129 deletions(-) > delete mode 100644 board/xilinx/ml507/Kconfig > delete mode 100644 board/xilinx/ml507/MAINTAINERS > delete mode 100644 board/xilinx/ml507/Makefile > delete mode 100644 board/xilinx/ml507/ml507.c > delete mode 100644 board/xilinx/ml507/xparameters.h > delete mode 100644 configs/ml507_defconfig > delete mode 100644 configs/ml507_flash_defconfig > delete mode 100644 include/configs/ml507.h > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [ANN] U-Boot v2016.01-rc4 released
Dear Anatolij, In message <20160126083017.4a7bc5dd@crub> you wrote: > > > Any plan to address these? > > is it the not running Inotify System Scheduler again or something > else? Could you please check? Thanks! This time it was purely my fault. I renewed my SSH keys and forgot to re-initialize this specific update script. Sorry for that. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Applying computer technology is simply finding the right wrench to pound in the correct screw. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 01/22] ppc: xilinx-ppc440: Remove support for ml507
ml507 is just a specialized version of the xilinx-ppc440-generic Signed-off-by: Ricardo Ribalda Delgado--- arch/powerpc/cpu/ppc4xx/Kconfig | 4 board/xilinx/ml507/Kconfig | 12 board/xilinx/ml507/MAINTAINERS | 7 --- board/xilinx/ml507/Makefile | 11 --- board/xilinx/ml507/ml507.c | 17 - board/xilinx/ml507/xparameters.h | 23 --- configs/ml507_defconfig | 9 - configs/ml507_flash_defconfig| 8 include/configs/ml507.h | 38 -- 9 files changed, 129 deletions(-) delete mode 100644 board/xilinx/ml507/Kconfig delete mode 100644 board/xilinx/ml507/MAINTAINERS delete mode 100644 board/xilinx/ml507/Makefile delete mode 100644 board/xilinx/ml507/ml507.c delete mode 100644 board/xilinx/ml507/xparameters.h delete mode 100644 configs/ml507_defconfig delete mode 100644 configs/ml507_flash_defconfig delete mode 100644 include/configs/ml507.h diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index efd316573ce6..ba09b57fca50 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -115,9 +115,6 @@ config TARGET_PIP405 config TARGET_XPEDITE1000 bool "Support xpedite1000" -config TARGET_ML507 - bool "Support ml507" - config TARGET_XILINX_PPC405_GENERIC bool "Support xilinx-ppc405-generic" @@ -158,7 +155,6 @@ source "board/mpl/mip405/Kconfig" source "board/mpl/pip405/Kconfig" source "board/t3corp/Kconfig" source "board/xes/xpedite1000/Kconfig" -source "board/xilinx/ml507/Kconfig" source "board/xilinx/ppc405-generic/Kconfig" source "board/xilinx/ppc440-generic/Kconfig" diff --git a/board/xilinx/ml507/Kconfig b/board/xilinx/ml507/Kconfig deleted file mode 100644 index d580a7beafef.. --- a/board/xilinx/ml507/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_ML507 - -config SYS_BOARD - default "ml507" - -config SYS_VENDOR - default "xilinx" - -config SYS_CONFIG_NAME - default "ml507" - -endif diff --git a/board/xilinx/ml507/MAINTAINERS b/board/xilinx/ml507/MAINTAINERS deleted file mode 100644 index 8b40f4450085.. --- a/board/xilinx/ml507/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -ML507 BOARD -M: Ricardo Ribalda -S: Maintained -F: board/xilinx/ml507/ -F: include/configs/ml507.h -F: configs/ml507_defconfig -F: configs/ml507_flash_defconfig diff --git a/board/xilinx/ml507/Makefile b/board/xilinx/ml507/Makefile deleted file mode 100644 index 9a3809f3c065.. --- a/board/xilinx/ml507/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# (C) Copyright 2008 -# Ricardo Ribalda,Universidad Autonoma de Madrid, ricardo.riba...@uam.es -# This work has been supported by: Qtechnology http://qtec.com/ -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += ml507.o - -include $(srctree)/board/xilinx/ppc440-generic/Makefile diff --git a/board/xilinx/ml507/ml507.c b/board/xilinx/ml507/ml507.c deleted file mode 100644 index 83b764b7337b.. --- a/board/xilinx/ml507/ml507.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es - * This work has been supported by: QTechnology http://qtec.com/ - * SPDX-License-Identifier:GPL-2.0+ -*/ - -#include -#include -#include - - -int checkboard(void) -{ - puts("Xilinx ML507 Board\n"); - return 0; -} diff --git a/board/xilinx/ml507/xparameters.h b/board/xilinx/ml507/xparameters.h deleted file mode 100644 index e30e592bbe12.. --- a/board/xilinx/ml507/xparameters.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es - * This work has been supported by: QTechnology http://qtec.com/ - * based on xparameters-ml507.h by Xilinx - * - * SPDX-License-Identifier:GPL-2.0+ -*/ - -#ifndef XPARAMETER_H -#define XPARAMETER_H - -#define XPAR_DDR2_SDRAM_MEM_BASEADDR 0x -#define XPAR_IIC_EEPROM_BASEADDR 0x8160 -#define XPAR_INTC_0_BASEADDR 0x8180 -#define XPAR_UARTLITE_0_BASEADDR 0x8400 -#define XPAR_FLASH_MEM0_BASEADDR 0xFE00 -#define XPAR_PLB_CLOCK_FREQ_HZ 1 -#define XPAR_CORE_CLOCK_FREQ_HZ4 -#define XPAR_INTC_MAX_NUM_INTR_INPUTS 13 -#define XPAR_UARTLITE_0_BAUDRATE 9600 - -#endif diff --git a/configs/ml507_defconfig b/configs/ml507_defconfig deleted file mode 100644 index d1e4e30371bf.. --- a/configs/ml507_defconfig +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG_PPC=y -CONFIG_4xx=y -CONFIG_TARGET_ML507=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x0410,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o" -CONFIG_SYS_PROMPT="ml507:/# " -# CONFIG_CMD_IMLS is not set -# CONFIG_CMD_SETEXPR is not
[U-Boot] [PATCH 04/22] .mailmap: Add all the mail alias for Ricardo Ribalda
Signed-off-by: Ricardo Ribalda Delgado--- .mailmap | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.mailmap b/.mailmap index 02dccfc1aee7..f72fef174825 100644 --- a/.mailmap +++ b/.mailmap @@ -21,6 +21,9 @@ Jagan Teki Markus Klotzbuecher Prabhakar Kushwaha Rajeshwari Shinde +Ricardo Ribalda Delgado +Ricardo Ribalda +Ricardo Ribalda Sandeep Paulraj Shaohui Xie Stefan Roese -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 00/22] xilinx-ppc4xx: Cleanout and port to DM serial
xilinx-ppc4xx made us of serial uartlite, which was ported to DM. This patch moves port these boards to DM. Now that Kconfig works really well, there is no need to maintain the specific boards (fx12mm, ml507 and v5fx30teval) or their flash version. The ppc440 boards have been wired to the ll_temac driver. A series of cleanouts have been done. This patchset sits on top of: http://git.denx.de/?p=u-boot/u-boot-microblaze.git;a=shortlog;h=refs/heads/mb It has been tested on a ppc440 bard. Hopefully Georg Schardt can test the changes on his fx12mm. These changes can also be browset at https://github.com/ribalda/u-boot/tree/xilinx-ppc4xx-generic-dm Regards (and thanks for your patience)! Ricardo Ribalda (22): ppc: xilinx-ppc440: Remove support for ml507 ppc: xilinx-ppc405: Remove support for fx12mm xilinx-ppc440: Remove support for v5fx30teval .mailmap: Add all the mail alias for Ricardo Ribalda mailaddr: Update mail address ppc: pp405-generic: Simplify Makefile ppc: pp440-generic: Simplify Makefile ppc: ppc440: ppc440-generic_flash_defconfig ppc: ppc405: ppc405-generic_flash_defconfig ppc: xilinx-ppc440-generic: Cleanout header files ppc: xilinx-ppc405-generic: Cleanout header files ppc: xilinx-ppc4xx-generic: Update xparameters.h ppc: dts: Add device tree for xilix-ppc4xx-generic configs/xilinx-ppc405-generic: Typos and size configs/xilinx-ppc440-generic: Typos and size ppc: xilinx-ppc4xx: Port to DM serial ppc: xilinx_ppc405_generic: Remove weak attributes ppc: xilinx_ppc440_generic: Remove weak attributes ppc: xilinx_ppc405_generic: Remove uncalled functions ppc: xilinx_ppc440_generic: Remove uncalled functions net: xilinx_ll_temac: Fix string overflow ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver .mailmap | 3 ++ arch/powerpc/cpu/ppc4xx/Kconfig| 20 - arch/powerpc/cpu/ppc4xx/interrupts.c | 2 +- arch/powerpc/cpu/ppc4xx/uic.c | 2 +- arch/powerpc/cpu/ppc4xx/xilinx_irq.c | 2 +- arch/powerpc/dts/Makefile | 2 + arch/powerpc/dts/xilinx-ppc405-generic.dts | 13 ++ arch/powerpc/dts/xilinx-ppc440-generic.dts | 13 ++ arch/powerpc/include/asm/interrupt.h | 2 +- arch/powerpc/include/asm/xilinx_irq.h | 2 +- board/avnet/fx12mm/Kconfig | 12 -- board/avnet/fx12mm/MAINTAINERS | 7 --- board/avnet/fx12mm/Makefile| 11 - board/avnet/fx12mm/fx12mm.c| 34 --- board/avnet/fx12mm/xparameters.h | 35 --- board/avnet/v5fx30teval/Kconfig| 12 -- board/avnet/v5fx30teval/MAINTAINERS| 7 --- board/avnet/v5fx30teval/Makefile | 11 - board/avnet/v5fx30teval/v5fx30teval.c | 17 board/avnet/v5fx30teval/xparameters.h | 22 -- board/xilinx/ml507/Kconfig | 12 -- board/xilinx/ml507/MAINTAINERS | 7 --- board/xilinx/ml507/Makefile| 11 - board/xilinx/ml507/ml507.c | 17 board/xilinx/ml507/xparameters.h | 23 -- board/xilinx/ppc405-generic/MAINTAINERS| 2 +- board/xilinx/ppc405-generic/Makefile | 4 +- .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 31 ++ board/xilinx/ppc405-generic/xparameters.h | 7 ++- board/xilinx/ppc440-generic/MAINTAINERS| 2 +- board/xilinx/ppc440-generic/Makefile | 6 +-- board/xilinx/ppc440-generic/init.S | 2 +- .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 49 ++--- board/xilinx/ppc440-generic/xparameters.h | 15 --- configs/fx12mm_defconfig | 10 - configs/fx12mm_flash_defconfig | 9 configs/ml507_defconfig| 9 configs/ml507_flash_defconfig | 8 configs/v5fx30teval_defconfig | 9 configs/v5fx30teval_flash_defconfig| 8 configs/xilinx-ppc405-generic_defconfig| 8 configs/xilinx-ppc405-generic_flash_defconfig | 8 configs/xilinx-ppc440-generic_defconfig| 17 ++-- configs/xilinx-ppc440-generic_flash_defconfig | 8 drivers/hwmon/adt7460.c| 2 +- drivers/net/xilinx_ll_temac.c | 3 +- drivers/serial/Kconfig | 2 +- include/configs/fx12mm.h | 50 -- include/configs/ml507.h| 38 include/configs/v5fx30teval.h | 38
Re: [U-Boot] [PATCHv3 4/9] arm: vybrid: Drop enabling GPIO, SPI and UART in legacy mode
Hi Bhuvanchandra, On Tue, Jan 26, 2016 at 5:46 PM, Bhuvanchandra DVwrote: > Remove the legacy way of enabling GPIO, SPI and UART on Vybrid > based boards since these driver's now only supports DT mode. > > Signed-off-by: Bhuvanchandra DV > --- > include/configs/colibri_vf.h | 13 - > include/configs/pcm052.h | 3 --- > include/configs/vf610twr.h | 3 --- > 3 files changed, 19 deletions(-) > > diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h > index 5aed3a5..6efff76 100644 > --- a/include/configs/colibri_vf.h > +++ b/include/configs/colibri_vf.h > @@ -36,13 +36,10 @@ > > #define CONFIG_BOARD_EARLY_INIT_F > > -#define LPUART_BASEUART0_BASE > - > /* Allow to overwrite serial and ethaddr */ > #define CONFIG_ENV_OVERWRITE > #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG > #define CONFIG_VERSION_VARIABLE > -#define CONFIG_SYS_UART_PORT (0) > #define CONFIG_BAUDRATE115200 > #define CONFIG_CMD_ASKENV > > @@ -52,10 +49,6 @@ > #define CONFIG_SYS_MAX_NAND_DEVICE 1 > #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR > > -/* GPIO support */ > -#define CONFIG_DM_GPIO > -#define CONFIG_VYBRID_GPIO > - > /* Dynamic MTD partition support */ > #define CONFIG_CMD_MTDPARTS/* Enable 'mtdparts' command line support */ > #define CONFIG_MTD_PARTITIONS > @@ -265,10 +258,4 @@ > #define CONFIG_USB_FUNCTION_MASS_STORAGE > #define CONFIG_CMD_USB_MASS_STORAGE > > -/* Enable SPI support */ > -#ifdef CONFIG_OF_CONTROL > -#define CONFIG_DM_SPI > -#define CONFIG_CMD_SPI > -#endif > - > #endif /* __CONFIG_H */ > diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h > index 891bdb0..f3353f2 100644 > --- a/include/configs/pcm052.h > +++ b/include/configs/pcm052.h > @@ -27,11 +27,8 @@ > > #define CONFIG_BOARD_EARLY_INIT_F > > -#define LPUART_BASEUART1_BASE > - > /* Allow to overwrite serial and ethaddr */ > #define CONFIG_ENV_OVERWRITE > -#define CONFIG_SYS_UART_PORT (1) > #define CONFIG_BAUDRATE115200 > > #undef CONFIG_CMD_IMLS > diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h > index dcfafaf..84ad2c3 100644 > --- a/include/configs/vf610twr.h > +++ b/include/configs/vf610twr.h > @@ -34,11 +34,8 @@ > > #define CONFIG_BOARD_EARLY_INIT_F > > -#define LPUART_BASEUART1_BASE > - > /* Allow to overwrite serial and ethaddr */ > #define CONFIG_ENV_OVERWRITE > -#define CONFIG_SYS_UART_PORT (1) > #define CONFIG_BAUDRATE115200 > > /* NAND support */ > -- I believe there is still bisectability issue here. At this stage, all these boards are still using legacy lpuart driver and we cannot remove those macros. This patch should come after patch#7 in the v3 series. Can you double check this? For the patch itself, Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCHv3 3/9] arm: colibri-vf: Enable serial support
On Tue, Jan 26, 2016 at 5:46 PM, Bhuvanchandra DVwrote: > - Enable lpuart support on Toradex Colibri VF50/VF61 > - Use UART0 for stdout. > > Signed-off-by: Bhuvanchandra DV > Acked-by: Stefan Agner > --- > arch/arm/dts/vf-colibri.dtsi | 9 + > 1 file changed, 9 insertions(+) > > diff --git a/arch/arm/dts/vf-colibri.dtsi b/arch/arm/dts/vf-colibri.dtsi > index f005339..029b02c 100644 > --- a/arch/arm/dts/vf-colibri.dtsi > +++ b/arch/arm/dts/vf-colibri.dtsi > @@ -5,6 +5,12 @@ > */ > #include "vf.dtsi" > > +/ { > + chosen { > + stdout-path = > + }; > +}; > + > { > status = "okay"; > bus-num = <1>; > @@ -14,3 +20,6 @@ > spi-max-frequency = <5000>; > }; > }; nits: there should be a blank line here > + { > + status = "okay"; > +}; > -- Other than that, Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCHv3 1/9] arm: vybrid: Enable lpuart support
On Tue, Jan 26, 2016 at 5:46 PM, Bhuvanchandra DVwrote: > Add device tree node's for lpuart on Vybrid platform > > Signed-off-by: Bhuvanchandra DV > --- > arch/arm/dts/vf.dtsi | 43 +++ > 1 file changed, 43 insertions(+) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] include:configs: Add usb device-tree fixup for all fsl platforms
On Tuesday, January 26, 2016 at 12:36:58 PM, Ramneek Mehresh wrote: > Add usb device-tree fixup for all relevant fsl ppc and arm platforms > > Signed-off-by: Ramneek Mehresh> --- > board/freescale/b4860qds/b4860qds.c | 2 +- > board/freescale/bsc9131rdb/bsc9131rdb.c | 2 ++ > board/freescale/bsc9132qds/bsc9132qds.c | 2 ++ > board/freescale/corenet_ds/corenet_ds.c | 4 > board/freescale/ls2080aqds/ls2080aqds.c | 4 > board/freescale/ls2080ardb/ls2080ardb.c | 4 > board/freescale/mpc8308rdb/mpc8308rdb.c | 4 > board/freescale/mpc8315erdb/mpc8315erdb.c | 2 ++ > board/freescale/mpc837xemds/mpc837xemds.c | 2 ++ > board/freescale/mpc837xerdb/mpc837xerdb.c | 2 ++ > board/freescale/mpc8536ds/mpc8536ds.c | 2 +- > board/freescale/p1010rdb/p1010rdb.c | 2 +- > board/freescale/p1022ds/p1022ds.c | 2 +- > board/freescale/p1023rdb/p1023rdb.c | 2 +- > board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- > board/freescale/p1_twr/p1_twr.c | 3 +++ > board/freescale/p2041rdb/p2041rdb.c | 2 +- > board/freescale/t102xqds/t102xqds.c | 2 +- > board/freescale/t102xrdb/t102xrdb.c | 3 +++ > board/freescale/t1040qds/t1040qds.c | 2 +- > board/freescale/t104xrdb/t104xrdb.c | 2 +- > board/freescale/t208xqds/t208xqds.c | 3 +++ > board/freescale/t208xrdb/t208xrdb.c | 3 +++ > board/freescale/t4qds/t4240emu.c| 3 +++ > board/freescale/t4qds/t4240qds.c| 3 +++ > board/freescale/t4rdb/t4240rdb.c| 3 +++ > include/configs/B4860QDS.h | 1 + > include/configs/BSC9131RDB.h| 1 + > include/configs/BSC9132QDS.h| 3 ++- > include/configs/MPC8308RDB.h| 3 +++ > include/configs/MPC8315ERDB.h | 1 + > include/configs/MPC837XEMDS.h | 3 ++- > include/configs/MPC837XERDB.h | 1 + > include/configs/MPC8536DS.h | 1 + > include/configs/P1010RDB.h | 1 + > include/configs/P1022DS.h | 1 + > include/configs/P1023RDB.h | 1 + > include/configs/P2041RDB.h | 1 + > include/configs/T102xQDS.h | 1 + > include/configs/T102xRDB.h | 1 + > include/configs/T1040QDS.h | 1 + > include/configs/T104xRDB.h | 1 + > include/configs/T208xQDS.h | 1 + > include/configs/T208xRDB.h | 1 + > include/configs/T4240QDS.h | 1 + > include/configs/corenet_ds.h| 1 + > include/configs/ls2080aqds.h| 1 + > include/configs/ls2080ardb.h| 1 + > include/configs/p1_p2_rdb_pc.h | 1 + > include/configs/p1_twr.h| 1 + > 50 files changed, 85 insertions(+), 12 deletions(-) Each such new macro must be documented. What is the point of this bulk rename anyway? ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 11/22] ppc: xilinx-ppc405-generic: Cleanout header files
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > Now that there is only one header file for all ppc405 files, merge > header files. > > Signed-off-by: Ricardo Ribalda Delgado > --- > include/configs/xilinx-ppc405-generic.h | 5 - > include/configs/xilinx-ppc405.h | 22 -- > 2 files changed, 4 insertions(+), 23 deletions(-) > delete mode 100644 include/configs/xilinx-ppc405.h > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 06/22] ppc: pp405-generic: Simplify Makefile
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > As a result of the specific board removal, the Makefiles can be > simplified. > > Signed-off-by: Ricardo Ribalda Delgado > --- > board/xilinx/ppc405-generic/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 04/22] .mailmap: Add all the mail alias for Ricardo Ribalda
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > Signed-off-by: Ricardo Ribalda Delgado > --- > .mailmap | 3 +++ > 1 file changed, 3 insertions(+) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 09/22] ppc: ppc405: ppc405-generic_flash_defconfig
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > Remove redundant defconfig file. Boot via flash can be configured via > Kconfig. > > Signed-off-by: Ricardo Ribalda Delgado > --- > configs/xilinx-ppc405-generic_flash_defconfig | 8 > 1 file changed, 8 deletions(-) > delete mode 100644 configs/xilinx-ppc405-generic_flash_defconfig > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 03/22] xilinx-ppc440: Remove support for v5fx30teval
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > It is just a specialized version of xilinx-ppc440 > > Signed-off-by: Ricardo Ribalda Delgado > --- > arch/powerpc/cpu/ppc4xx/Kconfig | 4 > board/avnet/v5fx30teval/Kconfig | 12 --- > board/avnet/v5fx30teval/MAINTAINERS | 7 --- > board/avnet/v5fx30teval/Makefile | 11 -- > board/avnet/v5fx30teval/v5fx30teval.c | 17 > board/avnet/v5fx30teval/xparameters.h | 22 > configs/v5fx30teval_defconfig | 9 - > configs/v5fx30teval_flash_defconfig | 8 > include/configs/v5fx30teval.h | 38 > --- > 9 files changed, 128 deletions(-) > delete mode 100644 board/avnet/v5fx30teval/Kconfig > delete mode 100644 board/avnet/v5fx30teval/MAINTAINERS > delete mode 100644 board/avnet/v5fx30teval/Makefile > delete mode 100644 board/avnet/v5fx30teval/v5fx30teval.c > delete mode 100644 board/avnet/v5fx30teval/xparameters.h > delete mode 100644 configs/v5fx30teval_defconfig > delete mode 100644 configs/v5fx30teval_flash_defconfig > delete mode 100644 include/configs/v5fx30teval.h > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv3 5/9] arm: vf610-twr: Add device tree file's
- Add device tree files for NXP/Freescale VF610 Tower Board. - Enable lpuart support on NXP/Freescale VF610 Tower Board. - Use UART1 as stdout. Signed-off-by: Bhuvanchandra DV--- arch/arm/dts/Makefile | 3 ++- arch/arm/dts/vf610-twr.dts | 22 ++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/vf610-twr.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index f66ff41..c6fb50c 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -190,7 +190,8 @@ dtb-$(CONFIG_MACH_SUN9I) += \ sun9i-a80-cubieboard4.dtb dtb-$(CONFIG_VF610) += vf500-colibri.dtb \ - vf610-colibri.dtb + vf610-colibri.dtb \ + vf610-twr.dtb dtb-$(CONFIG_SOC_KEYSTONE) += k2hk-evm.dtb \ k2l-evm.dtb \ diff --git a/arch/arm/dts/vf610-twr.dts b/arch/arm/dts/vf610-twr.dts new file mode 100644 index 000..a4ccbcb --- /dev/null +++ b/arch/arm/dts/vf610-twr.dts @@ -0,0 +1,22 @@ +/* + * Copyright 2016 Toradex AG + * + * SPDX-License-Identifier: GPL-2.0+ or X11 + */ + +/dts-v1/; +#include "vf.dtsi" + +/ { + model = "VF610 Tower Board"; + compatible = "fsl,vf610-twr", "fsl,vf610"; + + choosen { + stdout-path = + }; + +}; + + { + status = "okay"; +}; -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv3 4/9] arm: vybrid: Drop enabling GPIO, SPI and UART in legacy mode
Remove the legacy way of enabling GPIO, SPI and UART on Vybrid based boards since these driver's now only supports DT mode. Signed-off-by: Bhuvanchandra DV--- include/configs/colibri_vf.h | 13 - include/configs/pcm052.h | 3 --- include/configs/vf610twr.h | 3 --- 3 files changed, 19 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 5aed3a5..6efff76 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -36,13 +36,10 @@ #define CONFIG_BOARD_EARLY_INIT_F -#define LPUART_BASEUART0_BASE - /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_VERSION_VARIABLE -#define CONFIG_SYS_UART_PORT (0) #define CONFIG_BAUDRATE115200 #define CONFIG_CMD_ASKENV @@ -52,10 +49,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR -/* GPIO support */ -#define CONFIG_DM_GPIO -#define CONFIG_VYBRID_GPIO - /* Dynamic MTD partition support */ #define CONFIG_CMD_MTDPARTS/* Enable 'mtdparts' command line support */ #define CONFIG_MTD_PARTITIONS @@ -265,10 +258,4 @@ #define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE -/* Enable SPI support */ -#ifdef CONFIG_OF_CONTROL -#define CONFIG_DM_SPI -#define CONFIG_CMD_SPI -#endif - #endif /* __CONFIG_H */ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 891bdb0..f3353f2 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -27,11 +27,8 @@ #define CONFIG_BOARD_EARLY_INIT_F -#define LPUART_BASEUART1_BASE - /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_UART_PORT (1) #define CONFIG_BAUDRATE115200 #undef CONFIG_CMD_IMLS diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index dcfafaf..84ad2c3 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -34,11 +34,8 @@ #define CONFIG_BOARD_EARLY_INIT_F -#define LPUART_BASEUART1_BASE - /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_UART_PORT (1) #define CONFIG_BAUDRATE115200 /* NAND support */ -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 02/22] ppc: xilinx-ppc405: Remove support for fx12mm
It is just a specialized version of the xilinx-ppc405 Signed-off-by: Ricardo Ribalda Delgado--- arch/powerpc/cpu/ppc4xx/Kconfig | 4 board/avnet/fx12mm/Kconfig | 12 -- board/avnet/fx12mm/MAINTAINERS | 7 -- board/avnet/fx12mm/Makefile | 11 - board/avnet/fx12mm/fx12mm.c | 34 --- board/avnet/fx12mm/xparameters.h | 35 configs/fx12mm_defconfig | 10 configs/fx12mm_flash_defconfig | 9 include/configs/fx12mm.h | 50 9 files changed, 172 deletions(-) delete mode 100644 board/avnet/fx12mm/Kconfig delete mode 100644 board/avnet/fx12mm/MAINTAINERS delete mode 100644 board/avnet/fx12mm/Makefile delete mode 100644 board/avnet/fx12mm/fx12mm.c delete mode 100644 board/avnet/fx12mm/xparameters.h delete mode 100644 configs/fx12mm_defconfig delete mode 100644 configs/fx12mm_flash_defconfig delete mode 100644 include/configs/fx12mm.h diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index ba09b57fca50..120d5cfb3f39 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -55,9 +55,6 @@ config TARGET_YOSEMITE config TARGET_YUCCA bool "Support yucca" -config TARGET_FX12MM - bool "Support fx12mm" - config TARGET_V5FX30TEVAL bool "Support v5fx30teval" @@ -136,7 +133,6 @@ source "board/amcc/sequoia/Kconfig" source "board/amcc/walnut/Kconfig" source "board/amcc/yosemite/Kconfig" source "board/amcc/yucca/Kconfig" -source "board/avnet/fx12mm/Kconfig" source "board/avnet/v5fx30teval/Kconfig" source "board/esd/cpci2dp/Kconfig" source "board/esd/cpci405/Kconfig" diff --git a/board/avnet/fx12mm/Kconfig b/board/avnet/fx12mm/Kconfig deleted file mode 100644 index 0b67ebde93b8.. --- a/board/avnet/fx12mm/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_FX12MM - -config SYS_BOARD - default "fx12mm" - -config SYS_VENDOR - default "avnet" - -config SYS_CONFIG_NAME - default "fx12mm" - -endif diff --git a/board/avnet/fx12mm/MAINTAINERS b/board/avnet/fx12mm/MAINTAINERS deleted file mode 100644 index c92e258df95c.. --- a/board/avnet/fx12mm/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -FX12MM BOARD -M: Georg Schardt -S: Maintained -F: board/avnet/fx12mm/ -F: include/configs/fx12mm.h -F: configs/fx12mm_defconfig -F: configs/fx12mm_flash_defconfig diff --git a/board/avnet/fx12mm/Makefile b/board/avnet/fx12mm/Makefile deleted file mode 100644 index 618b42f8917c.. --- a/board/avnet/fx12mm/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# (C) Copyright 2008 -# Ricardo Ribalda,Universidad Autonoma de Madrid, ricardo.riba...@uam.es -# This work has been supported by: Qtechnology http://qtec.com/ -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += fx12mm.o - -include $(srctree)/board/xilinx/ppc405-generic/Makefile diff --git a/board/avnet/fx12mm/fx12mm.c b/board/avnet/fx12mm/fx12mm.c deleted file mode 100644 index 92e1cfb75f3c.. --- a/board/avnet/fx12mm/fx12mm.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * (C) Copyright 2008 - * - * Author: Xilinx Inc. - * - * Modified by: - * Georg Schardt - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#include -#include -#include - -int checkboard(void) -{ - char buf[64]; - int i; - int l = getenv_f("serial#", buf, sizeof(buf)); - - if (l < 0) { - printf("Avnet Virtex4 FX12 with no serial #"); - } else { - printf("Avnet Virtex4 FX12 Minimodul # "); - for (i = 0; i < l; ++i) { - if (buf[i] == ' ') - break; - putc(buf[i]); - } - } - putc('\n'); - return 0; -} diff --git a/board/avnet/fx12mm/xparameters.h b/board/avnet/fx12mm/xparameters.h deleted file mode 100644 index 94f682f8ecce.. --- a/board/avnet/fx12mm/xparameters.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * (C) Copyright 2008 - * - * Georg Schardt - * - * SPDX-License-Identifier:GPL-2.0+ - * - * CAUTION: This file is based on the xparameters.h automatically - * generated by libgen. Version: Xilinx EDK 10.1.02 Build EDK_K_SP2.5 - */ - -#ifndef __XPARAMETER_H__ -#define __XPARAMETER_H__ - -/* RS232 */ -#define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 1 -#define XPAR_UARTNS550_0_BASEADDR 0x83E0 - - -/* INT_C */ -#define XPAR_XPS_INTC_0_DEVICE_ID 0 -#define XPAR_XPS_INTC_0_BASEADDR 0x8180 -#define XPAR_INTC_MAX_NUM_INTR_INPUTS 2 - -/* CPU core clock */ -#define XPAR_CORE_CLOCK_FREQ_HZ 3 -#define XPAR_PLB_CLOCK_FREQ_HZ 1 - -/* RAM */ -#define XPAR_DDR2_SDRAM_MEM_BASEADDR 0x - -/* FLASH */ -#define XPAR_FLASH_MEM0_BASEADDR 0xFFC0 - -#endif diff --git
[U-Boot] [PATCH 03/22] xilinx-ppc440: Remove support for v5fx30teval
It is just a specialized version of xilinx-ppc440 Signed-off-by: Ricardo Ribalda Delgado--- arch/powerpc/cpu/ppc4xx/Kconfig | 4 board/avnet/v5fx30teval/Kconfig | 12 --- board/avnet/v5fx30teval/MAINTAINERS | 7 --- board/avnet/v5fx30teval/Makefile | 11 -- board/avnet/v5fx30teval/v5fx30teval.c | 17 board/avnet/v5fx30teval/xparameters.h | 22 configs/v5fx30teval_defconfig | 9 - configs/v5fx30teval_flash_defconfig | 8 include/configs/v5fx30teval.h | 38 --- 9 files changed, 128 deletions(-) delete mode 100644 board/avnet/v5fx30teval/Kconfig delete mode 100644 board/avnet/v5fx30teval/MAINTAINERS delete mode 100644 board/avnet/v5fx30teval/Makefile delete mode 100644 board/avnet/v5fx30teval/v5fx30teval.c delete mode 100644 board/avnet/v5fx30teval/xparameters.h delete mode 100644 configs/v5fx30teval_defconfig delete mode 100644 configs/v5fx30teval_flash_defconfig delete mode 100644 include/configs/v5fx30teval.h diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index 120d5cfb3f39..3959585d44c3 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -55,9 +55,6 @@ config TARGET_YOSEMITE config TARGET_YUCCA bool "Support yucca" -config TARGET_V5FX30TEVAL - bool "Support v5fx30teval" - config TARGET_CPCI2DP bool "Support CPCI2DP" @@ -133,7 +130,6 @@ source "board/amcc/sequoia/Kconfig" source "board/amcc/walnut/Kconfig" source "board/amcc/yosemite/Kconfig" source "board/amcc/yucca/Kconfig" -source "board/avnet/v5fx30teval/Kconfig" source "board/esd/cpci2dp/Kconfig" source "board/esd/cpci405/Kconfig" source "board/esd/plu405/Kconfig" diff --git a/board/avnet/v5fx30teval/Kconfig b/board/avnet/v5fx30teval/Kconfig deleted file mode 100644 index 079387b707a7.. --- a/board/avnet/v5fx30teval/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_V5FX30TEVAL - -config SYS_BOARD - default "v5fx30teval" - -config SYS_VENDOR - default "avnet" - -config SYS_CONFIG_NAME - default "v5fx30teval" - -endif diff --git a/board/avnet/v5fx30teval/MAINTAINERS b/board/avnet/v5fx30teval/MAINTAINERS deleted file mode 100644 index 91dde7a5c8f9.. --- a/board/avnet/v5fx30teval/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -V5FX30TEVAL BOARD -M: Ricardo Ribalda -S: Maintained -F: board/avnet/v5fx30teval/ -F: include/configs/v5fx30teval.h -F: configs/v5fx30teval_defconfig -F: configs/v5fx30teval_flash_defconfig diff --git a/board/avnet/v5fx30teval/Makefile b/board/avnet/v5fx30teval/Makefile deleted file mode 100644 index 8c41af02d4f2.. --- a/board/avnet/v5fx30teval/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# (C) Copyright 2008 -# Ricardo Ribalda,Universidad Autonoma de Madrid, ricardo.riba...@uam.es -# This work has been supported by: Qtechnology http://qtec.com/ -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += v5fx30teval.o - -include $(srctree)/board/xilinx/ppc440-generic/Makefile diff --git a/board/avnet/v5fx30teval/v5fx30teval.c b/board/avnet/v5fx30teval/v5fx30teval.c deleted file mode 100644 index 68b0eb959dea.. --- a/board/avnet/v5fx30teval/v5fx30teval.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es - * This work has been supported by: QTechnology http://qtec.com/ - * SPDX-License-Identifier:GPL-2.0+ -*/ - -#include -#include -#include - - -int checkboard(void) -{ - puts("Avnet Virtex 5 FX30 Evaluation Board\n"); - return 0; -} diff --git a/board/avnet/v5fx30teval/xparameters.h b/board/avnet/v5fx30teval/xparameters.h deleted file mode 100644 index 95b8c285ad1a.. --- a/board/avnet/v5fx30teval/xparameters.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es - * This work has been supported by: QTechnology http://qtec.com/ - * based on xparameters.h by Xilinx - * - * SPDX-License-Identifier:GPL-2.0+ -*/ - -#ifndef XPARAMETER_H -#define XPARAMETER_H - -#define XPAR_DDR2_SDRAM_MEM_BASEADDR 0x -#define XPAR_INTC_0_BASEADDR 0x8180 -#define XPAR_UARTLITE_0_BASEADDR 0x8400 -#define XPAR_FLASH_MEM0_BASEADDR 0xFF00 -#define XPAR_PLB_CLOCK_FREQ_HZ 1 -#define XPAR_CORE_CLOCK_FREQ_HZ4 -#define XPAR_INTC_MAX_NUM_INTR_INPUTS 13 -#define XPAR_UARTLITE_0_BAUDRATE 9600 - -#endif diff --git a/configs/v5fx30teval_defconfig b/configs/v5fx30teval_defconfig deleted file mode 100644 index 3e2ce7d2fe76.. --- a/configs/v5fx30teval_defconfig +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG_PPC=y -CONFIG_4xx=y -CONFIG_TARGET_V5FX30TEVAL=y
[U-Boot] [PATCH 05/22] mailaddr: Update mail address
The old mail address will stop working soon. Update it all the files Signed-off-by: Ricardo Ribalda Delgado--- arch/powerpc/cpu/ppc4xx/interrupts.c| 2 +- arch/powerpc/cpu/ppc4xx/uic.c | 2 +- arch/powerpc/cpu/ppc4xx/xilinx_irq.c| 2 +- arch/powerpc/include/asm/interrupt.h| 2 +- arch/powerpc/include/asm/xilinx_irq.h | 2 +- board/xilinx/ppc405-generic/MAINTAINERS | 2 +- board/xilinx/ppc405-generic/Makefile| 2 +- board/xilinx/ppc405-generic/xilinx_ppc405_generic.c | 2 +- board/xilinx/ppc405-generic/xparameters.h | 2 +- board/xilinx/ppc440-generic/MAINTAINERS | 2 +- board/xilinx/ppc440-generic/Makefile| 2 +- board/xilinx/ppc440-generic/init.S | 2 +- board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 2 +- board/xilinx/ppc440-generic/xparameters.h | 2 +- drivers/hwmon/adt7460.c | 2 +- include/configs/xilinx-ppc.h| 2 +- include/configs/xilinx-ppc405-generic.h | 2 +- include/configs/xilinx-ppc405.h | 2 +- include/configs/xilinx-ppc440-generic.h | 2 +- include/configs/xilinx-ppc440.h | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/cpu/ppc4xx/interrupts.c b/arch/powerpc/cpu/ppc4xx/interrupts.c index d9b565468b60..45997d6eae06 100644 --- a/arch/powerpc/cpu/ppc4xx/interrupts.c +++ b/arch/powerpc/cpu/ppc4xx/interrupts.c @@ -9,7 +9,7 @@ * Travis B. Sawyer, Sandburst Corporation, tsaw...@sandburst.com * * (C) Copyright 2008 (PPC440X05 port for Virtex 5 FX) - * Ricardo Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es + * Ricardo Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com * Work supported by Qtechnology (htpp://qtec.com) * * SPDX-License-Identifier:GPL-2.0+ diff --git a/arch/powerpc/cpu/ppc4xx/uic.c b/arch/powerpc/cpu/ppc4xx/uic.c index bd955ed83ff0..fb453b1adfb5 100644 --- a/arch/powerpc/cpu/ppc4xx/uic.c +++ b/arch/powerpc/cpu/ppc4xx/uic.c @@ -9,7 +9,7 @@ * Travis B. Sawyer, Sandburst Corporation, tsaw...@sandburst.com * * (C) Copyright 2008 (PPC440X05 port for Virtex 5 FX) - * Ricardo Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es + * Ricardo Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com * Work supported by Qtechnology (htpp://qtec.com) * * SPDX-License-Identifier:GPL-2.0+ diff --git a/arch/powerpc/cpu/ppc4xx/xilinx_irq.c b/arch/powerpc/cpu/ppc4xx/xilinx_irq.c index 71e1be02a678..1a2e917eb23b 100644 --- a/arch/powerpc/cpu/ppc4xx/xilinx_irq.c +++ b/arch/powerpc/cpu/ppc4xx/xilinx_irq.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es + * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com * This work has been supported by: QTechnology http://qtec.com/ * Based on interrupts.c Wolfgang Denk-DENX Software engineering...@denx.de * SPDX-License-Identifier:GPL-2.0+ diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h index 1a6a93384e76..9f370dd83c9d 100644 --- a/arch/powerpc/include/asm/interrupt.h +++ b/arch/powerpc/include/asm/interrupt.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es + * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com * This work has been supported by: QTechnology http://qtec.com/ * Based on interrupts.c Wolfgang Denk-DENX Software engineering...@denx.de * diff --git a/arch/powerpc/include/asm/xilinx_irq.h b/arch/powerpc/include/asm/xilinx_irq.h index 333a0372b788..5766bde366ce 100644 --- a/arch/powerpc/include/asm/xilinx_irq.h +++ b/arch/powerpc/include/asm/xilinx_irq.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es + * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com * This work has been supported by: QTechnology http://qtec.com/ * Based on interrupts.c Wolfgang Denk-DENX Software engineering...@denx.de * SPDX-License-Identifier:GPL-2.0+ diff --git a/board/xilinx/ppc405-generic/MAINTAINERS b/board/xilinx/ppc405-generic/MAINTAINERS index 2b0c98dc8b73..ba48f50c29bf 100644 --- a/board/xilinx/ppc405-generic/MAINTAINERS +++ b/board/xilinx/ppc405-generic/MAINTAINERS @@ -1,5 +1,5 @@ PPC405-GENERIC BOARD -M: Ricardo Ribalda +M: Ricardo Ribalda S: Maintained F: board/xilinx/ppc405-generic/ F: include/configs/xilinx-ppc405-generic.h diff --git a/board/xilinx/ppc405-generic/Makefile b/board/xilinx/ppc405-generic/Makefile index c9da87065747..922946d72341 100644 --- a/board/xilinx/ppc405-generic/Makefile +++
[U-Boot] [PATCH 09/22] ppc: ppc405: ppc405-generic_flash_defconfig
Remove redundant defconfig file. Boot via flash can be configured via Kconfig. Signed-off-by: Ricardo Ribalda Delgado--- configs/xilinx-ppc405-generic_flash_defconfig | 8 1 file changed, 8 deletions(-) delete mode 100644 configs/xilinx-ppc405-generic_flash_defconfig diff --git a/configs/xilinx-ppc405-generic_flash_defconfig b/configs/xilinx-ppc405-generic_flash_defconfig deleted file mode 100644 index 37084fb0a82d.. --- a/configs/xilinx-ppc405-generic_flash_defconfig +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_PPC=y -CONFIG_4xx=y -CONFIG_TARGET_XILINX_PPC405_GENERIC=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F6,RESET_VECTOR_ADDRESS=0xF7FC" -# CONFIG_CMD_IMLS is not set -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 07/22] ppc: pp440-generic: Simplify Makefile
As a result of the specific board removal, the Makefiles can be simplified. Signed-off-by: Ricardo Ribalda Delgado--- board/xilinx/ppc440-generic/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/xilinx/ppc440-generic/Makefile b/board/xilinx/ppc440-generic/Makefile index 5ca57a9b0d54..4d5f41029ac6 100644 --- a/board/xilinx/ppc440-generic/Makefile +++ b/board/xilinx/ppc440-generic/Makefile @@ -9,5 +9,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += ../../xilinx/ppc440-generic/xilinx_ppc440_generic.o -extra-y+= ../../xilinx/ppc440-generic/init.o +obj-y += xilinx_ppc440_generic.o +extra-y += init.o -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCHv2 3/8] dm: lpuart: Drop the legacy code
On 01/25/2016 10:54 PM, Stefan Agner wrote: On 2016-01-25 09:03, Bhuvanchandra DV wrote: All boards using this driver are with device tree support, hence drop the legacy code in driver to have a pure DT solution. Hm, dropping the legacy code at this point probably leads to a broken state (bisectability...) I would recommend to first move the boards to device tree and then drop legacy stuff... Probably along these lines: arm: vybrid: Enable lpuart support arm: colibri-vf: Enable serial support arm: vybrid: Drop enabling gpio, uart and spi in legacy mode arm: vf610-twr: Add device tree files arm: pcm052: Add device tree files arm: vybrid: Update defconfig's dm: lpuart: Drop the legacy code dm: vybrid_gpio: Drop legacy code Will reorder the patches in next version. -- Stefan Signed-off-by: Bhuvanchandra DVReviewed-by: Bin Meng --- drivers/serial/serial_lpuart.c | 101 + 1 file changed, 2 insertions(+), 99 deletions(-) diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index 3f9c4d1..fc3321f 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -48,8 +48,6 @@ DECLARE_GLOBAL_DATA_PTR; -struct lpuart_fsl *base = (struct lpuart_fsl *)LPUART_BASE; - struct lpuart_serial_platdata { struct lpuart_fsl *reg; }; @@ -127,43 +125,6 @@ static int _lpuart_serial_init(struct lpuart_fsl *base) return 0; } -#ifndef CONFIG_DM_SERIAL -static void lpuart_serial_setbrg(void) -{ - _lpuart_serial_setbrg(base, gd->baudrate); -} - -static int lpuart_serial_getc(void) -{ - return _lpuart_serial_getc(base); -} - -static void lpuart_serial_putc(const char c) -{ - _lpuart_serial_putc(base, c); -} - -static int lpuart_serial_tstc(void) -{ - return _lpuart_serial_tstc(base); -} - -static int lpuart_serial_init(void) -{ - return _lpuart_serial_init(base); -} - -static struct serial_device lpuart_serial_drv = { - .name = "lpuart_serial", - .start = lpuart_serial_init, - .stop = NULL, - .setbrg = lpuart_serial_setbrg, - .putc = lpuart_serial_putc, - .puts = default_serial_puts, - .getc = lpuart_serial_getc, - .tstc = lpuart_serial_tstc, -}; -#else /* CONFIG_DM_SERIAL */ static int lpuart_serial_setbrg(struct udevice *dev, int baudrate) { struct lpuart_serial_platdata *plat = dev->platdata; @@ -210,8 +171,8 @@ static int lpuart_serial_probe(struct udevice *dev) return _lpuart_serial_init(reg); } -#endif /* CONFIG_DM_SERIAL */ #else + static void _lpuart32_serial_setbrg(struct lpuart_fsl *base, int baudrate) { u32 clk = CONFIG_SYS_CLK_FREQ; @@ -281,43 +242,6 @@ static int _lpuart32_serial_init(struct lpuart_fsl *base) return 0; } -#ifndef CONFIG_DM_SERIAL -static void lpuart32_serial_setbrg(void) -{ - _lpuart32_serial_setbrg(base, gd->baudrate); -} - -static int lpuart32_serial_getc(void) -{ - return _lpuart32_serial_getc(base); -} - -static void lpuart32_serial_putc(const char c) -{ - _lpuart32_serial_putc(base, c); -} - -static int lpuart32_serial_tstc(void) -{ - return _lpuart32_serial_tstc(base); -} - -static int lpuart32_serial_init(void) -{ - return _lpuart32_serial_init(base); -} - -static struct serial_device lpuart32_serial_drv = { - .name = "lpuart32_serial", - .start = lpuart32_serial_init, - .stop = NULL, - .setbrg = lpuart32_serial_setbrg, - .putc = lpuart32_serial_putc, - .puts = default_serial_puts, - .getc = lpuart32_serial_getc, - .tstc = lpuart32_serial_tstc, -}; -#else /* CONFIG_DM_SERIAL */ static int lpuart32_serial_setbrg(struct udevice *dev, int baudrate) { struct lpuart_serial_platdata *plat = dev->platdata; @@ -364,28 +288,8 @@ static int lpuart32_serial_probe(struct udevice *dev) return _lpuart32_serial_init(reg); } -#endif /* CONFIG_DM_SERIAL */ -#endif - -#ifndef CONFIG_DM_SERIAL -void lpuart_serial_initialize(void) -{ -#ifdef CONFIG_LPUART_32B_REG - serial_register(_serial_drv); -#else - serial_register(_serial_drv); -#endif -} +#endif /* CONFIG_LPUART_32B_REG */ -__weak struct serial_device *default_serial_console(void) -{ -#ifdef CONFIG_LPUART_32B_REG - return _serial_drv; -#else - return _serial_drv; -#endif -} -#else /* CONFIG_DM_SERIAL */ static int lpuart_serial_ofdata_to_platdata(struct udevice *dev) { struct lpuart_serial_platdata *plat = dev->platdata; @@ -447,4 +351,3 @@ U_BOOT_DRIVER(serial_lpuart32) = { .flags = DM_FLAG_PRE_RELOC, }; #endif /* CONFIG_LPUART_32B_REG */ -#endif /* CONFIG_DM_SERIAL */ -- Best regards, Bhuvan ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 16/22] ppc: xilinx-ppc4xx: Port to DM serial
xilinx_uartlite has been ported to DM, this patch makes the xilinx-ppc405-generic and the xilinx-ppc440-generic boards use the new DM driver. Signed-off-by: Ricardo Ribalda Delgado--- arch/powerpc/cpu/ppc4xx/Kconfig | 8 board/xilinx/ppc405-generic/xilinx_ppc405_generic.c | 4 board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 4 configs/xilinx-ppc405-generic_defconfig | 8 configs/xilinx-ppc440-generic_defconfig | 12 drivers/serial/Kconfig | 2 +- include/configs/xilinx-ppc.h| 20 7 files changed, 37 insertions(+), 21 deletions(-) diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index 3959585d44c3..36af1b9419b0 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -111,9 +111,17 @@ config TARGET_XPEDITE1000 config TARGET_XILINX_PPC405_GENERIC bool "Support xilinx-ppc405-generic" + select SUPPORT_SPL + select OF_CONTROL + select DM + select DM_SERIAL config TARGET_XILINX_PPC440_GENERIC bool "Support xilinx-ppc440-generic" + select SUPPORT_SPL + select OF_CONTROL + select DM + select DM_SERIAL endchoice diff --git a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c index 8b10dbaed149..32105a823b0b 100644 --- a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c +++ b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c @@ -46,3 +46,7 @@ void __get_sys_info(sys_info_t *sysInfo) return; } void get_sys_info(sys_info_t *) __attribute__((weak, alias("__get_sys_info"))); + +int get_serial_clock(void){ + return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; +} diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c index 3718a76f8022..f92a3033e14d 100644 --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c @@ -39,3 +39,7 @@ void __get_sys_info(sys_info_t *sysInfo) return; } void get_sys_info(sys_info_t *) __attribute__((weak, alias("__get_sys_info"))); + +int get_serial_clock(void){ + return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; +} diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig index 53fafc324e68..e7132cd61152 100644 --- a/configs/xilinx-ppc405-generic_defconfig +++ b/configs/xilinx-ppc405-generic_defconfig @@ -7,3 +7,11 @@ CONFIG_SYS_PROMPT="xlx-ppc405:/# " # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set +CONFIG_SYS_MALLOC_SIMPLE=y +CONFIG_XILINX_UARTLITE=y +CONFIG_SYS_NS16550=y +CONFIG_OF_EMBED=y +CONFIG_OF_CONTROL=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig index 79be48a9955e..c66357e08724 100644 --- a/configs/xilinx-ppc440-generic_defconfig +++ b/configs/xilinx-ppc440-generic_defconfig @@ -3,7 +3,11 @@ CONFIG_4xx=y CONFIG_TARGET_XILINX_PPC440_GENERIC=y CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x0410,BOOT_FROM_XMD=1" CONFIG_SYS_PROMPT="board:/# " -# CONFIG_CMD_IMLS is not set -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set +CONFIG_SYS_MALLOC_SIMPLE=y +CONFIG_XILINX_UARTLITE=y +CONFIG_SYS_NS16550=y +CONFIG_OF_EMBED=y +CONFIG_OF_CONTROL=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 82f52dd12330..197686483cc7 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -252,7 +252,7 @@ config UNIPHIER_SERIAL config XILINX_UARTLITE bool "Xilinx Uarlite support" - depends on DM_SERIAL && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP) + depends on DM_SERIAL && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP || 4xx) help If you have a Xilinx based board and want to use the uartlite serial ports, say Y to this option. If unsure, say N. diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 876750b13820..d01d88b33f4d 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -101,22 +101,10 @@ #define CONFIG_SYS_NO_FLASH #endif -/* serial communication */ -#ifdef XPAR_UARTLITE_0_BASEADDR -#define CONFIG_XILINX_UARTLITE -#define XILINX_UARTLITE_BASEADDR XPAR_UARTLITE_0_BASEADDR -#define CONFIG_BAUDRATEXPAR_UARTLITE_0_BAUDRATE -#define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE } -#else -#ifdef XPAR_UARTNS550_0_BASEADDR -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE4 -#define CONFIG_CONS_INDEX 1 -#define
[U-Boot] [PATCH 19/22] ppc: xilinx_ppc405_generic: Remove uncalled functions
board_pre_init was not called because CONFIG_BOARD_EARLY_INIT_F was not set. Remove unused function. Signed-off-by: Ricardo Ribalda Delgado--- board/xilinx/ppc405-generic/xilinx_ppc405_generic.c | 5 - 1 file changed, 5 deletions(-) diff --git a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c index 5c19ac0e6a34..3729f07624a3 100644 --- a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c +++ b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c @@ -15,11 +15,6 @@ ulong get_PCI_freq(void) return 0; } -int board_pre_init(void) -{ - return 0; -} - int checkboard(void) { puts("Xilinx PPC405 Generic Board\n"); -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 15/22] configs/xilinx-ppc440-generic: Typos and size
-Fix typos (runnining -> running) -Increase default size Signed-off-by: Ricardo Ribalda Delgado--- include/configs/xilinx-ppc440-generic.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h index 47bc4aec148e..2af5f7fc1de5 100644 --- a/include/configs/xilinx-ppc440-generic.h +++ b/include/configs/xilinx-ppc440-generic.h @@ -21,17 +21,17 @@ #defineCONFIG_ENV_IS_IN_FLASH 1 #defineCONFIG_ENV_SIZE 0x2 #defineCONFIG_ENV_SECT_SIZE0x2 -#define CONFIG_ENV_OFFSET 0x34 +#define CONFIG_ENV_OFFSET 0x34 #define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET) /*Misc*/ -#define CONFIG_PREBOOT "echo U-Boot is up and runnining;" +#define CONFIG_PREBOOT "echo U-Boot is up and running;" /*Flash*/ -#defineCONFIG_SYS_FLASH_SIZE (32*1024*1024) -#defineCONFIG_SYS_MAX_FLASH_SECT 259 -#define MTDIDS_DEFAULT "nor0=ml507-flash" -#define MTDPARTS_DEFAULT "mtdparts=ml507-flash:-(user)" +#defineCONFIG_SYS_FLASH_SIZE (128*1024*1024) +#defineCONFIG_SYS_MAX_FLASH_SECT 1024 +#define MTDIDS_DEFAULT "nor0=flash" +#define MTDPARTS_DEFAULT "mtdparts=flash:-(user)" /*Generic Configs*/ #include -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 10/22] ppc: xilinx-ppc440-generic: Cleanout header files
Now that there is only one header file for all ppc440 files, merge header files. Signed-off-by: Ricardo Ribalda Delgado--- include/configs/xilinx-ppc440-generic.h | 3 ++- include/configs/xilinx-ppc440.h | 17 - 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 include/configs/xilinx-ppc440.h diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h index 769a1deb8a6f..47bc4aec148e 100644 --- a/include/configs/xilinx-ppc440-generic.h +++ b/include/configs/xilinx-ppc440-generic.h @@ -10,6 +10,7 @@ /*CPU*/ #define CONFIG_440 1 +#define CONFIG_XILINX_440 1 #define CONFIG_XILINX_PPC440_GENERIC 1 #include "../board/xilinx/ppc440-generic/xparameters.h" @@ -33,6 +34,6 @@ #define MTDPARTS_DEFAULT "mtdparts=ml507-flash:-(user)" /*Generic Configs*/ -#include +#include #endif /* __CONFIG_H */ diff --git a/include/configs/xilinx-ppc440.h b/include/configs/xilinx-ppc440.h deleted file mode 100644 index f521387d2289.. --- a/include/configs/xilinx-ppc440.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com - * This work has been supported by: QTechnology http://qtec.com/ - * SPDX-License-Identifier:GPL-2.0+ -*/ - -#ifndef __CONFIG_GEN_H -#define __CONFIG_GEN_H - -/*CPU*/ -#define CONFIG_440 1 -#define CONFIG_XILINX_440 1 - -#include - -#endif /* __CONFIG_H */ -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 00/22] xilinx-ppc4xx: Cleanout and port to DM serial
On 26.1.2016 11:24, Ricardo Ribalda Delgado wrote: > xilinx-ppc4xx made us of serial uartlite, which was ported to DM. > This patch moves port these boards to DM. > > Now that Kconfig works really well, there is no need to maintain > the specific boards (fx12mm, ml507 and v5fx30teval) or their flash > version. > > The ppc440 boards have been wired to the ll_temac driver. > > A series of cleanouts have been done. > > This patchset sits on top of: > http://git.denx.de/?p=u-boot/u-boot-microblaze.git;a=shortlog;h=refs/heads/mb > > It has been tested on a ppc440 bard. > > Hopefully Georg Schardt can test the changes on his fx12mm. > > These changes can also be browset at > https://github.com/ribalda/u-boot/tree/xilinx-ppc4xx-generic-dm > > > Regards (and thanks for your patience)! > > > > Ricardo Ribalda (22): > ppc: xilinx-ppc440: Remove support for ml507 > ppc: xilinx-ppc405: Remove support for fx12mm > xilinx-ppc440: Remove support for v5fx30teval > .mailmap: Add all the mail alias for Ricardo Ribalda > mailaddr: Update mail address > ppc: pp405-generic: Simplify Makefile > ppc: pp440-generic: Simplify Makefile > ppc: ppc440: ppc440-generic_flash_defconfig > ppc: ppc405: ppc405-generic_flash_defconfig > ppc: xilinx-ppc440-generic: Cleanout header files > ppc: xilinx-ppc405-generic: Cleanout header files > ppc: xilinx-ppc4xx-generic: Update xparameters.h > ppc: dts: Add device tree for xilix-ppc4xx-generic > configs/xilinx-ppc405-generic: Typos and size > configs/xilinx-ppc440-generic: Typos and size > ppc: xilinx-ppc4xx: Port to DM serial > ppc: xilinx_ppc405_generic: Remove weak attributes > ppc: xilinx_ppc440_generic: Remove weak attributes > ppc: xilinx_ppc405_generic: Remove uncalled functions > ppc: xilinx_ppc440_generic: Remove uncalled functions > net: xilinx_ll_temac: Fix string overflow > ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver > > .mailmap | 3 ++ > arch/powerpc/cpu/ppc4xx/Kconfig| 20 - > arch/powerpc/cpu/ppc4xx/interrupts.c | 2 +- > arch/powerpc/cpu/ppc4xx/uic.c | 2 +- > arch/powerpc/cpu/ppc4xx/xilinx_irq.c | 2 +- > arch/powerpc/dts/Makefile | 2 + > arch/powerpc/dts/xilinx-ppc405-generic.dts | 13 ++ > arch/powerpc/dts/xilinx-ppc440-generic.dts | 13 ++ > arch/powerpc/include/asm/interrupt.h | 2 +- > arch/powerpc/include/asm/xilinx_irq.h | 2 +- > board/avnet/fx12mm/Kconfig | 12 -- > board/avnet/fx12mm/MAINTAINERS | 7 --- > board/avnet/fx12mm/Makefile| 11 - > board/avnet/fx12mm/fx12mm.c| 34 --- > board/avnet/fx12mm/xparameters.h | 35 --- > board/avnet/v5fx30teval/Kconfig| 12 -- > board/avnet/v5fx30teval/MAINTAINERS| 7 --- > board/avnet/v5fx30teval/Makefile | 11 - > board/avnet/v5fx30teval/v5fx30teval.c | 17 > board/avnet/v5fx30teval/xparameters.h | 22 -- > board/xilinx/ml507/Kconfig | 12 -- > board/xilinx/ml507/MAINTAINERS | 7 --- > board/xilinx/ml507/Makefile| 11 - > board/xilinx/ml507/ml507.c | 17 > board/xilinx/ml507/xparameters.h | 23 -- > board/xilinx/ppc405-generic/MAINTAINERS| 2 +- > board/xilinx/ppc405-generic/Makefile | 4 +- > .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 31 ++ > board/xilinx/ppc405-generic/xparameters.h | 7 ++- > board/xilinx/ppc440-generic/MAINTAINERS| 2 +- > board/xilinx/ppc440-generic/Makefile | 6 +-- > board/xilinx/ppc440-generic/init.S | 2 +- > .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 49 ++--- > board/xilinx/ppc440-generic/xparameters.h | 15 --- > configs/fx12mm_defconfig | 10 - > configs/fx12mm_flash_defconfig | 9 > configs/ml507_defconfig| 9 > configs/ml507_flash_defconfig | 8 > configs/v5fx30teval_defconfig | 9 > configs/v5fx30teval_flash_defconfig| 8 > configs/xilinx-ppc405-generic_defconfig| 8 > configs/xilinx-ppc405-generic_flash_defconfig | 8 > configs/xilinx-ppc440-generic_defconfig| 17 ++-- > configs/xilinx-ppc440-generic_flash_defconfig | 8 > drivers/hwmon/adt7460.c| 2 +- > drivers/net/xilinx_ll_temac.c | 3 +- > drivers/serial/Kconfig |
Re: [U-Boot] [PATCH 05/22] mailaddr: Update mail address
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgadowrote: > The old mail address will stop working soon. > Update it all the files > > Signed-off-by: Ricardo Ribalda Delgado > --- > arch/powerpc/cpu/ppc4xx/interrupts.c| 2 +- > arch/powerpc/cpu/ppc4xx/uic.c | 2 +- > arch/powerpc/cpu/ppc4xx/xilinx_irq.c| 2 +- > arch/powerpc/include/asm/interrupt.h| 2 +- > arch/powerpc/include/asm/xilinx_irq.h | 2 +- > board/xilinx/ppc405-generic/MAINTAINERS | 2 +- > board/xilinx/ppc405-generic/Makefile| 2 +- > board/xilinx/ppc405-generic/xilinx_ppc405_generic.c | 2 +- > board/xilinx/ppc405-generic/xparameters.h | 2 +- > board/xilinx/ppc440-generic/MAINTAINERS | 2 +- > board/xilinx/ppc440-generic/Makefile| 2 +- > board/xilinx/ppc440-generic/init.S | 2 +- > board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 2 +- > board/xilinx/ppc440-generic/xparameters.h | 2 +- > drivers/hwmon/adt7460.c | 2 +- > include/configs/xilinx-ppc.h| 2 +- > include/configs/xilinx-ppc405-generic.h | 2 +- > include/configs/xilinx-ppc405.h | 2 +- > include/configs/xilinx-ppc440-generic.h | 2 +- > include/configs/xilinx-ppc440.h | 2 +- > 20 files changed, 20 insertions(+), 20 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 3/3] board: atmel: siemens: clean up PLLB code
Hello Wenyou, Am 27.01.2016 um 03:04 schrieb Wenyou Yang: Due to introducing the new PLLB clock handle functions, use these functions to clean up the PLLB enable code. Signed-off-by: Wenyou YangReviewed-by: Andreas Bießmann --- Changes in v2: - collect Reviewed-by from Andreas. board/siemens/smartweb/smartweb.c |6 +- board/siemens/taurus/taurus.c |6 +- 2 files changed, 2 insertions(+), 10 deletions(-) Tested on the smartweb board, so: Tested-by: Heiko Schocher bye, Heiko [1] testlog http://xeidos.ddns.net/buildbot/builders/smartweb_dfu/builds/48/steps/shell/logs/tbotlog diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c index e7ee65c..47a60a7 100644 --- a/board/siemens/smartweb/smartweb.c +++ b/board/siemens/smartweb/smartweb.c @@ -115,12 +115,8 @@ static void smartweb_macb_hw_init(void) void at91_udp_hw_init(void) { - at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; - /* Enable PLLB */ - writel(get_pllb_init(), >pllbr); - while ((readl(>sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) - ; + at91_pllb_clk_enable(get_pllb_init()); /* Enable UDPCK clock, MCK is enabled in at91_clock_init() */ at91_periph_clk_enable(ATMEL_ID_UDP); diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c index 9374064..b0385d8 100644 --- a/board/siemens/taurus/taurus.c +++ b/board/siemens/taurus/taurus.c @@ -289,12 +289,8 @@ void spi_cs_deactivate(struct spi_slave *slave) void at91_udp_hw_init(void) { - at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; - /* Enable PLLB */ - writel(get_pllb_init(), >pllbr); - while ((readl(>sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) - ; + at91_pllb_clk_enable(get_pllb_init()); /* Enable UDPCK clock, MCK is enabled in at91_clock_init() */ at91_periph_clk_enable(ATMEL_ID_UDP); -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 2/3] drivers: usb: ohci-at91: clean up the PLLB code
Hello Wenyou, Am 27.01.2016 um 03:04 schrieb Wenyou Yang: Due to introducing the new PLLB clock handle functions, use these functions to clean up the PLLB enable/disable code. Signed-off-by: Wenyou Yang--- Changes in v2: - add return value for timeout checking at91_pllb_clk_enable/disable(). drivers/usb/host/ohci-at91.c | 22 +++--- 1 file changed, 7 insertions(+), 15 deletions(-) Tested on the smartweb board, so: Tested-by: Heiko Schocher bye, Heiko [1] testlog http://xeidos.ddns.net/buildbot/builders/smartweb_dfu/builds/48/steps/shell/logs/tbotlog diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 6ae6959..e030a0a 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -9,20 +9,14 @@ #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) -#include -#include -#include #include int usb_cpu_init(void) { - at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; - #ifdef CONFIG_USB_ATMEL_CLK_SEL_PLLB - /* Enable PLLB */ - writel(get_pllb_init(), >pllbr); - while ((readl(>sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) - ; + if (at91_pllb_clk_enable(get_pllb_init())) + return -1; + #ifdef CONFIG_AT91SAM9N12 at91_usb_clk_init(AT91_PMC_USBS_USB_PLLB | AT91_PMC_USB_DIV_2); #endif @@ -45,8 +39,6 @@ int usb_cpu_init(void) int usb_cpu_stop(void) { - at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; - at91_periph_clk_disable(ATMEL_ID_UHP); at91_system_clk_disable(ATMEL_PMC_UHP); @@ -58,10 +50,10 @@ int usb_cpu_stop(void) #ifdef CONFIG_AT91SAM9N12 at91_usb_clk_init(0); #endif - /* Disable PLLB */ - writel(0, >pllbr); - while ((readl(>sr) & AT91_PMC_LOCKB) != 0) - ; + + if (at91_pllb_clk_disable()) + return -1; + #elif defined(CONFIG_USB_ATMEL_CLK_SEL_UPLL) if (at91_upll_clk_disable()) return -1; -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-marvell/master
Hi Tom, please pull the following patch. Thanks, Stefan The following changes since commit 9e4de7fd4acc8f99b6d383c711d21c0159849629: Merge branch 'master' of http://git.denx.de/u-boot-sunxi (2016-01-26 17:45:37 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-marvell.git for you to fetch changes up to b20c38a973a51bf3f663bd298c63ad1b8e0de445: arm: mvebu: Add support for the Armada XP theadorable board (2016-01-27 07:45:43 +0100) Stefan Roese (1): arm: mvebu: Add support for the Armada XP theadorable board arch/arm/dts/Makefile | 3 +- arch/arm/dts/armada-xp-theadorable.dts | 143 +++ arch/arm/mach-mvebu/Kconfig| 6 ++ board/theadorable/MAINTAINERS | 7 ++ board/theadorable/Makefile | 7 ++ board/theadorable/kwbimage.cfg | 12 +++ board/theadorable/theadorable.c| 171 + configs/theadorable_debug_defconfig| 28 ++ configs/theadorable_defconfig | 26 + include/configs/theadorable.h | 170 10 files changed, 572 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/armada-xp-theadorable.dts create mode 100644 board/theadorable/MAINTAINERS create mode 100644 board/theadorable/Makefile create mode 100644 board/theadorable/kwbimage.cfg create mode 100644 board/theadorable/theadorable.c create mode 100644 configs/theadorable_debug_defconfig create mode 100644 configs/theadorable_defconfig create mode 100644 include/configs/theadorable.h ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 0/7] Determine Boot mode at run time
> -Original Message- > From: Tom Rini [mailto:tr...@konsulko.com] > Sent: Monday, January 25, 2016 9:06 PM > To: Aneesh Bansal> Cc: u-boot@lists.denx.de; Ruchika Gupta > Subject: Re: [U-Boot] [PATCH v3 0/7] Determine Boot mode at run time > > On Fri, Jan 22, 2016 at 04:37:21PM +0530, Aneesh Bansal wrote: > > > There are two phases in Secure Boot > > 1. ISBC: In BootROM, validate the BootLoader (U-Boot). > > 2. ESBC: In U-Boot, continuing the Chain of Trust by > > validating and booting LINUX. > > > > For ESBC phase, there is no difference in SoC's based on ARM or > > PowerPC cores. > > > > But the exit conditions after ISBC phase i.e. entry conditions for > > U-Boot are different for ARM and PowerPC. > > PowerPC: > > > > If Secure Boot is executed, a separate U-Boot target is required which > > must be compiled with a diffrent Text Base as compared to Non-Secure Boot. > > There are some LAW and TLB settings which are required specifically > > for Secure Boot scenario. > > > > ARM: > > > > ARM based SoC's have a fixed memory map and exit conditions from > > BootROM are same irrespective of boot mode (Secure or Non-Secure). > > > > This patchset is aimed at removing the requirement for a separate > > Secure Boot target for ARM based SoC's. > > > > Another Security Requirement for running CHAIN_OF_TRUST is that U-Boot > > environemnt must not be picked from flash/external memory. This cannot > > be done based on bootmode at run time in current U-Boot architecture. > > Once this dependency is resolved, no separate SECURE_BOOT target will be > required for ARM based SoC's. > > > > Currently, the only code under CONFIG_SECURE_BOOT for ARM SoC's is > > defining CONFIG_ENV_IS_NOWHERE > > > > The patches have been tested on LS1043, LS1021, P3041 and T1024. > > > > The patch set is dependent on following: > > http://patchwork.ozlabs.org/patch/553826/ > > > > Aneesh Bansal (7): > > include/configs: make secure boot header file include uniform > > include/configs: move definition of CONFIG_CMD_BLOB > > SECURE_BOOT: split the secure boot functionality in two parts > > create function to determine boot mode > > enable chain of trust for ARM platforms > > enable chain of trust for PowerPC platforms > > SECURE_BOOT: change error handler for esbc_validate > > > > arch/arm/cpu/armv8/fsl-layerscape/soc.c| 6 ++ > > .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 3 + > > arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 2 + > > arch/arm/include/asm/fsl_secure_boot.h | 20 +++- > > arch/powerpc/cpu/mpc85xx/cpu_init.c| 14 +++ > > arch/powerpc/include/asm/fsl_secure_boot.h | 47 ++--- > > arch/powerpc/include/asm/immap_85xx.h | 3 + > > board/freescale/common/Makefile| 1 + > > board/freescale/common/cmd_esbc_validate.c | 7 +- > > board/freescale/common/fsl_chain_of_trust.c| 70 + > > board/freescale/common/fsl_validate.c | 7 ++ > > board/freescale/ls1021aqds/ls1021aqds.c| 4 + > > board/freescale/ls1021atwr/ls1021atwr.c| 4 + > > include/config_fsl_chain_trust.h | 101 ++ > > include/config_fsl_secboot.h | 116 > > - > > include/configs/B4860QDS.h | 4 - > > include/configs/BSC9132QDS.h | 4 - > > include/configs/P1010RDB.h | 4 - > > include/configs/P2041RDB.h | 4 - > > include/configs/T102xQDS.h | 10 +- > > include/configs/T102xRDB.h | 10 +- > > include/configs/T1040QDS.h | 3 - > > include/configs/T104xRDB.h | 3 - > > include/configs/T208xQDS.h | 4 - > > include/configs/T208xRDB.h | 4 - > > include/configs/T4240QDS.h | 4 - > > include/configs/T4240RDB.h | 9 -- > > include/configs/corenet_ds.h | 4 - > > include/configs/ls1021aqds.h | 5 +- > > include/configs/ls1021atwr.h | 5 +- > > include/configs/ls1043a_common.h | 8 ++ > > include/configs/ls1043aqds.h | 2 + > > include/configs/ls1043ardb.h | 8 -- > > include/fsl_validate.h | 2 + > > 34 files changed, 299 insertions(+), 203 deletions(-) create mode > > 100644 board/freescale/common/fsl_chain_of_trust.c > > create mode 100644 include/config_fsl_chain_trust.h delete mode > > 100644 include/config_fsl_secboot.h > > Looking at the config file changes, I think we need to move a bunch of this > stuff to > Kconfig so that we can get these
Re: [U-Boot] [PATCH 2/2] include:configs: Add usb device-tree fixup for all fsl platforms
On Wednesday, January 27, 2016 at 05:14:00 AM, Ramneek Mehresh wrote: > > -Original Message- > > From: Marek Vasut [mailto:ma...@denx.de] > > Sent: Tuesday, January 26, 2016 4:58 PM > > To: Ramneek Mehresh> > Cc: u-boot@lists.denx.de > > Subject: Re: [PATCH 2/2] include:configs: Add usb device-tree fixup for > > all fsl platforms > > > > On Tuesday, January 26, 2016 at 12:36:58 PM, Ramneek Mehresh wrote: > > > Add usb device-tree fixup for all relevant fsl ppc and arm platforms > > > > > > Signed-off-by: Ramneek Mehresh > > > --- > > > > > > board/freescale/b4860qds/b4860qds.c | 2 +- > > > board/freescale/bsc9131rdb/bsc9131rdb.c | 2 ++ > > > board/freescale/bsc9132qds/bsc9132qds.c | 2 ++ > > > board/freescale/corenet_ds/corenet_ds.c | 4 > > > board/freescale/ls2080aqds/ls2080aqds.c | 4 > > > board/freescale/ls2080ardb/ls2080ardb.c | 4 > > > board/freescale/mpc8308rdb/mpc8308rdb.c | 4 > > > board/freescale/mpc8315erdb/mpc8315erdb.c | 2 ++ > > > board/freescale/mpc837xemds/mpc837xemds.c | 2 ++ > > > board/freescale/mpc837xerdb/mpc837xerdb.c | 2 ++ > > > board/freescale/mpc8536ds/mpc8536ds.c | 2 +- > > > board/freescale/p1010rdb/p1010rdb.c | 2 +- > > > board/freescale/p1022ds/p1022ds.c | 2 +- > > > board/freescale/p1023rdb/p1023rdb.c | 2 +- > > > board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- > > > board/freescale/p1_twr/p1_twr.c | 3 +++ > > > board/freescale/p2041rdb/p2041rdb.c | 2 +- > > > board/freescale/t102xqds/t102xqds.c | 2 +- > > > board/freescale/t102xrdb/t102xrdb.c | 3 +++ > > > board/freescale/t1040qds/t1040qds.c | 2 +- > > > board/freescale/t104xrdb/t104xrdb.c | 2 +- > > > board/freescale/t208xqds/t208xqds.c | 3 +++ > > > board/freescale/t208xrdb/t208xrdb.c | 3 +++ > > > board/freescale/t4qds/t4240emu.c| 3 +++ > > > board/freescale/t4qds/t4240qds.c| 3 +++ > > > board/freescale/t4rdb/t4240rdb.c| 3 +++ > > > include/configs/B4860QDS.h | 1 + > > > include/configs/BSC9131RDB.h| 1 + > > > include/configs/BSC9132QDS.h| 3 ++- > > > include/configs/MPC8308RDB.h| 3 +++ > > > include/configs/MPC8315ERDB.h | 1 + > > > include/configs/MPC837XEMDS.h | 3 ++- > > > include/configs/MPC837XERDB.h | 1 + > > > include/configs/MPC8536DS.h | 1 + > > > include/configs/P1010RDB.h | 1 + > > > include/configs/P1022DS.h | 1 + > > > include/configs/P1023RDB.h | 1 + > > > include/configs/P2041RDB.h | 1 + > > > include/configs/T102xQDS.h | 1 + > > > include/configs/T102xRDB.h | 1 + > > > include/configs/T1040QDS.h | 1 + > > > include/configs/T104xRDB.h | 1 + > > > include/configs/T208xQDS.h | 1 + > > > include/configs/T208xRDB.h | 1 + > > > include/configs/T4240QDS.h | 1 + > > > include/configs/corenet_ds.h| 1 + > > > include/configs/ls2080aqds.h| 1 + > > > include/configs/ls2080ardb.h| 1 + > > > include/configs/p1_p2_rdb_pc.h | 1 + > > > include/configs/p1_twr.h| 1 + > > > 50 files changed, 85 insertions(+), 12 deletions(-) > > > > Each such new macro must be documented. What is the point of this bulk > > rename anyway? > > Yes, I'll document the new MACRO defined for usb device-tree fixup. > However, this is not bulk rename. I just modified all these files to > include usb device-tree fixup for all fsl ppc platforms. Most of these > platforms were already using this mechanism (some via different ways), but > now its consistent across them. Wouldn't it make more sense to make this generic then instead of patching zillion files ? ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv4 1/9] arm: vybrid: Enable lpuart support
Add device tree node's for lpuart on Vybrid platform Signed-off-by: Bhuvanchandra DVAcked-by: Stefan Agner Reviewed-by: Bin Meng --- arch/arm/dts/vf.dtsi | 43 +++ 1 file changed, 43 insertions(+) diff --git a/arch/arm/dts/vf.dtsi b/arch/arm/dts/vf.dtsi index 78706e1..7aa4c91 100644 --- a/arch/arm/dts/vf.dtsi +++ b/arch/arm/dts/vf.dtsi @@ -17,6 +17,12 @@ gpio2 = gpio3 = gpio4 = + serial0 = + serial1 = + serial2 = + serial3 = + serial4 = + serial5 = spi0 = spi1 = }; @@ -33,6 +39,30 @@ #size-cells = <1>; ranges; + uart0: serial@40027000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x40027000 0x1000>; + status = "disabled"; + }; + + uart1: serial@40028000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x40028000 0x1000>; + status = "disabled"; + }; + + uart2: serial@40029000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x40029000 0x1000>; + status = "disabled"; + }; + + uart3: serial@4002a000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x4002a000 0x1000>; + status = "disabled"; + }; + dspi0: dspi0@4002c000 { #address-cells = <1>; #size-cells = <0>; @@ -95,6 +125,19 @@ #address-cells = <1>; #size-cells = <1>; ranges; + + uart4: serial@400a9000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x400a9000 0x1000>; + status = "disabled"; + }; + + uart5: serial@400aa000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x400aa000 0x1000>; + status = "disabled"; + }; + }; }; }; -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv4 0/9] Migrate NXP/Freescale Vybrid based boards to support pure DT
Changes since v3: - Add missing space in device tree. - Reorder the patchset to avoid broken state. Changes since v2: - Split the patch for updating the license string. - Reorder the patchset to avoid broken state. Changes since v1: - Update the license string in device tree's. - Update all lpuart's uart nodes in device tree. - Dropped *_dtb_defconfig and updated the default defconfig's with DT support. - Reordered defconfig's using defconfig via savedefconfig. - Use one patch to update all Vybrid based board defconfig's. - Dropped vybrid_gpio driver legacy code. Thanks! Stefan for pointing this. - Dropped the legacy way of enabling GPIO, UART and SPI on NXP/Freescale Vybrid based board's. - Compile checked for vf610twr and pcm052 since I don't have access to such hardware at my end. Reviewer's and tester's welcome! Bhuvanchandra DV (9): arm: vybrid: Enable lpuart support arm: vybrid: Update the license string arm: colibri-vf: Enable serial support arm: vf610-twr: Add device tree file's arm: pcm052: Add device tree file's arm: vybrid: Update defconfig's arm: vybrid: Drop enabling GPIO, SPI and UART in legacy mode dm: lpuart: Drop the legacy code dm: vybrid_gpio: Drop legacy code arch/arm/dts/Makefile| 4 +- arch/arm/dts/pcm052.dts | 22 + arch/arm/dts/vf-colibri.dtsi | 15 -- arch/arm/dts/vf.dtsi | 48 +-- arch/arm/dts/vf500-colibri.dts | 5 -- arch/arm/dts/vf610-colibri.dts | 5 -- arch/arm/dts/vf610-twr.dts | 22 + configs/colibri_vf_defconfig | 8 configs/colibri_vf_dtb_defconfig | 14 -- configs/pcm052_defconfig | 7 +++ configs/vf610twr_defconfig | 7 +++ configs/vf610twr_nand_defconfig | 7 +++ drivers/gpio/vybrid_gpio.c | 18 --- drivers/serial/serial_lpuart.c | 101 +-- include/configs/colibri_vf.h | 13 - include/configs/pcm052.h | 3 -- include/configs/vf610twr.h | 3 -- 17 files changed, 131 insertions(+), 171 deletions(-) create mode 100644 arch/arm/dts/pcm052.dts create mode 100644 arch/arm/dts/vf610-twr.dts delete mode 100644 configs/colibri_vf_dtb_defconfig -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv4 2/9] arm: vybrid: Update the license string
Since SPDX license is already there, drop the full one. Signed-off-by: Bhuvanchandra DVAcked-by: Stefan Agner Reviewed-by: Bin Meng --- arch/arm/dts/vf-colibri.dtsi | 5 - arch/arm/dts/vf.dtsi | 5 - arch/arm/dts/vf500-colibri.dts | 5 - arch/arm/dts/vf610-colibri.dts | 5 - 4 files changed, 20 deletions(-) diff --git a/arch/arm/dts/vf-colibri.dtsi b/arch/arm/dts/vf-colibri.dtsi index 7a8e9bee..f005339 100644 --- a/arch/arm/dts/vf-colibri.dtsi +++ b/arch/arm/dts/vf-colibri.dtsi @@ -2,11 +2,6 @@ * Copyright 2014 Toradex AG * * SPDX-License-Identifier: GPL-2.0+ or X11 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include "vf.dtsi" diff --git a/arch/arm/dts/vf.dtsi b/arch/arm/dts/vf.dtsi index 7aa4c91..1530d2f 100644 --- a/arch/arm/dts/vf.dtsi +++ b/arch/arm/dts/vf.dtsi @@ -2,11 +2,6 @@ * Copyright 2013 Freescale Semiconductor, Inc. * * SPDX-License-Identifier: GPL-2.0+ or X11 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ /include/ "skeleton.dtsi" diff --git a/arch/arm/dts/vf500-colibri.dts b/arch/arm/dts/vf500-colibri.dts index e383306..02d0ce8 100644 --- a/arch/arm/dts/vf500-colibri.dts +++ b/arch/arm/dts/vf500-colibri.dts @@ -2,11 +2,6 @@ * Copyright 2014 Toradex AG * * SPDX-License-Identifier: GPL-2.0+ or X11 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ /dts-v1/; diff --git a/arch/arm/dts/vf610-colibri.dts b/arch/arm/dts/vf610-colibri.dts index 63bb3f4..24dfcbe 100644 --- a/arch/arm/dts/vf610-colibri.dts +++ b/arch/arm/dts/vf610-colibri.dts @@ -2,11 +2,6 @@ * Copyright 2014 Toradex AG * * SPDX-License-Identifier: GPL-2.0+ or X11 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ /dts-v1/; -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/1] mvtwsi: Fix breakage introduced by "Fix mvtwsi not working on sun6i and newer sunxi SoCs"
Hello Hans, Am 26.01.2016 um 18:05 schrieb Hans de Goede: Hi Heiko, Your fix for the checkpatch issues in one of my patches (sorry about those) has broken mvtwsi support. Uh! Sorry! This patch fixes this, I'm currently preparing a sunxi pull-req, and I plan to include this fix, so this is mostly FYI, you do not have to take any action. Thanks! bye, Heiko -- -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] hush: Add rudimentary support for PS1 and PS2
Hello Marek, Am 27.01.2016 um 04:47 schrieb Marek Vasut: Add trivial support for changing the U-Boot command prompt string by setting PS1 and PS2 environment variables. Only static variables are supported. Signed-off-by: Marek Vasut--- README| 8 common/cli_hush.c | 10 ++ 2 files changed, 18 insertions(+) Nice! Reviewed-by: Heiko Schocher bye, Heiko diff --git a/README b/README index ece4793..8fb25c6 100644 --- a/README +++ b/README @@ -2894,6 +2894,14 @@ CBFS (Coreboot Filesystem) support Enable editing and History functions for interactive command line input operations +- Command Line PS1/PS2 support: + CONFIG_CMDLINE_PS_SUPPORT + + Enable support for changing the command prompt string + at run-time. Only static string is supported so far. + The string is obtained from environment variables PS1 + and PS2. + - Default Environment: CONFIG_EXTRA_ENV_SETTINGS diff --git a/common/cli_hush.c b/common/cli_hush.c index cbaf22e..00861e2 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -978,12 +978,22 @@ static inline void setup_prompt_string(int promptmode, char **prompt_str) static int uboot_cli_readline(struct in_str *i) { char *prompt; + char __maybe_unused *ps_prompt = NULL; if (i->promptmode == 1) prompt = CONFIG_SYS_PROMPT; else prompt = CONFIG_SYS_PROMPT_HUSH_PS2; +#ifdef CONFIG_CMDLINE_PS_SUPPORT + if (i->promptmode == 1) + ps_prompt = getenv("PS1"); + else + ps_prompt = getenv("PS2"); + if (ps_prompt) + prompt = ps_prompt; +#endif + return cli_readline(prompt); } #endif -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] armv8: ls2080ardb: invert irq pins polarity for AQR405 PHY
From: Shaohui XieTo use AQR405 PHY's interrupt, we need to invert the relative IRQ pins polarity by setting IRQCR register, because AQR405 interrupt is low active but GIC accepts high active. Signed-off-by: Shaohui Xie --- board/freescale/ls2080ardb/ls2080ardb.c | 4 include/configs/ls2080a_common.h| 4 include/configs/ls2080ardb.h| 1 + 3 files changed, 9 insertions(+) diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index 2ae9d6c..da227a7 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -149,6 +149,7 @@ int board_init(void) { char *env_hwconfig; u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE; + u32 __iomem *irq_ccsr = (u32 __iomem *)ISC_BASE; u32 val; init_final_memctl_regs(); @@ -170,6 +171,9 @@ int board_init(void) QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET_EN); + /* invert AQR405 IRQ pins polarity */ + out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR405_IRQ_MASK); + return 0; } diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 2e1fe7a..1740dd6 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -38,6 +38,10 @@ #define CONFIG_SYS_TEXT_BASE 0x3010 #endif +/* Interrupt Sampling Control */ +#define ISC_BASE 0x01F7 +#define IRQCR_OFFSET 0x14 + #ifdef CONFIG_EMU #define CONFIG_SYS_NO_FLASH #endif diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 65d4f64..0d60420 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -336,6 +336,7 @@ unsigned long get_board_sys_clk(void); #define AQ_PHY_ADDR2 0x01 #define AQ_PHY_ADDR3 0x02 #define AQ_PHY_ADDR4 0x03 +#define AQR405_IRQ_MASK0x36 #define CONFIG_MII #define CONFIG_ETHPRIME"DPNI1" -- 2.1.0.27.g96db324 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] armv7: add cacheline sizes where missing
Hello Marek, On Wed, 27 Jan 2016 05:10:59 +0100, Marek Vasutwrote: > On Tuesday, January 26, 2016 at 05:40:49 PM, Albert ARIBAUD wrote: > > Some armv7 targets are missing a cache line size declaration. > > In preparation for "arm: cache: Implement cache range check for v7" > > patch, add these declarations with the appropriate value for > > the target's SoC or CPU. > > > > Signed-off-by: Albert ARIBAUD > > [...] > > > diff --git a/include/configs/at91-sama5_common.h > > b/include/configs/at91-sama5_common.h index 9db4a4f..7b06601 100644 > > --- a/include/configs/at91-sama5_common.h > > +++ b/include/configs/at91-sama5_common.h > > @@ -12,6 +12,8 @@ > > > > #include > > > > +#define CONFIG_SYS_CACHELINE_SIZE 64 > > + > > #define CONFIG_SYS_TEXT_BASE 0x26f0 > > > > /* ARM asynchronous clock */ > > I think SAMA5 is CortexA5 and that has 32B cachelines. Correct. V2 incoming. > Best regards, > Marek Vasut Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/6] usb: dwc2: Add support for SPLIT transactions
On 01/16/2016 08:09 PM, Stefan Brüns wrote: > The first patch fixes an out-of-bounds access, and makes the calculation of > maximum transfer size more straightforward. It also makes overriding the > maximum transfer size easier for split transactions Sorry I haven't been keeping up on the U-Boot dwc2 patches. Is this series still pending, or was it replaced with something else? It doesn't apply cleanly on top of u-boot/master. The good news is that with u-boot/master (b72ae192e39f "Merge branch 'master' of git://git.denx.de/u-boot-video") both USB keyboards I have work perfectly on both a model A and a model B, including keyboard repeat. That's great work; thanks very much! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/6] usb: dwc2: Add support for SPLIT transactions
On Wednesday, January 27, 2016 at 04:52:03 AM, Stephen Warren wrote: > On 01/16/2016 08:09 PM, Stefan Brüns wrote: > > The first patch fixes an out-of-bounds access, and makes the calculation > > of maximum transfer size more straightforward. It also makes overriding > > the maximum transfer size easier for split transactions > > Sorry I haven't been keeping up on the U-Boot dwc2 patches. Is this > series still pending, or was it replaced with something else? It doesn't > apply cleanly on top of u-boot/master. > > The good news is that with u-boot/master (b72ae192e39f "Merge branch > 'master' of git://git.denx.de/u-boot-video") both USB keyboards I have > work perfectly on both a model A and a model B, including keyboard > repeat. That's great work; thanks very much! V2 is applied on top of u-boot/master. Your keyboard patch is also applied: http://git.denx.de/?p=u-boot/u-boot-usb.git;a=summary Thank you! Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] include:configs: Add usb device-tree fixup for all fsl platforms
> -Original Message- > From: Marek Vasut [mailto:ma...@denx.de] > Sent: Wednesday, January 27, 2016 9:57 AM > To: Ramneek Mehresh> Cc: Ramneek Mehresh ; u- > b...@lists.denx.de; Simon Glass > Subject: Re: [PATCH 2/2] include:configs: Add usb device-tree fixup for all > fsl > platforms > > On Wednesday, January 27, 2016 at 05:14:00 AM, Ramneek Mehresh wrote: > > > -Original Message- > > > From: Marek Vasut [mailto:ma...@denx.de] > > > Sent: Tuesday, January 26, 2016 4:58 PM > > > To: Ramneek Mehresh > > > Cc: u-boot@lists.denx.de > > > Subject: Re: [PATCH 2/2] include:configs: Add usb device-tree fixup for > > > all fsl platforms > > > > > > On Tuesday, January 26, 2016 at 12:36:58 PM, Ramneek Mehresh wrote: > > > > Add usb device-tree fixup for all relevant fsl ppc and arm platforms > > > > > > > > Signed-off-by: Ramneek Mehresh > > > > > --- > > > > > > > > board/freescale/b4860qds/b4860qds.c | 2 +- > > > > board/freescale/bsc9131rdb/bsc9131rdb.c | 2 ++ > > > > board/freescale/bsc9132qds/bsc9132qds.c | 2 ++ > > > > board/freescale/corenet_ds/corenet_ds.c | 4 > > > > board/freescale/ls2080aqds/ls2080aqds.c | 4 > > > > board/freescale/ls2080ardb/ls2080ardb.c | 4 > > > > board/freescale/mpc8308rdb/mpc8308rdb.c | 4 > > > > board/freescale/mpc8315erdb/mpc8315erdb.c | 2 ++ > > > > board/freescale/mpc837xemds/mpc837xemds.c | 2 ++ > > > > board/freescale/mpc837xerdb/mpc837xerdb.c | 2 ++ > > > > board/freescale/mpc8536ds/mpc8536ds.c | 2 +- > > > > board/freescale/p1010rdb/p1010rdb.c | 2 +- > > > > board/freescale/p1022ds/p1022ds.c | 2 +- > > > > board/freescale/p1023rdb/p1023rdb.c | 2 +- > > > > board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- > > > > board/freescale/p1_twr/p1_twr.c | 3 +++ > > > > board/freescale/p2041rdb/p2041rdb.c | 2 +- > > > > board/freescale/t102xqds/t102xqds.c | 2 +- > > > > board/freescale/t102xrdb/t102xrdb.c | 3 +++ > > > > board/freescale/t1040qds/t1040qds.c | 2 +- > > > > board/freescale/t104xrdb/t104xrdb.c | 2 +- > > > > board/freescale/t208xqds/t208xqds.c | 3 +++ > > > > board/freescale/t208xrdb/t208xrdb.c | 3 +++ > > > > board/freescale/t4qds/t4240emu.c| 3 +++ > > > > board/freescale/t4qds/t4240qds.c| 3 +++ > > > > board/freescale/t4rdb/t4240rdb.c| 3 +++ > > > > include/configs/B4860QDS.h | 1 + > > > > include/configs/BSC9131RDB.h| 1 + > > > > include/configs/BSC9132QDS.h| 3 ++- > > > > include/configs/MPC8308RDB.h| 3 +++ > > > > include/configs/MPC8315ERDB.h | 1 + > > > > include/configs/MPC837XEMDS.h | 3 ++- > > > > include/configs/MPC837XERDB.h | 1 + > > > > include/configs/MPC8536DS.h | 1 + > > > > include/configs/P1010RDB.h | 1 + > > > > include/configs/P1022DS.h | 1 + > > > > include/configs/P1023RDB.h | 1 + > > > > include/configs/P2041RDB.h | 1 + > > > > include/configs/T102xQDS.h | 1 + > > > > include/configs/T102xRDB.h | 1 + > > > > include/configs/T1040QDS.h | 1 + > > > > include/configs/T104xRDB.h | 1 + > > > > include/configs/T208xQDS.h | 1 + > > > > include/configs/T208xRDB.h | 1 + > > > > include/configs/T4240QDS.h | 1 + > > > > include/configs/corenet_ds.h| 1 + > > > > include/configs/ls2080aqds.h| 1 + > > > > include/configs/ls2080ardb.h| 1 + > > > > include/configs/p1_p2_rdb_pc.h | 1 + > > > > include/configs/p1_twr.h| 1 + > > > > 50 files changed, 85 insertions(+), 12 deletions(-) > > > > > > Each such new macro must be documented. What is the point of this bulk > > > rename anyway? > > > > Yes, I'll document the new MACRO defined for usb device-tree fixup. > > However, this is not bulk rename. I just modified all these files to > > include usb device-tree fixup for all fsl ppc platforms. Most of these > > platforms were already using this mechanism (some via different ways), > but > > now its consistent across them. > > Wouldn't it make more sense to make this generic then instead of patching > zillion files ? The patch set is to make this support generic, but I do need to make these platforms use this generic support in consistent way via single macro inclusion in their configs... ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] armv7: add cacheline sizes where missing
On Tuesday, January 26, 2016 at 05:40:49 PM, Albert ARIBAUD wrote: > Some armv7 targets are missing a cache line size declaration. > In preparation for "arm: cache: Implement cache range check for v7" > patch, add these declarations with the appropriate value for > the target's SoC or CPU. > > Signed-off-by: Albert ARIBAUD[...] > diff --git a/include/configs/at91-sama5_common.h > b/include/configs/at91-sama5_common.h index 9db4a4f..7b06601 100644 > --- a/include/configs/at91-sama5_common.h > +++ b/include/configs/at91-sama5_common.h > @@ -12,6 +12,8 @@ > > #include > > +#define CONFIG_SYS_CACHELINE_SIZE64 > + > #define CONFIG_SYS_TEXT_BASE 0x26f0 > > /* ARM asynchronous clock */ I think SAMA5 is CortexA5 and that has 32B cachelines. Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4] mmc: socfpga_dw_mmc: Enable calibration for drvsel and smplsel
On Fri, 2015-11-27 at 15:22 +0800, Chin Liang See wrote: > Enable SDMMC calibration to determine the best setting for > drvsel and smplsel. Calibration will be triggered if the > drvsel and smplsel node are not available in DTS. We have a Cyclone V based board and on the latest revision the SD card interface has become unreliable at 50 MHz. The SD card moved a few inches further away from the SoC in this revision. I though maybe smplsel could be an issue and found this patch. I ported this to our board, but found that this algorithm doesn't appear to work that well for us. In my testing I found the fastest way to produce SD errors on Linux was to repeatedly issue two sector read multiple commands. This produces about one error per 10,000 commands. Usually a CRC error on the response but also data CRC errors and data stop bit errors. This calibration code tests by using a single set block length command to check if the combination of drvsel and smplsel is good. Obviously if 0.01% of commands fail then checking via the result of one command is nearly useless. And indeed this is the case, every cal test passes and one gets a table of all trues. It is however worse than that. Some cal settings are clearly bad. For instance, drvsel 3 smplsel 7 does not work at all on our board. Every read command tried with those settings will fail. But the set block length command succeeds. Perhaps because it neither sends nor receives any data? So the calibration seems unlikely to improve anything, since it will always choose 3, 3 for the settings. The basic premise, that it can tell if a pair of settings work or not, appears to not be true. > +static int socfpga_dwmci_find_row_col_fit_rectangle(unsigned rect_width, > + unsigned rect_height, > + unsigned char cal_results[SOCFPGA_SD_DRVSEL][SOCFPGA_SD_SMPLSEL], > + unsigned int *cal_row, unsigned int *cal_col) There is no documentation of what exactly parameters are here. But one can determine that cal_row will contain the zero based index of the "best" row. > + for (row = 0; row < SOCFPGA_SD_DRVSEL; row++) { > + for (col = 0; col < SOCFPGA_SD_SMPLSEL; col++) { > + priv->drvsel = row + 1; > + priv->smplsel = col; Here drvsel is set to row + 1. > + > + err = socfpga_dwmci_find_calibration_point(cal_results, sum, > +>drvsel, > +>smplsel); But this function returns the zero based row number (I think it would be easier to notice if it were documented) in priv->drvsel. Not row + 1. It seems that you will always program drvsel to be 1 smaller than it should be. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] include:configs: Add usb device-tree fixup for all fsl platforms
> -Original Message- > From: Marek Vasut [mailto:ma...@denx.de] > Sent: Tuesday, January 26, 2016 4:58 PM > To: Ramneek Mehresh> Cc: u-boot@lists.denx.de > Subject: Re: [PATCH 2/2] include:configs: Add usb device-tree fixup for all > fsl > platforms > > On Tuesday, January 26, 2016 at 12:36:58 PM, Ramneek Mehresh wrote: > > Add usb device-tree fixup for all relevant fsl ppc and arm platforms > > > > Signed-off-by: Ramneek Mehresh > > --- > > board/freescale/b4860qds/b4860qds.c | 2 +- > > board/freescale/bsc9131rdb/bsc9131rdb.c | 2 ++ > > board/freescale/bsc9132qds/bsc9132qds.c | 2 ++ > > board/freescale/corenet_ds/corenet_ds.c | 4 > > board/freescale/ls2080aqds/ls2080aqds.c | 4 > > board/freescale/ls2080ardb/ls2080ardb.c | 4 > > board/freescale/mpc8308rdb/mpc8308rdb.c | 4 > > board/freescale/mpc8315erdb/mpc8315erdb.c | 2 ++ > > board/freescale/mpc837xemds/mpc837xemds.c | 2 ++ > > board/freescale/mpc837xerdb/mpc837xerdb.c | 2 ++ > > board/freescale/mpc8536ds/mpc8536ds.c | 2 +- > > board/freescale/p1010rdb/p1010rdb.c | 2 +- > > board/freescale/p1022ds/p1022ds.c | 2 +- > > board/freescale/p1023rdb/p1023rdb.c | 2 +- > > board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- > > board/freescale/p1_twr/p1_twr.c | 3 +++ > > board/freescale/p2041rdb/p2041rdb.c | 2 +- > > board/freescale/t102xqds/t102xqds.c | 2 +- > > board/freescale/t102xrdb/t102xrdb.c | 3 +++ > > board/freescale/t1040qds/t1040qds.c | 2 +- > > board/freescale/t104xrdb/t104xrdb.c | 2 +- > > board/freescale/t208xqds/t208xqds.c | 3 +++ > > board/freescale/t208xrdb/t208xrdb.c | 3 +++ > > board/freescale/t4qds/t4240emu.c| 3 +++ > > board/freescale/t4qds/t4240qds.c| 3 +++ > > board/freescale/t4rdb/t4240rdb.c| 3 +++ > > include/configs/B4860QDS.h | 1 + > > include/configs/BSC9131RDB.h| 1 + > > include/configs/BSC9132QDS.h| 3 ++- > > include/configs/MPC8308RDB.h| 3 +++ > > include/configs/MPC8315ERDB.h | 1 + > > include/configs/MPC837XEMDS.h | 3 ++- > > include/configs/MPC837XERDB.h | 1 + > > include/configs/MPC8536DS.h | 1 + > > include/configs/P1010RDB.h | 1 + > > include/configs/P1022DS.h | 1 + > > include/configs/P1023RDB.h | 1 + > > include/configs/P2041RDB.h | 1 + > > include/configs/T102xQDS.h | 1 + > > include/configs/T102xRDB.h | 1 + > > include/configs/T1040QDS.h | 1 + > > include/configs/T104xRDB.h | 1 + > > include/configs/T208xQDS.h | 1 + > > include/configs/T208xRDB.h | 1 + > > include/configs/T4240QDS.h | 1 + > > include/configs/corenet_ds.h| 1 + > > include/configs/ls2080aqds.h| 1 + > > include/configs/ls2080ardb.h| 1 + > > include/configs/p1_p2_rdb_pc.h | 1 + > > include/configs/p1_twr.h| 1 + > > 50 files changed, 85 insertions(+), 12 deletions(-) > > Each such new macro must be documented. What is the point of this bulk > rename anyway? Yes, I'll document the new MACRO defined for usb device-tree fixup. However, this is not bulk rename. I just modified all these files to include usb device-tree fixup for all fsl ppc platforms. Most of these platforms were already using this mechanism (some via different ways), but now its consistent across them. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] buildman errors
Hi Tom, On Wed, Jan 27, 2016 at 10:08 AM, Tom Riniwrote: > On Wed, Jan 27, 2016 at 09:55:02AM +0800, Bin Meng wrote: >> Hi Tom, >> >> On Tue, Jan 26, 2016 at 10:47 PM, Tom Rini wrote: >> > On Tue, Jan 26, 2016 at 12:26:07PM +0800, Bin Meng wrote: >> >> Hi Tom, >> >> >> >> On Mon, Jan 25, 2016 at 10:12 PM, Tom Rini wrote: >> >> > On Mon, Jan 25, 2016 at 11:18:26AM +0800, Bin Meng wrote: >> >> >> Hi Tom, >> >> >> >> >> >> On Mon, Jan 25, 2016 at 11:05 AM, Tom Rini wrote: >> >> >> > On Mon, Jan 25, 2016 at 10:34:16AM +0800, Bin Meng wrote: >> >> >> >> Hi Tom, >> >> >> >> >> >> >> >> On Mon, Jan 25, 2016 at 12:19 AM, Tom Rini >> >> >> >> wrote: >> >> >> >> > On Sun, Jan 24, 2016 at 12:00:42PM +0800, Bin Meng wrote: >> >> >> >> > >> >> >> >> >> Hi, >> >> >> >> >> >> >> >> >> >> Summary of 71 commits for 1100 boards (24 threads, 1 job per >> >> >> >> >> thread) >> >> >> >> >> 01: iocon / bamboo: Drop CONFIG_SYS_LONGHELP >> >> >> >> >> blackfin: + bf561-acvilon cm-bf561 blackstamp bf537-minotaur >> >> >> >> >> bct-brettl2 cm-bf527 bf506f-ezkit ip04 bf527-sdp pr1 >> >> >> >> >> bf527-ad7160-eval >> >> >> >> >> bf609-ezkit bf537-stamp bf527-ezkit-v2 cm-bf537e tcm-bf518 >> >> >> >> >> cm-bf537u >> >> >> >> >> bf527-ezkit cm-bf533 bf533-ezkit ibf-dsp561 bf537-pnav bf537-srv1 >> >> >> >> >> cm-bf548 bf538f-ezkit bf548-ezkit bf525-ucr2 blackvme tcm-bf537 >> >> >> >> >> bf533-stamp dnp5370 bf518f-ezbrd bf526-ezbrd bf561-ezkit br4 >> >> >> >> >>aarch64: + test >> >> >> >> >> avr32: + atngw100mkii grasshopper atstk1002 atngw100 >> >> >> >> >> sh: + sh7753evb sh7785lcr_32bit sh7785lcr >> >> >> >> >>arc: + arcangel4-be axs101 axs103 tb100 arcangel4 >> >> >> >> >> openrisc: + openrisc-generic >> >> >> >> >>powerpc: + TQM834x katmai >> >> >> >> >>arm: + mx28evk mx28evk_nand xfi3 bg0900 sansa_fuze_plus >> >> >> >> >> mx23evk m28evk sc_sps_1 mx28evk_spi apx4devkit mx23_olinuxino >> >> >> >> >> mx28evk_auart_console >> >> >> >> >> nds32: + adp-ag101p >> >> >> >> > >> >> >> >> > I need to finally fetch a few toolchains as I don't do >> >> >> >> > avr32/sh/openrisc/nds32 iirc. As a tangent, x86 is very broken >> >> >> >> > with gcc >> >> >> >> > 5.x, can you look into it? :) >> >> >> >> > >> >> >> >> >> >> >> >> Sure, I can look into x86. Which gcc 5.x toolchain are you using? >> >> >> > >> >> >> > Pretty much any, I've seen it for a long time but not had time to >> >> >> > poke >> >> >> > at the libgcc "fun" that's involved here. >> >> >> > >> >> >> >> >> >> I mean if there is any prebuilt gcc 5.x for me to grab and test? Or do >> >> >> I need build one from gcc source? >> >> > >> >> > Fedora has shipped with gcc 5.x for a release or two and Debian/unstable >> >> > is how I get all of my gcc 5.x toolchains for build testing. >> >> > >> >> >> >> I installed a fresh Fedora 23 and got gcc 5.1.1 up and running. >> >> However I see _zero_ compiler warnings/errors using gcc 5.1.1 when >> >> building all of the 9 x86 boards. >> >> >> >> The only thing I noticed, which is probably best matched to what you >> >> said "x86 is very broken with gcc 5.x", is: >> >> >> >> HOSTCC tools/aisimage.o >> >> In file included from tools/aisimage.c:10:0: >> >> include/image.h:923:27: fatal error: openssl/evp.h: No such file or >> >> directory >> >> compilation terminated. >> >> scripts/Makefile.host:111: recipe for target 'tools/aisimage.o' failed >> >> make[1]: *** [tools/aisimage.o] Error 1 >> >> Makefile:1196: recipe for target 'tools' failed >> >> make: *** [tools] Error 2 >> > >> > Are you using the stock configs? >> >> Yes. >> >> > +(galileo,crownbay,coreboot-x86,bayleybay,qemu-x86,chromebook_link,minnowmax,chromebox_panther) >> > arch/x86/lib/built-in.o: In function `__wrap___udivdi3': >> > +(galileo,crownbay,coreboot-x86,bayleybay,qemu-x86,chromebook_link,minnowmax,chromebox_panther) >> > build/../arch/x86/lib/gcc.c:25: undefined reference to >> > `__normal___udivdi3' >> > >> >> Is your Fedora a 64-bit installation? And a 64-bit gcc compiler, >> right? I am using 32-bit Fedora with a 32-bit gcc. This is nothing >> related to gcc 5.x too. The same thing happens in gcc 4.x. If we want >> to use 64-bit gcc to build 32-bit U-Boot, gcc must ship with multilib >> support. > > Ug, even with CONFIG_USE_PRIVATE_LIBGCC=y ? > Yes. x86 build relies on gcc to provide a normal libgcc and adds some hacks on top of it (private). Regards, Bin ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/4] Implement "pci enum" command for CONFIG_DM_PCI
On Wed, Jan 27, 2016 at 2:10 AM, Stephen Warrenwrote: > From: Stephen Warren > > With CONFIG_DM_PCI enabled, PCI buses are not enumerated at boot, as they > are without that config option enabled. No command exists to enumerate the > PCI buses. Hence, unless some board-specific code causes PCI enumeration, > PCI-based Ethernet devices are not detected, and network access is not > available. > > This patch implements "pci enum" in the CONFIG_DM_PCI case, thus giving a > mechanism whereby PCI can be enumerated. > > do_pci()'s handling of case 'e' is moved into a single location before the > dev variable is assigned, in order to skip calculation of dev. The enum > sub-command doesn't need the dev value, and skipping its calculation > avoids an irrelevant error being printed. > > Using a command to initialize PCI like this has a disadvantage relative to > enumerating PCI at boot. In particular, Ethernet devices are not probed > during PCI enumeration, but only when used. This defers setting variables > such as ethact, ethaddr, etc. until the first network-related command is > executed. Hopefully this will not cause further issues. Perhaps in the > long term, we need a "net start/enum" command too? > > Signed-off-by: Stephen Warren > --- > This series naturally needs to be applied in order in a single branch. > This series depends on all previous applied test/py patches. > > common/cmd_pci.c | 18 +- > drivers/pci/pci-uclass.c | 15 +++ > 2 files changed, 20 insertions(+), 13 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mvtwsi: Fix breakage introduced by "Fix mvtwsi not working on sun6i and newer sunxi SoCs"
Hello Hans, Am 26.01.2016 um 18:05 schrieb Hans de Goede: "Fix mvtwsi not working on sun6i and newer sunxi SoCs" includes the following: @@ -189,7 +200,8 @@ static int twsi_start(struct i2c_adapter *adap, int expected_status) /* globally set TWSIEN in case it was not */ twsi_control_flags |= MVTWSI_CONTROL_TWSIEN; /* assert START */ - writel(twsi_control_flags | MVTWSI_CONTROL_START, >control); + twsi_control_flags |= MVTWSI_CONTROL_START | MVTWSI_CONTROL_CLEAR_IFLG; + writel(twsi_control_flags, >control); /* wait for controller to process START */ return twsi_wait(adap, expected_status); } The modification of twsi_control_flags done here was introduced while merging to fix a line > 80 chars, but twsi_control_flags is a global variable and should not be modified like this here, this commit fixes this, restoring mvtwsi functionality. Signed-off-by: Hans de Goede--- drivers/i2c/mvtwsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Thanks! Acked-by: Heiko Schocher If we would have automated tests, such cases would hopefully not happen. Maybe you find time to look into: [1] [U-Boot] [PATCH] test, tools: introduce tbot README http://lists.denx.de/pipermail/u-boot/2016-January/243248.html With tbot we could setup a test setup, where we can run testcases on boards wherever they are availiable for tests. In [1] search for "automated Testsetup with buildbot and tbot doing cyclic tests" With this setup I detected your checkpatch error, and thought its easy to fix (never think its easy ... again sorry). If I/we would have a sunxi SoC HW with i2c testcases my bad fix would have automatically poped up ... As tbot is written in python it would be easy to send an automated EMail if tbot detects such problems with a patch ... so, I never would have tried to fix and break it ... but I tend to say, sending EMails should be done by humans ... bye, Heiko diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index 5f993b9..221ff4f 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -204,8 +204,8 @@ static int twsi_start(struct i2c_adapter *adap, int expected_status) /* globally set TWSIEN in case it was not */ twsi_control_flags |= MVTWSI_CONTROL_TWSIEN; /* assert START */ - twsi_control_flags |= MVTWSI_CONTROL_START | MVTWSI_CONTROL_CLEAR_IFLG; - writel(twsi_control_flags, >control); + writel(twsi_control_flags | MVTWSI_CONTROL_START | + MVTWSI_CONTROL_CLEAR_IFLG, >control); /* wait for controller to process START */ return twsi_wait(adap, expected_status); } -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/3] ARM: at91: clock: add PLLB enable/disable functions
Hello Heiko, Thank you for your test. > -Original Message- > From: Heiko Schocher [mailto:h...@denx.de] > Sent: 2016年1月27日 14:31 > To: Yang, Wenyou> Cc: U-Boot Mailing List > Subject: Re: [U-Boot] [PATCH v2 1/3] ARM: at91: clock: add PLLB enable/disable > functions > > Hello Wenyou, > > Am 27.01.2016 um 03:04 schrieb Wenyou Yang: > > To avoid the duplicated code, add the PLLB handle functions. > > > > Signed-off-by: Wenyou Yang > > Reviewed-by: Andreas Bießmann > > --- > > > > Changes in v2: None > > > > arch/arm/mach-at91/arm926ejs/clock.c | 38 > + > > arch/arm/mach-at91/include/mach/clk.h |2 ++ > > 2 files changed, 40 insertions(+) > > Tested on the smartweb board, so: > > Tested-by: Heiko Schocher > > bye, > Heiko > > [1] testlog > http://xeidos.ddns.net/buildbot/builders/smartweb_dfu/builds/48/steps/shell/logs/tb > otlog > > > > > diff --git a/arch/arm/mach-at91/arm926ejs/clock.c > > b/arch/arm/mach-at91/arm926ejs/clock.c > > index c8b5e10..c8d24ae 100644 > > --- a/arch/arm/mach-at91/arm926ejs/clock.c > > +++ b/arch/arm/mach-at91/arm926ejs/clock.c > > @@ -18,6 +18,8 @@ > > # error You need to define CONFIG_AT91FAMILY in your board config! > > #endif > > > > +#define EN_PLLB_TIMEOUT500 > > + > > DECLARE_GLOBAL_DATA_PTR; > > > > static unsigned long at91_css_to_rate(unsigned long css) @@ -242,3 > > +244,39 @@ void at91_mck_init(u32 mckr) > > while (!(readl(>sr) & AT91_PMC_MCKRDY)) > > ; > > } > > + > > +int at91_pllb_clk_enable(u32 pllbr) > > +{ > > + struct at91_pmc *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; > > + ulong start_time, tmp_time; > > + > > + start_time = get_timer(0); > > + writel(pllbr, >pllbr); > > + while ((readl(>sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) { > > + tmp_time = get_timer(0); > > + if ((tmp_time - start_time) > EN_PLLB_TIMEOUT) { > > + printf("ERROR: failed to enable PLLB\n"); > > + return -1; > > + } > > + } > > + > > + return 0; > > +} > > + > > +int at91_pllb_clk_disable(void) > > +{ > > + struct at91_pmc *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; > > + ulong start_time, tmp_time; > > + > > + start_time = get_timer(0); > > + writel(0, >pllbr); > > + while ((readl(>sr) & AT91_PMC_LOCKB) != 0) { > > + tmp_time = get_timer(0); > > + if ((tmp_time - start_time) > EN_PLLB_TIMEOUT) { > > + printf("ERROR: failed to disable PLLB\n"); > > + return -1; > > + } > > + } > > + > > + return 0; > > +} > > diff --git a/arch/arm/mach-at91/include/mach/clk.h > > b/arch/arm/mach-at91/include/mach/clk.h > > index b2604ef..64dec52 100644 > > --- a/arch/arm/mach-at91/include/mach/clk.h > > +++ b/arch/arm/mach-at91/include/mach/clk.h > > @@ -133,5 +133,7 @@ void at91_system_clk_disable(int sys_clk); > > int at91_upll_clk_enable(void); > > int at91_upll_clk_disable(void); > > void at91_usb_clk_init(u32 value); > > +int at91_pllb_clk_enable(u32 pllbr); > > +int at91_pllb_clk_disable(void); > > > > #endif /* __ASM_ARM_ARCH_CLK_H__ */ > > > > -- > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Best Regards, Wenyou Yang ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] hush: Pull out U-Boot prompt display and read functionality
Hello Marek, Am 27.01.2016 um 04:47 schrieb Marek Vasut: Pull the code which displays U-Boot prompt and reads the command line into a separate function. No functional change. Signed-off-by: Marek Vasut--- common/cli_hush.c | 21 - 1 file changed, 16 insertions(+), 5 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko diff --git a/common/cli_hush.c b/common/cli_hush.c index 2fbfdbe..cbaf22e 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -974,6 +974,20 @@ static inline void setup_prompt_string(int promptmode, char **prompt_str) } #endif +#ifdef __U_BOOT__ +static int uboot_cli_readline(struct in_str *i) +{ + char *prompt; + + if (i->promptmode == 1) + prompt = CONFIG_SYS_PROMPT; + else + prompt = CONFIG_SYS_PROMPT_HUSH_PS2; + + return cli_readline(prompt); +} +#endif + static void get_user_input(struct in_str *i) { #ifndef __U_BOOT__ @@ -1003,11 +1017,8 @@ static void get_user_input(struct in_str *i) bootretry_reset_cmd_timeout(); i->__promptme = 1; - if (i->promptmode == 1) { - n = cli_readline(CONFIG_SYS_PROMPT); - } else { - n = cli_readline(CONFIG_SYS_PROMPT_HUSH_PS2); - } + n = uboot_cli_readline(i); + #ifdef CONFIG_BOOT_RETRY_TIME if (n == -2) { puts("\nTimeout waiting for command\n"); -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] arm: mvebu: enable generic distro boot config
Hi Dennis, On 15.01.2016 02:20, Dennis Gilmore wrote: > Switch all of the mvebu boards to support disto generic booting > This will enable Fedora, Debian and other distros to support > mvebu systems easier. Tested on SolidRun ClearFog Sorry for the late review. I have a few issues with this patch. It generates build errors on some mvebu boards: ds414 db-88f6820-gp db-mv784mp-gp Mostly because of redefined macros: This one (db-mv784mp-gp): include/configs/mv-common.h:187:0: warning: "CONFIG_PREBOOT" redefined #define CONFIG_PREBOOT "sata init" ^ In file included from include/configs/db-mv784mp-gp.h:100:0, from include/config.h:5, from include/common.h:18, from examples/standalone/hello_world.c:8: include/configs/mv-common.h:61:0: note: this is the location of the previous definition #define CONFIG_PREBOOT Or this one (db-88f6820-gp): include/configs/mv-common.h:236:0: warning: "CONFIG_EXTRA_ENV_SETTINGS" redefined #define CONFIG_EXTRA_ENV_SETTINGS ^ In file included from include/config.h:5:0, from include/common.h:18, from drivers/ddr/marvell/a38x/xor.c:7: include/configs/db-88f6820-gp.h:108:0: note: this is the location of the previous definition #define CONFIG_EXTRA_ENV_SETTINGS \ Or this one (ds414): include/configs/ds414.h:156:0: warning: "CONFIG_BOOTCOMMAND" redefined #define CONFIG_BOOTCOMMAND "sf read ${loadaddr} 0xd 0x70; bootm" ^ In file included from include/configs/mv-common.h:204:0, from include/configs/ds414.h:104, from include/config.h:5, from include/common.h:18, from include/ubi_uboot.h:17, from fs/ubifs/ubifs.h:37, from fs/ubifs/recovery.c:45: Perhaps it makes sense to not move all mvebu boards to the generic distro booting. But only the Marvell eval boards and the community boards, like the clearfog (and not the ds414 for example). What do you think? > Signed-off-by: Dennis Gilmore> --- > include/configs/clearfog.h | 5 --- > include/configs/mv-common.h | 86 > - > 2 files changed, 85 insertions(+), 6 deletions(-) > > diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h > index f0de827..926b3c5 100644 > --- a/include/configs/clearfog.h > +++ b/include/configs/clearfog.h > @@ -104,11 +104,6 @@ > #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ > startup */ > #define CONFIG_SYS_ALT_MEMTEST > > -/* Keep device tree and initrd in lower memory so the kernel can access them > */ > -#define CONFIG_EXTRA_ENV_SETTINGS\ > - "fdt_high=0x1000\0" \ > - "initrd_high=0x1000\0" > - Are these settings really configured to this value in the distro include files? > /* SPL */ > /* >* Select the boot device here > diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h > index d12d725..e219243 100644 > --- a/include/configs/mv-common.h > +++ b/include/configs/mv-common.h > @@ -57,7 +57,7 @@ > #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ > 115200,230400, 460800, 921600 } > /* auto boot */ > -#define CONFIG_BOOTDELAY 3 /* default enable autoboot */ > +#define CONFIG_BOOTDELAY 2 /* default enable autoboot */ > #define CONFIG_PREBOOT > > #define CONFIG_OF_LIBFDT/* Device tree support */ > @@ -152,4 +152,88 @@ > #define CONFIG_LZO > #endif > > +#ifndef CONFIG_SPL_BUILD > +#include > + > +/* > +* 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc. > +* 32M uncompressed kernel, 16M compressed kernel, 1M fdt, > +* 1M script, 1M pxe and the ramdisk at the end. > +*/ > +#define SDRAM_OFFSET(x) 0x0##x > + > +#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(200)) > +#define FDT_ADDR_R __stringify(SDRAM_OFFSET(300)) > +#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(310)) > +#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(320)) > +#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(330)) > + > +#define MEM_LAYOUT_ENV_SETTINGS \ > +"bootm_size=0xa00\0" \ > +"kernel_addr_r=" KERNEL_ADDR_R "\0" \ > +"fdt_addr_r=" FDT_ADDR_R "\0" \ > +"scriptaddr=" SCRIPT_ADDR_R "\0" \ > +"pxefile_addr_r=" PXEFILE_ADDR_R "\0" \ > +"ramdisk_addr_r=" RAMDISK_ADDR_R "\0" > + > +#ifdef CONFIG_MMC > +#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) > +#else > +#define BOOT_TARGET_DEVICES_MMC(func) > +#endif > + > +#ifdef CONFIG_CMD_SATA > +#define BOOT_TARGET_DEVICES_SATA(func) func(SATA, sata, 0) func(SATA, sata, > 1) > +#define CONFIG_PREBOOT "sata init" CONFIG_PREBOOT is already defined in this file above. > +#else > +#define BOOT_TARGET_DEVICES_SATA(func) > +#endif > + > +#ifdef CONFIG_USB_STORAGE > +#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) > +#else > +#define BOOT_TARGET_DEVICES_USB(func) >
[U-Boot] [PATCH 2/2] hush: Add rudimentary support for PS1 and PS2
Add trivial support for changing the U-Boot command prompt string by setting PS1 and PS2 environment variables. Only static variables are supported. Signed-off-by: Marek Vasut--- README| 8 common/cli_hush.c | 10 ++ 2 files changed, 18 insertions(+) diff --git a/README b/README index ece4793..8fb25c6 100644 --- a/README +++ b/README @@ -2894,6 +2894,14 @@ CBFS (Coreboot Filesystem) support Enable editing and History functions for interactive command line input operations +- Command Line PS1/PS2 support: + CONFIG_CMDLINE_PS_SUPPORT + + Enable support for changing the command prompt string + at run-time. Only static string is supported so far. + The string is obtained from environment variables PS1 + and PS2. + - Default Environment: CONFIG_EXTRA_ENV_SETTINGS diff --git a/common/cli_hush.c b/common/cli_hush.c index cbaf22e..00861e2 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -978,12 +978,22 @@ static inline void setup_prompt_string(int promptmode, char **prompt_str) static int uboot_cli_readline(struct in_str *i) { char *prompt; + char __maybe_unused *ps_prompt = NULL; if (i->promptmode == 1) prompt = CONFIG_SYS_PROMPT; else prompt = CONFIG_SYS_PROMPT_HUSH_PS2; +#ifdef CONFIG_CMDLINE_PS_SUPPORT + if (i->promptmode == 1) + ps_prompt = getenv("PS1"); + else + ps_prompt = getenv("PS2"); + if (ps_prompt) + prompt = ps_prompt; +#endif + return cli_readline(prompt); } #endif -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] hush: Pull out U-Boot prompt display and read functionality
Pull the code which displays U-Boot prompt and reads the command line into a separate function. No functional change. Signed-off-by: Marek Vasut--- common/cli_hush.c | 21 - 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/common/cli_hush.c b/common/cli_hush.c index 2fbfdbe..cbaf22e 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -974,6 +974,20 @@ static inline void setup_prompt_string(int promptmode, char **prompt_str) } #endif +#ifdef __U_BOOT__ +static int uboot_cli_readline(struct in_str *i) +{ + char *prompt; + + if (i->promptmode == 1) + prompt = CONFIG_SYS_PROMPT; + else + prompt = CONFIG_SYS_PROMPT_HUSH_PS2; + + return cli_readline(prompt); +} +#endif + static void get_user_input(struct in_str *i) { #ifndef __U_BOOT__ @@ -1003,11 +1017,8 @@ static void get_user_input(struct in_str *i) bootretry_reset_cmd_timeout(); i->__promptme = 1; - if (i->promptmode == 1) { - n = cli_readline(CONFIG_SYS_PROMPT); - } else { - n = cli_readline(CONFIG_SYS_PROMPT_HUSH_PS2); - } + n = uboot_cli_readline(i); + #ifdef CONFIG_BOOT_RETRY_TIME if (n == -2) { puts("\nTimeout waiting for command\n"); -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv4 9/9] dm: vybrid_gpio: Drop legacy code
All boards using this driver are with device tree support, hence drop the legacy code in driver to have a pure DT solution. Signed-off-by: Bhuvanchandra DVReviewed-by: Bin Meng --- drivers/gpio/vybrid_gpio.c | 18 -- 1 file changed, 18 deletions(-) diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c index 4d25f9a..a30ba5d 100644 --- a/drivers/gpio/vybrid_gpio.c +++ b/drivers/gpio/vybrid_gpio.c @@ -135,24 +135,6 @@ static int vybrid_gpio_bind(struct udevice *dev) return 0; } -#if !CONFIG_IS_ENABLED(OF_CONTROL) -static const struct vybrid_gpio_platdata vybrid_gpio[] = { - {0, GPIO0_BASE_ADDR, "GPIO0 "}, - {1, GPIO1_BASE_ADDR, "GPIO1 "}, - {2, GPIO2_BASE_ADDR, "GPIO2 "}, - {3, GPIO3_BASE_ADDR, "GPIO3 "}, - {4, GPIO4_BASE_ADDR, "GPIO4 "}, -}; - -U_BOOT_DEVICES(vybrid_gpio) = { - { "gpio_vybrid", _gpio[0] }, - { "gpio_vybrid", _gpio[1] }, - { "gpio_vybrid", _gpio[2] }, - { "gpio_vybrid", _gpio[3] }, - { "gpio_vybrid", _gpio[4] }, -}; -#endif - static const struct udevice_id vybrid_gpio_ids[] = { { .compatible = "fsl,vf610-gpio" }, { } -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv4 8/9] dm: lpuart: Drop the legacy code
All boards using this driver are with device tree support, hence drop the legacy code in driver to have a pure DT solution. Signed-off-by: Bhuvanchandra DVReviewed-by: Bin Meng --- drivers/serial/serial_lpuart.c | 101 + 1 file changed, 2 insertions(+), 99 deletions(-) diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index 3f9c4d1..fc3321f 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -48,8 +48,6 @@ DECLARE_GLOBAL_DATA_PTR; -struct lpuart_fsl *base = (struct lpuart_fsl *)LPUART_BASE; - struct lpuart_serial_platdata { struct lpuart_fsl *reg; }; @@ -127,43 +125,6 @@ static int _lpuart_serial_init(struct lpuart_fsl *base) return 0; } -#ifndef CONFIG_DM_SERIAL -static void lpuart_serial_setbrg(void) -{ - _lpuart_serial_setbrg(base, gd->baudrate); -} - -static int lpuart_serial_getc(void) -{ - return _lpuart_serial_getc(base); -} - -static void lpuart_serial_putc(const char c) -{ - _lpuart_serial_putc(base, c); -} - -static int lpuart_serial_tstc(void) -{ - return _lpuart_serial_tstc(base); -} - -static int lpuart_serial_init(void) -{ - return _lpuart_serial_init(base); -} - -static struct serial_device lpuart_serial_drv = { - .name = "lpuart_serial", - .start = lpuart_serial_init, - .stop = NULL, - .setbrg = lpuart_serial_setbrg, - .putc = lpuart_serial_putc, - .puts = default_serial_puts, - .getc = lpuart_serial_getc, - .tstc = lpuart_serial_tstc, -}; -#else /* CONFIG_DM_SERIAL */ static int lpuart_serial_setbrg(struct udevice *dev, int baudrate) { struct lpuart_serial_platdata *plat = dev->platdata; @@ -210,8 +171,8 @@ static int lpuart_serial_probe(struct udevice *dev) return _lpuart_serial_init(reg); } -#endif /* CONFIG_DM_SERIAL */ #else + static void _lpuart32_serial_setbrg(struct lpuart_fsl *base, int baudrate) { u32 clk = CONFIG_SYS_CLK_FREQ; @@ -281,43 +242,6 @@ static int _lpuart32_serial_init(struct lpuart_fsl *base) return 0; } -#ifndef CONFIG_DM_SERIAL -static void lpuart32_serial_setbrg(void) -{ - _lpuart32_serial_setbrg(base, gd->baudrate); -} - -static int lpuart32_serial_getc(void) -{ - return _lpuart32_serial_getc(base); -} - -static void lpuart32_serial_putc(const char c) -{ - _lpuart32_serial_putc(base, c); -} - -static int lpuart32_serial_tstc(void) -{ - return _lpuart32_serial_tstc(base); -} - -static int lpuart32_serial_init(void) -{ - return _lpuart32_serial_init(base); -} - -static struct serial_device lpuart32_serial_drv = { - .name = "lpuart32_serial", - .start = lpuart32_serial_init, - .stop = NULL, - .setbrg = lpuart32_serial_setbrg, - .putc = lpuart32_serial_putc, - .puts = default_serial_puts, - .getc = lpuart32_serial_getc, - .tstc = lpuart32_serial_tstc, -}; -#else /* CONFIG_DM_SERIAL */ static int lpuart32_serial_setbrg(struct udevice *dev, int baudrate) { struct lpuart_serial_platdata *plat = dev->platdata; @@ -364,28 +288,8 @@ static int lpuart32_serial_probe(struct udevice *dev) return _lpuart32_serial_init(reg); } -#endif /* CONFIG_DM_SERIAL */ -#endif - -#ifndef CONFIG_DM_SERIAL -void lpuart_serial_initialize(void) -{ -#ifdef CONFIG_LPUART_32B_REG - serial_register(_serial_drv); -#else - serial_register(_serial_drv); -#endif -} +#endif /* CONFIG_LPUART_32B_REG */ -__weak struct serial_device *default_serial_console(void) -{ -#ifdef CONFIG_LPUART_32B_REG - return _serial_drv; -#else - return _serial_drv; -#endif -} -#else /* CONFIG_DM_SERIAL */ static int lpuart_serial_ofdata_to_platdata(struct udevice *dev) { struct lpuart_serial_platdata *plat = dev->platdata; @@ -447,4 +351,3 @@ U_BOOT_DRIVER(serial_lpuart32) = { .flags = DM_FLAG_PRE_RELOC, }; #endif /* CONFIG_LPUART_32B_REG */ -#endif /* CONFIG_DM_SERIAL */ -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv4 7/9] arm: vybrid: Drop enabling GPIO, SPI and UART in legacy mode
Remove the legacy way of enabling GPIO, SPI and UART on Vybrid based boards since these driver's now only supports DT mode. Signed-off-by: Bhuvanchandra DVAcked-by: Stefan Agner Reviewed-by: Bin Meng --- include/configs/colibri_vf.h | 13 - include/configs/pcm052.h | 3 --- include/configs/vf610twr.h | 3 --- 3 files changed, 19 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 5aed3a5..6efff76 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -36,13 +36,10 @@ #define CONFIG_BOARD_EARLY_INIT_F -#define LPUART_BASEUART0_BASE - /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_VERSION_VARIABLE -#define CONFIG_SYS_UART_PORT (0) #define CONFIG_BAUDRATE115200 #define CONFIG_CMD_ASKENV @@ -52,10 +49,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR -/* GPIO support */ -#define CONFIG_DM_GPIO -#define CONFIG_VYBRID_GPIO - /* Dynamic MTD partition support */ #define CONFIG_CMD_MTDPARTS/* Enable 'mtdparts' command line support */ #define CONFIG_MTD_PARTITIONS @@ -265,10 +258,4 @@ #define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE -/* Enable SPI support */ -#ifdef CONFIG_OF_CONTROL -#define CONFIG_DM_SPI -#define CONFIG_CMD_SPI -#endif - #endif /* __CONFIG_H */ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 891bdb0..f3353f2 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -27,11 +27,8 @@ #define CONFIG_BOARD_EARLY_INIT_F -#define LPUART_BASEUART1_BASE - /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_UART_PORT (1) #define CONFIG_BAUDRATE115200 #undef CONFIG_CMD_IMLS diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index dcfafaf..84ad2c3 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -34,11 +34,8 @@ #define CONFIG_BOARD_EARLY_INIT_F -#define LPUART_BASEUART1_BASE - /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_UART_PORT (1) #define CONFIG_BAUDRATE115200 /* NAND support */ -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv4 6/9] arm: vybrid: Update defconfig's
Let's go with pure DT solution for board's based on NXP/Freescale Vybrid platform. - Merge the DT defconfig with non-DT defconfig for Toradex Colibri VF50/VF61 and drop the non-DT defconfig. - Update the legacy defconfigs for NXP/Freescale VF610 Tower Board with DT. - Update the legacy defconfigs for Phytec phyCORE-vybrid Board with DT. Signed-off-by: Bhuvanchandra DVAcked-by: Stefan Agner Reviewed-by: Bin Meng --- configs/colibri_vf_defconfig | 8 configs/colibri_vf_dtb_defconfig | 14 -- configs/pcm052_defconfig | 7 +++ configs/vf610twr_defconfig | 7 +++ configs/vf610twr_nand_defconfig | 7 +++ 5 files changed, 29 insertions(+), 14 deletions(-) delete mode 100644 configs/colibri_vf_dtb_defconfig diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 45917c8..27a41e7 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -1,11 +1,19 @@ CONFIG_ARM=y CONFIG_TARGET_COLIBRI_VF=y +CONFIG_DM_SERIAL=y +CONFIG_DM_SPI=y +CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND" CONFIG_SYS_PROMPT="Colibri VFxx # " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPI=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y CONFIG_DM=y +CONFIG_VYBRID_GPIO=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y CONFIG_FSL_LPUART=y +CONFIG_FSL_DSPI=y diff --git a/configs/colibri_vf_dtb_defconfig b/configs/colibri_vf_dtb_defconfig deleted file mode 100644 index b1a843a..000 --- a/configs/colibri_vf_dtb_defconfig +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_COLIBRI_VF=y -CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri" -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND" -CONFIG_SYS_PROMPT="Colibri VFxx # " -# CONFIG_CMD_IMLS is not set -CONFIG_CMD_GPIO=y -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -CONFIG_OF_CONTROL=y -CONFIG_DM=y -CONFIG_NAND_VF610_NFC=y -CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y -CONFIG_FSL_LPUART=y diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig index 26ab733..49159ce 100644 --- a/configs/pcm052_defconfig +++ b/configs/pcm052_defconfig @@ -1,6 +1,13 @@ CONFIG_ARM=y CONFIG_TARGET_PCM052=y +CONFIG_DM_SERIAL=y +CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="pcm052" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/pcm052/imximage.cfg,ENV_IS_IN_NAND" +CONFIG_CMD_GPIO=y +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_VYBRID_GPIO=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_FSL_LPUART=y diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig index d51c93b..d959293 100644 --- a/configs/vf610twr_defconfig +++ b/configs/vf610twr_defconfig @@ -1,8 +1,15 @@ CONFIG_ARM=y CONFIG_TARGET_VF610TWR=y +CONFIG_DM_SERIAL=y +CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="vf610-twr" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_IS_IN_MMC" # CONFIG_CMD_IMLS is not set +CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_VYBRID_GPIO=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPI_FLASH=y diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig index 299fa8f..b6a96f2 100644 --- a/configs/vf610twr_nand_defconfig +++ b/configs/vf610twr_nand_defconfig @@ -1,8 +1,15 @@ CONFIG_ARM=y CONFIG_TARGET_VF610TWR=y +CONFIG_DM_SERIAL=y +CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="vf610-twr" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_IS_IN_NAND" # CONFIG_CMD_IMLS is not set +CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_VYBRID_GPIO=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPI_FLASH=y -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv4 4/9] arm: vf610-twr: Add device tree file's
- Add device tree files for NXP/Freescale VF610 Tower Board. - Enable lpuart support on NXP/Freescale VF610 Tower Board. - Use UART1 as stdout. Signed-off-by: Bhuvanchandra DVReviewed-by: Bin Meng --- arch/arm/dts/Makefile | 3 ++- arch/arm/dts/vf610-twr.dts | 22 ++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/vf610-twr.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index f66ff41..c6fb50c 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -190,7 +190,8 @@ dtb-$(CONFIG_MACH_SUN9I) += \ sun9i-a80-cubieboard4.dtb dtb-$(CONFIG_VF610) += vf500-colibri.dtb \ - vf610-colibri.dtb + vf610-colibri.dtb \ + vf610-twr.dtb dtb-$(CONFIG_SOC_KEYSTONE) += k2hk-evm.dtb \ k2l-evm.dtb \ diff --git a/arch/arm/dts/vf610-twr.dts b/arch/arm/dts/vf610-twr.dts new file mode 100644 index 000..a4ccbcb --- /dev/null +++ b/arch/arm/dts/vf610-twr.dts @@ -0,0 +1,22 @@ +/* + * Copyright 2016 Toradex AG + * + * SPDX-License-Identifier: GPL-2.0+ or X11 + */ + +/dts-v1/; +#include "vf.dtsi" + +/ { + model = "VF610 Tower Board"; + compatible = "fsl,vf610-twr", "fsl,vf610"; + + choosen { + stdout-path = + }; + +}; + + { + status = "okay"; +}; -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv4 5/9] arm: pcm052: Add device tree file's
- Add device tree files for Phytec phyCORE-Vybrid Board. - Enable lpuart support for Phytec phyCORE-Vybrid Board. - Use UART1 for stdout. Signed-off-by: Bhuvanchandra DVReviewed-by: Bin Meng --- arch/arm/dts/Makefile | 3 ++- arch/arm/dts/pcm052.dts | 22 ++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/pcm052.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index c6fb50c..b3bde5a 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -191,7 +191,8 @@ dtb-$(CONFIG_MACH_SUN9I) += \ dtb-$(CONFIG_VF610) += vf500-colibri.dtb \ vf610-colibri.dtb \ - vf610-twr.dtb + vf610-twr.dtb \ + pcm052.dtb dtb-$(CONFIG_SOC_KEYSTONE) += k2hk-evm.dtb \ k2l-evm.dtb \ diff --git a/arch/arm/dts/pcm052.dts b/arch/arm/dts/pcm052.dts new file mode 100644 index 000..0475f1f --- /dev/null +++ b/arch/arm/dts/pcm052.dts @@ -0,0 +1,22 @@ +/* + * Copyright 2016 Toradex AG + * + * SPDX-License-Identifier: GPL-2.0+ or X11 + */ + +/dts-v1/; +#include "vf.dtsi" + +/ { + model = "Phytec phyCORE-Vybrid"; + compatible = "phytec,pcm052", "fsl,vf610"; + + choosen { + stdout-path = + }; + +}; + + { + status = "okay"; +}; -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCHv4 3/9] arm: colibri-vf: Enable serial support
- Enable lpuart support on Toradex Colibri VF50/VF61 - Use UART0 for stdout. Signed-off-by: Bhuvanchandra DVReviewed-by: Bin Meng --- arch/arm/dts/vf-colibri.dtsi | 10 ++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/dts/vf-colibri.dtsi b/arch/arm/dts/vf-colibri.dtsi index f005339..dc52748 100644 --- a/arch/arm/dts/vf-colibri.dtsi +++ b/arch/arm/dts/vf-colibri.dtsi @@ -5,6 +5,12 @@ */ #include "vf.dtsi" +/ { + chosen { + stdout-path = + }; +}; + { status = "okay"; bus-num = <1>; @@ -14,3 +20,7 @@ spi-max-frequency = <5000>; }; }; + + { + status = "okay"; +}; -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/3] ARM: at91: clock: add PLLB enable/disable functions
Hello Wenyou, Am 27.01.2016 um 03:04 schrieb Wenyou Yang: To avoid the duplicated code, add the PLLB handle functions. Signed-off-by: Wenyou YangReviewed-by: Andreas Bießmann --- Changes in v2: None arch/arm/mach-at91/arm926ejs/clock.c | 38 + arch/arm/mach-at91/include/mach/clk.h |2 ++ 2 files changed, 40 insertions(+) Tested on the smartweb board, so: Tested-by: Heiko Schocher bye, Heiko [1] testlog http://xeidos.ddns.net/buildbot/builders/smartweb_dfu/builds/48/steps/shell/logs/tbotlog diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c index c8b5e10..c8d24ae 100644 --- a/arch/arm/mach-at91/arm926ejs/clock.c +++ b/arch/arm/mach-at91/arm926ejs/clock.c @@ -18,6 +18,8 @@ # error You need to define CONFIG_AT91FAMILY in your board config! #endif +#define EN_PLLB_TIMEOUT500 + DECLARE_GLOBAL_DATA_PTR; static unsigned long at91_css_to_rate(unsigned long css) @@ -242,3 +244,39 @@ void at91_mck_init(u32 mckr) while (!(readl(>sr) & AT91_PMC_MCKRDY)) ; } + +int at91_pllb_clk_enable(u32 pllbr) +{ + struct at91_pmc *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; + ulong start_time, tmp_time; + + start_time = get_timer(0); + writel(pllbr, >pllbr); + while ((readl(>sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) { + tmp_time = get_timer(0); + if ((tmp_time - start_time) > EN_PLLB_TIMEOUT) { + printf("ERROR: failed to enable PLLB\n"); + return -1; + } + } + + return 0; +} + +int at91_pllb_clk_disable(void) +{ + struct at91_pmc *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; + ulong start_time, tmp_time; + + start_time = get_timer(0); + writel(0, >pllbr); + while ((readl(>sr) & AT91_PMC_LOCKB) != 0) { + tmp_time = get_timer(0); + if ((tmp_time - start_time) > EN_PLLB_TIMEOUT) { + printf("ERROR: failed to disable PLLB\n"); + return -1; + } + } + + return 0; +} diff --git a/arch/arm/mach-at91/include/mach/clk.h b/arch/arm/mach-at91/include/mach/clk.h index b2604ef..64dec52 100644 --- a/arch/arm/mach-at91/include/mach/clk.h +++ b/arch/arm/mach-at91/include/mach/clk.h @@ -133,5 +133,7 @@ void at91_system_clk_disable(int sys_clk); int at91_upll_clk_enable(void); int at91_upll_clk_disable(void); void at91_usb_clk_init(u32 value); +int at91_pllb_clk_enable(u32 pllbr); +int at91_pllb_clk_disable(void); #endif /* __ASM_ARM_ARCH_CLK_H__ */ -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] arm: mvebu: Add support for the Armada XP theadorable board
On 20.01.2016 08:13, Stefan Roese wrote: This patch adds support for the Armada XP (MV78260) based theadorable board. Its equipped with onboard DDR3, UART, ethernet, I2C, SPI NOR, LCD and SATA (SSD) interfaces / devices. Two defconfigs are added: theadorable_defconfig: The production U-Boot version with a stripped down drivers and feature list. This removes networking, USB and PCI support. theadorable_debug_defconfig: The debugging / testing U-Boot version with full support for all drivers. Signed-off-by: Stefan RoeseCc: Luka Perkov Applied to u-boot-marvell/master. Thanks, Stefan ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] armv7: add cacheline sizes where missing
Some armv7 targets are missing a cache line size declaration. In preparation for "arm: cache: Implement cache range check for v7" patch, add these declarations with the appropriate value for the target's SoC or CPU. Signed-off-by: Albert ARIBAUD--- Changes in v2: - fix include/configs/at91-sama5_common.h (Cortex-A5: 32 bytes) include/configs/am3517_crane.h | 2 ++ include/configs/am3517_evm.h| 2 ++ include/configs/at91-sama5_common.h | 2 ++ include/configs/bcm_ep_board.h | 1 + include/configs/cm_t35.h| 2 ++ include/configs/cm_t3517.h | 2 ++ include/configs/colibri_vf.h| 2 ++ include/configs/kzm9g.h | 2 ++ include/configs/nokia_rx51.h| 2 ++ include/configs/pcm052.h| 2 ++ include/configs/rcar-gen2-common.h | 2 ++ include/configs/rk3036_common.h | 2 ++ include/configs/rk3288_common.h | 2 ++ include/configs/s5p_goni.h | 2 ++ include/configs/smdkc100.h | 2 ++ include/configs/tao3530.h | 2 ++ include/configs/ti814x_evm.h| 2 ++ include/configs/ti816x_evm.h| 2 ++ include/configs/ti_omap3_common.h | 5 + include/configs/tricorder.h | 2 ++ include/configs/vexpress_common.h | 2 ++ include/configs/vf610twr.h | 2 ++ 22 files changed, 46 insertions(+) diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 4ed8e00..3cc2874 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -13,6 +13,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_CACHELINE_SIZE 64 + /* * High Level Configuration Options */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 23457d6..4547d7f 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -13,6 +13,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_CACHELINE_SIZE 64 + /* * High Level Configuration Options */ diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 9db4a4f..d692106 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -12,6 +12,8 @@ #include +#define CONFIG_SYS_CACHELINE_SIZE 32 + #define CONFIG_SYS_TEXT_BASE 0x26f0 /* ARM asynchronous clock */ diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index 305864f..1d4869b 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -11,6 +11,7 @@ #define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SYS_CACHELINE_SIZE 64 /* * Memory configuration diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 2dc745e..24ae14d 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -17,6 +17,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_CACHELINE_SIZE 64 + /* * High Level Configuration Options */ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 0aefec8..7a07de4 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_CACHELINE_SIZE 64 + /* * High Level Configuration Options */ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 5aed3a5..dd44462 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -12,6 +12,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_CACHELINE_SIZE 32 + #include #define CONFIG_VF610 diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 94b0f03..d5cbb33 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -10,6 +10,8 @@ #undef DEBUG +#define CONFIG_SYS_CACHELINE_SIZE 32 + #define CONFIG_SH73A0 #define CONFIG_KZM_A9_GT #define CONFIG_RMOBILE_BOARD_STRING"KMC KZM-A9-GT" diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index b11e43a..5c41405 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -19,6 +19,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_CACHELINE_SIZE 64 + /* * High Level Configuration Options */ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 891bdb0..2628dfa 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_CACHELINE_SIZE 32 + #include #define CONFIG_VF610 diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index f0a3a18..f750b53 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -9,6 +9,8 @@ #ifndef __RCAR_GEN2_COMMON_H #define __RCAR_GEN2_COMMON_H +#define CONFIG_SYS_CACHELINE_SIZE 64 + #include #define CONFIG_CMD_DFL diff --git a/include/configs/rk3036_common.h
Re: [U-Boot] [PATCH V6] sf: Turn SPI flash chip into 3-Byte address mode
Hi Jagan, Up to now, I didn't find the 4-Byte addressing mode support. Do you know if anybody have schedule to add it? if no, could you please apply this patch, due to as I have said when do the warm boot up, the SPI flash will be kept in 4-Byte addressing mode that kernel driver set, while the u-boot doesn't support 4-Byte mode and assume it is in 3-Byte mode. This mismatch make the u-boot spi driver working incorrectly. What the worse is it will crash when booting from SPI flash. So please take it into account. Thanks, Zhiqiang > -Original Message- > From: Hou Zhiqiang-B48286 [mailto:b48...@freescale.com] > Sent: 2015年8月19日 20:27 > To: Hou Zhiqiang-B48286; Siva Durga Prasad Paladugu > ; u-boot@lists.denx.de; jt...@openedev.com; > jaga...@xilinx.com > Cc: Yusong Sun ; Hu Mingkai-B21284 > ; nofooter > Subject: RE: [PATCH V6] sf: Turn SPI flash chip into 3-Byte address mode > > Hello Jagannadha and Siva, > > Do you have any idea for if there should be a shift upon the flash size? > If yes, why there isn't one when initializing the BAR read/write commands? > > > -Original Message- > > From: Hou Zhiqiang-B48286 > > Sent: 2015年8月14日 18:02 > > To: 'Siva Durga Prasad Paladugu'; u-boot@lists.denx.de; > > jt...@openedev.com; 'jaga...@xilinx.com' > > Cc: Sun York-R58495; Hu Mingkai-B21284; nofooter > > Subject: RE: [PATCH V6] sf: Turn SPI flash chip into 3-Byte address > > mode > > > > Hi Jagannadha, > > > > See Siva's comments inline and For the DUAL spi flash memories, do you > > have any comment? > > > > > -Original Message- > > > From: Siva Durga Prasad Paladugu > > > [mailto:siva.durga.palad...@xilinx.com] > > > Sent: 2015年8月14日 12:55 > > > To: Hou Zhiqiang-B48286; u-boot@lists.denx.de; jt...@openedev.com > > > Cc: Sun York-R58495; Hu Mingkai-B21284; nofooter > > > Subject: RE: [PATCH V6] sf: Turn SPI flash chip into 3-Byte address > > > mode > > > > > > Hi Zhiqiang, > > > > > > > -Original Message- > > > > From: Zhiqiang Hou [mailto:b48...@freescale.com] > > > > Sent: Wednesday, August 12, 2015 11:48 AM > > > > To: u-boot@lists.denx.de; jt...@openedev.com > > > > Cc: york...@freescale.com; mingkai...@freescale.com; Siva Durga > > > > Prasad Paladugu; Hou Zhiqiang > > > > Subject: [PATCH V6] sf: Turn SPI flash chip into 3-Byte address > > > > mode > > > > > > > > From: Hou Zhiqiang > > > > > > > > For more than 16MiB SPI flash chips, there are 3-Byte and 4-Byte > > > > address mode, and only the 3-Byte address mode is supported in > > > > U-Boot > > > so far. > > > > So, reset the SPI flash to 3-Byte address mode in probe to ensure > > > > the SPI flash work correctly, because it may has been set to > > > > 4-Byte address mode after warm boot. > > > > > > > > Signed-off-by: Hou Zhiqiang > > > > --- > > > > Tested on T1042RDB board. > > > > V6: > > > > Add the spi_release_bus. > > > > V5: > > > > 1. Removed #ifdef for STMICRO. > > > > 2. Add support for Spansion chips (>16MiB) switch to 3-Byte > > > > address > > > mode. > > > > V4: > > > > Split the the patch to 2 patches for clear FSR and SPI flash > > > address mode. > > > > V3: > > > > Generate the patch based on the latest tree > > > > git://git.denx.de/u- > > > boot.git. > > > > V2: > > > > Add the operation of enter 3 Byte address mode in probe. > > > > V1: > > > > Based on git://git.denx.de/u-boot.git. > > > > drivers/mtd/spi/sf_internal.h | 7 +++ > > > > drivers/mtd/spi/sf_ops.c | 40 > > > > > > > > drivers/mtd/spi/sf_probe.c| 10 ++ > > > > 3 files changed, 57 insertions(+) > > > > > > > > diff --git a/drivers/mtd/spi/sf_internal.h > > > > b/drivers/mtd/spi/sf_internal.h index 1de1dac..9519bd8 100644 > > > > --- a/drivers/mtd/spi/sf_internal.h > > > > +++ b/drivers/mtd/spi/sf_internal.h > > > > @@ -75,6 +75,10 @@ enum { > > > > #define CMD_FLAG_STATUS 0x70 > > > > #define CMD_CLEAR_FLAG_STATUS0x50 > > > > > > > > +/* Used for Micron, Macronix and Winbond flashes */ > > > > +#define CMD_ENTER_4B_ADDR 0xB7 > > > > +#define CMD_EXIT_4B_ADDR0xE9 > > > > + > > > > /* Read commands */ > > > > #define CMD_READ_ARRAY_SLOW 0x03 > > > > #define CMD_READ_ARRAY_FAST 0x0b > > > > @@ -231,6 +235,9 @@ int spi_flash_read_common(struct spi_flash > > > > *flash, const u8 *cmd, int spi_flash_cmd_read_ops(struct > > > > spi_flash *flash, > > > > u32 offset, > > > > size_t len, void *data); > > > > > > > > +int spi_flash_cmd_4B_addr_switch(struct spi_flash *flash, > > > > + int enable, u8 idcode0); > > > > + > > > > #ifdef CONFIG_SPI_FLASH_MTD > > > > int spi_flash_mtd_register(struct spi_flash *flash); void > > > >
Re: [U-Boot] [PATCH 05/10] superio: Add SMSC SIO1007 driver
Hi Simon, On Wed, Jan 6, 2016 at 8:24 AM, Simon Glasswrote: > Hi Bin, > > On 20 December 2015 at 19:42, Bin Meng wrote: >> Hi Simon, >> >> On Sat, Dec 19, 2015 at 10:52 AM, Simon Glass wrote: >>> Hi Bin, >>> >>> On 11 December 2015 at 03:55, Bin Meng wrote: The SMSC SIO1007 superio chipset integrates two ns16550 compatible serial ports for legacy applications, 16 GPIO pins and some other functionalities like power management. This adds a simple driver to enable serial port and handle GPIO. Signed-off-by: Bin Meng --- drivers/misc/Makefile | 1 + drivers/misc/smsc_sio1007.c | 126 include/smsc_sio1007.h | 115 3 files changed, 242 insertions(+) create mode 100644 drivers/misc/smsc_sio1007.c create mode 100644 include/smsc_sio1007.h diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index aa137f5..6952f8ce 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -29,6 +29,7 @@ ifdef CONFIG_DM_I2C obj-$(CONFIG_SANDBOX) += i2c_eeprom_emul.o endif obj-$(CONFIG_SMSC_LPC47M) += smsc_lpc47m.o +obj-$(CONFIG_SMSC_SIO1007) += smsc_sio1007.o obj-$(CONFIG_STATUS_LED) += status_led.o obj-$(CONFIG_SANDBOX) += swap_case.o obj-$(CONFIG_SANDBOX) += syscon_sandbox.o diff --git a/drivers/misc/smsc_sio1007.c b/drivers/misc/smsc_sio1007.c new file mode 100644 index 000..79e9e15 --- /dev/null +++ b/drivers/misc/smsc_sio1007.c @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2015, Bin Meng + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#include +#include +#include +#include + +static inline u8 sio1007_read(int port, int reg) +{ + outb(reg, port); + + return inb(port + 1); +} + +static inline void sio1007_write(int port, int reg, int val) +{ + outb(reg, port); + outb(val, port + 1); +} + +static inline void sio1007_clrsetbits(int port, int reg, u8 clr, u8 set) +{ + sio1007_write(port, reg, (sio1007_read(port, reg) & ~clr) | set); +} + +void sio1007_enable_serial(int port, int num, int iobase, int irq) +{ + if (num < 0 || num > SIO1007_UART_NUM) + return; + + /* enter configuration state */ + outb(0x55, port); + + /* power on serial port and set up its i/o base & irq */ + if (!num) { + sio1007_clrsetbits(port, DEV_POWER_CTRL, 0, UART1_POWER_ON); + sio1007_clrsetbits(port, UART1_IOBASE, 0xfe, iobase >> 2); + sio1007_clrsetbits(port, UART_IRQ, 0xf0, irq << 4); + } else { + sio1007_clrsetbits(port, DEV_POWER_CTRL, 0, UART2_POWER_ON); + sio1007_clrsetbits(port, UART2_IOBASE, 0xfe, iobase >> 2); + sio1007_clrsetbits(port, UART_IRQ, 0x0f, irq); + } + + /* exit configuration state */ + outb(0xaa, port); +} + +void sio1007_enable_runtime(int port, int iobase) +{ + /* enter configuration state */ + outb(0x55, port); + + /* set i/o base for the runtime register block */ + sio1007_clrsetbits(port, RTR_IOBASE_LOW, 0, iobase >> 4); + sio1007_clrsetbits(port, RTR_IOBASE_HIGH, 0, iobase >> 12); + /* turn on address decoding for this block */ + sio1007_clrsetbits(port, DEV_ACTIVATE, 0, RTR_EN); + + /* exit configuration state */ + outb(0xaa, port); +} + +void sio1007_gpio_config(int port, int gpio, int dir, int pol, int type) +{ + int reg = GPIO0_DIR; + + if (gpio < 0 || gpio > SIO1007_GPIO_NUM) + return; + if (gpio >= GPIO_NUM_PER_GROUP) { + reg = GPIO1_DIR; + gpio -= GPIO_NUM_PER_GROUP; + } + + /* enter configuration state */ + outb(0x55, port); + + /* set gpio pin direction, polority and type */ + sio1007_clrsetbits(port, reg, 1 << gpio, dir << gpio); + sio1007_clrsetbits(port, reg + 1, 1 << gpio, pol << gpio); + sio1007_clrsetbits(port, reg + 2, 1 << gpio, type << gpio); + + /* exit configuration state */ + outb(0xaa, port); +} + +int sio1007_gpio_get_value(int port, int gpio) +{ + int reg = GPIO0_DATA; + int val; + + if (gpio < 0 || gpio > SIO1007_GPIO_NUM) +
Re: [U-Boot] [PATCH] malloc: work around some memalign fragmentation issues
Hi Stephen, > From: Stephen Warren> > Use of memalign can trigger fragmentation issues such as: > > // Internally, this needs to find a free block quite bit larger than > s. // Once the free region is found, any unaligned "padding" > immediately // before and after the block is marked free, so that the > allocation // takes only s bytes (plus malloc header overhead). > p = memalign(a, s); > // If there's little fragmentation so far, this allocation is likely > // located immediately after p. > p2 = malloc(x); > free(p); > // In theory, this should return the same value for p. However, the > hole // left by the free() call is only s in size (plus malloc header > overhead) // whereas memalign searches for a larger block in order to > guarantee it // can adjust the returned pointer to the alignment > requirements. Hence, // the pointer returned, if any, won't be p. If > there's little or no space // left after p2, this allocation will > fail. p = memalign(a, s); > > In practice, this issue occurs when running the "dfu" command > repeatedly on NVIDIA Tegra boards, since DFU allocates a large 32M > data buffer, and then initializes the USB controller. If this is the > first time USB has been used in the U-Boot session, this causes a > probe of the USB driver, which causes various allocations, including > a strdup() of a GPIO name when requesting the VBUS GPIO. When DFU is > torn down, the USB driver is left probed, and hence its memory is > left allocated. If "dfu" is executed again, allocation of the 32M > data buffer fails as described above. > > In practice, there is a memory hole exactly large enough to hold the > 32M data buffer than DFU needs. However, memalign() can't know that > in a general way. Given that, it's particularly annoying that the > allocation fails! > > The issue is that memalign() tries to allocate something larger to > guarantee the ability to align the returned pointer. This patch > modifies memalign() so that if the "general case" over-sized > allocation fails, another allocation is attempted, of the exact size > the user desired. If that allocation just happens to be aligned in > the way the user wants, (and in the case described above, it will be, > since the free memory region is located where a previous identical > allocation was located), the pointer can be returned. > > This patch is somewhat related to 806bd245b1ab "dfu: don't keep > freeing/reallocating". That patch worked around the issue by removing > repeated free/memalign within a single execution of "dfu". However, > the same technique can't be applied across multiple invocations, since > there's no reason to keep the DFU buffer allocated while DFU isn't > running. This patch addresses the root-cause a bit more directly. > > This problem highlights some of the disadvantages of dynamic > allocation and deferred probing of devices. > > This patch isn't checkpatch-clean, since it conforms to the existing > coding style in dlmalloc.c, which is different to the rest of U-Boot. > > Signed-off-by: Stephen Warren > --- > common/dlmalloc.c | 22 ++ > 1 file changed, 22 insertions(+) > > diff --git a/common/dlmalloc.c b/common/dlmalloc.c > index b5bb05191c24..2b964d16b11e 100644 > --- a/common/dlmalloc.c > +++ b/common/dlmalloc.c > @@ -2829,6 +2829,28 @@ Void_t* mEMALIGn(alignment, bytes) size_t > alignment; size_t bytes; nb = request2size(bytes); >m = (char*)(mALLOc(nb + alignment + MINSIZE)); > > + /* > + * The attempt to over-allocate (with a size large enough to > guarantee the > + * ability to find an aligned region within allocated memory) > failed. > + * > + * Try again, this time only allocating exactly the size the user > wants. If > + * the allocation now succeeds and just happens to be aligned, we > can still > + * fulfill the user's request. > + */ > + if (m == NULL) { > +/* > + * Use bytes not nb, since mALLOc internally calls request2size > too, and > + * each call increases the size to allocate, to account for the > header. > + */ > +m = (char*)(mALLOc(bytes)); > +/* Aligned -> return it */ > +if unsigned long)(m)) % alignment) == 0) > + return m; > +/* Otherwise, fail */ > +fREe(m); > +return NULL; > + } > + >if (m == NULL) return NULL; /* propagate failure */ > >p = mem2chunk(m); U-boot's ./common/dlmalloc.c file is from year 2000 (version 2.6.6). I'm just wondering if there exists newer version of this code (and can be easily ported to u-boot). Despite the above note, Acked-by: Lukasz Majewski -- Best regards, Lukasz Majewski Samsung R Institute Poland (SRPOL) | Linux Platform Group ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 00/22] xilinx-ppc4xx: Cleanout and port to DM serial
On Tue, Jan 26, 2016 at 01:14:44PM +0100, Ricardo Ribalda Delgado wrote: > Hello Michal > > Thanks for your fast review :). > > Usually my patches were through Stefan Roese (sorry, I forgot to add > you as cc in the patchset :( ) > In this case, as it depends on yuour patches I do not know what should > be the right path. > > Tom, Stefan what do you propose? I would be quite happy for all of these to come in via Michal's tree. I'll try and review everything shortly as well. Thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] imx: mx6sx: Fix issue in LCDIF clock enablement
Wrong checking for the base_addr paramter with LCDIF1 and LCDIF2. Always enter the -EINVAL return. Signed-off-by: Ye Li--- arch/arm/cpu/armv7/mx6/clock.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index 27a3f2f..007204d 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -742,8 +742,8 @@ int enable_lcdif_clock(u32 base_addr) u32 lcdif_clk_sel_mask, lcdif_ccgr3_mask; if (is_cpu_type(MXC_CPU_MX6SX)) { - if ((base_addr == LCDIF1_BASE_ADDR) || - (base_addr == LCDIF2_BASE_ADDR)) { + if ((base_addr != LCDIF1_BASE_ADDR) && + (base_addr != LCDIF2_BASE_ADDR)) { puts("Wrong LCD interface!\n"); return -EINVAL; } -- 1.7.4.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] imx: mx6ul/sx: Fix issue in LCDIF clock dividers calculation
The checking with max frequency supported is not correct, because the temp is calculated by max pre and post dividers. We can decrease any divider to meet the max frequency limitation. Actually, the calculation below the codes is doing this way to find best pre and post dividers. Signed-off-by: Ye Li--- arch/arm/cpu/armv7/mx6/clock.c |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index 007204d..88380a6 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -638,10 +638,6 @@ void mxs_set_lcdclk(u32 base_addr, u32 freq) } temp = freq * max_pred * max_postd; - if (temp > max) { - puts("Please decrease freq, too large!\n"); - return; - } if (temp < min) { /* * Register: PLL_VIDEO -- 1.7.4.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 00/22] xilinx-ppc4xx: Cleanout and port to DM serial
On 26.01.2016 14:55, Tom Rini wrote: On Tue, Jan 26, 2016 at 01:14:44PM +0100, Ricardo Ribalda Delgado wrote: Hello Michal Thanks for your fast review :). Usually my patches were through Stefan Roese (sorry, I forgot to add you as cc in the patchset :( ) In this case, as it depends on yuour patches I do not know what should be the right path. Tom, Stefan what do you propose? I would be quite happy for all of these to come in via Michal's tree. I'll try and review everything shortly as well. Thanks! I'll try to review the patches later today. Or very early tomorrow. And, if Tom also sees no problems, then I also agree to push them via Michal's tree. Thanks, Stefan ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot