December 2016 - U-Boot

[U-Boot] [PATCH v3 0/1] cmd: pci: add option to parse and display BAR information
by yehuday＠marvell.com 01 Dec '16

01 Dec '16

From: Yehuda Yitschak <yehuday(a)marvell.com> Updated v3 following review from Simon. The only issue i wasn't able to address is the warnings on the PCI BAR print format when compiling sandbox. I wasn't able to reproduce them on my machine nor when compiling to ARMv7 (32 bit) or ARMv8 (64 bit). v2->v3: - removed support for !DM_PCI - Fixed error return values v1->v2: - Added support for DM_PCI - Added print of memory type and prefetchable flag - Skipped printing of disabled BARs Yehuda Yitschak (1): cmd: pci: add option to parse and display BAR information cmd/pci.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) -- 1.9.1

2 2

[U-Boot] [PATCH] nds32: Support eth DM.
by Andes 01 Dec '16

01 Dec '16

From: rick <rick(a)andestech.com> Add eth DM driver for ag101p board. Enable random ethaddr. Signed-off-by: rick <rick(a)andestech.com> Cc: Andes <uboot(a)andestech.com> --- arch/nds32/dts/ag101p.dts | 1 + board/AndesTech/adp-ag101p/adp-ag101p.c | 5 +- configs/adp-ag101p_defconfig | 3 + drivers/net/Kconfig | 5 + drivers/net/ftmac100.c | 281 +++++++++++++++++++++++++------ include/configs/adp-ag101p.h | 6 - 6 files changed, 241 insertions(+), 60 deletions(-) diff --git a/arch/nds32/dts/ag101p.dts b/arch/nds32/dts/ag101p.dts index c87d0bd..dd2bf8f 100644 --- a/arch/nds32/dts/ag101p.dts +++ b/arch/nds32/dts/ag101p.dts @@ -7,6 +7,7 @@ aliases { uart0 = &serial0; + ethernet0 = &mac0; } ; chosen { diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c index dbeb662..430e611 100644 --- a/board/AndesTech/adp-ag101p/adp-ag101p.c +++ b/board/AndesTech/adp-ag101p/adp-ag101p.c @@ -7,9 +7,10 @@ */ #include <common.h> +#if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH) #include <netdev.h> +#endif #include <asm/io.h> - #include <faraday/ftsdc010.h> #include <faraday/ftsmc020.h> @@ -57,10 +58,12 @@ void dram_init_banksize(void) gd->bd->bi_dram[1].size = PHYS_SDRAM_1_SIZE; } +#if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH) int board_eth_init(bd_t *bd) { return ftmac100_initialize(bd); } +#endif ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info) { diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig index f22a85b..0514f6e 100644 --- a/configs/adp-ag101p_defconfig +++ b/configs/adp-ag101p_defconfig @@ -11,11 +11,14 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_BLK=y CONFIG_DM_MMC=y CONFIG_DM_MMC_OPS=y CONFIG_NDS32_MMC=y +CONFIG_DM_ETH=y +CONFIG_FTMAC100=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_TIMER=y diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 302c005..48ec1ef 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -197,4 +197,9 @@ config PIC32_ETH This driver implements 10/100 Mbps Ethernet and MAC layer for Microchip PIC32 microcontrollers. +config FTMAC100 + bool "Ftmac100 Ethernet Support" + help + This MAC is present in Andestech AG101P SoCs. + endif # NETDEVICES diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 1fc7da9..1479294 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -12,23 +12,27 @@ #include <malloc.h> #include <net.h> #include <asm/io.h> - #include "ftmac100.h" - +#ifdef CONFIG_DM_ETH +#include <dm.h> +DECLARE_GLOBAL_DATA_PTR; +#endif #define ETH_ZLEN 60 struct ftmac100_data { struct ftmac100_txdes txdes[1]; struct ftmac100_rxdes rxdes[PKTBUFSRX]; int rx_index; + const char *name; + phys_addr_t iobase; }; /* * Reset MAC */ -static void ftmac100_reset (struct eth_device *dev) +static void ftmac100_reset(struct ftmac100_data *priv) { - struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase; + struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase; debug ("%s()\n", __func__); @@ -41,9 +45,10 @@ static void ftmac100_reset (struct eth_device *dev) /* * Set MAC address */ -static void ftmac100_set_mac (struct eth_device *dev, const unsigned char *mac) +static void ftmac100_set_mac(struct ftmac100_data *priv , + const unsigned char *mac) { - struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase; + struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase; unsigned int maddr = mac[0] << 8 | mac[1]; unsigned int laddr = mac[2] << 24 | mac[3] << 16 | mac[4] << 8 | mac[5]; @@ -53,29 +58,22 @@ static void ftmac100_set_mac (struct eth_device *dev, const unsigned char *mac) writel (laddr, &ftmac100->mac_ladr); } -static void ftmac100_set_mac_from_env (struct eth_device *dev) -{ - eth_getenv_enetaddr ("ethaddr", dev->enetaddr); - - ftmac100_set_mac (dev, dev->enetaddr); -} - /* - * disable transmitter, receiver - */ -static void ftmac100_halt (struct eth_device *dev) + * Disable MAC +*/ +static void _ftmac100_halt(struct ftmac100_data *priv) { - struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase; - + struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase; debug ("%s()\n", __func__); - writel (0, &ftmac100->maccr); } -static int ftmac100_init (struct eth_device *dev, bd_t *bd) +/* + * Initialize MAC + */ +static int _ftmac100_init(struct ftmac100_data *priv, unsigned char enetaddr[6]) { - struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase; - struct ftmac100_data *priv = dev->priv; + struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase; struct ftmac100_txdes *txdes = priv->txdes; struct ftmac100_rxdes *rxdes = priv->rxdes; unsigned int maccr; @@ -83,15 +81,15 @@ static int ftmac100_init (struct eth_device *dev, bd_t *bd) debug ("%s()\n", __func__); - ftmac100_reset (dev); + ftmac100_reset(priv); /* set the ethernet address */ + ftmac100_set_mac(priv, enetaddr); - ftmac100_set_mac_from_env (dev); /* disable all interrupts */ - writel (0, &ftmac100->imr); + writel(0, &ftmac100->imr); /* initialize descriptors */ @@ -109,15 +107,15 @@ static int ftmac100_init (struct eth_device *dev, bd_t *bd) /* transmit ring */ - writel ((unsigned int)txdes, &ftmac100->txr_badr); + writel((unsigned int)txdes, &ftmac100->txr_badr); /* receive ring */ - writel ((unsigned int)rxdes, &ftmac100->rxr_badr); + writel((unsigned int)rxdes, &ftmac100->rxr_badr); /* poll receive descriptor automatically */ - writel (FTMAC100_APTC_RXPOLL_CNT (1), &ftmac100->aptc); + writel(FTMAC100_APTC_RXPOLL_CNT(1) , &ftmac100->aptc); /* enable transmitter, receiver */ @@ -130,31 +128,43 @@ static int ftmac100_init (struct eth_device *dev, bd_t *bd) FTMAC100_MACCR_RX_RUNT | FTMAC100_MACCR_RX_BROADPKT; - writel (maccr, &ftmac100->maccr); + writel(maccr, &ftmac100->maccr); return 0; } /* - * Get a data block via Ethernet + * Free receiving buffer */ -static int ftmac100_recv (struct eth_device *dev) +static int _ftmac100_free_pkt(struct ftmac100_data *priv) +{ + struct ftmac100_rxdes *curr_des; + curr_des = &priv->rxdes[priv->rx_index]; + /* release buffer to DMA */ + curr_des->rxdes0 |= FTMAC100_RXDES0_RXDMA_OWN; + priv->rx_index = (priv->rx_index + 1) % PKTBUFSRX; + return 0; +} + +/* + * Receive a data block via Ethernet + */ +static int __ftmac100_recv(struct ftmac100_data *priv) { - struct ftmac100_data *priv = dev->priv; struct ftmac100_rxdes *curr_des; unsigned short rxlen; curr_des = &priv->rxdes[priv->rx_index]; if (curr_des->rxdes0 & FTMAC100_RXDES0_RXDMA_OWN) - return -1; + return 0; if (curr_des->rxdes0 & (FTMAC100_RXDES0_RX_ERR | FTMAC100_RXDES0_CRC_ERR | FTMAC100_RXDES0_FTL | FTMAC100_RXDES0_RUNT | FTMAC100_RXDES0_RX_ODD_NB)) { - return -1; + return 0; } rxlen = FTMAC100_RXDES0_RFL (curr_des->rxdes0); @@ -162,26 +172,15 @@ static int ftmac100_recv (struct eth_device *dev) debug ("%s(): RX buffer %d, %x received\n", __func__, priv->rx_index, rxlen); - /* pass the packet up to the protocol layers. */ - - net_process_received_packet((void *)curr_des->rxdes2, rxlen); - - /* release buffer to DMA */ - - curr_des->rxdes0 |= FTMAC100_RXDES0_RXDMA_OWN; - - priv->rx_index = (priv->rx_index + 1) % PKTBUFSRX; - - return 0; + return rxlen; } /* * Send a data block via Ethernet */ -static int ftmac100_send(struct eth_device *dev, void *packet, int length) +static int _ftmac100_send(struct ftmac100_data *priv, void *packet, int length) { - struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase; - struct ftmac100_data *priv = dev->priv; + struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase; struct ftmac100_txdes *curr_des = priv->txdes; ulong start; @@ -224,25 +223,69 @@ static int ftmac100_send(struct eth_device *dev, void *packet, int length) return 0; } +#ifndef CONFIG_DM_ETH +/* + * disable transmitter, receiver + */ +static void ftmac100_halt(struct eth_device *dev) +{ + struct ftmac100_data *priv = dev->priv; + return _ftmac100_halt(priv); +} + +static int ftmac100_init(struct eth_device *dev, bd_t *bd) +{ + struct ftmac100_data *priv = dev->priv; + return _ftmac100_init(priv , dev->enetaddr); +} + +static int _ftmac100_recv(struct ftmac100_data *priv) +{ + struct ftmac100_rxdes *curr_des; + unsigned short len; + curr_des = &priv->rxdes[priv->rx_index]; + len = __ftmac100_recv(priv); + if (len) { + /* pass the packet up to the protocol layers. */ + net_process_received_packet((void *)curr_des->rxdes2, len); + _ftmac100_free_pkt(priv); + } + return len ? 1 : 0; +} + +/* + * Get a data block via Ethernet + */ +static int ftmac100_recv(struct eth_device *dev) +{ + struct ftmac100_data *priv = dev->priv; + return _ftmac100_recv(priv); +} + +/* + * Send a data block via Ethernet + */ +static int ftmac100_send(struct eth_device *dev, void *packet, int length) +{ + struct ftmac100_data *priv = dev->priv; + return _ftmac100_send(priv , packet , length); +} + int ftmac100_initialize (bd_t *bd) { struct eth_device *dev; struct ftmac100_data *priv; - dev = malloc (sizeof *dev); if (!dev) { printf ("%s(): failed to allocate dev\n", __func__); goto out; } - /* Transmit and receive descriptors should align to 16 bytes */ - priv = memalign (16, sizeof (struct ftmac100_data)); if (!priv) { printf ("%s(): failed to allocate priv\n", __func__); goto free_dev; } - memset (dev, 0, sizeof (*dev)); memset (priv, 0, sizeof (*priv)); @@ -253,7 +296,7 @@ int ftmac100_initialize (bd_t *bd) dev->send = ftmac100_send; dev->recv = ftmac100_recv; dev->priv = priv; - + priv->iobase = dev->iobase; eth_register (dev); return 1; @@ -263,3 +306,135 @@ free_dev: out: return 0; } +#endif + +#ifdef CONFIG_DM_ETH +static int ftmac100_start(struct udevice *dev) +{ + struct eth_pdata *plat = dev_get_platdata(dev); + struct ftmac100_data *priv = dev_get_priv(dev); + + return _ftmac100_init(priv, plat->enetaddr); +} + +static void ftmac100_stop(struct udevice *dev) +{ + struct ftmac100_data *priv = dev_get_priv(dev); + _ftmac100_halt(priv); +} + +static int ftmac100_send(struct udevice *dev, void *packet, int length) +{ + struct ftmac100_data *priv = dev_get_priv(dev); + int ret; + ret = _ftmac100_send(priv , packet , length); + return ret ? 0 : -ETIMEDOUT; +} + +static int ftmac100_recv(struct udevice *dev, int flags, uchar **packetp) +{ + struct ftmac100_data *priv = dev_get_priv(dev); + struct ftmac100_rxdes *curr_des; + curr_des = &priv->rxdes[priv->rx_index]; + int len; + len = __ftmac100_recv(priv); + if (len) + *packetp = (void *)curr_des->rxdes2; + + return len ? len : -EAGAIN; +} + +static int ftmac100_free_pkt(struct udevice *dev, uchar *packet, int length) +{ + struct ftmac100_data *priv = dev_get_priv(dev); + _ftmac100_free_pkt(priv); + return 0; +} + +int ftmac100_read_rom_hwaddr(struct udevice *dev) +{ + struct eth_pdata *pdata = dev_get_platdata(dev); + eth_getenv_enetaddr("ethaddr", pdata->enetaddr); + return 0; +} + +static const char *dtbmacaddr(u32 ifno) +{ + int node, len; + char enet[16]; + const char *mac; + const char *path; + if (gd->fdt_blob == NULL) { + printf("%s: don't have a valid gd->fdt_blob!\n", __func__); + return NULL; + } + node = fdt_path_offset(gd->fdt_blob, "/aliases"); + if (node < 0) + return NULL; + + sprintf(enet, "ethernet%d", ifno); + path = fdt_getprop(gd->fdt_blob, node, enet, NULL); + if (!path) { + printf("no alias for %s\n", enet); + return NULL; + } + node = fdt_path_offset(gd->fdt_blob, path); + mac = fdt_getprop(gd->fdt_blob, node, "mac-address", &len); + if (mac && is_valid_ethaddr((u8 *)mac)) + return mac; + + return NULL; +} + +static int ftmac100_ofdata_to_platdata(struct udevice *dev) +{ + struct ftmac100_data *priv = dev_get_priv(dev); + struct eth_pdata *pdata = dev_get_platdata(dev); + const char *mac; + pdata->iobase = dev_get_addr(dev); + priv->iobase = pdata->iobase; + mac = dtbmacaddr(0); + if (mac) + memcpy(pdata->enetaddr , mac , 6); + + return 0; +} + +static int ftmac100_probe(struct udevice *dev) +{ + struct ftmac100_data *priv = dev_get_priv(dev); + priv->name = dev->name; + return 0; +} + +static int ftmac100_bind(struct udevice *dev) +{ + return device_set_name(dev, dev->name); +} + +static const struct eth_ops ftmac100_ops = { + .start = ftmac100_start, + .send = ftmac100_send, + .recv = ftmac100_recv, + .stop = ftmac100_stop, + .free_pkt = ftmac100_free_pkt, +}; + +static const struct udevice_id ftmac100_ids[] = { + { .compatible = "andestech,atmac100" }, + { } +}; + +U_BOOT_DRIVER(ftmac100) = { + .name = "nds32_mac", + .id = UCLASS_ETH, + .of_match = ftmac100_ids, + .bind = ftmac100_bind, + .ofdata_to_platdata = ftmac100_ofdata_to_platdata, + .probe = ftmac100_probe, + .ops = &ftmac100_ops, + .priv_auto_alloc_size = sizeof(struct ftmac100_data), + .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .flags = DM_FLAG_ALLOC_PRIV_DMA, +}; +#endif diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index eb8b2d3..136149e 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -96,12 +96,6 @@ #define CONFIG_SYS_NS16550_CLK ((18432000 * 20) / 25) /* AG101P */ /* - * Ethernet - */ -#define CONFIG_FTMAC100 - - -/* * SD (MMC) controller */ #define CONFIG_MMC -- 1.7.9.5

1 0

[U-Boot] [PATCH] nds32: Support timer DM.
by Andes 01 Dec '16

01 Dec '16

From: rick <rick(a)andestech.com> Add ag101p baord timer DM driver. Signed-off-by: rick <rick(a)andestech.com> Cc: Andes <uboot(a)andestech.com> --- arch/nds32/cpu/n1213/ag101/timer.c | 3 +- arch/nds32/dts/ag101p.dts | 1 + configs/adp-ag101p_defconfig | 2 + drivers/timer/Kconfig | 6 ++ drivers/timer/Makefile | 1 + drivers/timer/ag101p_timer.c | 122 ++++++++++++++++++++++++++++++++++++ 6 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 drivers/timer/ag101p_timer.c diff --git a/arch/nds32/cpu/n1213/ag101/timer.c b/arch/nds32/cpu/n1213/ag101/timer.c index 758b354..0c03a10 100644 --- a/arch/nds32/cpu/n1213/ag101/timer.c +++ b/arch/nds32/cpu/n1213/ag101/timer.c @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: GPL-2.0+ */ - +#ifndef CONFIG_TIMER #include <common.h> #include <asm/io.h> #include <faraday/fttmr010.h> @@ -189,3 +189,4 @@ ulong get_tbclk(void) return CONFIG_SYS_CLK_FREQ; #endif } +#endif /* CONFIG_TIMER */ diff --git a/arch/nds32/dts/ag101p.dts b/arch/nds32/dts/ag101p.dts index 07f7c98..8099665 100644 --- a/arch/nds32/dts/ag101p.dts +++ b/arch/nds32/dts/ag101p.dts @@ -13,6 +13,7 @@ /* bootargs = "console=ttyS0,38400n8 earlyprintk=uart8250-32bit,0x99600000 debug bootmem_debug memblock=debug loglevel=7"; */ bootargs = "console=ttyS0,38400n8 earlyprintk=uart8250-32bit,0x99600000 debug loglevel=7"; stdout-path = "uart0:38400n8"; + tick-timer = &timer0; }; memory@0 { diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig index eb46e3f..8c2fc0b 100644 --- a/configs/adp-ag101p_defconfig +++ b/configs/adp-ag101p_defconfig @@ -14,3 +14,5 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y +CONFIG_TIMER=y +CONFIG_AG101P_TIMER=y diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index cb18f12..c2aa440 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -46,4 +46,10 @@ config OMAP_TIMER help Select this to enable an timer for Omap devices. +config AG101P_TIMER + bool "Ag101p timer support" + depends on TIMER + help + Select this to enable a timer for Ag101p devices. + endmenu diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile index f351fbb..bf19355 100644 --- a/drivers/timer/Makefile +++ b/drivers/timer/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o obj-$(CONFIG_SANDBOX_TIMER) += sandbox_timer.o obj-$(CONFIG_X86_TSC_TIMER) += tsc_timer.o obj-$(CONFIG_OMAP_TIMER) += omap-timer.o +obj-$(CONFIG_AG101P_TIMER) += ag101p_timer.o diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c new file mode 100644 index 0000000..e763b80 --- /dev/null +++ b/drivers/timer/ag101p_timer.c @@ -0,0 +1,122 @@ +/* + * Andestech ATFTMR010 timer driver + * + * (C) Copyright 2016 + * Rick Chen, NDS32 Software Engineering, rick(a)andestech.com + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <timer.h> +#include <asm/io.h> + +DECLARE_GLOBAL_DATA_PTR; + +/* + * Timer Control Register + */ +#define T3_UPDOWN (1 << 11) +#define T2_UPDOWN (1 << 10) +#define T1_UPDOWN (1 << 9) +#define T3_OFENABLE (1 << 8) +#define T3_CLOCK (1 << 7) +#define T3_ENABLE (1 << 6) +#define T2_OFENABLE (1 << 5) +#define T2_CLOCK (1 << 4) +#define T2_ENABLE (1 << 3) +#define T1_OFENABLE (1 << 2) +#define T1_CLOCK (1 << 1) +#define T1_ENABLE (1 << 0) + +/* + * Timer Interrupt State & Mask Registers + */ +#define T3_OVERFLOW (1 << 8) +#define T3_MATCH2 (1 << 7) +#define T3_MATCH1 (1 << 6) +#define T2_OVERFLOW (1 << 5) +#define T2_MATCH2 (1 << 4) +#define T2_MATCH1 (1 << 3) +#define T1_OVERFLOW (1 << 2) +#define T1_MATCH2 (1 << 1) +#define T1_MATCH1 (1 << 0) + +struct atftmr_timer_regs { + u32 t1_counter; /* 0x00 */ + u32 t1_load; /* 0x04 */ + u32 t1_match1; /* 0x08 */ + u32 t1_match2; /* 0x0c */ + u32 t2_counter; /* 0x10 */ + u32 t2_load; /* 0x14 */ + u32 t2_match1; /* 0x18 */ + u32 t2_match2; /* 0x1c */ + u32 t3_counter; /* 0x20 */ + u32 t3_load; /* 0x24 */ + u32 t3_match1; /* 0x28 */ + u32 t3_match2; /* 0x2c */ + u32 cr; /* 0x30 */ + u32 int_state; /* 0x34 */ + u32 int_mask; /* 0x38 */ +}; + +struct atftmr_timer_platdata { + struct atftmr_timer_regs *regs; +}; + +static int atftmr_timer_get_count(struct udevice *dev, u64 *count) +{ + struct atftmr_timer_platdata *plat = dev->platdata; + struct atftmr_timer_regs *const regs = plat->regs; + u32 val; + val = readl(&regs->t3_counter); + *count = timer_conv_64(val); + return 0; +} + +static int atftmr_timer_probe(struct udevice *dev) +{ + struct atftmr_timer_platdata *plat = dev->platdata; + struct atftmr_timer_regs *const regs = plat->regs; + u32 cr; + writel(0, &regs->t3_load); + writel(0, &regs->t3_counter); + writel(TIMER_LOAD_VAL, &regs->t3_match1); + writel(TIMER_LOAD_VAL, &regs->t3_match2); + /* disable interrupts */ + writel(T3_MATCH1|T3_MATCH2|T3_OVERFLOW , &regs->int_mask); + cr = readl(&regs->cr); + cr |= (T3_ENABLE|T3_UPDOWN); + writel(cr, &regs->cr); + return 0; +} + +static int atftme_timer_ofdata_to_platdata(struct udevice *dev) +{ + struct atftmr_timer_platdata *plat = dev_get_platdata(dev); + plat->regs = map_physmem(dev_get_addr(dev), + sizeof(struct atftmr_timer_regs), + MAP_NOCACHE); + return 0; +} + +static const struct timer_ops ag101p_timer_ops = { + .get_count = atftmr_timer_get_count, +}; + +static const struct udevice_id ag101p_timer_ids[] = { + { .compatible = "andestech,attmr010" }, + {} +}; + +U_BOOT_DRIVER(altera_timer) = { + .name = "ag101p_timer", + .id = UCLASS_TIMER, + .of_match = ag101p_timer_ids, + .ofdata_to_platdata = atftme_timer_ofdata_to_platdata, + .platdata_auto_alloc_size = sizeof(struct atftmr_timer_platdata), + .probe = atftmr_timer_probe, + .ops = &ag101p_timer_ops, + .flags = DM_FLAG_PRE_RELOC, +}; -- 1.7.9.5

1 0

[U-Boot] [PATCH] nds32: Support serial DM.
by Andes 01 Dec '16

01 Dec '16

From: rick <rick(a)andestech.com> Add device tree source file and enable DM and DM_SERIAL ag101p board can run ns16550 serial DM flow. Signed-off-by: rick <rick(a)andestech.com> Cc: Andes <uboot(a)andestech.com> --- arch/Kconfig | 1 + arch/nds32/cpu/n1213/start.S | 13 +++++---- arch/nds32/dts/Makefile | 14 +++++++++ arch/nds32/dts/ag101p.dts | 61 +++++++++++++++++++++++++++++++++++++++ arch/nds32/include/asm/config.h | 1 + configs/adp-ag101p_defconfig | 5 ++++ include/configs/adp-ag101p.h | 8 +++-- 7 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 arch/nds32/dts/Makefile create mode 100644 arch/nds32/dts/ag101p.dts diff --git a/arch/Kconfig b/arch/Kconfig index d718a68..4c5e4cd 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -42,6 +42,7 @@ config MIPS config NDS32 bool "NDS32 architecture" + select SUPPORT_OF_CONTROL config NIOS2 bool "Nios II architecture" diff --git a/arch/nds32/cpu/n1213/start.S b/arch/nds32/cpu/n1213/start.S index 7b2b637..e51bb2b 100644 --- a/arch/nds32/cpu/n1213/start.S +++ b/arch/nds32/cpu/n1213/start.S @@ -179,11 +179,14 @@ update_gp: */ call_board_init_f: li $sp, CONFIG_SYS_INIT_SP_ADDR - li $r10, GD_SIZE /* get GD size */ - sub $sp, $sp, $r10 /* GD start addr */ - move $r10, $sp - li $r0, 0x00000000 - + move $r0, $sp + bal board_init_f_alloc_reserve + move $sp, $r0 + bal board_init_f_init_reserve +#ifdef CONFIG_DEBUG_UART + bal debug_uart_init +#endif + li $r0, 0x00000000 #ifdef __PIC__ #ifdef __NDS32_N1213_43U1H__ /* __NDS32_N1213_43U1H__ implies NDS32 V0 ISA */ diff --git a/arch/nds32/dts/Makefile b/arch/nds32/dts/Makefile new file mode 100644 index 0000000..2d8480b --- /dev/null +++ b/arch/nds32/dts/Makefile @@ -0,0 +1,14 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + +dtb-$(CONFIG_TARGET_ADP_AG101P) += ag101p.dtb +targets += $(dtb-y) + +DTC_FLAGS += -R 4 -p 0x1000 + +PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y)) + @: + +clean-files := *.dtb diff --git a/arch/nds32/dts/ag101p.dts b/arch/nds32/dts/ag101p.dts new file mode 100644 index 0000000..07f7c98 --- /dev/null +++ b/arch/nds32/dts/ag101p.dts @@ -0,0 +1,61 @@ +/dts-v1/; +/ { + compatible = "nds32 ag101p"; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + aliases { + uart0 = &serial0; + } ; + + chosen { + /* bootargs = "console=ttyS0,38400n8 earlyprintk=uart8250-32bit,0x99600000 debug bootmem_debug memblock=debug loglevel=7"; */ + bootargs = "console=ttyS0,38400n8 earlyprintk=uart8250-32bit,0x99600000 debug loglevel=7"; + stdout-path = "uart0:38400n8"; + }; + + memory@0 { + device_type = "memory"; + reg = <0x00000000 0x40000000>; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + cpu@0 { + compatible = "andestech,n13"; + reg = <0>; + /* FIXME: to fill correct frqeuency */ + clock-frequency = <60000000>; + }; + }; + + intc: interrupt-controller { + compatible = "andestech,atnointc010"; + #interrupt-cells = <1>; + interrupt-controller; + }; + + serial0: serial@99600000 { + compatible = "andestech,uart16550", "ns16550a"; + reg = <0x99600000 0x1000>; + interrupts = <7 4>; + clock-frequency = <14745600>; + reg-shift = <2>; + no-loopback-test = <1>; + }; + + timer0: timer@98400000 { + compatible = "andestech,attmr010"; + reg = <0x98400000 0x1000>; + interrupts = <19 4>; + clock-frequency = <15000000>; + }; + + mac0: mac@90900000 { + compatible = "andestech,atmac100"; + reg = <0x90900000 0x1000>; + interrupts = <25 4>; + }; +}; diff --git a/arch/nds32/include/asm/config.h b/arch/nds32/include/asm/config.h index 054cc48..7289217 100644 --- a/arch/nds32/include/asm/config.h +++ b/arch/nds32/include/asm/config.h @@ -8,5 +8,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ +#define CONFIG_LMB #endif diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig index 0def407..eb46e3f 100644 --- a/configs/adp-ag101p_defconfig +++ b/configs/adp-ag101p_defconfig @@ -1,5 +1,7 @@ CONFIG_NDS32=y CONFIG_TARGET_ADP_AG101P=y +CONFIG_DEFAULT_DEVICE_TREE="ag101p" +CONFIG_FIT=y CONFIG_BOOTDELAY=3 CONFIG_SYS_PROMPT="NDS32 # " CONFIG_CMD_MMC=y @@ -8,4 +10,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 5cb79f1..eb8b2d3 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -20,8 +20,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SYS_GENERIC_GLOBAL_DATA - /* * Definitions related to passing arguments to kernel. */ @@ -35,6 +33,10 @@ #ifdef CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_TEXT_BASE 0x00500000 +#ifdef CONFIG_OF_CONTROL +#undef CONFIG_OF_SEPARATE +#define CONFIG_OF_EMBED +#endif #else #ifdef CONFIG_MEM_REMAP #define CONFIG_SYS_TEXT_BASE 0x80000000 @@ -88,7 +90,9 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_COM1 CONFIG_FTUART010_02_BASE +#ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE -4 +#endif #define CONFIG_SYS_NS16550_CLK ((18432000 * 20) / 25) /* AG101P */ /* -- 1.7.9.5

1 0

[U-Boot] [PATCH v2 1/2] common/board_f.c: align m68k arch to use CONFIG_DISPLAY_CPUINFO
by Angelo Dureghello 01 Dec '16

01 Dec '16

Change all coldfire arch files to use CONFIG_DISPLAY_CPUINFO. Signed-off-by: Angelo Dureghello <angelo(a)sysam.it> --- Changes for v2: - update common/Kconfig to add M68K to the default y list --- arch/m68k/cpu/mcf5227x/cpu.c | 4 +++- arch/m68k/cpu/mcf523x/cpu.c | 4 +++- arch/m68k/cpu/mcf52x2/cpu.c | 29 +++++++++++++++++++++-------- arch/m68k/cpu/mcf530x/cpu.c | 4 +++- arch/m68k/cpu/mcf532x/cpu.c | 4 +++- arch/m68k/cpu/mcf5445x/cpu.c | 4 +++- arch/m68k/cpu/mcf547x_8x/cpu.c | 4 +++- common/Kconfig | 2 +- common/board_f.c | 2 +- 9 files changed, 41 insertions(+), 16 deletions(-) diff --git a/arch/m68k/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c index 7d611de..63cffd3 100644 --- a/arch/m68k/cpu/mcf5227x/cpu.c +++ b/arch/m68k/cpu/mcf5227x/cpu.c @@ -28,7 +28,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }; -int checkcpu(void) +#if defined(CONFIG_DISPLAY_CPUINFO) +int print_cpuinfo(void) { ccm_t *ccm = (ccm_t *) MMAP_CCM; u16 msk; @@ -60,3 +61,4 @@ int checkcpu(void) return 0; } +#endif /* CONFIG_DISPLAY_CPUINFO */ diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c index 67879c7..2e52939 100644 --- a/arch/m68k/cpu/mcf523x/cpu.c +++ b/arch/m68k/cpu/mcf523x/cpu.c @@ -28,7 +28,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; } -int checkcpu(void) +#if defined(CONFIG_DISPLAY_CPUINFO) +int print_cpuinfo(void) { ccm_t *ccm = (ccm_t *) MMAP_CCM; u16 msk; @@ -56,6 +57,7 @@ int checkcpu(void) return 0; }; +#endif /* CONFIG_DISPLAY_CPUINFO */ #if defined(CONFIG_WATCHDOG) /* Called by macro WATCHDOG_RESET */ diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c index 5ec7609..7b27133 100644 --- a/arch/m68k/cpu/mcf52x2/cpu.c +++ b/arch/m68k/cpu/mcf52x2/cpu.c @@ -37,7 +37,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }; -int checkcpu(void) +#if defined(CONFIG_DISPLAY_CPUINFO) +int print_cpuinfo(void) { char buf1[32], buf2[32]; @@ -47,6 +48,7 @@ int checkcpu(void) strmhz(buf2, gd->bus_clk)); return 0; }; +#endif /* CONFIG_DISPLAY_CPUINFO */ #if defined(CONFIG_WATCHDOG) /* Called by macro WATCHDOG_RESET */ @@ -94,12 +96,13 @@ int watchdog_init(void) #endif /* #ifdef CONFIG_M5208 */ #ifdef CONFIG_M5271 +#if defined(CONFIG_DISPLAY_CPUINFO) /* * Both MCF5270 and MCF5271 are members of the MPC5271 family. Try to * determine which one we are running on, based on the Chip Identification * Register (CIR). */ -int checkcpu(void) +int print_cpuinfo(void) { char buf[32]; unsigned short cir; /* Chip Identification Register */ @@ -133,6 +136,7 @@ int checkcpu(void) return 0; } +#endif /* CONFIG_DISPLAY_CPUINFO */ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { @@ -184,7 +188,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }; -int checkcpu(void) +#if defined(CONFIG_DISPLAY_CPUINFO) +int print_cpuinfo(void) { sysctrl_t *sysctrl = (sysctrl_t *) (MMAP_CFG); uchar msk; @@ -209,6 +214,7 @@ int checkcpu(void) printf("Freescale MCF5272 %s\n", suf); return 0; }; +#endif /* CONFIG_DISPLAY_CPUINFO */ #if defined(CONFIG_WATCHDOG) /* Called by macro WATCHDOG_RESET */ @@ -268,7 +274,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }; -int checkcpu(void) +#if defined(CONFIG_DISPLAY_CPUINFO) +int print_cpuinfo(void) { char buf[32]; @@ -276,7 +283,7 @@ int checkcpu(void) strmhz(buf, CONFIG_SYS_CLK)); return 0; }; - +#endif /* CONFIG_DISPLAY_CPUINFO */ #if defined(CONFIG_WATCHDOG) /* Called by macro WATCHDOG_RESET */ @@ -326,7 +333,8 @@ int watchdog_init(void) #endif /* #ifdef CONFIG_M5275 */ #ifdef CONFIG_M5282 -int checkcpu(void) +#if defined(CONFIG_DISPLAY_CPUINFO) +int print_cpuinfo(void) { unsigned char resetsource = MCFRESET_RSR; @@ -342,6 +350,7 @@ int checkcpu(void) (resetsource & MCFRESET_RSR_LVD) ? " Low Voltage" : ""); return 0; } +#endif /* CONFIG_DISPLAY_CPUINFO */ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { @@ -351,7 +360,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif #ifdef CONFIG_M5249 -int checkcpu(void) +#if defined(CONFIG_DISPLAY_CPUINFO) +int print_cpuinfo(void) { char buf[32]; @@ -359,6 +369,7 @@ int checkcpu(void) strmhz(buf, CONFIG_SYS_CLK)); return 0; } +#endif /* CONFIG_DISPLAY_CPUINFO */ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { @@ -372,7 +383,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif #ifdef CONFIG_M5253 -int checkcpu(void) +#if defined(CONFIG_DISPLAY_CPUINFO) +int print_cpuinfo(void) { char buf[32]; @@ -389,6 +401,7 @@ int checkcpu(void) } return 0; } +#endif /* CONFIG_DISPLAY_CPUINFO */ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { diff --git a/arch/m68k/cpu/mcf530x/cpu.c b/arch/m68k/cpu/mcf530x/cpu.c index 78f4385..3552af2 100644 --- a/arch/m68k/cpu/mcf530x/cpu.c +++ b/arch/m68k/cpu/mcf530x/cpu.c @@ -25,7 +25,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; } -int checkcpu(void) +#if defined(CONFIG_DISPLAY_CPUINFO) +int print_cpuinfo(void) { char buf[32]; @@ -33,4 +34,5 @@ int checkcpu(void) strmhz(buf, CONFIG_SYS_CPU_CLK)); return 0; } +#endif /* CONFIG_DISPLAY_CPUINFO */ #endif diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c index 46b57e9..602c106 100644 --- a/arch/m68k/cpu/mcf532x/cpu.c +++ b/arch/m68k/cpu/mcf532x/cpu.c @@ -30,7 +30,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }; -int checkcpu(void) +#if defined(CONFIG_DISPLAY_CPUINFO) +int print_cpuinfo(void) { ccm_t *ccm = (ccm_t *) MMAP_CCM; u16 msk; @@ -95,6 +96,7 @@ int checkcpu(void) return 0; }; +#endif /* CONFIG_DISPLAY_CPUINFO */ #if defined(CONFIG_WATCHDOG) /* Called by macro WATCHDOG_RESET */ diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c index 57bdcfb..5967043 100644 --- a/arch/m68k/cpu/mcf5445x/cpu.c +++ b/arch/m68k/cpu/mcf5445x/cpu.c @@ -31,7 +31,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }; -int checkcpu(void) +#if defined(CONFIG_DISPLAY_CPUINFO) +int print_cpuinfo(void) { ccm_t *ccm = (ccm_t *) MMAP_CCM; u16 msk; @@ -100,6 +101,7 @@ int checkcpu(void) return 0; } +#endif /* CONFIG_DISPLAY_CPUINFO */ #if defined(CONFIG_MCFFEC) /* Default initializations for MCFFEC controllers. To override, diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c index b1ca5c6..9980967 100644 --- a/arch/m68k/cpu/mcf547x_8x/cpu.c +++ b/arch/m68k/cpu/mcf547x_8x/cpu.c @@ -34,7 +34,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; }; -int checkcpu(void) +#if defined(CONFIG_DISPLAY_CPUINFO) +int print_cpuinfo(void) { siu_t *siu = (siu_t *) MMAP_SIU; u16 id = 0; @@ -91,6 +92,7 @@ int checkcpu(void) return 0; }; +#endif /* CONFIG_DISPLAY_CPUINFO */ #if defined(CONFIG_HW_WATCHDOG) /* Called by macro WATCHDOG_RESET */ diff --git a/common/Kconfig b/common/Kconfig index 913d21a..6094d6c 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -369,7 +369,7 @@ config VERSION_VARIABLE config DISPLAY_CPUINFO bool "Display information about the CPU during start up" - default y if ARM || BLACKFIN || NIOS2 || X86 || XTENSA + default y if ARM || BLACKFIN || NIOS2 || X86 || XTENSA || M68K help Display information about the CPU that U-Boot is running on when U-Boot starts up. The function print_cpuinfo() is called diff --git a/common/board_f.c b/common/board_f.c index 4b74835..f2c8655 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -921,7 +921,7 @@ static init_fnc_t init_sequence_f[] = { #if defined(CONFIG_MPC83xx) prt_83xx_rsr, #endif -#if defined(CONFIG_PPC) || defined(CONFIG_M68K) +#if defined(CONFIG_PPC) checkcpu, #endif print_cpuinfo, /* display cpu info (and speed) */ -- 2.10.2

2 1

[U-Boot] [PATCH] net: phy: micrel: Fix error handling
by Marek Vasut 01 Dec '16

01 Dec '16

Fix the following error, the $ret variable handling must be part of the loop, while due to the missing parenthesis it was not. drivers/net/phy/micrel.c: In function ‘ksz9021_of_config’: drivers/net/phy/micrel.c:303:2: warning: this ‘for’ clause does not guard... [-Wmisleading-indentation] for (i = 0; i < ARRAY_SIZE(ofcfg); i++) ^~~ drivers/net/phy/micrel.c:305:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘for’ if (ret) ^~ drivers/net/phy/micrel.c: In function ‘ksz9031_of_config’: drivers/net/phy/micrel.c:411:2: warning: this ‘for’ clause does not guard... [-Wmisleading-indentation] for (i = 0; i < ARRAY_SIZE(ofcfg); i++) ^~~ drivers/net/phy/micrel.c:413:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘for’ if (ret) ^~ Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Joe Hershberger <joe.hershberger(a)ni.com> --- drivers/net/phy/micrel.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 28a1401..7163fa2 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -300,10 +300,11 @@ static int ksz9021_of_config(struct phy_device *phydev) }; int i, ret = 0; - for (i = 0; i < ARRAY_SIZE(ofcfg); i++) + for (i = 0; i < ARRAY_SIZE(ofcfg); i++) { ret = ksz90x1_of_config_group(phydev, &(ofcfg[i])); if (ret) return ret; + } return 0; } @@ -408,10 +409,11 @@ static int ksz9031_of_config(struct phy_device *phydev) }; int i, ret = 0; - for (i = 0; i < ARRAY_SIZE(ofcfg); i++) + for (i = 0; i < ARRAY_SIZE(ofcfg); i++) { ret = ksz90x1_of_config_group(phydev, &(ofcfg[i])); if (ret) return ret; + } return 0; } -- 2.10.2

3 2

[U-Boot] [PATCH] travis.yml: Split Freescale ARM job up more
by Tom Rini 01 Dec '16

01 Dec '16

In order to avoid running into the time limit, split the 32bit and 64bit Freescale boards into separate jobs. We could either pass "freescale & armv8" to buildman or exclude all of the 32bit CPUs. While the former is shorter I fear the amount of possible escaping required would make things less readable. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ffa3e68c536a..c89ada92969e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,9 +125,12 @@ matrix: - env: - BUILDMAN="denx" - env: - - JOB="Freescale ARM" + - JOB="Freescale ARM32" BUILDMAN="freescale -x powerpc,m68k" - env: + - JOB="Freescale AArch64" + BUILDMAN="freescale -x powerpc,m68k,armv7,arm9,arm11" + - env: - JOB="i.MX (non-Freescale)" BUILDMAN="mx -x freescale" - env: -- 1.9.1

1 1

[U-Boot] [PATCH] ts4600: Disable CONFIG_DISPLAY_CPUINFO
by Tom Rini 01 Dec '16

01 Dec '16

Without this change we see: ../arch/arm/cpu/arm926ejs/mxs/mxs.c: In function ‘print_cpuinfo’: ../arch/arm/cpu/arm926ejs/mxs/mxs.c:181:23: warning: unused variable ‘data’ [-Wunused-variable] ../arch/arm/cpu/arm926ejs/mxs/mxs.c:180:6: warning: variable ‘cpurev’ set but not used [-Wunused-but-set-variable] So the easy solution is to disable CONFIG_DISPLAY_CPUINFO Cc: Sebastien Bourdelin <sebastien.bourdelin(a)savoirfairelinux.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- configs/ts4600_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/ts4600_defconfig b/configs/ts4600_defconfig index c052dedf1368..1d3acd3c7126 100644 --- a/configs/ts4600_defconfig +++ b/configs/ts4600_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC" CONFIG_SYS_CONSOLE_IS_IN_ENV=y +# CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y -- 1.9.1

2 2

[U-Boot] [GIT PULL] u-boot-mips/master
by Daniel Schwierzeck 01 Dec '16

01 Dec '16

Hi Tom, Travis-CI build is green (one job has failed due to job time limit) https://travis-ci.org/danielschwierzeck/u-boot/builds/180114376 The following changes since commit 6b29a395b62965eef6b5065d3a526a8588a92038: Merge git://git.denx.de/u-boot-mpc85xx (2016-11-29 19:42:48 -0500) are available in the git repository at: git://git.denx.de/u-boot-mips.git master for you to fetch changes up to 6fd596a1aa57bd431263f45b0c57ee8ae6b2403c: MIPS: Fix map_physmem for cached mappings (2016-11-30 16:18:19 +0100) ---------------------------------------------------------------- Daniel Schwierzeck (9): MIPS: make inclusion of ROM exception vectors configurable MIPS: fix ROM exception vectors MIPS: fix iand optimize setup of CP0 registers MIPS: factor out code for initial stack and global data MIPS: add possibility to setup initial stack and global data in SRAM MIPS: add asm-offsets for struct pt_regs MIPS: reserve space for exception vectors MIPS: add handling for generic and EJTAG exceptions common/board_f: enable initr_trap for MIPS Marek Vasut (1): mips: Let cache.h be included from assembly source Paul Burton (2): MIPS: Use ram_top, not bi_memsize, in arch_lmb_reserve MIPS: Fix map_physmem for cached mappings arch/mips/Kconfig | 32 +++++++++++++++++++ arch/mips/cpu/start.S | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------ arch/mips/include/asm/asm-offsets.h | 5 +++ arch/mips/include/asm/cache.h | 2 ++ arch/mips/include/asm/io.h | 2 +- arch/mips/include/asm/mipsregs.h | 1 + arch/mips/include/asm/system.h | 8 +++++ arch/mips/include/asm/u-boot-mips.h | 4 +++ arch/mips/lib/Makefile | 3 ++ arch/mips/lib/asm-offsets.c | 61 ++++++++++++++++++++++++++++++++++++ arch/mips/lib/bootm.c | 2 +- arch/mips/lib/genex.S | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/mips/lib/stack.c | 19 ++++++++++++ arch/mips/lib/traps.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/mips/mach-ath79/Kconfig | 2 ++ arch/mips/mach-pic32/Kconfig | 1 + common/board_r.c | 4 +-- 17 files changed, 584 insertions(+), 65 deletions(-) create mode 100644 arch/mips/include/asm/asm-offsets.h create mode 100644 arch/mips/lib/asm-offsets.c create mode 100644 arch/mips/lib/genex.S create mode 100644 arch/mips/lib/stack.c create mode 100644 arch/mips/lib/traps.c

2 3

[U-Boot] [PULL] Please pull u-boot-imx
by Stefano Babic 01 Dec '16

01 Dec '16

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit e94793c844a40606252f2e3f6428063e057b3fd2: spl: add USB Gadget config option (2016-11-28 19:49:49 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 4db4d42ee290a8cad00b358b2e7ef6a00483893b: imx6: clock: Enable External Memory Interface [EIM] clock (eim_slow_clock) (2016-11-30 09:57:19 +0100) ---------------------------------------------------------------- Angus Ainslie (1): imx7: SPI: add suport for SPI flash in mikroBUS slot Breno Lima (1): mx6sx: Add initial support for UDOO Neo Board Christoph Fritz (2): pwm: imx: increase support up to PWM8 for i.MX6SX mx6sx: Add initial support for Samtec VIN|ING 2000 board Eric Nelson (6): tools: imximage: display DCD block offset, length imx: mx6: ddr: add register MPZQLP2CTL for LPDDR2 mx6: ddr: allow 32 cycles for DQS gating calibration mx6: ddr: pass mx6_ddr_sysinfo to calibration routines mx6: ddr: add routine to return DDR calibration data ARM: mx6: ddr: use Kconfig for inclusion of DDR calibration routines Heiko Schocher (2): mx35: add DT support to flea3 board mx35: adjust default environment for flea3 board Ken Lin (1): board: ge: bx50v3: add the PMIC configuration support Lukasz Majewski (1): imx6: clock: Enable External Memory Interface [EIM] clock (eim_slow_clock) Marcin Niestroj (1): ARM: mx6: add MMC2 boot device detection support in SPL Max Krummenacher (2): spl: mmc: fix switch statement imx: make ipu's di configurable Peng Fan (1): imx: mx6ull: update the REFTOP_VBGADJ setting Sanchayan Maity (1): colibri_vf: Read kernel and device tree from static UBI volumes Sebastien Bourdelin (1): ARM: ts4600: add basic board support Soeren Moch (1): tbs2910: Make Ethernet functional again Stefan Agner (1): arm: mx6: specify SPL padding Stefano Babic (3): mx35: factorize SDRAM setup in flea3 mx35: add GPIO setup on flea3 board Merge branch 'master' of git://git.denx.de/u-boot Sven Ebenfeld (1): arm: imx: wandboard: fix compile error if CONFIG_VIDEO is deactivated Ye.Li (1): imx: mx6sx: Disable ENET clock before switching clock parent arch/arm/Kconfig | 6 + arch/arm/cpu/armv7/mx6/Kconfig | 20 ++ arch/arm/cpu/armv7/mx6/clock.c | 19 ++ arch/arm/cpu/armv7/mx6/ddr.c | 131 +++++--- arch/arm/cpu/armv7/mx6/soc.c | 31 +- arch/arm/imx-common/spl.c | 6 +- arch/arm/imx-common/video.c | 2 +- arch/arm/include/asm/arch-mx6/clock.h | 1 + arch/arm/include/asm/arch-mx6/crm_regs.h | 1 + arch/arm/include/asm/arch-mx6/mx6-ddr.h | 10 +- arch/arm/include/asm/imx-common/video.h | 1 + board/CarMediaLab/flea3/flea3.c | 124 ++----- board/freescale/mx7dsabresd/mx7dsabresd.c | 24 ++ board/ge/bx50v3/bx50v3.c | 54 ++++ board/kosagi/novena/novena_spl.c | 4 +- board/samtec/vining_2000/Kconfig | 12 + board/samtec/vining_2000/MAINTAINERS | 6 + board/samtec/vining_2000/Makefile | 6 + board/samtec/vining_2000/imximage.cfg | 132 ++++++++ board/samtec/vining_2000/vining_2000.c | 517 ++++++++++++++++++++++++++++++ board/tbs/tbs2910/tbs2910.c | 33 ++ board/technologic/ts4600/Kconfig | 15 + board/technologic/ts4600/MAINTAINERS | 6 + board/technologic/ts4600/Makefile | 11 + board/technologic/ts4600/iomux.c | 149 +++++++++ board/technologic/ts4600/ts4600.c | 89 +++++ board/udoo/neo/Kconfig | 12 + board/udoo/neo/MAINTAINERS | 7 + board/udoo/neo/Makefile | 6 + board/udoo/neo/neo.c | 441 +++++++++++++++++++++++++ board/wandboard/wandboard.c | 2 + common/spl/spl_mmc.c | 1 - configs/flea3_defconfig | 4 + configs/mx7dsabresd_secure_defconfig | 3 + configs/novena_defconfig | 1 + configs/ts4600_defconfig | 18 ++ configs/udoo_neo_defconfig | 30 ++ configs/vining_2000_defconfig | 31 ++ drivers/pwm/pwm-imx-util.c | 12 +- include/configs/colibri_vf.h | 6 +- include/configs/flea3.h | 9 +- include/configs/imx6_spl.h | 6 + include/configs/mx7dsabresd.h | 3 + include/configs/ts4600.h | 70 ++++ include/configs/udoo_neo.h | 94 ++++++ include/configs/vining_2000.h | 123 +++++++ include/configs/wandboard.h | 2 + tools/imximage.c | 10 +- 48 files changed, 2144 insertions(+), 157 deletions(-) create mode 100644 board/samtec/vining_2000/Kconfig create mode 100644 board/samtec/vining_2000/MAINTAINERS create mode 100644 board/samtec/vining_2000/Makefile create mode 100644 board/samtec/vining_2000/imximage.cfg create mode 100644 board/samtec/vining_2000/vining_2000.c create mode 100644 board/technologic/ts4600/Kconfig create mode 100644 board/technologic/ts4600/MAINTAINERS create mode 100644 board/technologic/ts4600/Makefile create mode 100644 board/technologic/ts4600/iomux.c create mode 100644 board/technologic/ts4600/ts4600.c create mode 100644 board/udoo/neo/Kconfig create mode 100644 board/udoo/neo/MAINTAINERS create mode 100644 board/udoo/neo/Makefile create mode 100644 board/udoo/neo/neo.c create mode 100644 configs/ts4600_defconfig create mode 100644 configs/udoo_neo_defconfig create mode 100644 configs/vining_2000_defconfig create mode 100644 include/configs/ts4600.h create mode 100644 include/configs/udoo_neo.h create mode 100644 include/configs/vining_2000.h -- ===================================================================== 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: sbabic(a)denx.de =====================================================================

2 1