[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-212-g47596b7
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-212-g47596b7
|
From: jorasse <jo...@us...> - 2014-04-08 14:05:36
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 47596b76c6e7450cf14186df04fd23886497e6a2 (commit)
from 334fdb2001931dc138069c7c08942a80831def77 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 47596b76c6e7450cf14186df04fd23886497e6a2
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 8 16:04:58 2014 +0200
[UBOOT] 2014.04: add apf28 patchwork
-----------------------------------------------------------------------
Summary of changes:
.../u-boot/2014.04/501-imx28-update-and-fix.patch | 60 ++++++
.../{2013.04 => 2014.04}/502-add-apf28.patch | 216 ++++----------------
2 files changed, 101 insertions(+), 175 deletions(-)
create mode 100644 patches/u-boot/2014.04/501-imx28-update-and-fix.patch
copy patches/u-boot/{2013.04 => 2014.04}/502-add-apf28.patch (81%)
diff --git a/patches/u-boot/2014.04/501-imx28-update-and-fix.patch b/patches/u-boot/2014.04/501-imx28-update-and-fix.patch
new file mode 100644
index 0000000..5c128b4
--- /dev/null
+++ b/patches/u-boot/2014.04/501-imx28-update-and-fix.patch
@@ -0,0 +1,60 @@
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Philippe Reynes <tr...@ya...>
+---
+ arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd | 4 ++--
+ common/memsize.c | 2 ++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
+index c60615a..f533ad0 100644
+--- a/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
++++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
+@@ -8,7 +8,7 @@ section (0) {
+ load ivt (entry = 0x0014) > 0x8000;
+ hab call 0x8000;
+
+- load u_boot > 0x40000100;
+- load ivt (entry = 0x40000100) > 0x8000;
++ load u_boot > 0x40000000;
++ load ivt (entry = 0x40000000) > 0x8000;
+ hab call 0x8000;
+ }
+--- a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
++++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
+@@ -3,6 +3,6 @@ SECTION 0x0 BOOTABLE
+ LOAD 0x0 OBJTREE/spl/u-boot-spl.bin
+ LOAD IVT 0x8000 0x14
+ CALL HAB 0x8000 0x0
+- LOAD 0x40000100 OBJTREE/u-boot.bin
+- LOAD IVT 0x8000 0x40000100
++ LOAD 0x40000000 OBJTREE/u-boot.bin
++ LOAD IVT 0x8000 0x40000000
+ CALL HAB 0x8000 0x0
+--- a/include/configs/mxs.h
++++ b/include/configs/mxs.h
+@@ -81,7 +81,9 @@
+ * strange BUG in ROM corrupting first 4 bytes of RAM when loading U-Boot
+ * binary. In case there was more of this mess, 0x100 bytes are skipped.
+ */
++#ifndef CONFIG_SYS_TEXT_BASE
+ #define CONFIG_SYS_TEXT_BASE 0x40000100
++#endif
+
+ /* U-Boot general configuration */
+ #define CONFIG_SYS_LONGHELP
+diff --git a/common/memsize.c b/common/memsize.c
+index 963e4f3..a9f76bc 100644
+--- a/common/memsize.c
++++ b/common/memsize.c
+@@ -61,6 +61,8 @@ long get_ram_size(long *base, long maxsize)
+ return (0);
+ }
+
++ sync();
++ *addr = save[i];
+ for (cnt = 1; cnt < maxsize / sizeof (long); cnt <<= 1) {
+ addr = base + cnt; /* pointer arith! */
+ val = *addr;
+--
+1.7.2.5
+
diff --git a/patches/u-boot/2013.04/502-add-apf28.patch b/patches/u-boot/2014.04/502-add-apf28.patch
similarity index 81%
copy from patches/u-boot/2013.04/502-add-apf28.patch
copy to patches/u-boot/2014.04/502-add-apf28.patch
index 3bac862..912b16d 100644
--- a/patches/u-boot/2013.04/502-add-apf28.patch
+++ b/patches/u-boot/2014.04/502-add-apf28.patch
@@ -19,87 +19,34 @@ new file mode 100644
index 0000000..029e58d
--- /dev/null
+++ b/board/armadeus/apf28/Makefile
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,13 @@
+#
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd...@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
++# SPDX-License-Identifier: GPL-2.0+
+#
+
-+include $(TOPDIR)/config.mk
-+
-+LIB = $(obj)lib$(BOARD).o
-+
+ifndef CONFIG_SPL_BUILD
-+COBJS-$(CONFIG_IMX_OCOTP) += cmd_ocotp.o
-+COBJS := $(COBJS-y) mx28_bcb.o apf28.o
++obj-y := mx28_bcb.o apf28.o
++obj-$(CONFIG_IMX_OCOTP) += cmd_ocotp.o
+else
-+COBJS := spl_boot.o
++obj-y := spl_boot.o
+endif
-+
-+SRCS := $(COBJS:.o=.c)
-+OBJS := $(addprefix $(obj),$(COBJS))
-+
-+$(LIB): $(obj).depend $(OBJS)
-+ $(call cmd_link_o_target, $(OBJS))
-+
-+all: $(ALL)
-+
-+#########################################################################
-+
-+# defines $(obj).depend target
-+include $(SRCTREE)/rules.mk
-+
-+sinclude $(obj).depend
-+
-+#########################################################################
diff --git a/board/armadeus/apf28/apf28.c b/board/armadeus/apf28/apf28.c
new file mode 100644
index 0000000..7f75494
--- /dev/null
+++ b/board/armadeus/apf28/apf28.c
-@@ -0,0 +1,176 @@
+@@ -0,0 +1,130 @@
+/*
+ * APF28 motherboard based on DENX M28 module
+ *
-+ * Copyright (C) 2012-2013 Eric Jarrige <eri...@ar...>
++ * Copyright (C) 2012-2014 Eric Jarrige <eri...@ar...>
+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
+ * on behalf of DENX Software Engineering GmbH
+ *
-+ * 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
++ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
@@ -172,30 +119,16 @@ index 0000000..7f75494
+#endif
+
+#ifdef CONFIG_CMD_NET
-+
-+#define MII_OPMODE_STRAP_OVERRIDE 0x16
-+#define MII_PHY_CTRL1 0x1e
-+#define MII_PHY_CTRL2 0x1f
-+
-+int fecmxc_mii_postcall(int phy)
-+{
-+ miiphy_write("FEC0", phy, MII_BMCR, 0x9000);
-+ miiphy_write("FEC0", phy, MII_OPMODE_STRAP_OVERRIDE, 0x0202);
-+ if (phy == 3)
-+ miiphy_write("FEC0", 3, MII_PHY_CTRL2, 0x8180);
-+ return 0;
-+}
-+
+int board_eth_init(bd_t *bis)
+{
-+#define STR_ENV_ETHADDR "ethaddr"
+ struct mxs_clkctrl_regs *clkctrl_regs =
+ (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
+ struct eth_device *dev;
-+ uchar eth_addr[6];
+ int ret;
+
+ ret = cpu_eth_init(bis);
++ if (ret)
++ return ret;
+
+ /* uses ENET_CLK PAD to drive FEC clock */
+ writel(CLKCTRL_ENET_TIME_SEL_RMII_CLK | CLKCTRL_ENET_CLK_OUT_EN,
@@ -217,21 +150,6 @@ index 0000000..7f75494
+ return -EINVAL;
+ }
+
-+ ret = fecmxc_register_mii_postcall(dev, fecmxc_mii_postcall);
-+ if (ret) {
-+ printf("FEC MXS: Unable to register FEC0 mii postcall\n");
-+ return ret;
-+ }
-+
-+ if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
-+ if (dev) {
-+ eth_setenv_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
-+ } else {
-+ printf("FEC APF28: Couldn't get eth device\n");
-+ ret = -1;
-+ }
-+ }
-+
+ return ret;
+}
+
@@ -250,34 +168,17 @@ index 0000000..7f75494
+ mac[5] += 1;
+}
+#endif
-+
+#endif
diff --git a/board/armadeus/apf28/cmd_ocotp.c b/board/armadeus/apf28/cmd_ocotp.c
new file mode 100644
index 0000000..2efae8d
--- /dev/null
+++ b/board/armadeus/apf28/cmd_ocotp.c
-@@ -0,0 +1,269 @@
+@@ -0,0 +1,253 @@
+/*
-+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
++ * Copyright (C) 2012-2014 Eric Jarrige <eri...@ar...>
+ *
-+ * 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
++ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <linux/types.h>
@@ -289,14 +190,14 @@ index 0000000..2efae8d
+
+#define MXS_OCOTP_MAX_TIMEOUT 1000000
+
-+static struct mx28_ocotp_regs *ocotp_regs =
-+ (struct mx28_ocotp_regs *)IMX_OCOTP_BASE;
++static struct mxs_ocotp_regs *ocotp_regs =
++ (struct mxs_ocotp_regs *)MXS_OCOTP_BASE;
+
+int otp_error(void)
+{
+ u32 otpctrl;
+
-+ if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
++ if (mxs_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
+ MXS_OCOTP_MAX_TIMEOUT)) {
+ printf("OCOTP still busy after timeout\n");
+ return -1;
@@ -333,7 +234,7 @@ index 0000000..2efae8d
+
+ writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_set);
+
-+ if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
++ if (mxs_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
+ MXS_OCOTP_MAX_TIMEOUT)) {
+ printf("OCOTP Busy: Can't open OCOTP bank\n");
+ return val;
@@ -350,10 +251,10 @@ index 0000000..2efae8d
+{
+ u32 hbus, clkseq, vddio;
+ int err = 0;
-+ struct mx28_clkctrl_regs *clkctrl_regs =
-+ (struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
-+ struct mx28_power_regs *power_regs =
-+ (struct mx28_power_regs *)MXS_POWER_BASE;
++ struct mxs_clkctrl_regs *clkctrl_regs =
++ (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
++ struct mxs_power_regs *power_regs =
++ (struct mxs_power_regs *)MXS_POWER_BASE;
+
+ if ((addr < 0) || (addr > 0x27)) {
+ printf("Invalid address! (should be between 0 and 0x27)\n");
@@ -532,35 +433,16 @@ new file mode 100644
index 0000000..2be032c
--- /dev/null
+++ b/board/armadeus/apf28/mx28_bcb.c
-@@ -0,0 +1,559 @@
+@@ -0,0 +1,540 @@
+/*
+ * i.MX28 NANDÂ Boot Control Blocks generator
+ *
-+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
++ * Copyright (C) 2012-2014 Eric Jarrige <eri...@ar...>
+ *
+ * Based on code from mxsboot:
+ * Freescale i.MX28 image generator
+ *
-+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
-+ * on behalf of DENX Software Engineering GmbH
-+ *
-+ * 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
++ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <asm/io.h>
@@ -946,7 +828,7 @@ index 0000000..2be032c
+ .oobbuf = (u8 *)fcbblock + nand->writesize,
+ .len = nand->writesize,
+ .ooblen = nand->oobsize,
-+ .mode = MTD_OOB_RAW
++ .mode = MTD_OPS_RAW
+ };
+
+ printf("Writing FCB...\n");
@@ -954,7 +836,7 @@ index 0000000..2be032c
+ for (i = 0; i < stride_pages * stride_count;
+ i += stride_pages) {
+ offset = i * nand->writesize;
-+ ret = nand->write_oob(nand, offset, &ops);
++ ret = nand->_write_oob(nand, offset, &ops);
+ }
+ }
+ free(fcbblock);
@@ -983,14 +865,14 @@ index 0000000..2be032c
+ .oobbuf = (u8 *)dbbt + nand->writesize,
+ .len = nand->writesize,
+ .ooblen = nand->oobsize,
-+ .mode = MTD_OOB_RAW
++ .mode = MTD_OPS_RAW
+ };
+
+ printf("Writing DBBT...\n");
+
+ for (; i < 2 * stride_pages * stride_count; i += stride_pages) {
+ offset = i * nand->writesize;
-+ ret = nand->write_oob(nand, offset, &ops);
++ ret = nand->_write_oob(nand, offset, &ops);
+ }
+
+ }
@@ -1097,31 +979,15 @@ new file mode 100644
index 0000000..9854cda
--- /dev/null
+++ b/board/armadeus/apf28/spl_boot.c
-@@ -0,0 +1,206 @@
+@@ -0,0 +1,190 @@
+/*
+ * Freescale i.MX28 Boot setup for the APF28 board
+ *
-+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
++ * Copyright (C) 2012-2014 Eric Jarrige <eri...@ar...>
+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
+ * on behalf of DENX Software Engineering GmbH
+ *
-+ * 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
++ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
@@ -1291,7 +1157,7 @@ index 0000000..9854cda
+ *dram_vals++ = apf28_dram_vals[i];
+}
+
-+void board_init_ll(void)
++void board_init_ll(const uint32_t arg, const uint32_t *resptr)
+{
+ struct mxs_clkctrl_regs *clkctrl_regs =
+ (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
@@ -1301,20 +1167,20 @@ index 0000000..9854cda
+ setbits_le32(&clkctrl_regs->hw_clkctrl_reset,
+ CLKCTRL_RESET_WDOG_POR_DISABLE);
+
-+ mxs_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
++ mxs_common_spl_init(arg, resptr, iomux_setup, ARRAY_SIZE(iomux_setup));
+}
+
diff --git a/boards.cfg b/boards.cfg
index 1aa7e95..f3c8b40 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -198,6 +198,7 @@ zmx25 arm arm926ejs zmx25 syteco
- mx23_olinuxino arm arm926ejs mx23_olinuxino olimex mxs mx23_olinuxino
- apx4devkit arm arm926ejs apx4devkit bluegiga mxs apx4devkit
- mx23evk arm arm926ejs mx23evk freescale mxs mx23evk
-+apf28 arm arm926ejs - armadeus mxs
- m28evk arm arm926ejs m28evk denx mxs m28evk
- mx28evk arm arm926ejs mx28evk freescale mxs mx28evk:ENV_IS_IN_MMC
- mx28evk_nand arm arm926ejs mx28evk freescale mxs mx28evk:ENV_IS_IN_NAND--
+@@ -210,6 +210,7 @@ Active arm arm926ejs mx27
+ Active arm arm926ejs mx27 logicpd imx27lite magnesium - Heiko Schocher <hs...@de...>
+ Active arm arm926ejs mxs bluegiga apx4devkit apx4devkit - Lauri Hintsala <lau...@bl...>
+ Active arm arm926ejs mxs creative xfi3 xfi3 - Marek Vasut <mar...@gm...>
++Active arm arm926ejs mxs armadeus apf28 apf28 - Eric Jarrige <eri...@ar...>
+ Active arm arm926ejs mxs denx m28evk m28evk - Marek Vasut <mar...@gm...>
+ Active arm arm926ejs mxs freescale mx23evk mx23evk - Otavio Salvador <ot...@os...>
+ Active arm arm926ejs mxs freescale mx28evk mx28evk mx28evk:ENV_IS_IN_MMC Fabio Estevam <fab...@fr...>
1.7.2.5
hooks/post-receive
--
armadeus
|
