Re: [U-Boot] [PATCH 05/10] superio: Add SMSC SIO1007 driver
Hi Simon,
On Wed, Jan 6, 2016 at 8:24 AM, Simon Glass wrote:
> 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)
+ return -EINVAL;
+ if (gpio >= GPIO_NUM_PER_GROUP) {
+ reg = GPIO1_DATA;
+
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&D Institute Poland (SRPOL) | Linux Platform Group
___
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 0x0030 +DATA 4 0x020e0620 0x0030 +DATA
[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(&fuse->mac_addr_high);
- mac[0] = (value >> 8);
- mac[1] = value ;
-
- value = readl(&fuse->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(&fuse->mac_addr2);
+ mac[0] = value >> 24 ;
+ mac[1] = value >> 16 ;
+ mac[2] = value >> 8 ;
+ mac[3] = value ;
+
+ value = readl(&fuse->mac_addr1);
+ mac[4] = value >> 24 ;
+ mac[5] = value >> 16 ;
+
+ } else {
+ u32 value = readl(&fuse->mac_addr1);
+ mac[0] = (value >> 8);
+ mac[1] = value ;
+
+ value = readl(&fuse->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] [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 DV
Reviewed-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(&lpuart32_serial_drv);
-#else
- serial_register(&lpuart_serial_drv);
-#endif
-}
+#endif /* CONFIG_LPUART_32B_REG */
-__weak struct serial_device *default_serial_console(void)
-{
-#ifdef CONFIG_LPUART_32B_REG
- return &lpuart32_serial_drv;
-#else
- return &lpuart_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] [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 = &gpio2;
gpio3 = &gpio3;
gpio4 = &gpio4;
+ serial0 = &uart0;
+ serial1 = &uart1;
+ serial2 = &uart2;
+ serial3 = &uart3;
+ serial4 = &uart4;
+ serial5 = &uart5;
spi0 = &dspi0;
spi1 = &dspi1;
};
@@ -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] [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 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 = &uart0;
+ };
+};
+
&dspi1 {
status = "okay";
bus-num = <1>;
@@ -14,3 +20,6 @@
spi-max-frequency = <5000>;
};
};
+&uart0 {
+ 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
[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 = &uart1;
+ };
+
+};
+
+&uart1 {
+ 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] [PATCHv3 6/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 DV
---
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 = &uart1;
+ };
+
+};
+
+&uart1 {
+ 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 7/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 DV --- 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] [PATCHv3 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 DV
Reviewed-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(&lpuart32_serial_drv);
-#else
- serial_register(&lpuart_serial_drv);
-#endif
-}
+#endif /* CONFIG_LPUART_32B_REG */
-__weak struct serial_device *default_serial_console(void)
-{
-#ifdef CONFIG_LPUART_32B_REG
- return &lpuart32_serial_drv;
-#else
- return &lpuart_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] [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 DV
Reviewed-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", &vybrid_gpio[0] },
- { "gpio_vybrid", &vybrid_gpio[1] },
- { "gpio_vybrid", &vybrid_gpio[2] },
- { "gpio_vybrid", &vybrid_gpio[3] },
- { "gpio_vybrid", &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] 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
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 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 include/co
[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 set
-# CONFIG_CMD_NET is not set
-# CONFIG_CMD_NFS i
[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 a/configs/fx12mm_defconfig b/configs/fx12mm_defconfig
deleted file mode 100644
index c714d0d35e4e..
--- a/conf
[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
[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
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x0410,BOOT_
[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 +++ b/board/xilinx/ppc405-generic/Makefile @@ -3,7 +3,7 @@ # Wolfgang Denk, DENX Software Engineering, w..
[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 06/22] ppc: pp405-generic: Simplify Makefile
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(-) diff --git a/board/xilinx/ppc405-generic/Makefile b/board/xilinx/ppc405-generic/Makefile index 922946d72341..2800f6862640 100644 --- a/board/xilinx/ppc405-generic/Makefile +++ b/board/xilinx/ppc405-generic/Makefile @@ -9,4 +9,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += ../../xilinx/ppc405-generic/xilinx_ppc405_generic.o +obj-y += xilinx_ppc405_generic.o -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 14/22] configs/xilinx-ppc405-generic: Typos and size
-Fix typos (runnining -> running) -Increase default size Signed-off-by: Ricardo Ribalda Delgado --- include/configs/xilinx-ppc405-generic.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/xilinx-ppc405-generic.h b/include/configs/xilinx-ppc405-generic.h index e2d189d0ac60..6182b0e7cf05 100644 --- a/include/configs/xilinx-ppc405-generic.h +++ b/include/configs/xilinx-ppc405-generic.h @@ -29,16 +29,16 @@ #define CONFIG_ENV_OVERWRITE 1 /*Misc*/ -#define CONFIG_PREBOOT "echo U-Boot is up and runnining;" +#define CONFIG_PREBOOT "echo U-Boot is up and running;" /*Flash*/ -#define CONFIG_SYS_FLASH_BASE XPAR_FLASH_MEM0_BASEADDR -#define CONFIG_SYS_FLASH_SIZE (32*1024*1024) -#define CONFIG_SYS_MAX_FLASH_SECT 71 +#define CONFIG_SYS_FLASH_BASE XPAR_FLASH_MEM0_BASEADDR +#define CONFIG_SYS_FLASH_SIZE (128*1024*1024) +#define CONFIG_SYS_MAX_FLASH_SECT 1024 #define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER1 -#define MTDIDS_DEFAULT "nor0=ppc405-flash" -#define MTDPARTS_DEFAULT "mtdpartsa=ppc405-flash:-(user)" +#define MTDIDS_DEFAULT "nor0=flash" +#define MTDPARTS_DEFAULT "mtdparts=flash:-(user)" #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
[U-Boot] [PATCH 13/22] ppc: dts: Add device tree for xilix-ppc4xx-generic
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/;
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ aliases {
+ console = &uart0;
+ } ;
+ 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;
+ } ;
+ uart0: serial@8b00 {
+ compatible = "xlnx,xps-uartlite-1.00.a";
+ interrupts = <0 0>;
+ reg = <0x8b00 0x1>;
+ };
+} ;
--
2.7.0.rc3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 12/22] ppc: xilinx-ppc4xx-generic: Update xparameters.h
-Remove UART address (It is now part of the dts). -Include dummy ns16550 clock -Fix address to last test Signed-off-by: Ricardo Ribalda Delgado --- board/xilinx/ppc405-generic/xparameters.h | 5 ++--- board/xilinx/ppc440-generic/xparameters.h | 9 - 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/board/xilinx/ppc405-generic/xparameters.h b/board/xilinx/ppc405-generic/xparameters.h index e61040785937..c3df9e51091f 100644 --- a/board/xilinx/ppc405-generic/xparameters.h +++ b/board/xilinx/ppc405-generic/xparameters.h @@ -14,12 +14,11 @@ #define XPAR_IIC_EEPROM_BASEADDR 0x8160 #define XPAR_INTC_0_BASEADDR 0x8180 #define XPAR_SPI_0_BASEADDR 0x8340 -#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 +#define XPAR_INTC_MAX_NUM_INTR_INPUTS 32 #define XPAR_SPI_0_NUM_TRANSFER_BITS 8 +#define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 1 #endif diff --git a/board/xilinx/ppc440-generic/xparameters.h b/board/xilinx/ppc440-generic/xparameters.h index 3c135ec42b37..9685560673ab 100644 --- a/board/xilinx/ppc440-generic/xparameters.h +++ b/board/xilinx/ppc440-generic/xparameters.h @@ -12,12 +12,11 @@ #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_INTC_0_BASEADDR 0x8700 +#define XPAR_FLASH_MEM0_BASEADDR 0xF000 #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 +#define XPAR_INTC_MAX_NUM_INTR_INPUTS 32 +#define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 1 #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 08/22] ppc: ppc440: ppc440-generic_flash_defconfig
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 diff --git a/configs/xilinx-ppc440-generic_flash_defconfig b/configs/xilinx-ppc440-generic_flash_defconfig deleted file mode 100644 index 629903344b77.. --- a/configs/xilinx-ppc440-generic_flash_defconfig +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_PPC=y -CONFIG_4xx=y -CONFIG_TARGET_XILINX_PPC440_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 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
[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 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 CONFIG_SYS_NS16550_COM1
[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 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 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 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 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
Re: [U-Boot] [PATCHv3 1/9] arm: vybrid: Enable lpuart support
On Tue, Jan 26, 2016 at 5:46 PM, Bhuvanchandra DV wrote: > 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] [PATCHv3 3/9] arm: colibri-vf: Enable serial support
On Tue, Jan 26, 2016 at 5:46 PM, Bhuvanchandra DV
wrote:
> - 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 = &uart0;
> + };
> +};
> +
> &dspi1 {
> status = "okay";
> bus-num = <1>;
> @@ -14,3 +20,6 @@
> spi-max-frequency = <5000>;
> };
> };
nits: there should be a blank line here
> +&uart0 {
> + 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 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 DV wrote: > 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 2/9] arm: vybrid: Update the license string
On Tue, Jan 26, 2016 at 5:46 PM, Bhuvanchandra DV wrote: > 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(-) > 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 6/9] arm: pcm052: Add device tree file's
On Tue, Jan 26, 2016 at 5:46 PM, Bhuvanchandra DV wrote: > - 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 DV > --- > 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 > 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 5/9] arm: vf610-twr: Add device tree file's
On Tue, Jan 26, 2016 at 5:46 PM, Bhuvanchandra DV wrote: > - 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 > 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 7/9] arm: vybrid: Update defconfig's
On Tue, Jan 26, 2016 at 5:46 PM, Bhuvanchandra DV wrote: > 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 DV > --- > 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 > 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 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 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
[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, &node_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, &node_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 usb_erratum_a006261_off = -1;
+ int
[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 ft_board_setup(void *blob, bd_t *bd)
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 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 Simek wrote: > 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-p
Re: [U-Boot] [PATCH 01/22] ppc: xilinx-ppc440: Remove support for ml507
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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] [PATCH 02/22] ppc: xilinx-ppc405: Remove support for fx12mm
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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 07/22] ppc: pp440-generic: Simplify Makefile
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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
Re: [U-Boot] [PATCH 08/22] ppc: ppc440: ppc440-generic_flash_defconfig
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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 05/22] mailaddr: Update mail address
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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 06/22] ppc: pp405-generic: Simplify Makefile
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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 Delgado wrote: > 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 Delgado wrote: > 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 11/22] ppc: xilinx-ppc405-generic: Cleanout header files
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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 17/22] ppc: xilinx_ppc405_generic: Remove weak attributes
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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 Delgado wrote: > 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 20/22] ppc: xilinx_ppc440_generic: Remove uncalled functions
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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 21/22] net: xilinx_ll_temac: Fix string overflow
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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
Re: [U-Boot] [PATCH 18/22] ppc: xilinx_ppc440_generic: Remove weak attributes
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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 10/22] ppc: xilinx-ppc440-generic: Cleanout header files
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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
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 Delgado
wrote:
> 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 = &uart0;
> + } ;
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;
> + } ;
> + 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 Delgado
wrote:
> 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 03/22] xilinx-ppc440: Remove support for v5fx30teval
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado wrote: > 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
Re: [U-Boot] [PATCH 13/22] ppc: dts: Add device tree for xilix-ppc4xx-generic
On Tue, Jan 26, 2016 at 1:21 PM, Bin Meng wrote:
> Hi Ricardo,
>
> On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado
> wrote:
>> 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 = &uart0;
>> + } ;
>
> 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;
>> + } ;
>> + uart0: serial@8b00 {
>> + compatible = "xlnx,xps-uartlite-1.00.a";
>> + interrupts = <0 0>;
>> + reg = <0x8b00 0x1>;
>> + };
>> +} ;
>> --
>
> BTW no /chosen node?
Apparently it is not needed
>
> Regards,
> Bin
--
Ricardo Ribalda
___
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
Hello Bin
On Tue, Jan 26, 2016 at 1:21 PM, Bin Meng wrote:
> Hi Ricardo,
>
> On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado
> wrote:
>> 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?
Not as far as I know
>
>> +
>> + 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.
>
I want to build it only when the core is present. This is checked with
the definitions from the xparameters.h file, obtained by the fpga
syntesis tool.
>> +#endif
>> +
>> /*Generic Configs*/
>> #include
>>
>> --
>
> Regards,
> Bin
Thanks!
--
Ricardo Ribalda
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 13/22] ppc: dts: Add device tree for xilix-ppc4xx-generic
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 | 15 +++
arch/powerpc/dts/xilinx-ppc440-generic.dts | 15 +++
3 files changed, 32 insertions(+)
create mode 100644 arch/powerpc/dts/xilinx-ppc405-generic.dts
create mode 100644 arch/powerpc/dts/xilinx-ppc440-generic.dts
v2: Add newlines after size-cells and aliases block
Credit-to: Bin Meng
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 ..64983216b57f
--- /dev/null
+++ b/arch/powerpc/dts/xilinx-ppc405-generic.dts
@@ -0,0 +1,15 @@
+/dts-v1/;
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ aliases {
+ console = &uart0;
+ };
+
+ 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 ..c83523a5a481
--- /dev/null
+++ b/arch/powerpc/dts/xilinx-ppc440-generic.dts
@@ -0,0 +1,15 @@
+/dts-v1/;
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ aliases {
+ console = &uart0;
+ };
+
+ uart0: serial@8b00 {
+ compatible = "xlnx,xps-uartlite-1.00.a";
+ interrupts = <0 0>;
+ reg = <0x8b00 0x1>;
+ };
+} ;
--
2.7.0.rc3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 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
---
v2: Add whitespaces after /* and before*/
Credit-to: Bin Meng
.../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| 22 --
4 files changed, 47 insertions(+), 6 deletions(-)
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..f2505a6cd2b2 100644
--- a/include/configs/xilinx-ppc440-generic.h
+++ b/include/configs/xilinx-ppc440-generic.h
@@ -8,32 +8,42 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*CPU*/
+/* CPU */
#define CONFIG_440 1
#define CONFIG_XILINX_440 1
#define CONFIG_XILINX_PPC440_GENERIC 1
#include "../board/xilinx/ppc440-generic/xparameters.h"
-/*Mem Map*/
+/* Mem Map */
#define CONFIG_SYS_SDRAM_SIZE_MB 256
-/*Env*/
+/* Env */
#defineCONFIG_ENV_IS_IN_FLASH 1
#defineCONFIG_ENV_SIZE 0x2
#defineCONFIG_ENV_SECT_SIZE0x2
#define CONFIG_ENV_OFFSET 0x34
#define CONFIG_ENV_ADDR
(XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
-/*Misc*/
+/* Misc */
#define CONFIG_PREBOOT "echo U-Boot is up and running;"
-/*Flash*/
+/* Flash */
#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*/
+/* 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
#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 v2 13/22] ppc: dts: Add device tree for xilix-ppc4xx-generic
On Tue, Jan 26, 2016 at 8:47 PM, Ricardo Ribalda Delgado wrote: > 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 | 15 +++ > arch/powerpc/dts/xilinx-ppc440-generic.dts | 15 +++ > 3 files changed, 32 insertions(+) > create mode 100644 arch/powerpc/dts/xilinx-ppc405-generic.dts > create mode 100644 arch/powerpc/dts/xilinx-ppc440-generic.dts > > v2: Add newlines after size-cells and aliases block > Credit-to: Bin Meng > 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 22/22] ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver
On Tue, Jan 26, 2016 at 8:47 PM, Ricardo Ribalda Delgado wrote: > If the xparameters file contains a LL_TEMAC definition compile its > driver and the net commands. > > Signed-off-by: Ricardo Ribalda Delgado > --- > > v2: Add whitespaces after /* and before*/ > Credit-to: Bin Meng > > .../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| 22 > -- > 4 files changed, 47 insertions(+), 6 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 5/5] tools: Add tool to add crc8 to a mac address
Hello Joe, On Mon, 25 Jan 2016 18:45:52 -0600, Joe Hershberger wrote: > On Mon, Dec 14, 2015 at 6:41 AM, Olliver Schinagl > wrote: > > +++ b/tools/gen_mac_addr.c > > This is not "generating a mac address", right? Its point is to create > a CRC for the user-supplied MAC address. > > Perhaps a better name would be "gen_ethaddr_rom_crc". Hmm, why the "_rom" part? Amicalement, -- Albert. ___ 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
[U-Boot] [PATCH] imx: mx6sxsabresd: Add MCIMX28LCD display support
The i.MX6SX SABRESD board supports MCIMX28LCD (800x480x24) at LCDIF1
port, enable this display feature by adding relevant BSP codes
and configurations.
Signed-off-by: Ye Li
---
board/freescale/mx6sxsabresd/mx6sxsabresd.c | 61 +++
include/configs/mx6sxsabresd.h | 20 +
2 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 56dc020..886c883 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -59,6 +59,9 @@ DECLARE_GLOBAL_DATA_PTR;
PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \
PAD_CTL_ODE)
+#define LCD_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \
+ PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
+
int dram_init(void)
{
gd->ram_size = PHYS_SDRAM_SIZE;
@@ -458,6 +461,60 @@ int board_qspi_init(void)
}
#endif
+#ifdef CONFIG_VIDEO_MXS
+static iomux_v3_cfg_t const lcd_pads[] = {
+ MX6_PAD_LCD1_CLK__LCDIF1_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_ENABLE__LCDIF1_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_HSYNC__LCDIF1_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_VSYNC__LCDIF1_VSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA00__LCDIF1_DATA_0 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA01__LCDIF1_DATA_1 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA02__LCDIF1_DATA_2 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA03__LCDIF1_DATA_3 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA04__LCDIF1_DATA_4 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA05__LCDIF1_DATA_5 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA06__LCDIF1_DATA_6 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA07__LCDIF1_DATA_7 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA08__LCDIF1_DATA_8 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA09__LCDIF1_DATA_9 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA10__LCDIF1_DATA_10 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA11__LCDIF1_DATA_11 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA12__LCDIF1_DATA_12 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA13__LCDIF1_DATA_13 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA14__LCDIF1_DATA_14 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA15__LCDIF1_DATA_15 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA16__LCDIF1_DATA_16 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA17__LCDIF1_DATA_17 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA18__LCDIF1_DATA_18 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA19__LCDIF1_DATA_19 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA20__LCDIF1_DATA_20 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA21__LCDIF1_DATA_21 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA22__LCDIF1_DATA_22 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_DATA23__LCDIF1_DATA_23 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD1_RESET__GPIO3_IO_27 | MUX_PAD_CTRL(NO_PAD_CTRL),
+
+ /* Use GPIO for Brightness adjustment, duty cycle = period */
+ MX6_PAD_SD1_DATA2__GPIO6_IO_4 | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+static int setup_lcd(void)
+{
+ enable_lcdif_clock(LCDIF1_BASE_ADDR);
+
+ imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
+
+ /* Reset the LCD */
+ gpio_direction_output(IMX_GPIO_NR(3, 27) , 0);
+ udelay(500);
+ gpio_direction_output(IMX_GPIO_NR(3, 27) , 1);
+
+ /* Set Brightness to high */
+ gpio_direction_output(IMX_GPIO_NR(6, 4) , 1);
+
+ return 0;
+}
+#endif
+
int board_init(void)
{
/* Address of boot parameters */
@@ -471,6 +528,10 @@ int board_init(void)
board_qspi_init();
#endif
+#ifdef CONFIG_VIDEO_MXS
+ setup_lcd();
+#endif
+
return 0;
}
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 0aec296..29e9c08 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -36,6 +36,7 @@
"fdt_addr=0x8800\0" \
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
+
"videomode=video=ctfb:x:800,y:480,depth:24,pclk:29850,le:89,ri:164,up:23,lo:10,hs:10,vs:10,sync:0,vmode:0\0"
\
"mmcdev=2\0" \
"mmcpart=1\0" \
"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
@@ -195,6 +196,25 @@
#define FSL_QSPI_FLASH_NUM 2
#endif
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_VIDEO
+#ifdef CONFIG_VIDEO
+#define CONFIG_CFB_CONSOLE
+#define CONFIG_VIDEO_MXS
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_SW_CURSOR
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASH_SCREEN_ALIGN
+#define CONFIG_CMD_BMP
+#define CONFIG_BMP_16BPP
+#define CONFIG_VIDEO_BMP_RLE8
+#define CONFIG_VIDEO
Re: [U-Boot] [PATCH 1/2] imx: mx6sx: Fix issue in LCDIF clock enablement
On 26/01/2016 15:01, Ye Li wrote:
> 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;
> }
>
Reviewed-by: Stefano Babic
Best regards,
Stefano Babic
--
=
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] imx: mx6ul/sx: Fix issue in LCDIF clock dividers calculation
On 26/01/2016 15:01, Ye Li wrote:
> 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
>
Reviewed-by: Stefano Babic
Best regards,
Stefano Babic
--
=
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=
___
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 15:09, Stefan Roese wrote: > 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 guys will wait for you and will compose that branch you are done. Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform signature.asc Description: OpenPGP digital signature ___ 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
On 26.1.2016 13:43, Ricardo Ribalda Delgado wrote:
> Hello Bin
>
> On Tue, Jan 26, 2016 at 1:21 PM, Bin Meng wrote:
>> Hi Ricardo,
>>
>> On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado
>> wrote:
>>> 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?
>
>
> Not as far as I know
I have removed ll_temac support from Microblaze and as we discussed
before we are not going to support ppc platforms. That's why if someone
wants to use this driver it has to invest time to move it to DM or will
be removed at some point in future.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
signature.asc
Description: OpenPGP digital signature
___
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
hello
We are using the driver and can take a look if we can port it to DM.
But it wont be in this or next week sorry.
Regards!
On Tue, Jan 26, 2016 at 3:20 PM, Michal Simek wrote:
> On 26.1.2016 13:43, Ricardo Ribalda Delgado wrote:
>> Hello Bin
>>
>> On Tue, Jan 26, 2016 at 1:21 PM, Bin Meng wrote:
>>> Hi Ricardo,
>>>
>>> On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado
>>> wrote:
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?
>>
>>
>> Not as far as I know
>
> I have removed ll_temac support from Microblaze and as we discussed
> before we are not going to support ppc platforms. That's why if someone
> wants to use this driver it has to invest time to move it to DM or will
> be removed at some point in future.
>
> Thanks,
> Michal
>
> --
> Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
> w: www.monstr.eu p: +42-0-721842854
> Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
> Maintainer of Linux kernel - Xilinx Zynq ARM architecture
> Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
>
>
--
Ricardo Ribalda
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/2] mx6: soc: Add ENET2 mac address support
On Tue, Jan 26, 2016 at 3:10 AM, Ye Li wrote:
> 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(&fuse->mac_addr_high);
> - mac[0] = (value >> 8);
> - mac[1] = value ;
> -
> - value = readl(&fuse->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(&fuse->mac_addr2);
> + mac[0] = value >> 24 ;
> + mac[1] = value >> 16 ;
> + mac[2] = value >> 8 ;
> + mac[3] = value ;
I'm surprised the compiler doesn't warn you about your int being too
big. If it does, you should address that before sending a v3.
> +
> + value = readl(&fuse->mac_addr1);
> + mac[4] = value >> 24 ;
> + mac[5] = value >> 16 ;
> +
> + } else {
> + u32 value = readl(&fuse->mac_addr1);
> + mac[0] = (value >> 8);
> + mac[1] = value ;
> +
> + value = readl(&fuse->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
___
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 11:24:24AM +0100, Ricardo Ribalda Delgado wrote: > Size of this snprintf "lltemac.%lx" is bigger than 16 characters. > Replacing it with "ll_tem.%lx" > > Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Tom Rini ... and added to my TODO list to check over everyone else too. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 02/22] ppc: xilinx-ppc405: Remove support for fx12mm
On Tue, Jan 26, 2016 at 11:24:05AM +0100, Ricardo Ribalda Delgado wrote: > It is just a specialized version of the xilinx-ppc405 > > Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature ___ 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 11:24:04AM +0100, Ricardo Ribalda Delgado wrote: > ml507 is just a specialized version of the xilinx-ppc440-generic > > Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature ___ 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 11:24:06AM +0100, Ricardo Ribalda Delgado wrote: > It is just a specialized version of xilinx-ppc440 > > Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature ___ 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 11:24:07AM +0100, Ricardo Ribalda Delgado wrote: > Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature ___ 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 11:24:10AM +0100, Ricardo Ribalda Delgado wrote: > As a result of the specific board removal, the Makefiles can be > simplified. > > Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature ___ 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 11:24:09AM +0100, Ricardo Ribalda Delgado wrote: > As a result of the specific board removal, the Makefiles can be > simplified. > > Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 05/22] mailaddr: Update mail address
On Tue, Jan 26, 2016 at 11:24:08AM +0100, Ricardo Ribalda Delgado wrote: > The old mail address will stop working soon. > Update it all the files > > Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature ___ 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 11:24:12AM +0100, Ricardo Ribalda Delgado wrote: > Remove redundant defconfig file. Boot via flash can be configured via > Kconfig. > > Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature ___ 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 11:24:13AM +0100, Ricardo Ribalda Delgado wrote: > Now that there is only one header file for all ppc440 files, merge > header files. > > Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature ___ 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 11:24:14AM +0100, Ricardo Ribalda Delgado wrote: > Now that there is only one header file for all ppc405 files, merge > header files. > > Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
