Re: [U-Boot] [PATCH v4 1/1] add support for mcf5307
Hi Jason an all, many thanks for the feedback, sure, i post another updated patch-set, as a cpu patch followed from board patch, in some minutes. Regards angelo On 30/09/2011 11:15, Jin Zhengxiong-R64188 wrote: -Original Message- From: angelo [mailto:angel...@gmail.com] Sent: Thursday, September 22, 2011 4:06 AM To: U-Boot@lists.denx.de; Jin Zhengxiong-R64188 Subject: [PATCH v4 1/1] add support for mcf5307 Add support for mcf5307 cpu. Signed-off-by: Angelo Dureghello sysa...@gmail.com --- Changes for v4: - all previous patches was wrong, some files was missing, for an improper usage of git. arch/m68k/cpu/mcf530x/Makefile | 48 +++ arch/m68k/cpu/mcf530x/config.mk| 25 arch/m68k/cpu/mcf530x/cpu.c| 48 +++ arch/m68k/cpu/mcf530x/cpu.h| 33 + arch/m68k/cpu/mcf530x/cpu_init.c | 162 +++ arch/m68k/cpu/mcf530x/interrupts.c | 42 ++ arch/m68k/cpu/mcf530x/speed.c | 36 + arch/m68k/cpu/mcf530x/start.S | 253 arch/m68k/include/asm/cache.h |2 +- arch/m68k/include/asm/immap.h | 22 +++ arch/m68k/include/asm/immap_5307.h | 78 +++ arch/m68k/include/asm/m5307.h | 124 ++ arch/m68k/include/asm/timer.h |2 +- include/common.h |6 +- 14 files changed, 876 insertions(+), 5 deletions(-) Hi, Angelo, I suggest to send all the patchset including the board file changes so that we can at least test the building. Thanks. Jason ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/4] da830: emac: add support for RMII
On 09/30/11 18:48, Mike Frysinger wrote:
On Friday, September 30, 2011 07:57:10 nagabhushana.netagu...@ti.com wrote:
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -246,7 +246,7 @@ static int gen_get_link_speed(int phy_addr)
if (davinci_eth_phy_read(phy_addr, MII_STATUS_REG, tmp)
(tmp 0x04)) {
#if defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) \
there's a common CONFIG_RMII symbol already ...
-defined(CONFIG_MACH_DAVINCI_DA850_EVM)
+defined(CONFIG_MACH_DAVINCI_DA8XX_EVM)
maybe it's just me, but board level defines in an emac driver make no sense
No, it is not just you ;)
Davinci EMAC is used also in non davinci SoCs and restricting its
features to some board (or family of boards) indeed makes no sense.
There must be a good reason for doing so, otherwise that board
specific config should be removed.
--
Regards,
Igor.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/1] add support for Sysam AMCORE board
Add support for mcf5307 based Sysam AMCORE open board.
Board main features:
cpu : Freescale mcf5307
flash : 4MB, nor, SST39VF3201B
sdram : 16M, MT48LC4M32B2
eth : 1 x dm9000e
rtc : ds1338, i2c
Signed-off-by: Angelo Dureghello sysa...@gmail.com
---
Makefile |3 +
board/sysam/amcore/Makefile | 43
board/sysam/amcore/amcore.c | 174
board/sysam/amcore/config.mk | 23 ++
board/sysam/amcore/flash.c| 462 +
board/sysam/amcore/u-boot.lds | 99 +
boards.cfg|1 +
include/configs/amcore.h | 193 +
include/flash.h |1 +
9 files changed, 999 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 77140eb..7b56c09 100644
--- a/Makefile
+++ b/Makefile
@@ -608,6 +608,9 @@ ucname = $(shell echo $(1) | sed -e
's/\(.*\)_config/\U\1/')
## Coldfire
#
+amcore_config:
+ @$(MKCONFIG) -n $@ -a amcore m68k mcf530x amcore sysam
+
astro_mcf5373l_config \
astro_mcf5373l_RAM_config :unconfig
@$(MKCONFIG) -n $@ -t $@ astro_mcf5373l m68k mcf532x mcf5373l astro
diff --git a/board/sysam/amcore/Makefile b/board/sysam/amcore/Makefile
new file mode 100644
index 000..c585b19
--- /dev/null
+++ b/board/sysam/amcore/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2011 Angelo Dureghello sysa...@gmail.com
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB= $(obj)lib$(BOARD).o
+
+COBJS = $(BOARD).o flash.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):$(obj).depend $(OBJS)
+ $(call cmd_link_o_target, $(OBJS))
+
+#
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#
diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c
new file mode 100644
index 000..b7aa6a9
--- /dev/null
+++ b/board/sysam/amcore/amcore.c
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2011 Angelo Dureghello sysa...@gmail.com
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include common.h
+#include command.h
+#include malloc.h
+#include asm/immap.h
+
+/*
+ * board can have a K0108 lcd connected on the parallel port,
+ * wired as below:
+ *
+ * fc cpu P0 P1 P2 P3 P4 P5 P6 P7 P10 P11 P12 P13 P14
+ * lcd D0 D1 D2 D3 D4 D5 D6 D7 CS1 CS2 RW DI E
+ *
+ * Starting up setting lines in high impedance
+ */
+int init_lcd (void)
+{
+ /* all pins set to parallel port except PP8 and PP9 */
+ mbar_writeShort(MCFSIM_PAR, 0x300);
+ /* all outputs except P8 and P9 */
+ mbar_writeShort(MCFSIM_PADDR, 0xfcff);
+ /* CSX and E all disabled, D(data), W(write) */
+ mbar_writeShort(MCFSIM_PADAT, 0x0c00);
+}
+
+int checkboard (void)
+{
+ puts (Board: );
+ puts (AMCORE v.001(alpha)\n);
+
+ init_lcd();
+
+ return 0;
+}
+
+/* aprox delay, to use before any timer init */
+void fudelay (int usec)
+{
+ int i=0;
+
+ for (;i10;++i)
+ {
+ __asm__ __volatile__ (nop);
+ }
+}
+
+phys_size_t initdram (int board_type)
+{
+ icache_disable();
+
+
[U-Boot] [PATCH v5 1/1] add support for mcf5307
Add support for mcf5307 cpu.
Signed-off-by: Angelo Dureghello sysa...@gmail.com
---
Changes for v5:
- updated to current remote master
arch/m68k/cpu/mcf530x/Makefile | 48 +++
arch/m68k/cpu/mcf530x/config.mk| 25
arch/m68k/cpu/mcf530x/cpu.c| 48 +++
arch/m68k/cpu/mcf530x/cpu.h| 33 +
arch/m68k/cpu/mcf530x/cpu_init.c | 162 +++
arch/m68k/cpu/mcf530x/interrupts.c | 42 ++
arch/m68k/cpu/mcf530x/speed.c | 36 +
arch/m68k/cpu/mcf530x/start.S | 253
arch/m68k/include/asm/cache.h |2 +-
arch/m68k/include/asm/immap.h | 22 +++
arch/m68k/include/asm/immap_5307.h | 78 +++
arch/m68k/include/asm/m5307.h | 124 ++
arch/m68k/include/asm/timer.h |2 +-
include/common.h |6 +-
14 files changed, 876 insertions(+), 5 deletions(-)
diff --git a/arch/m68k/cpu/mcf530x/Makefile b/arch/m68k/cpu/mcf530x/Makefile
new file mode 100644
index 000..3c5a1c2
--- /dev/null
+++ b/arch/m68k/cpu/mcf530x/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (c) 2011 Angelo Dureghello sysa...@gmail.com
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+# CFLAGS += -DET_DEBUG
+
+LIB= $(obj)lib$(CPU).o
+
+START = start.o
+COBJS = interrupts.o cpu.o speed.o cpu_init.o
+
+SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
+START := $(addprefix $(obj),$(START))
+
+all: $(obj).depend $(START) $(LIB)
+
+$(LIB):$(OBJS)
+ $(call cmd_link_o_target, $(OBJS))
+
+#
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#
diff --git a/arch/m68k/cpu/mcf530x/config.mk b/arch/m68k/cpu/mcf530x/config.mk
new file mode 100644
index 000..2ba1644
--- /dev/null
+++ b/arch/m68k/cpu/mcf530x/config.mk
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2011 Angelo Dureghello sysa...@gmail.com
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
+
+PLATFORM_CPPFLAGS += -m5307 -fPIC
diff --git a/arch/m68k/cpu/mcf530x/cpu.c b/arch/m68k/cpu/mcf530x/cpu.c
new file mode 100644
index 000..efd9cbd
--- /dev/null
+++ b/arch/m68k/cpu/mcf530x/cpu.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2011 Angelo Dureghello sysa...@gmail.com
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include common.h
+#include watchdog.h
+#include command.h
+#include asm/immap.h
+
+#include cpu.h
+
+int checkcpu(void)
+{
+ char buf[32];
+
+
[U-Boot] [PATCH v7 0/3] those series patches for add ben nanonote board
Hi, Here's seventh patchset for Ben NanoNote initial support. I've been working with Xiangfu past six months to polish v6 patches. We have addressed all comments from Wolfgang and Scott so far, drop nand_spl and USB_boot functions to make the initial bring-up minimum and simple. I think the patchset is now in good shape, so will merge and make a pull-request during this merge window. Please give it a final review and if something to fix, please let us know. Scott and Wolfgang, I know NAND land changes should go through Scott's tree, but the NAND driver is part of the initial support. May I take it through MIPS tree? Hope it's Ok with you. Changes since v6 patchset are described in each patch. Shinya --- 8 --- Boilerplate from Xiangfu Liu: those patches are for add xburst jz4740 base file and Ben NanoNote (codename qi_lb60) to U-Boot some info about xburst jz4740: the xburst jz4740 is recently added to linux 2.6.36 and it's support the device Ben NanoNote out of box, this xburst jz4740 cpu have one feature is Boot From USB, there is a small rom in jz4740, but LOW some PIN, the cpu will boot to this small rom, then init cpu and USB module, then we can send 8KB bin file to the cpu by USB(by using 'xbboot' or 'usbboot'[1]). which means if your bootloader is borken,(the first few KBs in NAND) you can always boot the device from usb, then reflash the nand. in OpenMoko FreeRunner, there are NOR and NAND. when people broken the nand bootloader, it's must boot from NOR, reflash the bootloader back when people broken the NAND and NOR, he(she) must reflash by using JTAG but in Ben NanoNote, we just need boot from usb. flash the nand again :) BTW:there are a lot of PMP, Audio device in China use the Xburst cpu, but I think they are all base on u-boot 1.1.6. by working on Ben NanoNote (http://en.qi-hardware.com) one year, we try to update the u-boot to last version and send it to upstream. :) for more info about Ingenic Xburst JZ4740 http://www.ingenic.cn/eng/default.aspx http://www.linux-mips.org/wiki/Ingenic Xiangfu Liu (3): MIPS: Ingenic XBurst Jz4740 processor support MIPS: Jz4740: Add NAND driver MIPS: JZ4740: Add qi_lb60 board support MAINTAINERS |4 + MAKEALL |4 +- README |1 + arch/mips/cpu/xburst/Makefile | 49 ++ arch/mips/cpu/xburst/config.mk | 24 + arch/mips/cpu/xburst/cpu.c | 152 + arch/mips/cpu/xburst/jz4740.c | 248 arch/mips/cpu/xburst/jz_serial.c| 114 arch/mips/cpu/xburst/start.S| 171 ++ arch/mips/cpu/xburst/timer.c| 169 ++ arch/mips/include/asm/global_data.h | 11 + arch/mips/include/asm/jz4740.h | 1115 +++ board/qi/qi_lb60/Makefile | 45 ++ board/qi/qi_lb60/config.mk | 31 + board/qi/qi_lb60/qi_lb60.c | 104 board/qi/qi_lb60/u-boot.lds | 61 ++ boards.cfg |1 + drivers/mtd/nand/Makefile |1 + drivers/mtd/nand/jz4740_nand.c | 261 include/configs/qi_lb60.h | 210 +++ 20 files changed, 2775 insertions(+), 1 deletions(-) create mode 100644 arch/mips/cpu/xburst/Makefile create mode 100644 arch/mips/cpu/xburst/config.mk create mode 100644 arch/mips/cpu/xburst/cpu.c create mode 100644 arch/mips/cpu/xburst/jz4740.c create mode 100644 arch/mips/cpu/xburst/jz_serial.c create mode 100644 arch/mips/cpu/xburst/start.S create mode 100644 arch/mips/cpu/xburst/timer.c create mode 100644 arch/mips/include/asm/jz4740.h create mode 100644 board/qi/qi_lb60/Makefile create mode 100644 board/qi/qi_lb60/config.mk create mode 100644 board/qi/qi_lb60/qi_lb60.c create mode 100644 board/qi/qi_lb60/u-boot.lds create mode 100644 drivers/mtd/nand/jz4740_nand.c create mode 100644 include/configs/qi_lb60.h ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v7 2/3] MIPS: Jz4740: Add NAND driver
From: Xiangfu Liu xian...@openmobilefree.net
Date: Fri, 19 Aug 2011 14:35:29 +0800
Jz4740 NAND flash controller can support:
* MLC NAND as well as SLC NAND
* all 8-bit/16-bit NAND flash devices
* HAMMING and RS hardware ECC
* automatic boot up from NAND flash devices
nand_ecclayout is set up for 2GiB NAND chip mounted in Qi LB60.
We'll bring up boot-from-NAND support in nand_spl/ in the future.
Signed-off-by: Xiangfu Liu xian...@openmobilefree.net
Acked-by: Daniel z...@ingenic.cn
Signed-off-by: Shinya Kuribayashi skuri...@pobox.com
---
Changes since v6:
* Remove NAND-boot stuff. Those bits will be submitted as a nand-spl
support once this Jz4740 base support is merged.
* All previous comments from Scott are fixed.
* Bunch of coding style issues fixed.
drivers/mtd/nand/Makefile |1 +
drivers/mtd/nand/jz4740_nand.c | 261
2 files changed, 262 insertions(+), 0 deletions(-)
create mode 100644 drivers/mtd/nand/jz4740_nand.c
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index b6a7886..c257128 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -44,6 +44,7 @@ COBJS-$(CONFIG_DRIVER_NAND_BFIN) += bfin_nand.o
COBJS-$(CONFIG_NAND_DAVINCI) += davinci_nand.o
COBJS-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_nand.o
COBJS-$(CONFIG_NAND_FSL_UPM) += fsl_upm.o
+COBJS-$(CONFIG_NAND_JZ4740) += jz4740_nand.o
COBJS-$(CONFIG_NAND_KB9202) += kb9202_nand.o
COBJS-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
COBJS-$(CONFIG_NAND_KMETER1) += kmeter1_nand.o
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
new file mode 100644
index 000..db50da3
--- /dev/null
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -0,0 +1,261 @@
+/*
+ * Platform independend driver for JZ4740.
+ *
+ * Copyright (c) 2007 Ingenic Semiconductor Inc.
+ * Author: jl...@ingenic.cn
+ *
+ * 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 common.h
+
+#include nand.h
+#include asm/io.h
+#include asm/jz4740.h
+
+#define JZ_NAND_DATA_ADDR ((void __iomem *)0xB800)
+#define JZ_NAND_CMD_ADDR (JZ_NAND_DATA_ADDR + 0x8000)
+#define JZ_NAND_ADDR_ADDR (JZ_NAND_DATA_ADDR + 0x1)
+
+#define BIT(x) (1 (x))
+#define JZ_NAND_ECC_CTRL_ENCODING BIT(3)
+#define JZ_NAND_ECC_CTRL_RSBIT(2)
+#define JZ_NAND_ECC_CTRL_RESET BIT(1)
+#define JZ_NAND_ECC_CTRL_ENABLEBIT(0)
+
+#define EMC_SMCR1_OPT_NAND 0x094c4400
+/* Optimize the timing of nand */
+
+static struct jz4740_emc * emc = (struct jz4740_emc *)JZ4740_EMC_BASE;
+
+static struct nand_ecclayout qi_lb60_ecclayout_2gb = {
+ .eccbytes = 72,
+ .eccpos = {
+ 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83 },
+ .oobfree = {
+ {.offset = 2,
+.length = 10 },
+ {.offset = 84,
+.length = 44 } }
+};
+
+static int is_reading;
+
+static void jz_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+{
+ struct nand_chip *this = mtd-priv;
+ uint32_t reg;
+
+ if (ctrl NAND_CTRL_CHANGE) {
+ if (ctrl NAND_ALE)
+ this-IO_ADDR_W = JZ_NAND_ADDR_ADDR;
+ else if (ctrl NAND_CLE)
+ this-IO_ADDR_W = JZ_NAND_CMD_ADDR;
+ else
+ this-IO_ADDR_W = JZ_NAND_DATA_ADDR;
+
+ reg = readl(emc-nfcsr);
+ if (ctrl NAND_NCE)
+ reg |= EMC_NFCSR_NFCE1;
+ else
+ reg = ~EMC_NFCSR_NFCE1;
+ writel(reg, emc-nfcsr);
+ }
+
+ if (cmd != NAND_CMD_NONE)
+ writeb(cmd, this-IO_ADDR_W);
+}
+
+static int jz_nand_device_ready(struct mtd_info *mtd)
+{
+ return (readl(GPIO_PXPIN(2)) 0x4000) ? 1 : 0;
+}
+
+void board_nand_select_device(struct nand_chip *nand, int chip)
+{
+ /*
+* Don't use chip to address the NAND device,
+* generate the cs from the address where it is encoded.
+*/
+}
+
+static int jz_nand_rs_calculate_ecc(struct mtd_info* mtd, const u_char* dat,
+ u_char* ecc_code)
+{
+ uint32_t status;
+ int i;
+
+ if (is_reading)
+ return 0;
+
+ do {
+ status = readl(emc-nfints);
+ } while (!(status EMC_NFINTS_ENCF));
+
+ /* disable ecc */
+
[U-Boot] [PATCH v7 3/3] MIPS: JZ4740: Add qi_lb60 board support
From: Xiangfu Liu xian...@openmobilefree.net Date: Fri, 19 Aug 2011 14:35:29 +0800 Add support for the qi_lb60 (a.k.a QI Ben NanoNote) clamshell device from Qi hardware: http://en.qi-hardware.com/wiki/Ben_NanoNote http://en.qi-hardware.com/wiki/Main_Page http://en.wikipedia.org/wiki/Qi_hardware This Jz4740-based clamshell device does not use NOR flash to boot. The initial bring-up assumes that U-Boot is directly loaded into SDRAM using USB boot tool, and starts from 0x8010. About USB boot tool --- Jz4740 is one of the XBurst processors with USB boot functionality supported. The CPU can boot from a small ROM in the LSI, initialize CPU and USB module, then wait for USB commands from the USB host. We can send 8 KB binary data to the CPU cache using USB boot tool. USB boot tool is available to the public at Ingenic website. Also there is an alternative Debian package named xburst-tools. Signed-off-by: Xiangfu Liu xian...@openmobilefree.net Acked-by: Daniel z...@ingenic.cn Signed-off-by: Shinya Kuribayashi skuri...@pobox.com --- Changes since v6: * nanonote.h config files is folded into qi_lb60.h * Following configs are deleted: CONFIG_SYS_64BIT_VSPRINTF CONFIG_NANDBOOT_CFG CONFIG_QI_LB60 MAINTAINERS |4 + MAKEALL |4 +- board/qi/qi_lb60/Makefile | 45 + board/qi/qi_lb60/config.mk | 31 +++ board/qi/qi_lb60/qi_lb60.c | 104 + board/qi/qi_lb60/u-boot.lds | 61 + boards.cfg |1 + include/configs/qi_lb60.h | 210 +++ 8 files changed, 459 insertions(+), 1 deletions(-) create mode 100644 board/qi/qi_lb60/Makefile create mode 100644 board/qi/qi_lb60/config.mk create mode 100644 board/qi/qi_lb60/qi_lb60.c create mode 100644 board/qi/qi_lb60/u-boot.lds create mode 100644 include/configs/qi_lb60.h diff --git a/MAINTAINERS b/MAINTAINERS index 3ab38fa..bb95e6d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -928,6 +928,10 @@ Stefan Roese s...@denx.de vct_xxx MIPS32 4Kc +Xiangfu Liu xian...@openmobilefree.net + + qi_lb60 MIPS32 (XBurst Jz4740 SoC) + # # Nios-II Systems: # # # diff --git a/MAKEALL b/MAKEALL index 4d18c11..f57d47d 100755 --- a/MAKEALL +++ b/MAKEALL @@ -400,7 +400,9 @@ LIST_mips= \ ## MIPS Systems(little endian) # -LIST_mips4kc_el= +LIST_mips4kc_el= \ + qi_lb60 \ + LIST_mips5kc_el= diff --git a/board/qi/qi_lb60/Makefile b/board/qi/qi_lb60/Makefile new file mode 100644 index 000..2f5b4be --- /dev/null +++ b/board/qi/qi_lb60/Makefile @@ -0,0 +1,45 @@ +# +# (C) Copyright 2006 +# Ingenic Semiconductor, jl...@ingenic.cn +# +# 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. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).o + +COBJS := $(BOARD).o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS)) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/qi/qi_lb60/config.mk b/board/qi/qi_lb60/config.mk new file mode 100644 index 000..858e6a2 --- /dev/null +++ b/board/qi/qi_lb60/config.mk @@ -0,0 +1,31 @@ +# +# (C) Copyright 2006 Qi Hardware, Inc. +# Author: Xiangfu Liu xiangf...@gmail.com +# +# 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. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the
[U-Boot] [PATCH 0/5] Marvell: reduce dependence files
Reduce the dependence between driver files and platform files Lei Wen (5): ARM: pantheon: reduce dependence of including platform file ARM: armada100: reduce dependence of including platform file ARM: kirkwood: reduce dependence of including platform file serial: reduce include platform file for marvell chip gpio: mvmfp: reduce include platform file arch/arm/cpu/arm926ejs/armada100/cpu.c |2 +- arch/arm/cpu/arm926ejs/armada100/dram.c |1 + arch/arm/cpu/arm926ejs/armada100/timer.c|1 + arch/arm/cpu/arm926ejs/kirkwood/cpu.c |2 + arch/arm/cpu/arm926ejs/kirkwood/dram.c |2 + arch/arm/cpu/arm926ejs/kirkwood/mpp.c |2 + arch/arm/cpu/arm926ejs/kirkwood/timer.c |1 + arch/arm/cpu/arm926ejs/pantheon/cpu.c |2 +- arch/arm/cpu/arm926ejs/pantheon/dram.c |1 + arch/arm/cpu/arm926ejs/pantheon/timer.c |1 + arch/arm/include/asm/arch-armada100/armada100.h | 63 --- arch/arm/include/asm/arch-armada100/config.h|1 + arch/arm/include/asm/arch-armada100/cpu.h | 57 arch/arm/include/asm/arch-kirkwood/config.h |1 + arch/arm/include/asm/arch-kirkwood/kirkwood.h |6 -- arch/arm/include/asm/arch-pantheon/config.h |2 + arch/arm/include/asm/arch-pantheon/pantheon.h |7 --- board/Marvell/aspenite/aspenite.c |1 + board/Marvell/guruplug/guruplug.c |1 + board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |1 + board/Marvell/openrd/openrd.c |1 + board/Marvell/rd6281a/rd6281a.c |1 + board/Marvell/sheevaplug/sheevaplug.c |1 + board/keymile/km_arm/km_arm.c |1 + drivers/gpio/kw_gpio.c |1 + drivers/gpio/mvmfp.c|7 --- drivers/net/mvgbe.c |2 + drivers/serial/serial.c |9 --- drivers/spi/kirkwood_spi.c |1 + drivers/usb/host/ehci-kirkwood.c|1 + 30 files changed, 86 insertions(+), 94 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/5] ARM: pantheon: reduce dependence of including platform file
For files like the drivers/serial/serial.c, it must include the platform file, as the CONFIG_SYS_NS16550_COM1 must reference to the definition in the platform definition files. Include the platform definition file in the config file, so that it would decouple the dependence for the driver files. Signed-off-by: Lei Wen lei...@marvell.com --- arch/arm/cpu/arm926ejs/pantheon/cpu.c |2 +- arch/arm/cpu/arm926ejs/pantheon/dram.c|1 + arch/arm/cpu/arm926ejs/pantheon/timer.c |1 + arch/arm/include/asm/arch-pantheon/config.h |2 ++ arch/arm/include/asm/arch-pantheon/pantheon.h |7 --- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/pantheon/cpu.c b/arch/arm/cpu/arm926ejs/pantheon/cpu.c index 8b2eafa..efc9395 100644 --- a/arch/arm/cpu/arm926ejs/pantheon/cpu.c +++ b/arch/arm/cpu/arm926ejs/pantheon/cpu.c @@ -23,8 +23,8 @@ */ #include common.h +#include asm/arch/cpu.h #include asm/arch/pantheon.h -#include asm/io.h #define UARTCLK14745KHZ(APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1)) #define SET_MRVL_ID(18) diff --git a/arch/arm/cpu/arm926ejs/pantheon/dram.c b/arch/arm/cpu/arm926ejs/pantheon/dram.c index bbca7ee..a3d719e 100644 --- a/arch/arm/cpu/arm926ejs/pantheon/dram.c +++ b/arch/arm/cpu/arm926ejs/pantheon/dram.c @@ -23,6 +23,7 @@ */ #include common.h +#include asm/io.h #include asm/arch/pantheon.h DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/arm926ejs/pantheon/timer.c b/arch/arm/cpu/arm926ejs/pantheon/timer.c index c71162a..17045b1 100644 --- a/arch/arm/cpu/arm926ejs/pantheon/timer.c +++ b/arch/arm/cpu/arm926ejs/pantheon/timer.c @@ -23,6 +23,7 @@ */ #include common.h +#include asm/arch/cpu.h #include asm/arch/pantheon.h /* diff --git a/arch/arm/include/asm/arch-pantheon/config.h b/arch/arm/include/asm/arch-pantheon/config.h index 5658592..fd23c97 100644 --- a/arch/arm/include/asm/arch-pantheon/config.h +++ b/arch/arm/include/asm/arch-pantheon/config.h @@ -25,6 +25,8 @@ #ifndef _PANTHEON_CONFIG_H #define _PANTHEON_CONFIG_H +#include asm/arch/pantheon.h + #define CONFIG_ARM926EJS 1 /* Basic Architecture */ #define CONFIG_SYS_TCLK(14745600) /* NS16550 clk config */ diff --git a/arch/arm/include/asm/arch-pantheon/pantheon.h b/arch/arm/include/asm/arch-pantheon/pantheon.h index e4ed087..c7fe646 100644 --- a/arch/arm/include/asm/arch-pantheon/pantheon.h +++ b/arch/arm/include/asm/arch-pantheon/pantheon.h @@ -25,13 +25,6 @@ #ifndef _PANTHEON_H #define _PANTHEON_H -#ifndef __ASSEMBLY__ -#include asm/types.h -#include asm/io.h -#endif /* __ASSEMBLY__ */ - -#include asm/arch/cpu.h - /* Common APB clock register bit definitions */ #define APBC_APBCLK (10) /* APB Bus Clock Enable */ #define APBC_FNCLK (11) /* Functional Clock Enable */ -- 1.7.0.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/5] ARM: armada100: reduce dependence of including platform file
For files like the drivers/serial/serial.c, it must include the
platform file, as the CONFIG_SYS_NS16550_COM1 must reference to the
definition in the platform definition files.
Include the platform definition file in the config file, so that it
would decouple the dependence for the driver files.
Signed-off-by: Lei Wen lei...@marvell.com
---
arch/arm/cpu/arm926ejs/armada100/cpu.c |2 +-
arch/arm/cpu/arm926ejs/armada100/dram.c |1 +
arch/arm/cpu/arm926ejs/armada100/timer.c|1 +
arch/arm/include/asm/arch-armada100/armada100.h | 63 ---
arch/arm/include/asm/arch-armada100/config.h|1 +
arch/arm/include/asm/arch-armada100/cpu.h | 57
board/Marvell/aspenite/aspenite.c |1 +
7 files changed, 62 insertions(+), 64 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c
b/arch/arm/cpu/arm926ejs/armada100/cpu.c
index c21938e..14121a0 100644
--- a/arch/arm/cpu/arm926ejs/armada100/cpu.c
+++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c
@@ -24,8 +24,8 @@
*/
#include common.h
+#include asm/arch/cpu.h
#include asm/arch/armada100.h
-#include asm/io.h
#define UARTCLK14745KHZ(APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1))
#define SET_MRVL_ID(18)
diff --git a/arch/arm/cpu/arm926ejs/armada100/dram.c
b/arch/arm/cpu/arm926ejs/armada100/dram.c
index eacec23..8609004 100644
--- a/arch/arm/cpu/arm926ejs/armada100/dram.c
+++ b/arch/arm/cpu/arm926ejs/armada100/dram.c
@@ -24,6 +24,7 @@
*/
#include common.h
+#include asm/io.h
#include asm/arch/armada100.h
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c
b/arch/arm/cpu/arm926ejs/armada100/timer.c
index 82a6d7b..fbade4b 100644
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -24,6 +24,7 @@
*/
#include common.h
+#include asm/arch/cpu.h
#include asm/arch/armada100.h
/*
diff --git a/arch/arm/include/asm/arch-armada100/armada100.h
b/arch/arm/include/asm/arch-armada100/armada100.h
index d5d125a..f27c4f6 100644
--- a/arch/arm/include/asm/arch-armada100/armada100.h
+++ b/arch/arm/include/asm/arch-armada100/armada100.h
@@ -26,13 +26,7 @@
#ifndef _ASM_ARCH_ARMADA100_H
#define _ASM_ARCH_ARMADA100_H
-#ifndef __ASSEMBLY__
-#include asm/types.h
-#include asm/io.h
-#endif /* __ASSEMBLY__ */
-
#if defined (CONFIG_ARMADA100)
-#include asm/arch/cpu.h
/* Common APB clock register bit definitions */
#define APBC_APBCLK (10) /* APB Bus Clock Enable */
@@ -60,62 +54,5 @@
#define ARMD1_APMU_BASE0xD4282800
#define ARMD1_CPU_BASE 0xD4282C00
-/*
- * Main Power Management (MPMU) Registers
- * Refer Datasheet Appendix A.8
- */
-struct armd1mpmu_registers {
- u8 pad0[0x08 - 0x00];
- u32 fccr; /*0x0008*/
- u32 pocr; /*0x000c*/
- u32 posr; /*0x0010*/
- u32 succr; /*0x0014*/
- u8 pad1[0x030 - 0x014 - 4];
- u32 gpcr; /*0x0030*/
- u8 pad2[0x200 - 0x030 - 4];
- u32 wdtpcr; /*0x0200*/
- u8 pad3[0x1000 - 0x200 - 4];
- u32 apcr; /*0x1000*/
- u32 apsr; /*0x1004*/
- u8 pad4[0x1020 - 0x1004 - 4];
- u32 aprr; /*0x1020*/
- u32 acgr; /*0x1024*/
- u32 arsr; /*0x1028*/
-};
-
-/*
- * APB1 Clock Reset/Control Registers
- * Refer Datasheet Appendix A.10
- */
-struct armd1apb1_registers {
- u32 uart1; /*0x000*/
- u32 uart2; /*0x004*/
- u32 gpio; /*0x008*/
- u32 pwm1; /*0x00c*/
- u32 pwm2; /*0x010*/
- u32 pwm3; /*0x014*/
- u32 pwm4; /*0x018*/
- u8 pad0[0x028 - 0x018 - 4];
- u32 rtc;/*0x028*/
- u32 twsi0; /*0x02c*/
- u32 kpc;/*0x030*/
- u32 timers; /*0x034*/
- u8 pad1[0x03c - 0x034 - 4];
- u32 aib;/*0x03c*/
- u32 sw_jtag;/*0x040*/
- u32 timer1; /*0x044*/
- u32 onewire;/*0x048*/
- u8 pad2[0x050 - 0x048 - 4];
- u32 asfar; /*0x050 AIB Secure First Access Reg*/
- u32 assar; /*0x054 AIB Secure Second Access Reg*/
- u8 pad3[0x06c - 0x054 - 4];
- u32 twsi1; /*0x06c*/
- u32 uart3; /*0x070*/
- u8 pad4[0x07c - 0x070 - 4];
- u32 timer2; /*0x07C*/
- u8 pad5[0x084 - 0x07c - 4];
- u32 ac97; /*0x084*/
-};
-
#endif /* CONFIG_ARMADA100 */
#endif /* _ASM_ARCH_ARMADA100_H */
diff --git a/arch/arm/include/asm/arch-armada100/config.h
b/arch/arm/include/asm/arch-armada100/config.h
index 1126b38..d2094e5 100644
--- a/arch/arm/include/asm/arch-armada100/config.h
+++ b/arch/arm/include/asm/arch-armada100/config.h
@@ -31,6 +31,7 @@
#ifndef _ARMD1_CONFIG_H
#define _ARMD1_CONFIG_H
+#include asm/arch/armada100.h
#define CONFIG_ARM926EJS 1 /* Basic Architecture */
#define CONFIG_SYS_TCLK(14745600) /* NS16550 clk
[U-Boot] [PATCH 3/5] ARM: kirkwood: reduce dependence of including platform file
For files like the drivers/serial/serial.c, it must include the platform file, as the CONFIG_SYS_NS16550_COM1 must reference to the definition in the platform definition files. Include the platform definition file in the config file, so that it would decouple the dependence for the driver files. Signed-off-by: Lei Wen lei...@marvell.com --- arch/arm/cpu/arm926ejs/kirkwood/cpu.c |2 ++ arch/arm/cpu/arm926ejs/kirkwood/dram.c |2 ++ arch/arm/cpu/arm926ejs/kirkwood/mpp.c |2 ++ arch/arm/cpu/arm926ejs/kirkwood/timer.c |1 + arch/arm/include/asm/arch-kirkwood/config.h |1 + arch/arm/include/asm/arch-kirkwood/kirkwood.h |6 -- board/Marvell/guruplug/guruplug.c |1 + board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |1 + board/Marvell/openrd/openrd.c |1 + board/Marvell/rd6281a/rd6281a.c |1 + board/Marvell/sheevaplug/sheevaplug.c |1 + board/keymile/km_arm/km_arm.c |1 + drivers/gpio/kw_gpio.c |1 + drivers/net/mvgbe.c |2 ++ drivers/spi/kirkwood_spi.c |1 + drivers/usb/host/ehci-kirkwood.c|1 + 16 files changed, 19 insertions(+), 6 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c index b4a4c04..8f04ddb 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c @@ -26,6 +26,8 @@ #include netdev.h #include asm/cache.h #include u-boot/md5.h +#include asm/io.h +#include asm/arch/cpu.h #include asm/arch/kirkwood.h #include hush.h diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c index 2441554..181b3e7 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c @@ -24,6 +24,8 @@ #include config.h #include common.h +#include asm/io.h +#include asm/arch/cpu.h #include asm/arch/kirkwood.h DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c index b2f0ad5..3da6c98 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c @@ -10,6 +10,8 @@ */ #include common.h +#include asm/io.h +#include asm/arch/cpu.h #include asm/arch/kirkwood.h #include asm/arch/mpp.h diff --git a/arch/arm/cpu/arm926ejs/kirkwood/timer.c b/arch/arm/cpu/arm926ejs/kirkwood/timer.c index b4f6cf8..a98f54c 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/timer.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/timer.c @@ -22,6 +22,7 @@ */ #include common.h +#include asm/io.h #include asm/arch/kirkwood.h #define UBOOT_CNTR 0 /* counter to use for uboot timer */ diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h index b7dae1e..ab7201b 100644 --- a/arch/arm/include/asm/arch-kirkwood/config.h +++ b/arch/arm/include/asm/arch-kirkwood/config.h @@ -39,6 +39,7 @@ #error SOC Name not defined #endif /* CONFIG_KW88F6281 */ +#include asm/arch/kirkwood.h #define CONFIG_ARM926EJS 1 /* Basic Architecture */ #define CONFIG_MD5 /* get_random_hex on krikwood needs MD5 support */ diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h index 3c843a0..0035ed5 100644 --- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h +++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h @@ -27,13 +27,7 @@ #ifndef _ASM_ARCH_KIRKWOOD_H #define _ASM_ARCH_KIRKWOOD_H -#ifndef __ASSEMBLY__ -#include asm/types.h -#include asm/io.h -#endif /* __ASSEMBLY__ */ - #if defined (CONFIG_FEROCEON_88FR131) || defined (CONFIG_SHEEVA_88SV131) -#include asm/arch/cpu.h /* SOC specific definations */ #define INTREG_BASE0xd000 diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c index 1f0e67a..057c558 100644 --- a/board/Marvell/guruplug/guruplug.c +++ b/board/Marvell/guruplug/guruplug.c @@ -24,6 +24,7 @@ #include common.h #include miiphy.h +#include asm/arch/cpu.h #include asm/arch/kirkwood.h #include asm/arch/mpp.h #include guruplug.h diff --git a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c index 80fd20b..4c41f3b 100644 --- a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c +++ b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c @@ -26,6 +26,7 @@ #include common.h #include netdev.h +#include asm/arch/cpu.h #include asm/arch/kirkwood.h #include asm/arch/mpp.h #include mv88f6281gtw_ge.h diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c index 87939de..2a10e69 100644 --- a/board/Marvell/openrd/openrd.c +++ b/board/Marvell/openrd/openrd.c @@ -29,6 +29,7 @@ #include common.h #include miiphy.h +#include asm/arch/cpu.h #include asm/arch/kirkwood.h #include
[U-Boot] [PATCH 4/5] serial: reduce include platform file for marvell chip
Build pass with following config: dkb_config aspenite_config edminiv2_config openrd_ultimate_config sheevaplug_config mv88f6281gtw_ge_config rd6281a_config guruplug_config km_kirkwood_config Signed-off-by: Lei Wen lei...@marvell.com --- drivers/serial/serial.c |9 - 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 0d56e78..0d6ad62 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -28,15 +28,6 @@ #ifdef CONFIG_NS87308 #include ns87308.h #endif -#ifdef CONFIG_KIRKWOOD -#include asm/arch/kirkwood.h -#elif defined(CONFIG_ORION5X) -#include asm/arch/orion5x.h -#elif defined(CONFIG_ARMADA100) -#include asm/arch/armada100.h -#elif defined(CONFIG_PANTHEON) -#include asm/arch/pantheon.h -#endif #if defined (CONFIG_SERIAL_MULTI) #include serial.h -- 1.7.0.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 5/5] gpio: mvmfp: reduce include platform file
Build pass with following config: dkb_config aspenite_config Signed-off-by: Lei Wen lei...@marvell.com --- drivers/gpio/mvmfp.c |7 --- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/mvmfp.c b/drivers/gpio/mvmfp.c index e7830c6..f56c037 100644 --- a/drivers/gpio/mvmfp.c +++ b/drivers/gpio/mvmfp.c @@ -26,13 +26,6 @@ #include asm/io.h #include mvmfp.h #include asm/arch/mfp.h -#ifdef CONFIG_ARMADA100 -#include asm/arch/armada100.h -#elif defined(CONFIG_PANTHEON) -#include asm/arch/pantheon.h -#else -#error Unsupported SoC... -#endif /* * mfp_config -- 1.7.0.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Unpaid Beneficiary $20.million is ready to be paid....
Unpaid-Beneficiary It is obvious that you have not received your fund which is to the tune of 20million dollars for more info contact director of payment rev.KOFFI NELSON with your information wish is Age,Sex,Name,occupation,tel, Yours. Mr. Boateng Johnson CC: Federal Bureau of Investigation CC: National Central Bureau of Interpol ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v7 0/3] those series patches for add ben nanonote board
On 10/02/2011 09:52 PM, Shinya Kuribayashi wrote: Hi, Here's seventh patchset for Ben NanoNote initial support. I've been working with Xiangfu past six months to polish v6 patches. We have addressed all comments from Wolfgang and Scott so far, drop nand_spl and USB_boot functions to make the initial bring-up minimum and simple. I think the patchset is now in good shape, so will merge and make a pull-request during this merge window. Please give it a final review and if something to fix, please let us know. thanks Shinya. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/3] misc:pmic: New PMIC generic driver
Am 26/09/2011 17:10, schrieb Lukasz Majewski: This patch series adds new generic PMIC framework for u-boot. It is supposed to handle various types of pmic IC's (both I2C and SPI). Hi Lukasz, This patch series has been tested on Samsung's GONI reference target. Moreover a special patch for mx51evk target board has been prepared. It is compiling, but I cannot test if the driver works. I have tested the SPI part on a different board instead of MX51EVK(vision2). I think you can forget for your patchset about MX5 boards - they can be switched to the general pmic_core when the fsl_pmic file will be dropped and after merging your patches. Thanks in any case to have provided an example ;-) Other iMX targets shall be corrected in a similar way that mx51evk. The old fsl_pmic.c driver has been preserved. Ok - it will be removed after including you patches. The write function is symmetric to the read function: int pmic_reg_write(struct pmic *p, u32 reg, u32 *val) However, we do not want to change the value pointed by val. I think it is should better to pass a u32 instead of a pointer. Lukasz Majewski (3): misc:pmic New generic pmic driver misc:pmic: Enable PMIC handling at u-boot startup code misc:pmic:mx: Code modification for mx51evk board arch/arm/lib/board.c |5 + board/freescale/mx51evk/mx51evk.c | 68 -- drivers/misc/Makefile |6 +- drivers/misc/pmic_core.c | 148 + drivers/misc/pmic_fsl.c | 57 ++ drivers/misc/pmic_i2c.c | 92 +++ drivers/misc/pmic_max8998.c | 43 +++ drivers/misc/pmic_spi.c | 109 +++ include/configs/mx51evk.h |6 +- include/configs/s5p_goni.h|4 + include/fsl_pmic.h|5 +- include/max8998_pmic.h| 84 + include/pmic.h| 71 ++ Logically I see your patchset split into 3 patches, but differently as you did: - adding pmic core driver - adding support for max8998 - adding pmic to the s5p_goni Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] misc:pmic New generic pmic driver
Am 26/09/2011 17:10, schrieb Lukasz Majewski:
This commit adds new PMIC core driver.
PMIC IC devices connected via I2C or SPI can be used.
Separate files: pmic_i2c.c and pmic_spi.c are responsible
for handling transmission specific files for I2C or SPI busses.
pmic_fsl.c and pmic_max8998.c are PMIC specific files. They define
pmic_init() method for early init.
New flags added:
CONFIG_PMIC - enable PMIC general device.
CONFIG_PMIC_I2C/SPI - specify the interface to be used.
CONFIG_PMIC_MAX8998/FSL - add routines specific for PMIC chip.
Signed-off-by: Lukasz Majewski l.majew...@samsung.com
Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com
Cc: Stefano Babic sba...@denx.de
Hi Lukasz,
+
+ if (!(i % 8))
+ printf(\n0x%02x: , i);
+
+ printf(%08x , val);
+ }
+ puts(\n);
+}
+
+
Drop the second newline-
+int pmic_init(void)
+{
+ struct pmic *p = get_pmic();
+ static const char name[] = FSL_PMIC;
+
+ puts(Board PMIC init\n);
This contains no info - you can drop or replace puts with debug().
+ p-hw.spi.bitlen = CONFIG_FSL_PMIC_BITLEN;
+ p-hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END;
+ p-hw.spi.prepare_tx = pmic_spi_prepare_tx;
+
+ return 0;
+}
Ok - I do not know if CONFIG_FSL_PMIC_BITLEN is really needed, but we
can leave it.
+int pmic_probe(struct pmic *p)
+{
+ i2c_set_bus_num(p-bus);
+ printf(PMIC:%s probed!\n, p-name);
Probably this comes from your testing - you can drop it or use debug()
+ if (i2c_probe(pmic_i2c_addr)) {
+ puts(Can't find max8998\n);
...and we have not always a max8998 !
+int pmic_init(void)
+{
+ struct pmic *p = get_pmic();
+ static const char name[] = MAX8998_PMIC;
+
+ puts(Board PMIC init\n);
Replace with debug()
diff --git a/drivers/misc/pmic_spi.c b/drivers/misc/pmic_spi.c
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 7d05dc8..bbc54f0 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
You can leave away the MX boards (and we have to change all of them or
none of them - there are also MX3 boards that can use the new code).
* MMC Configs
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 886c8be..aa51114 100644
Put changes to board configuration in a separate patch.
Best regards,
Stefano Babic
--
=
DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de
=
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/3] misc:pmic: Enable PMIC handling at u-boot startup code
Am 26/09/2011 17:10, schrieb Lukasz Majewski: The pmic_init() initialization handler has been added to board_init_r function. Signed-off-by: Lukasz Majewski l.majew...@samsung.com Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com Cc: Stefano Babic sba...@denx.de --- arch/arm/lib/board.c |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 85320bc..ea9e3d6 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -48,6 +48,7 @@ #include nand.h #include onenand_uboot.h #include mmc.h +#include pmic.h #ifdef CONFIG_BITBANGMII #include miiphy.h @@ -578,6 +579,10 @@ void board_init_r(gd_t *id, ulong dest_addr) copy_filename(BootFile, s, sizeof(BootFile)); #endif +#if defined(CONFIG_PMIC) + pmic_init(); +#endif + #ifdef BOARD_LATE_INIT board_late_init(); #endif I do not think this is correct. Only a few boards have a PMIC, and we put the initialization in the general code for all ARM. And we cannot decide *when* the PMIC must be initialized. Maybe a board requires some other parts (GPIO initialization,...) before accessing the PMIC. It is better to let the board maintainers to decide when to call this function. So simply drop this patch, and put the call to pmic_init() in your s5p_goni code. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] misc:pmic:mx: Code modification for mx51evk board
Am 26/09/2011 17:10, schrieb Lukasz Majewski: This is an example code for adjusting the mx51evk example board to new pmic_core driver. Signed-off-by: Lukasz Majewski l.majew...@samsung.com Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com Cc: Stefano Babic sba...@denx.de Thnaks for example. In the next version you do not need to repost this code. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] mx25: generic.c: Fix Codyng Style
Running checkpatch on arch/arm/cpu/arm926ejs/mx25/generic.c we get:
total: 2 errors, 59 warnings, 326 lines checked
Fix these errors and warnings.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
arch/arm/cpu/arm926ejs/mx25/generic.c | 110
1 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c
b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 8e60a26..c045a0b 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -39,7 +39,7 @@
* f = 2 * f_ref *
*pd + 1
*/
-static unsigned int imx_decode_pll (unsigned int pll, unsigned int f_ref)
+static unsigned int imx_decode_pll(unsigned int pll, unsigned int f_ref)
{
unsigned int mfi = (pll CCM_PLL_MFI_SHIFT)
CCM_PLL_MFI_MASK;
@@ -52,57 +52,57 @@ static unsigned int imx_decode_pll (unsigned int pll,
unsigned int f_ref)
mfi = mfi = 5 ? 5 : mfi;
- return lldiv (2 * (u64) f_ref * (mfi * (mfd + 1) + mfn),
+ return lldiv(2 * (u64) f_ref * (mfi * (mfd + 1) + mfn),
(mfd + 1) * (pd + 1));
}
-static ulong imx_get_mpllclk (void)
+static ulong imx_get_mpllclk(void)
{
struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
ulong fref = 2400;
- return imx_decode_pll (readl (ccm-mpctl), fref);
+ return imx_decode_pll(readl(ccm-mpctl), fref);
}
-ulong imx_get_armclk (void)
+ulong imx_get_armclk(void)
{
struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
- ulong cctl = readl (ccm-cctl);
- ulong fref = imx_get_mpllclk ();
+ ulong cctl = readl(ccm-cctl);
+ ulong fref = imx_get_mpllclk();
ulong div;
if (cctl CCM_CCTL_ARM_SRC)
- fref = lldiv ((fref * 3), 4);
+ fref = lldiv((fref * 3), 4);
div = ((cctl CCM_CCTL_ARM_DIV_SHIFT)
CCM_CCTL_ARM_DIV_MASK) + 1;
- return lldiv (fref, div);
+ return lldiv(fref, div);
}
-ulong imx_get_ahbclk (void)
+ulong imx_get_ahbclk(void)
{
struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
- ulong cctl = readl (ccm-cctl);
- ulong fref = imx_get_armclk ();
+ ulong cctl = readl(ccm-cctl);
+ ulong fref = imx_get_armclk();
ulong div;
div = ((cctl CCM_CCTL_AHB_DIV_SHIFT)
CCM_CCTL_AHB_DIV_MASK) + 1;
- return lldiv (fref, div);
+ return lldiv(fref, div);
}
-ulong imx_get_perclk (int clk)
+ulong imx_get_perclk(int clk)
{
struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
- ulong fref = imx_get_ahbclk ();
+ ulong fref = imx_get_ahbclk();
ulong div;
- div = readl (ccm-pcdr[CCM_PERCLK_REG (clk)]);
- div = ((div CCM_PERCLK_SHIFT (clk)) CCM_PERCLK_MASK) + 1;
+ div = readl(ccm-pcdr[CCM_PERCLK_REG(clk)]);
+ div = ((div CCM_PERCLK_SHIFT(clk)) CCM_PERCLK_MASK) + 1;
- return lldiv (fref, div);
+ return lldiv(fref, div);
}
u32 get_cpu_rev(void)
@@ -153,7 +153,7 @@ static char *get_reset_cause(void)
}
-int print_cpuinfo (void)
+int print_cpuinfo(void)
{
char buf[32];
u32 cpurev = get_cpu_rev();
@@ -161,22 +161,22 @@ int print_cpuinfo (void)
printf(CPU: Freescale i.MX25 rev%d.%d%s at %s MHz\n,
(cpurev 0xF0) 4, (cpurev 0x0F),
((cpurev 0x8000) ? unknown : ),
- strmhz (buf, imx_get_armclk ()));
+ strmhz(buf, imx_get_armclk()));
printf(Reset cause: %s\n\n, get_reset_cause());
return 0;
}
#endif
-int cpu_eth_init (bd_t * bis)
+int cpu_eth_init(bd_t *bis)
{
#if defined(CONFIG_FEC_MXC)
struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
ulong val;
- val = readl (ccm-cgr0);
+ val = readl(ccm-cgr0);
val |= (1 23);
- writel (val, ccm-cgr0);
- return fecmxc_initialize (bis);
+ writel(val, ccm-cgr0);
+ return fecmxc_initialize(bis);
#else
return 0;
#endif
@@ -186,10 +186,10 @@ int cpu_eth_init (bd_t * bis)
* Initializes on-chip MMC controllers.
* to override, implement board_mmc_init()
*/
-int cpu_mmc_init (bd_t * bis)
+int cpu_mmc_init(bd_t *bis)
{
#ifdef CONFIG_MXC_MMC
- return mxc_mmc_init (bis);
+ return mxc_mmc_init(bis);
#else
return 0;
#endif
@@ -206,7 +206,7 @@ void mx25_uart1_init_pins(void)
muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE;
padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE;
- muxmode0 = MX25_PIN_MUX_MODE (0);
+ muxmode0 = MX25_PIN_MUX_MODE(0);
/*
* set up input pins with hysteresis and 100K pull-ups
*/
@@ -227,25 +227,25 @@ void mx25_uart1_init_pins(void)
/* UART1 */
/* rxd */
- writel (muxmode0, muxctl-pad_uart1_rxd);
- writel (inpadctl, padctl-pad_uart1_rxd);
+
[U-Boot] [PATCH 2/2] mx25: timer.c: Fix Codyng Style
Running checkpatch on arch/arm/cpu/arm926ejs/mx25/timer.c we get:
total: 2 errors, 7 warnings, 182 lines checked
Fix these errors and warnings.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
arch/arm/cpu/arm926ejs/mx25/timer.c | 16
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/mx25/timer.c
b/arch/arm/cpu/arm926ejs/mx25/timer.c
index 5eb2747..1cfd02b 100644
--- a/arch/arm/cpu/arm926ejs/mx25/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx25/timer.c
@@ -15,7 +15,7 @@
*
* (C) Copyright 2009 DENX Software Engineering
* Author: John Rigby jri...@gmail.com
- * Add support for MX25
+ * Add support for MX25
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -43,8 +43,8 @@
DECLARE_GLOBAL_DATA_PTR;
-#define timestamp gd-tbl
-#define lastinc gd-lastinc
+#define timestamp (gd-tbl)
+#define lastinc(gd-lastinc)
/*
* time is measured in 1 / CONFIG_SYS_HZ seconds,
@@ -121,7 +121,7 @@ int timer_init(void)
return 0;
}
-unsigned long long get_ticks (void)
+unsigned long long get_ticks(void)
{
struct gpt_regs *gpt = (struct gpt_regs *)IMX_GPT1_BASE;
ulong now = readl(gpt-counter); /* current tick value */
@@ -140,7 +140,7 @@ unsigned long long get_ticks (void)
return timestamp;
}
-ulong get_timer_masked (void)
+ulong get_timer_masked(void)
{
/*
* get_ticks() returns a long long (64 bit), it wraps in
@@ -151,13 +151,13 @@ ulong get_timer_masked (void)
return tick_to_time(get_ticks());
}
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
{
- return get_timer_masked () - base;
+ return get_timer_masked() - base;
}
/* delay x useconds AND preserve advance timstamp value */
-void __udelay (unsigned long usec)
+void __udelay(unsigned long usec)
{
unsigned long long tmp;
ulong tmo;
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] mx25: reset.c: Fix Codyng Style
From: Fabio Estevam fabio.este...@freescale.com
Fix errors/warnings reported by checkpatch.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
arch/arm/cpu/arm926ejs/mx25/reset.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/mx25/reset.c
b/arch/arm/cpu/arm926ejs/mx25/reset.c
index 1a43683..e6f1056 100644
--- a/arch/arm/cpu/arm926ejs/mx25/reset.c
+++ b/arch/arm/cpu/arm926ejs/mx25/reset.c
@@ -39,7 +39,7 @@
/*
* Reset the cpu by setting up the watchdog timer and let it time out
*/
-void reset_cpu (ulong ignored)
+void reset_cpu(ulong ignored)
{
struct wdog_regs *regs = (struct wdog_regs *)IMX_WDT_BASE;
/* Disable watchdog and set Time-Out field to 0 */
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/3] mx27: generic.c: Fix Codyng Style
Fix warning reported by checkpatch.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
arch/arm/cpu/arm926ejs/mx27/generic.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c
b/arch/arm/cpu/arm926ejs/mx27/generic.c
index 222a8e9..33640ce 100644
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -153,7 +153,7 @@ ulong imx_get_perclk4(void)
}
#if defined(CONFIG_DISPLAY_CPUINFO)
-int print_cpuinfo (void)
+int print_cpuinfo(void)
{
char buf[32];
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/3] mx27: timer.c: Fix Codyng Style
Fix warnings reported by checkpatch.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
arch/arm/cpu/arm926ejs/mx27/timer.c | 14 +++---
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c
b/arch/arm/cpu/arm926ejs/mx27/timer.c
index df76d16..5af9359 100644
--- a/arch/arm/cpu/arm926ejs/mx27/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx27/timer.c
@@ -45,8 +45,8 @@
DECLARE_GLOBAL_DATA_PTR;
-#define timestamp gd-tbl
-#define lastinc gd-lastinc
+#define timestamp (gd-tbl)
+#define lastinc(gd-lastinc)
/*
* time is measured in 1 / CONFIG_SYS_HZ seconds,
@@ -124,7 +124,7 @@ int timer_init(void)
return 0;
}
-unsigned long long get_ticks (void)
+unsigned long long get_ticks(void)
{
struct gpt_regs *regs = (struct gpt_regs *)IMX_TIM1_BASE;
ulong now = readl(regs-gpt_tcn); /* current tick value */
@@ -143,7 +143,7 @@ unsigned long long get_ticks (void)
return timestamp;
}
-ulong get_timer_masked (void)
+ulong get_timer_masked(void)
{
/*
* get_ticks() returns a long long (64 bit), it wraps in
@@ -154,13 +154,13 @@ ulong get_timer_masked (void)
return tick_to_time(get_ticks());
}
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
{
- return get_timer_masked () - base;
+ return get_timer_masked() - base;
}
/* delay x useconds AND preserve advance timstamp value */
-void __udelay (unsigned long usec)
+void __udelay(unsigned long usec)
{
unsigned long long tmp;
ulong tmo;
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/3] mx27: reset.c: Fix Codyng Style
Fix warning reported by checkpatch.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
arch/arm/cpu/arm926ejs/mx27/reset.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/mx27/reset.c
b/arch/arm/cpu/arm926ejs/mx27/reset.c
index 6c54eaf..cc0a33e 100644
--- a/arch/arm/cpu/arm926ejs/mx27/reset.c
+++ b/arch/arm/cpu/arm926ejs/mx27/reset.c
@@ -39,7 +39,7 @@
/*
* Reset the cpu by setting up the watchdog timer and let it time out
*/
-void reset_cpu (ulong ignored)
+void reset_cpu(ulong ignored)
{
struct wdog_regs *regs = (struct wdog_regs *)IMX_WDT_BASE;
/* Disable watchdog and set Time-Out field to 0 */
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] mx35: generic.c: Fix Codyng Style
Fix warning reported by checkpatch. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- arch/arm/cpu/arm1136/mx35/generic.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c index fcfaba5..1b9809b 100644 --- a/arch/arm/cpu/arm1136/mx35/generic.c +++ b/arch/arm/cpu/arm1136/mx35/generic.c @@ -240,7 +240,7 @@ unsigned int mxc_get_main_clock(enum mxc_main_clocks clk) } break; case IPG_CLK: - ret_val = get_ipg_clk();; + ret_val = get_ipg_clk(); break; case IPG_PER_CLK: ret_val = get_ipg_per_clk(); -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] mx31: timer.c: Fix Codyng Style
Fix warnings/errors reported by checkpatch.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
arch/arm/cpu/arm1136/mx31/timer.c | 22 +-
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/arch/arm/cpu/arm1136/mx31/timer.c
b/arch/arm/cpu/arm1136/mx31/timer.c
index 717a2b7..d3a461e 100644
--- a/arch/arm/cpu/arm1136/mx31/timer.c
+++ b/arch/arm/cpu/arm1136/mx31/timer.c
@@ -43,7 +43,10 @@
DECLARE_GLOBAL_DATA_PTR;
-/* time is measured in 1 / CONFIG_SYS_HZ seconds, tick is internal timer
period */
+/* time is measured in 1 / CONFIG_SYS_HZ seconds,
+ * tick is internal timer period
+ */
+
#ifdef CONFIG_MX31_TIMER_HIGH_PRECISION
/* ~0.4% error - measured with stop-watch on 100s boot-delay */
static inline unsigned long long tick_to_time(unsigned long long tick)
@@ -68,7 +71,8 @@ static inline unsigned long long us_to_tick(unsigned long
long us)
}
#else
/* ~2% error */
-#define TICK_PER_TIME ((CONFIG_MX31_CLK32 + CONFIG_SYS_HZ / 2) /
CONFIG_SYS_HZ)
+#define TICK_PER_TIME ((CONFIG_MX31_CLK32 + CONFIG_SYS_HZ / 2) \
+ / CONFIG_SYS_HZ)
#define US_PER_TICK(100 / CONFIG_MX31_CLK32)
static inline unsigned long long tick_to_time(unsigned long long tick)
@@ -91,7 +95,7 @@ static inline unsigned long long us_to_tick(unsigned long
long us)
#endif
/* The 32768Hz 32-bit timer overruns in 131072 seconds */
-int timer_init (void)
+int timer_init(void)
{
int i;
@@ -106,7 +110,7 @@ int timer_init (void)
return 0;
}
-unsigned long long get_ticks (void)
+unsigned long long get_ticks(void)
{
ulong now = GPTCNT; /* current tick value */
@@ -119,7 +123,7 @@ unsigned long long get_ticks (void)
return gd-tbl;
}
-ulong get_timer_masked (void)
+ulong get_timer_masked(void)
{
/*
* get_ticks() returns a long long (64 bit), it wraps in
@@ -130,13 +134,13 @@ ulong get_timer_masked (void)
return tick_to_time(get_ticks());
}
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
{
- return get_timer_masked () - base;
+ return get_timer_masked() - base;
}
/* delay x useconds AND preserve advance timestamp value */
-void __udelay (unsigned long usec)
+void __udelay(unsigned long usec)
{
unsigned long long tmp;
ulong tmo;
@@ -148,7 +152,7 @@ void __udelay (unsigned long usec)
/*NOP*/;
}
-void reset_cpu (ulong addr)
+void reset_cpu(ulong addr)
{
struct wdog_regs *wdog = (struct wdog_regs *)WDOG_BASE;
wdog-wcr = WDOG_ENABLE;
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] mx5: soc.c: Fix Codyng Style
Do not declare extern in c files as pointed out by checkpatch.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
arch/arm/cpu/armv7/mx5/soc.c | 10 ++
arch/arm/include/asm/arch-mx5/sys_proto.h | 10 ++
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/arch/arm/cpu/armv7/mx5/soc.c b/arch/arm/cpu/armv7/mx5/soc.c
index c6106d5..cf12ba8 100644
--- a/arch/arm/cpu/armv7/mx5/soc.c
+++ b/arch/arm/cpu/armv7/mx5/soc.c
@@ -26,6 +26,8 @@
#include common.h
#include asm/arch/imx-regs.h
#include asm/arch/clock.h
+#include asm/arch/sys_proto.h
+
#include asm/errno.h
#include asm/io.h
@@ -117,14 +119,6 @@ int print_cpuinfo(void)
}
#endif
-/*
- * Initializes on-chip ethernet controllers.
- * to override, implement board_eth_init()
- */
-#if defined(CONFIG_FEC_MXC)
-extern int fecmxc_initialize(bd_t *bis);
-#endif
-
int cpu_eth_init(bd_t *bis)
{
int rc = -ENODEV;
diff --git a/arch/arm/include/asm/arch-mx5/sys_proto.h
b/arch/arm/include/asm/arch-mx5/sys_proto.h
index ce63675..789558e 100644
--- a/arch/arm/include/asm/arch-mx5/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx5/sys_proto.h
@@ -28,4 +28,14 @@ u32 get_cpu_rev(void);
#define is_soc_rev(rev)((get_cpu_rev() 0xFF) - rev)
void sdelay(unsigned long);
void set_chipselect_size(int const);
+
+/*
+ * Initializes on-chip ethernet controllers.
+ * to override, implement board_eth_init()
+ */
+#if defined(CONFIG_FEC_MXC)
+int fecmxc_initialize(bd_t *bis);
+
+#endif
+
#endif
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/7 V3] GCC4.6: Convert various empty macros to inline functions
Dear Marik, In message 1317058579-936-1-git-send-email-marek.va...@gmail.com you wrote: Fix the following gcc4.6 problems: cmd_date.c: In function `do_date´: cmd_date.c:50:6: warning: variable `old_bus´ set but not used [-Wunused-but-set-variable] asix.c: In function `asix_init´: asix.c:317:6: warning: variable `rx_ctl´ set but not used [-Wunused-but-set-variable] usb.c: In function `usb_parse_config´: usb.c:331:17: warning: variable `ch´ set but not used [-Wunused-but-set-variable] usb.c: In function `usb_hub_port_connect_change´: usb.c:1123:29: warning: variable `portchange´ set but not used [-Wunused-but-set-variable] usb.c: In function `usb_hub_configure´: usb.c:1183:25: warning: variable `hubsts´ set but not used [-Wunused-but-set-variable] usb_storage.c: In function `usb_stor_CB_reset´: usb_storage.c:466:6: warning: variable `result´ set but not used [-Wunused-but-set-variable] Signed-off-by: Marek Vasut marek.va...@gmail.com --- common/usb.c |4 ++-- common/usb_storage.c |2 +- include/common.h |4 ++-- include/i2c.h|5 - 4 files changed, 9 insertions(+), 6 deletions(-) Unforstunately this patch breaks a number of boards. Did you by chance forget to run MAKEALL on it? :-( Example: ./MAKEALL TQM823L Configuring for TQM823L board... tqm8xx_pcmcia.c: In function 'pcmcia_voltage_set': tqm8xx_pcmcia.c:265: error: 'pcmp' undeclared (first use in this function) tqm8xx_pcmcia.c:265: error: (Each undeclared identifier is reported only once tqm8xx_pcmcia.c:265: error: for each function it appears in.) make[1]: *** [/work/wd/tmp-ppc/drivers/pcmcia/tqm8xx_pcmcia.o] Error 1 make: *** [/work/wd/tmp-ppc/drivers/pcmcia/libpcmcia.o] Error 2 make: *** Waiting for unfinished jobs ppc_6xx-size: '/work/wd/tmp-ppc/u-boot': No such file ... 60ce53cf9f408d9ad721f8e7a87d6a564e6d5bac is the first bad commit commit 60ce53cf9f408d9ad721f8e7a87d6a564e6d5bac Author: Marek Vasut marek.va...@gmail.com Date: Mon Sep 26 19:36:19 2011 +0200 GCC4.6: Convert various empty macros to inline functions Please fix. Thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de The word fit, as I understand it, means appropriate to a purpose, and I would say the body of the Dean is supremely appropriate to the purpose of sitting around all day and eating big heavy meals. - Terry Pratchett, _Moving Pictures_ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/5] mx31ads: Fix Codying Style
Fix warning generated by checkpatch.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
board/freescale/mx31ads/mx31ads.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/board/freescale/mx31ads/mx31ads.c
b/board/freescale/mx31ads/mx31ads.c
index 4dd1e63..a8a9ddb 100644
--- a/board/freescale/mx31ads/mx31ads.c
+++ b/board/freescale/mx31ads/mx31ads.c
@@ -104,7 +104,7 @@ int board_init(void)
return 0;
}
-int checkboard (void)
+int checkboard(void)
{
printf(Board: MX31ADS\n);
return 0;
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/5] qong: Fix Codying Style
Fix warnings generated by checkpatch.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
board/davedenx/qong/qong.c | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/board/davedenx/qong/qong.c b/board/davedenx/qong/qong.c
index 99432ed..d362dab 100644
--- a/board/davedenx/qong/qong.c
+++ b/board/davedenx/qong/qong.c
@@ -41,7 +41,7 @@ void hw_watchdog_reset(void)
}
#endif
-int dram_init (void)
+int dram_init(void)
{
/* dram_init must store complete ramsize in gd-ram_size */
gd-ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
@@ -58,7 +58,7 @@ static void qong_fpga_reset(void)
udelay(300);
}
-int board_early_init_f (void)
+int board_early_init_f(void)
{
#ifdef CONFIG_QONG_FPGA
/* CS1: FPGA/Network Controller/GPIO */
@@ -141,7 +141,7 @@ int board_early_init_f (void)
}
-int board_init (void)
+int board_init(void)
{
/* Chip selects */
/* CS0: Nor Flash #0 - it must be init'ed when executing from DDR */
@@ -216,13 +216,13 @@ int board_late_init(void)
return 0;
}
-int checkboard (void)
+int checkboard(void)
{
printf(Board: DAVE/DENX Qong\n);
return 0;
}
-int misc_init_r (void)
+int misc_init_r(void)
{
#ifdef CONFIG_QONG_FPGA
u32 tmp;
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/5] tx25: Fix Codying Style
Fix warning generated by checkpatch.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
board/karo/tx25/tx25.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/board/karo/tx25/tx25.c b/board/karo/tx25/tx25.c
index 307ffd0..bbf12ec 100644
--- a/board/karo/tx25/tx25.c
+++ b/board/karo/tx25/tx25.c
@@ -157,7 +157,7 @@ int board_late_init(void)
return 0;
}
-int dram_init (void)
+int dram_init(void)
{
/* dram_init must store complete ramsize in gd-ram_size */
gd-ram_size = get_ram_size((void *)PHYS_SDRAM_1,
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 4/5] imx27lite: Fix Codying Style
Fix warnings generated by checkpatch.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
board/logicpd/imx27lite/imx27lite.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/board/logicpd/imx27lite/imx27lite.c
b/board/logicpd/imx27lite/imx27lite.c
index 2b273ac..8a5015c 100644
--- a/board/logicpd/imx27lite/imx27lite.c
+++ b/board/logicpd/imx27lite/imx27lite.c
@@ -26,7 +26,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int board_init (void)
+int board_init(void)
{
struct gpio_regs *regs = (struct gpio_regs *)IMX_GPIO_BASE;
#if defined(CONFIG_SYS_NAND_LARGEPAGE)
@@ -64,7 +64,7 @@ int board_init (void)
return 0;
}
-int dram_init (void)
+int dram_init(void)
{
/* dram_init must store complete ramsize in gd-ram_size */
gd-ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
@@ -86,7 +86,7 @@ void dram_init_banksize(void)
int checkboard(void)
{
- puts (Board: );
+ puts(Board: );
puts(CONFIG_BOARDNAME);
return 0;
}
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 5/5] imx31_litekit: Fix Codying Style
Fix warning generated by checkpatch.
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
board/logicpd/imx31_litekit/imx31_litekit.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/board/logicpd/imx31_litekit/imx31_litekit.c
b/board/logicpd/imx31_litekit/imx31_litekit.c
index 7214008..8393ccb 100644
--- a/board/logicpd/imx31_litekit/imx31_litekit.c
+++ b/board/logicpd/imx31_litekit/imx31_litekit.c
@@ -75,7 +75,7 @@ int board_init(void)
return 0;
}
-int checkboard (void)
+int checkboard(void)
{
printf(Board: i.MX31 Litekit\n);
return 0;
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/7 V3] GCC4.6: Convert various empty macros to inline functions
On Sunday, October 02, 2011 08:36:04 PM Wolfgang Denk wrote: Dear Marek, [...] Please fix. Hi Wolfgang, I have to admit I didn't test ppc boards. But by looking at the TQM pcmcia driver, the problem is in the driver itself. That's where I suspect it should be fixed. Can you share the list of broken boards you detected please ? Thanks! Cheers ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] mx25: generic.c: Fix Codyng Style
all of your patches have the typo: Codying - Coding also, please don't capitalize Fix Coding Style. it doesn't need to be. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Hallo
*Hallo meine lieben! Wie geht es Ihnen! hoffe, Sie sind fein und in einwandfreiem Zustand. Mein Name ist Susan und ich komme auf Ihre E-Mail hier während des Surfens und beschlossen, Ihnen für den Kontakt Freundschaft, weil ich für eine ehrliche Partner suchen Sie bitte, wenn du nichts dagegen hast, schreib mir wieder hier(susanbugib...@hotmail.com) so dass ich Ihnen mehr sagen wird, über mich und Bilder austauschen mit Ihnen zu warten auf Ihre Antwort bald kiss * *susan* *Hello my dear! how are you! hope you are fine and in perfect condition. my name is susan and i come across your email here while browsing and decided to contact you for friendship because i am looking for a honest partner please if you don't mind, write me back here (susanbugib...@hotmail.com) so that i will tell you more about myself and share pictures with you too waiting for your reply soon kiss susan* ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/4] punt !NET_MULTI legacy code
This fulfills the pending feature removal of the non-net multi code. At this point, only two net drivers and one board seem to still be using the !NET_MULTI code paths. So it's easy to scrub all of that. As for the rest, my MAKEALL run didn't seem to indicate there were any problems due to my changes, but there were so many failures over all, that it's hard to tell exactly. Mike Frysinger (4): net: drop !NET_MULTI bcm570x/tigon3 drivers net: drop !NET_MULTI ns7520 driver net: drop !NET_MULTI code board configs: drop NET_MULTI references README |8 +- api/api_net.c |4 - arch/arm/include/asm/arch-kirkwood/config.h |1 - arch/arm/lib/board.c|2 - arch/avr32/lib/board.c |2 - arch/m68k/lib/board.c |2 - arch/mips/lib/board.c |2 - arch/nios2/lib/board.c |2 - arch/powerpc/cpu/mpc8220/fec.c |3 +- arch/powerpc/cpu/mpc8260/ether_fcc.c|3 +- arch/powerpc/cpu/mpc8260/ether_scc.c|4 - arch/powerpc/cpu/mpc85xx/ether_fcc.c|3 +- arch/powerpc/cpu/ppc4xx/miiphy.c|7 +- arch/powerpc/include/asm/ppc4xx-emac.h |1 - arch/powerpc/lib/board.c|2 - arch/sparc/lib/board.c |2 - arch/x86/lib/board.c|2 - board/BuS/eb_cpux9k2/cpux9k2.c |2 - board/cm-bf537e/cm-bf537e.c |2 - board/cm-bf537u/cm-bf537u.c |2 - board/evb64260/eth.c|2 +- board/tcm-bf537/tcm-bf537.c |2 - doc/README.m53017evb|1 - doc/README.m5373evb |1 - doc/README.m54455evb|1 - doc/README.m5475evb |1 - doc/README.usb |1 - doc/feature-removal-schedule.txt| 19 - drivers/net/4xx_enet.c |4 - drivers/net/5701rls.c | 46 - drivers/net/5701rls.h | 198 - drivers/net/Makefile|7 - drivers/net/bcm570x.c | 1598 drivers/net/bcm570x_autoneg.c | 439 -- drivers/net/bcm570x_autoneg.h | 408 -- drivers/net/bcm570x_bits.h | 57 - drivers/net/bcm570x_debug.h | 109 - drivers/net/bcm570x_lm.h| 434 -- drivers/net/bcm570x_mm.h| 158 - drivers/net/bcm570x_queue.h | 387 -- drivers/net/mcfmii.c|4 +- drivers/net/mpc512x_fec.c |5 - drivers/net/ns7520_eth.c| 850 drivers/net/tigon3.c| 5697 --- drivers/net/tigon3.h| 3339 include/configs/A3000.h |1 - include/configs/ADCIOP.h|1 - include/configs/AP1000.h|1 - include/configs/APC405.h|1 - include/configs/AR405.h |1 - include/configs/ASH405.h|1 - include/configs/Alaska8220.h|1 - include/configs/BAB7xx.h|1 - include/configs/BC3450.h|1 - include/configs/BMW.h |5 +- include/configs/CATcenter.h |1 - include/configs/CMS700.h|1 - include/configs/CPC45.h |1 - include/configs/CPCI405.h |1 - include/configs/CPCI4052.h |1 - include/configs/CPCI405AB.h |1 - include/configs/CPCI405DT.h |1 - include/configs/CPCI750.h |1 - include/configs/CPCIISER4.h |1 - include/configs/CRAYL1.h|1 - include/configs/CU824.h |1 - include/configs/DASA_SIM.h |1 - include/configs/DB64360.h |1 - include/configs/DB64460.h |1 - include/configs/DU405.h |1 - include/configs/DU440.h |1 - include/configs/EB+MCF-EV123.h |1 - include/configs/ELPPC.h |1 - include/configs/EVB64260.h |1 - include/configs/EXBITGEN.h |1 - include/configs/G2000.h |1 - include/configs/HH405.h |1 - include/configs/HIDDEN_DRAGON.h |1 - include/configs/HUB405.h|1 - include/configs/IceCube.h |1 - include/configs/JSE.h |1 -
[U-Boot] [PATCH 2/4] net: drop !NET_MULTI ns7520 driver
This driver was never converted to NET_MULTI, and no board uses it.
So punt it and be done.
Signed-off-by: Mike Frysinger vap...@gentoo.org
---
drivers/net/Makefile |1 -
drivers/net/ns7520_eth.c | 850 --
include/ns7520_eth.h | 336 --
net/eth.c|4 -
4 files changed, 0 insertions(+), 1191 deletions(-)
delete mode 100644 drivers/net/ns7520_eth.c
delete mode 100644 include/ns7520_eth.h
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index a0e5dd7..7632745 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -61,7 +61,6 @@ COBJS-$(CONFIG_DRIVER_NE2000) += ne2000.o ne2000_base.o
COBJS-$(CONFIG_DRIVER_AX88796L) += ax88796.o ne2000_base.o
COBJS-$(CONFIG_DRIVER_NETARMETH) += netarm_eth.o
COBJS-$(CONFIG_NETCONSOLE) += netconsole.o
-COBJS-$(CONFIG_DRIVER_NS7520_ETHERNET) += ns7520_eth.o
COBJS-$(CONFIG_NS8382X) += ns8382x.o
COBJS-$(CONFIG_DRIVER_NS9750_ETHERNET) += ns9750_eth.o
COBJS-$(CONFIG_PCNET) += pcnet.o
diff --git a/drivers/net/ns7520_eth.c b/drivers/net/ns7520_eth.c
deleted file mode 100644
index de82b04..000
--- a/drivers/net/ns7520_eth.c
+++ /dev/null
@@ -1,850 +0,0 @@
-/***
- *
- * Copyright (C) 2005 by Videon Central, Inc.
- *
- * $Id$
- * @Author: Arthur Shipkowski
- * @Descr: Ethernet driver for the NS7520. Uses polled Ethernet, like
- * the older netarmeth driver. Note that attempting to filter
- * broadcast and multicast out in the SAFR register will cause
- * bad things due to released errata.
- * @References: [1] NS7520 Hardware Reference, December 2003
- * [2] Intel LXT971 Datasheet #249414 Rev. 02
- *
- ***/
-
-#include common.h
-
-#include net.h /* NetSendPacket */
-#include asm/arch/netarm_registers.h
-#include asm/arch/netarm_dma_module.h
-
-#include ns7520_eth.h/* for Ethernet and PHY */
-
-/**
- * Send an error message to the terminal.
- */
-#define ERROR(x) \
-do { \
- char *__foo = strrchr(__FILE__, '/'); \
- \
- printf(%s: %d: %s(): , (__foo == NULL ? __FILE__ : (__foo + 1)), \
- __LINE__, __FUNCTION__); \
- printf x; printf(\n); \
-} while (0);
-
-/* some definition to make transistion to linux easier */
-
-#define NS7520_DRIVER_NAME eth
-#define KERN_WARNING Warning:
-#define KERN_ERR Error:
-#define KERN_INFO Info:
-
-#if 1
-# define DEBUG
-#endif
-
-#ifdef DEBUG
-# define printkprintf
-
-# define DEBUG_INIT0x0001
-# define DEBUG_MINOR 0x0002
-# define DEBUG_RX 0x0004
-# define DEBUG_TX 0x0008
-# define DEBUG_INT 0x0010
-# define DEBUG_POLL0x0020
-# define DEBUG_LINK0x0040
-# define DEBUG_MII 0x0100
-# define DEBUG_MII_LOW 0x0200
-# define DEBUG_MEM 0x0400
-# define DEBUG_ERROR 0x4000
-# define DEBUG_ERROR_CRIT 0x8000
-
-static int nDebugLvl = DEBUG_ERROR_CRIT;
-
-# define DEBUG_ARGS0( FLG, a0 ) if( ( nDebugLvl (FLG) ) == (FLG) ) \
- printf(%s: a0, __FUNCTION__, 0, 0, 0, 0, 0, 0 )
-# define DEBUG_ARGS1( FLG, a0, a1 ) if( ( nDebugLvl (FLG) ) == (FLG)) \
- printf(%s: a0, __FUNCTION__, (int)(a1), 0, 0, 0, 0, 0 )
-# define DEBUG_ARGS2( FLG, a0, a1, a2 ) if( (nDebugLvl (FLG)) ==(FLG))\
- printf(%s: a0, __FUNCTION__, (int)(a1), (int)(a2), 0, 0,0,0 )
-# define DEBUG_ARGS3( FLG, a0, a1, a2, a3 ) if((nDebugLvl (FLG))==(FLG))\
- printf(%s:
a0,__FUNCTION__,(int)(a1),(int)(a2),(int)(a3),0,0,0)
-# define DEBUG_FN( FLG ) if( (nDebugLvl (FLG)) == (FLG) ) \
- printf(\r%s:line %d\n, (int)__FUNCTION__, __LINE__, 0,0,0,0);
-# define ASSERT( expr, func ) if( !( expr ) ) { \
- printf( Assertion failed! %s:line %d %s\n, \
- (int)__FUNCTION__,__LINE__,(int)(#expr),0,0,0); \
- func }
-#else /* DEBUG */
-# define printk(...)
-# define DEBUG_ARGS0( FLG, a0 )
-# define DEBUG_ARGS1( FLG, a0, a1 )
-# define DEBUG_ARGS2( FLG, a0, a1, a2 )
-# define DEBUG_ARGS3( FLG, a0, a1, a2, a3 )
-# define DEBUG_FN( n )
-# define ASSERT(expr, func)
-#endif /* DEBUG */
-
-#define NS7520_MII_NEG_DELAY (5*CONFIG_SYS_HZ) /* in s */
-#define TX_TIMEOUT (5*CONFIG_SYS_HZ) /* in s */
-#define RX_STALL_WORKAROUND_CNT 100
-
-static int ns7520_eth_reset(void);
-
-static void ns7520_link_auto_negotiate(void);
-static void ns7520_link_update_egcr(void);
-static void ns7520_link_print_changed(void);
-
-/* the PHY stuff */
-
-static char ns7520_mii_identify_phy(void);
-static unsigned short ns7520_mii_read(unsigned short uiRegister);
-static void ns7520_mii_write(unsigned short
[U-Boot] [PATCH 3/4] net: drop !NET_MULTI code
This is long over due. All but two net drivers have been converted, but
those have now been dropped.
The only thing left to do is actually delete all references to NET_MULTI
and code that is compiled when that is not defined. So here we scrub the
core code.
Signed-off-by: Mike Frysinger vap...@gentoo.org
---
README |8 ++---
api/api_net.c |4 --
arch/arm/lib/board.c |2 -
arch/avr32/lib/board.c |2 -
arch/m68k/lib/board.c |2 -
arch/mips/lib/board.c |2 -
arch/nios2/lib/board.c |2 -
arch/powerpc/cpu/mpc8220/fec.c |3 +-
arch/powerpc/cpu/mpc8260/ether_fcc.c |3 +-
arch/powerpc/cpu/mpc8260/ether_scc.c |4 --
arch/powerpc/cpu/mpc85xx/ether_fcc.c |3 +-
arch/powerpc/cpu/ppc4xx/miiphy.c |7 ++--
arch/powerpc/include/asm/ppc4xx-emac.h |1 -
arch/powerpc/lib/board.c |2 -
arch/sparc/lib/board.c |2 -
arch/x86/lib/board.c |2 -
board/BuS/eb_cpux9k2/cpux9k2.c |2 -
board/cm-bf537e/cm-bf537e.c|2 -
board/cm-bf537u/cm-bf537u.c|2 -
board/evb64260/eth.c |2 +-
board/tcm-bf537/tcm-bf537.c|2 -
doc/README.m53017evb |1 -
doc/README.m5373evb|1 -
doc/README.m54455evb |1 -
doc/README.m5475evb|1 -
doc/README.usb |1 -
doc/feature-removal-schedule.txt | 19
drivers/net/4xx_enet.c |4 --
drivers/net/mcfmii.c |4 +-
drivers/net/mpc512x_fec.c |5 ---
include/net.h | 40 --
net/eth.c | 49 +++
net/net.c | 30 ---
net/nfs.c |2 -
net/tftp.c |4 --
35 files changed, 23 insertions(+), 198 deletions(-)
diff --git a/README b/README
index a43da97..c3717be 100644
--- a/README
+++ b/README
@@ -3460,12 +3460,10 @@ List of environment variables (most likely not
complete):
bootstopkey - see CONFIG_AUTOBOOT_STOP_STR
- ethprime - When CONFIG_NET_MULTI is enabled controls which
- interface is used first.
+ ethprime - controls which interface is used first.
- ethact - When CONFIG_NET_MULTI is enabled controls which
- interface is currently active. For example you
- can do the following
+ ethact - controls which interface is currently active.
+ For example you can do the following
= setenv ethact FEC
= ping 192.168.0.1 # traffic sent on FEC
diff --git a/api/api_net.c b/api/api_net.c
index afe072e..cd80ea5 100644
--- a/api/api_net.c
+++ b/api/api_net.c
@@ -34,10 +34,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define DEBUG
#undef DEBUG
-#if !defined(CONFIG_NET_MULTI)
-#error API/net is currently only available for platforms with
CONFIG_NET_MULTI
-#endif
-
#ifdef DEBUG
#define debugf(fmt, args...) do { printf(%s(): , __func__); printf(fmt,
##args); } while (0)
#else
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 85320bc..85d86ee 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -586,9 +586,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
bb_miiphy_init();
#endif
#if defined(CONFIG_CMD_NET)
-#if defined(CONFIG_NET_MULTI)
puts(Net: );
-#endif
eth_initialize(gd-bd);
#if defined(CONFIG_RESET_PHY_R)
debug(Reset Ethernet PHY\n);
diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c
index 65473a1..3e1cc0d 100644
--- a/arch/avr32/lib/board.c
+++ b/arch/avr32/lib/board.c
@@ -330,9 +330,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
s = getenv(bootfile);
if (s)
copy_filename(BootFile, s, sizeof(BootFile));
-#if defined(CONFIG_NET_MULTI)
puts(Net: );
-#endif
eth_initialize(gd-bd);
#endif
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index 1df50f1..b9ccb64 100644
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -606,11 +606,9 @@ void board_init_r (gd_t *id, ulong dest_addr)
#if defined(FEC_ENET)
eth_init(bd);
#endif
-#if defined(CONFIG_NET_MULTI)
puts (Net: );
eth_initialize (bd);
#endif
-#endif
#ifdef CONFIG_POST
post_run (NULL, POST_RAM | post_bootmode_get(0));
diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
index 4f85bbd..cc75d3f 100644
--- a/arch/mips/lib/board.c
+++ b/arch/mips/lib/board.c
@@ -372,9 +372,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
bb_miiphy_init();
#endif
#if defined(CONFIG_CMD_NET)
-#if defined(CONFIG_NET_MULTI)
[U-Boot] [PATCH] serial: pl01x: drain PL01x FIFO before baudrate change
Not draining the FIFO and waiting for the UART to be non-busy
before changing baudrate results in crap characters on the
console, so let's wait for the FIFO to drain and the last
character to be clocked out before we do that.
Signed-off-by: Linus Walleij linus.wall...@linaro.org
---
drivers/serial/serial_pl01x.c | 10 ++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 7a064ff..ed581ae 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -194,7 +194,17 @@ int serial_tstc (void)
void serial_setbrg (void)
{
+ struct pl01x_regs *regs = pl01x_get_regs(CONSOLE_PORT);
+
baudrate = gd-baudrate;
+ /*
+* Flush FIFO and wait for non-busy before changing baudrate to avoid
+* crap in console
+*/
+ while (!(readl(regs-fr) UART_PL01x_FR_TXFE))
+ WATCHDOG_RESET();
+ while (readl(regs-fr) UART_PL01x_FR_BUSY)
+ WATCHDOG_RESET();
serial_init();
}
--
1.7.6.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/7 V3] GCC4.6: Convert various empty macros to inline functions
On Sunday, October 02, 2011 09:08:52 PM Marek Vasut wrote: On Sunday, October 02, 2011 08:36:04 PM Wolfgang Denk wrote: Dear Marek, [...] Please fix. Hi Wolfgang, I have to admit I didn't test ppc boards. But by looking at the TQM pcmcia driver, the problem is in the driver itself. That's where I suspect it should be fixed. Can you share the list of broken boards you detected please ? Hi, I'm running the compile tests for powerpc arch right now and I noticed many problems of this form: Configuring for PCIPPC2 board... interrupts.c: In function 'interrupt_init_cpu': interrupts.c:38: warning: implicit declaration of function 'GTREGREAD' interrupts.c:38: error: 'LOW_INTERRUPT_CAUSE_REGISTER' undeclared (first use in this function) interrupts.c:38: error: (Each undeclared identifier is reported only once interrupts.c:38: error: for each function it appears in.) interrupts.c:39: error: 'HIGH_INTERRUPT_CAUSE_REGISTER' undeclared (first use in this function) interrupts.c:41: error: 'ETHERNET0_INTERRUPT_CAUSE_REGISTER' undeclared (first use in this function) interrupts.c:42: error: 'ETHERNET1_INTERRUPT_CAUSE_REGISTER' undeclared (first use in this function) interrupts.c:43: error: 'ETHERNET2_INTERRUPT_CAUSE_REGISTER' undeclared (first use in this function) interrupts.c:45: error: 'ETHERNET0_INTERRUPT_MASK_REGISTER' undeclared (first use in this function) interrupts.c:46: error: 'ETHERNET1_INTERRUPT_MASK_REGISTER' undeclared (first use in this function) interrupts.c:47: error: 'ETHERNET2_INTERRUPT_MASK_REGISTER' undeclared (first use in this function) make[1]: *** [interrupts.o] Error 1 make: *** [arch/powerpc/cpu/74xx_7xx/lib74xx_7xx.o] Error 2 make: *** Waiting for unfinished jobs powerpc-linux-size: './u-boot': No such file This seems like noone actually tested compiling those boards with DEBUG enabled ... ever. Anyway, there seems to be an easy fix, add the following into the config file: #ifndef __ASSEMBLY__ #include galileo/core.h #endif There is a catch I don't quite understand though, that is, some boards include board/Marvell/include/mv_gen_reg.h instead. Which should be included in those config files? Is there some way to tell please? = As for the tqm-pcmcia problem, removing the #ifdef DEBUG fixed the problem with no growth in the u-boot.bin size. Though u-boot (elf binary) grew a bit (tested with ELDK4.2, gcc 4.2.2): With no gcc4.6 patches and unfixed: Configuring for TQM823L board... textdata bss dec hex filename 260523 13960 25704 300187 4949b ./u-boot - SUMMARY Boards compiled: 1 -- [u-boot]$ ls -la u-boot.bin -rwxrwxr-x 1 user user 274568 Oct 3 00:10 u-boot.bin With gcc4.6 patches and removed #ifdef DEBUG: Configuring for TQM823L board... textdata bss dec hex filename 260547 13960 25704 300211 494b3 ./u-boot - SUMMARY Boards compiled: 1 -- [u-boot]$ ls -la u-boot.bin -rwxrwxr-x 1 user user 274568 Oct 3 00:11 u-boot.bin Cheers ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/8] Fix PPC issues introduced by debug() macro change
From: Marek Vasut ma...@pollux.denx.de Due to the conversion of debug() macro to inline function, the type-checking happens even if DEBUG isn't defined. This made a few problems surface. These fixes here address the ones found so far. Marek Vasut (8): PPC: Fix tqm8xx_pcmcia.c by removing condition around pcmp PPC: Fix mem_to_mem_idma2intr.c by renaming debug to mmdebug PPC: Fix i82365.c by removing ifdef around buf PPC: Fix relative path in galileo/core.h PPC: Fix pd67290.c by removing ifdef around buf PPC: Fix eepro100_eeprom.c by renaming debug to eedebug PPC: Fix fsl_upm.c by renaming nand handling functions PPC: Remove #ifdef DEBUG around step_to_string arch/powerpc/cpu/mpc8xxx/ddr/main.c|2 -- board/cpc45/pd67290.c |2 -- drivers/mtd/nand/fsl_upm.c | 16 drivers/pcmcia/i82365.c|2 -- drivers/pcmcia/tqm8xx_pcmcia.c |2 -- examples/standalone/eepro100_eeprom.c | 10 +- examples/standalone/mem_to_mem_idma2intr.c |4 ++-- include/galileo/core.h |2 +- 8 files changed, 16 insertions(+), 24 deletions(-) -- 1.7.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/8] PPC: Fix tqm8xx_pcmcia.c by removing condition around pcmp
From: Marek Vasut ma...@pollux.denx.de
This fix has no impact on u-boot.bin size (tested with ELDK 4.2).
Signed-off-by: Marek Vasut marek.va...@gmail.com
---
drivers/pcmcia/tqm8xx_pcmcia.c |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/pcmcia/tqm8xx_pcmcia.c b/drivers/pcmcia/tqm8xx_pcmcia.c
index ca1a9fe..2e997dd 100644
--- a/drivers/pcmcia/tqm8xx_pcmcia.c
+++ b/drivers/pcmcia/tqm8xx_pcmcia.c
@@ -227,10 +227,8 @@ int pcmcia_voltage_set(int slot, int vcc, int vpp)
{
#ifndef CONFIG_NSCU
u_long reg;
-# ifdef DEBUG
volatile pcmconf8xx_t *pcmp =
(pcmconf8xx_t *)immap_t *)CONFIG_SYS_IMMR)-im_pcmcia));
-# endif
debug (voltage_set: PCMCIA_BOARD_MSG
Slot %c, Vcc=%d.%d, Vpp=%d.%d\n,
--
1.7.6.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 8/8] PPC: Remove #ifdef DEBUG around step_to_string
From: Marek Vasut ma...@pollux.denx.de
This fixes a type-checking issue.
The growth of u-boot.bin isn't measurable here as the resulting
binary is always 512k big. But the u-boot executable is 500 bytes
bigger.
Signed-off-by: Marek Vasut ma...@pollux.denx.de
---
arch/powerpc/cpu/mpc8xxx/ddr/main.c |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/main.c
b/arch/powerpc/cpu/mpc8xxx/ddr/main.c
index 249fd7d..eb70535 100644
--- a/arch/powerpc/cpu/mpc8xxx/ddr/main.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/main.c
@@ -132,7 +132,6 @@ void fsl_ddr_get_spd(generic_spd_eeprom_t *ctrl_dimms_spd,
* | interleaving
*/
-#ifdef DEBUG
const char *step_string_tbl[] = {
STEP_GET_SPD,
STEP_COMPUTE_DIMM_PARMS,
@@ -153,7 +152,6 @@ const char * step_to_string(unsigned int step) {
return step_string_tbl[s];
}
-#endif
int step_assign_addresses(fsl_ddr_info_t *pinfo,
unsigned int dbw_cap_adj[],
--
1.7.6.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 5/8] PPC: Fix pd67290.c by removing ifdef around buf
From: Marek Vasut ma...@pollux.denx.de
As the buf is cleared at runtime, this might introduce a slight overhead.
Signed-off-by: Marek Vasut marek.va...@gmail.com
---
board/cpc45/pd67290.c |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/board/cpc45/pd67290.c b/board/cpc45/pd67290.c
index 0d8ef23..96d7289 100644
--- a/board/cpc45/pd67290.c
+++ b/board/cpc45/pd67290.c
@@ -225,11 +225,9 @@ static u_int cirrus_set_opts (socket_info_t * s)
{
cirrus_state_t *p = s-c_state;
u_int mask = 0x;
-#if DEBUG
char buf[200];
memset (buf, 0, 200);
-#endif
if (has_ring == -1)
has_ring = 1;
--
1.7.6.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 6/8] PPC: Fix eepro100_eeprom.c by renaming debug to eedebug
From: Marek Vasut ma...@pollux.denx.de
Also, squash a warning about initialized static data.
Signed-off-by: Marek Vasut marek.va...@gmail.com
---
examples/standalone/eepro100_eeprom.c | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/standalone/eepro100_eeprom.c
b/examples/standalone/eepro100_eeprom.c
index 3c7f380..889ab55 100644
--- a/examples/standalone/eepro100_eeprom.c
+++ b/examples/standalone/eepro100_eeprom.c
@@ -59,7 +59,7 @@ static unsigned short eeprom[256];
static int eeprom_size = 64;
static int eeprom_addr_size = 6;
-static int debug = 0;
+static int eedebug;
static inline unsigned short swap16(unsigned short x)
{
@@ -123,7 +123,7 @@ static int do_eeprom_cmd(long ioaddr, int cmd, int cmd_len)
unsigned retval = 0;
long ee_addr = ioaddr + EE_OFFSET;
- if (debug 1)
+ if (eedebug 1)
printf( EEPROM op 0x%x: , cmd);
outw(EE_ENB | EE_SHIFT_CLK, ee_addr);
@@ -133,7 +133,7 @@ static int do_eeprom_cmd(long ioaddr, int cmd, int cmd_len)
short dataval = (cmd (1 cmd_len)) ? EE_WRITE_1 :
EE_WRITE_0;
outw(dataval, ee_addr);
eeprom_delay(ee_addr);
- if (debug 2)
+ if (eedebug 2)
printf(%X, inw(ee_addr) 15);
outw(dataval | EE_SHIFT_CLK, ee_addr);
eeprom_delay(ee_addr);
@@ -144,7 +144,7 @@ static int do_eeprom_cmd(long ioaddr, int cmd, int cmd_len)
#endif
/* Terminate the EEPROM access. */
outw(EE_ENB ~EE_CS, ee_addr);
- if (debug 1)
+ if (eedebug 1)
printf( EEPROM result is 0x%5.5x.\n, retval);
return retval;
}
@@ -170,7 +170,7 @@ static void write_eeprom(long ioaddr, int index, int value,
int addr_len)
3 + addr_len + 16);
/* Poll for write finished. */
i = eeprom_busy_poll(ee_ioaddr);/* Typical 2000
ticks */
- if (debug)
+ if (eedebug)
printf( Write finished after %d ticks.\n, i);
/* Disable programming. This command is not instantaneous, so we check
for busy before the next op. */
--
1.7.6.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 4/8] PPC: Fix relative path in galileo/core.h
From: Marek Vasut ma...@pollux.denx.de Change #include gt64260R.h to #include galileo/gt64260R.h Signed-off-by: Marek Vasut ma...@pollux.denx.de --- include/galileo/core.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/galileo/core.h b/include/galileo/core.h index c277509..eee0cce 100644 --- a/include/galileo/core.h +++ b/include/galileo/core.h @@ -13,7 +13,7 @@ space). The macros take care of Big/Little endian conversions. #define __INCcoreh /* includes */ -#include gt64260R.h +#include galileo/gt64260R.h extern unsigned int INTERNAL_REG_BASE_ADDR; -- 1.7.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/8] PPC: Fix mem_to_mem_idma2intr.c by renaming debug to mmdebug
From: Marek Vasut ma...@pollux.denx.de
Also, squash a checkpatch warning in if(debug != 0) part.
Signed-off-by: Marek Vasut marek.va...@gmail.com
---
examples/standalone/mem_to_mem_idma2intr.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/standalone/mem_to_mem_idma2intr.c
b/examples/standalone/mem_to_mem_idma2intr.c
index d0a75ea..8a986d3 100644
--- a/examples/standalone/mem_to_mem_idma2intr.c
+++ b/examples/standalone/mem_to_mem_idma2intr.c
@@ -44,10 +44,10 @@ DECLARE_GLOBAL_DATA_PTR;
}
#endif /* STANDALONE */
-static int debug = 1;
+static int mmdebug = 1;
#define DEBUG(fmt, args...) { \
- if(debug != 0) {\
+ if (mmdebug != 0) { \
printf([%s %d %s]: ,__FILE__,__LINE__,__FUNCTION__); \
printf(fmt, ##args);\
} \
--
1.7.6.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 7/8] PPC: Fix fsl_upm.c by renaming nand handling functions
From: Marek Vasut ma...@pollux.denx.de
This avoids colision with nand subsystem's functions.
Signed-off-by: Marek Vasut marek.va...@gmail.com
Cc: Scott Wood scottw...@freescale.com
---
drivers/mtd/nand/fsl_upm.c | 16
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index c33e278..31c174b 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -124,14 +124,14 @@ static void fun_cmd_ctrl(struct mtd_info *mtd, int cmd,
unsigned int ctrl)
fun_wait(fun);
}
-static u8 nand_read_byte(struct mtd_info *mtd)
+static u8 upm_nand_read_byte(struct mtd_info *mtd)
{
struct nand_chip *chip = mtd-priv;
return in_8(chip-IO_ADDR_R);
}
-static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
+static void upm_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int
len)
{
int i;
struct nand_chip *chip = mtd-priv;
@@ -147,7 +147,7 @@ static void nand_write_buf(struct mtd_info *mtd, const
u_char *buf, int len)
fun_wait(fun);
}
-static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+static void upm_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
{
int i;
struct nand_chip *chip = mtd-priv;
@@ -156,7 +156,7 @@ static void nand_read_buf(struct mtd_info *mtd, u_char
*buf, int len)
buf[i] = in_8(chip-IO_ADDR_R);
}
-static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
+static int upm_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int
len)
{
int i;
struct nand_chip *chip = mtd-priv;
@@ -191,10 +191,10 @@ int fsl_upm_nand_init(struct nand_chip *chip, struct
fsl_upm_nand *fun)
#if CONFIG_SYS_NAND_MAX_CHIPS 1
chip-select_chip = fun_select_chip;
#endif
- chip-read_byte = nand_read_byte;
- chip-read_buf = nand_read_buf;
- chip-write_buf = nand_write_buf;
- chip-verify_buf = nand_verify_buf;
+ chip-read_byte = upm_nand_read_byte;
+ chip-read_buf = upm_nand_read_buf;
+ chip-write_buf = upm_nand_write_buf;
+ chip-verify_buf = upm_nand_verify_buf;
if (fun-dev_ready)
chip-dev_ready = nand_dev_ready;
--
1.7.6.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH] arm: provide a CONFIG flag for disabling relocation
Hi Albert, On Sat, Oct 1, 2011 at 12:01 AM, Albert ARIBAUD albert.u.b...@aribaud.net wrote: Hi Simon, Le 23/09/2011 18:04, Simon Glass a écrit : Are you looking for CONFIG_SYS_SKIP_ARM_RELOCATION? I think Anthony is only fixing couple of issues uncovered by the original 'skip relocation' patch but I don't think CONFIG_SYS_SKIP_ARM_RELOCATION itself is getting accepted. I see. That is sad, because skipping relocation is very useful for development. Why do we make things harder for devs than they need to be? There is at least a possibility to avoid relocation without introducing the CONFIG_SYS_SKIP_ARM_RELOCATION flag; set CONFIG_SKIP_LOWLEVEL_INIT and adjust CONFIG_SYS_TEXT_BASE to be the base address where your code will be located. It is a two-round process (you need a first run with the 'wrong' CONFIG_SYS_TEXT_BASE in order to find its 'right' value) and will work only for a given board variant (same available RAM amount always) but might be enough to cover the use case(s) you are looking for? In other words, still relocation, but we 'know' where it will relocate to after it does its maths. It works, but it's a little brittle, and I would prefer a simple option to disable relocation for devs. I keep such a patch around for when I am using an ICE. Is the concern that people might use it in their boards? Should be easy enough to refuse patches which do include it. Regards, Simon Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] Tegra2: Add support for Toradex Colibri T20 board
Hi Marek,
On Fri, Sep 30, 2011 at 5:12 PM, Marek Vasut marek.va...@gmail.com wrote:
Signed-off-by: Marek Vasut marek.va...@gmail.com
Cc: Simon Glass s...@chromium.org
Cc: Ben Warren biggerbadder...@gmail.com
Cc: Tom Warren twarren.nvi...@gmail.com
Cc: Stephen Warren swar...@nvidia.com
---
MAINTAINERS | 1 +
board/toradex/colibri_t20/Makefile | 49 +
board/toradex/colibri_t20/colibri_t20.c | 119 ++
boards.cfg | 1 +
include/configs/colibri_t20.h | 162
+++
5 files changed, 332 insertions(+), 0 deletions(-)
create mode 100644 board/toradex/colibri_t20/Makefile
create mode 100644 board/toradex/colibri_t20/colibri_t20.c
create mode 100644 include/configs/colibri_t20.h
Btw. is that a pure coincidence that there are three Warrens maintaining
Tegras?
Or are you guys some kind of Warren-brothers ? ;-)
diff --git a/MAINTAINERS b/MAINTAINERS
index c10996c..db7d85a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -853,6 +853,7 @@ Marek Vasut marek.va...@gmail.com
zipitz2 xscale/pxa
efikamx i.MX51
efikasb i.MX51
+ colibri_t20 Tegra2 (ARM7 A9 Dual Core)
Hugo Villeneuve hugo.villene...@lyrtech.com
diff --git a/board/toradex/colibri_t20/Makefile
b/board/toradex/colibri_t20/Makefile
new file mode 100644
index 000..5002dd5
--- /dev/null
+++ b/board/toradex/colibri_t20/Makefile
@@ -0,0 +1,49 @@
+#
+# (C) Copyright 2000, 2001, 2002
+# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB = $(obj)lib$(BOARD).o
+
+COBJS := colibri_t20.o
+
+SRCS := $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+
+$(LIB): $(obj).depend $(OBJS)
+ $(call cmd_link_o_target, $(OBJS))
+
+clean:
+ rm -f $(OBJS)
+
+distclean: clean
+ rm -f $(LIB) core *.bak $(obj).depend
+
+#
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#
diff --git a/board/toradex/colibri_t20/colibri_t20.c
b/board/toradex/colibri_t20/colibri_t20.c
new file mode 100644
index 000..4945888
--- /dev/null
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -0,0 +1,119 @@
+/*
+ * Toradex Colibri T20 Board Support
+ *
+ * Copyright (C) 2011 Marek Vasut marek.va...@gmail.com
+ *
+ * Based on code:
+ *
+ * Copyright (C) 2011 Ant Micro www.antmicro.com
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include common.h
+#include ns16550.h
+#include asm/io.h
+#include asm/arch/tegra2.h
+#include asm/arch/sys_proto.h
+
+#include asm/arch/clk_rst.h
+#include asm/arch/clock.h
+#include asm/arch/pinmux.h
+#include asm/arch/uart.h
+
+DECLARE_GLOBAL_DATA_PTR;
+
+const struct tegra2_sysinfo sysinfo = {
+ CONFIG_TEGRA2_BOARD_STRING
+};
+
+int timer_init(void)
+{
+ return 0;
+}
+
+static void uart_init(void)
+{
+ struct clk_rst_ctlr *clkrst = (struct clk_rst_ctlr
*)NV_PA_CLK_RST_BASE;
+ struct clk_pll *pll = clkrst-crc_pll[CLOCK_PLL_ID_PERIPH];
+ uint32_t reg;
+
+ reg = readl(pll-pll_base);
+ if
Re: [U-Boot] [PATCH v8] dreamplug: initial board support.
-Original Message- From: Jason Cooper [mailto:u-b...@lakedaemon.net] Sent: Monday, September 19, 2011 12:37 AM To: w...@denx.de Cc: u-boot@lists.denx.de; albert.u.b...@aribaud.net; Prafulla Wadaskar; u-b...@lakedaemon.net Subject: [PATCH v8] dreamplug: initial board support. Copied wholeheartedly from board/Marvell/guruplug and modified to add support for SPI NOR flash. CONFIG_MACH_DREAMPLUG defined in include/configs/dreamplug.h until Linus's kernel.org tree adds it to mach-types.h. Once it trickles down, the definition can be removed from include/configs/dreamplug.h. Signed-off-by: Jason Cooper u-b...@lakedaemon.net --- Changes from v1 to v2: - resorted series to move 'make all' support last. Changes from v2 to v3: - Use MACH_TYPE_GURUPLUG for now until dreamplug support is in Linux. - Update MAINTAINERS. - Collapse into one patch. Changes from v3 to v4: - update copyright info as recommended by Prafulla Wadaskar. - maintain proper order in boards.cfg, MAINTAINERS, etc. - label MPP's - change back to MACH_TYPE_DREAMPLUG. This patch is just RFC until the Dreamplug is supported in Linux (and MACH_TYPE_ added). Changes from v4 to v5: - Complete rewrite due to receiving u-boot source indirectly from Global Scale Tech. - Added driver for integrated RTC. (thx GST!) - Added support for displaying CPU frequencies at boot. (thx GST!) - Adjust USB timeout to handle dreamplug EHCI chipset. - Cleaned up MPP registers based on Global Scale code. (thx GST!) - broke out MACH_TYPE_DREAMPLUG changes since it's going to be a while until the Linux arm tree gets sorted and accepts new boards again. Since all Dreamplugs currently on the market set r1 to MACH_TYPE_GURUPLUG, this allows the board to be added to u-boot while waiting for Linux mainline. Once it's in Linux mainline, then the last patch can be integrated to use MACH_TYPE_DREAMPLUG. Changes from v5 to v6: - Define MACH_TYPE_DREAMPLUG in includes/configs/dreamplug.h until Linus's kernel.org tree includes assigned machine id. This is on Wolfgang's recommendation [1]. - Removed dcache disabling as it is no longer enabled by default. - USB timeout fix was merged. - Marvell Integrated RTC was merged. - Dropped CPU frequency printout as I'm not familiar enough with all flavors of kirkwood SoCs to do it correctly. - Labelled MPP*_GPIO pins that are broken out as gpio pins for the user. - Fixed function name mv_phy_88e1121_init() - mv_phy_88e1116_init(). Changes from v6 to v7: - Use CONFIG_MACH_TYPE in dreamplug.c and define it to MACH_TYPE_DREAMPLUG in include/configs/dreamplug.h Changes from v7 to v8: - #error MACH_TYPE_DREAMPLUG once it is defined in mach-types.h. On Albert Aribaud's recommendation. [1] http://www.mail-archive.com/u-boot@lists.denx.de/msg60921.html MAINTAINERS |4 + board/Marvell/dreamplug/Makefile | 54 board/Marvell/dreamplug/dreamplug.c | 151 +++ board/Marvell/dreamplug/dreamplug.h | 42 +++ board/Marvell/dreamplug/kwbimage.cfg | 163 + boards.cfg|1 + include/configs/dreamplug.h | 151 +++ 7 files changed, 566 insertions(+), 0 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/kirkwood/asm-offsets.s create mode 100644 board/Marvell/dreamplug/Makefile create mode 100644 board/Marvell/dreamplug/dreamplug.c create mode 100644 board/Marvell/dreamplug/dreamplug.h create mode 100644 board/Marvell/dreamplug/kwbimage.cfg create mode 100644 include/configs/dreamplug.h Applied to u-boot-marvell.git master branch Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 3/4] Armada100: Add SPI flash support for Marvell gplugD
-Original Message- From: Ajay Bhargav [mailto:ajay.bhar...@einfochips.com] Sent: Wednesday, September 21, 2011 12:31 PM To: Prafulla Wadaskar Cc: u-boot@lists.denx.de; marek.va...@gmail.com; vap...@gentoo.org; Ajay Bhargav Subject: [PATCH v2 3/4] Armada100: Add SPI flash support for Marvell gplugD This patch enables Atmel AT45 SPI flash support for Marvell gplugD Enables SF commands. Signed-off-by: Ajay Bhargav ajay.bhar...@einfochips.com --- Changes for v2: - Not changed include/configs/gplugd.h |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 527a0c8..260a1dc 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -96,6 +96,10 @@ #define CONFIG_ENV_SPI_CS110 #define CONFIG_SYS_SSP_PORT 2 +/* Flash Support */ +#define CONFIG_CMD_SF +#define CONFIG_SPI_FLASH_ATMEL + /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros -- Applied to u-boot-marvell.git master branch Regards.. Prafulla . . 1.7.0.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 4/4] Armada100: Add env storage support for Marvell gplugD
-Original Message- From: Ajay Bhargav [mailto:ajay.bhar...@einfochips.com] Sent: Wednesday, September 21, 2011 12:31 PM To: Prafulla Wadaskar Cc: u-boot@lists.denx.de; marek.va...@gmail.com; vap...@gentoo.org; Ajay Bhargav Subject: [PATCH v2 4/4] Armada100: Add env storage support for Marvell gplugD This patch adds support for envrionment varaible storage in SPI flash for Marvell gplugD. Signed-off-by: Ajay Bhargav ajay.bhar...@einfochips.com --- Changes for v2: - Not changed include/configs/gplugd.h | 10 -- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 260a1dc..8905df8 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -116,7 +116,13 @@ /* * Environment variables configurations */ -#define CONFIG_ENV_IS_NOWHERE1 /* if env in SDRAM */ -#define CONFIG_ENV_SIZE 0x2 /* 64k */ +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_SECT_SIZE 0x4000 +#define CONFIG_ENV_SIZE 0x4000 +#define CONFIG_ENV_OFFSET0x07C000 + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_EDITENV +#define CONFIG_CMD_SAVEENV #endif /* __CONFIG_GPLUGD_H */ -- 1.7.0.4 Applied to u-boot-marvell.git master branch Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 3/4] Armada100: Add SPI flash support for Marvell gplugD
-Original Message- From: Ajay Bhargav [mailto:ajay.bhar...@einfochips.com] Sent: Wednesday, September 21, 2011 12:31 PM To: Prafulla Wadaskar Cc: u-boot@lists.denx.de; marek.va...@gmail.com; vap...@gentoo.org; Ajay Bhargav Subject: [PATCH v2 3/4] Armada100: Add SPI flash support for Marvell gplugD This patch enables Atmel AT45 SPI flash support for Marvell gplugD Enables SF commands. Signed-off-by: Ajay Bhargav ajay.bhar...@einfochips.com --- Changes for v2: - Not changed include/configs/gplugd.h |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 527a0c8..260a1dc 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -96,6 +96,10 @@ #define CONFIG_ENV_SPI_CS110 #define CONFIG_SYS_SSP_PORT 2 +/* Flash Support */ +#define CONFIG_CMD_SF +#define CONFIG_SPI_FLASH_ATMEL + /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros -- 1.7.0.4 Applied to u-boot-marvell.git master branch Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/4] SPI: Add SPI driver support for Marvell Armada100
-Original Message- From: Ajay Bhargav [mailto:ajay.bhar...@einfochips.com] Sent: Wednesday, September 21, 2011 12:31 PM To: Prafulla Wadaskar Cc: u-boot@lists.denx.de; marek.va...@gmail.com; vap...@gentoo.org; Ajay Bhargav Subject: [PATCH v2 1/4] SPI: Add SPI driver support for Marvell Armada100 This patch provides support for SPI emulated over SSP for Marvell Armada100 SOC. Signed-off-by: Ajay Bhargav ajay.bhar...@einfochips.com --- Changes for v2: - Code cleanup arch/arm/include/asm/arch-armada100/spi.h | 95 drivers/spi/Makefile |1 + drivers/spi/armada100_spi.c | 228 + 3 files changed, 324 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/spi.h create mode 100644 drivers/spi/armada100_spi.c Applied to u-boot-marvell.git master branch Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH v2 02/20] Fix use of int as pointer in image.c
On Monday, September 26, 2011 12:51:42 Simon Glass wrote: Thanks - quick question: I want to move this from RFC to normal patch in the next version - should I start at version 3 or version 1 for the header? just keep upreving the ver number -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH v2 0/20] New 'sandbox' test architecture for U-Boot
On Monday, September 26, 2011 20:07:34 Simon Glass wrote: On Sun, Sep 25, 2011 at 9:59 PM, Mike Frysinger wrote: On Friday, September 23, 2011 12:22:02 Simon Glass wrote: This patch set points towards a possible way to improve the test infrastructure in U-Boot. The goal is to have a test suite that can run in a minute or two on a Linux PC and test all non-platform code. do you have this in a public git tree ? No I don't sorry. The Chromium tree is a bit behind master so if I push there I will create a flood of commits. Is there an easy way to create a branch on the U-Boot server? If not, I will figure something out. if you don't have a dedicated tree already, then i don't think so. easiest thing after that is probably just to push your own branch to the u-boot repo on git.chromium.org. you can push stuff directly to that without going through gerrit right ? -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 01/21] sandbox: Add architecture header files
On Monday, September 26, 2011 20:10:35 Simon Glass wrote: --- a/include/linux/string.h +++ b/include/linux/string.h @@ -1,6 +1,8 @@ #ifndef _LINUX_STRING_H_ #define _LINUX_STRING_H_ +#include linux/string.h + #include linux/types.h /* for size_t */ #include linux/stddef.h/* for NULL */ hmm, this can't be right ... -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
