summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-06-28 17:51:13 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-06-28 17:51:13 +0200
commite6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c (patch)
treefb7b4ca068bf10217d28af5c33e7a0a9c9961c6a /board
parent9dc8fef2583f23ca6a99c6f5e709a8b80018364f (diff)
parentd6c6d127c5b948ec381fad5b24a2bc5497720644 (diff)
downloadu-boot-imx-e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c.zip
u-boot-imx-e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c.tar.gz
u-boot-imx-e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c.tar.bz2
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'board')
-rw-r--r--board/denx/m28evk/README13
-rw-r--r--board/freescale/mx28evk/README46
-rw-r--r--board/freescale/mx6sabresd/Makefile (renamed from board/freescale/mx6qsabresd/Makefile)2
-rw-r--r--board/freescale/mx6sabresd/mx6sabresd.c (renamed from board/freescale/mx6qsabresd/mx6qsabresd.c)7
-rw-r--r--board/wandboard/README5
-rw-r--r--board/wandboard/wandboard.c2
6 files changed, 68 insertions, 7 deletions
diff --git a/board/denx/m28evk/README b/board/denx/m28evk/README
new file mode 100644
index 0000000..cb3ae20
--- /dev/null
+++ b/board/denx/m28evk/README
@@ -0,0 +1,13 @@
+DENX M28EVK
+===========
+
+Files of the M28/M28EVK port
+----------------------------
+
+arch/arm/cpu/arm926ejs/mxs/ - The CPU support code for the Freescale i.MX28
+arch/arm/include/asm/arch-mxs/ - Header files for the Freescale i.MX28
+board/denx/m28evk/ - M28EVK board specific files
+include/configs/m28evk.h - M28EVK configuration file
+
+Follow the instructions from doc/README.mxs to generate a bootable SD card or to
+boot from NAND flash.
diff --git a/board/freescale/mx28evk/README b/board/freescale/mx28evk/README
new file mode 100644
index 0000000..524f3fc
--- /dev/null
+++ b/board/freescale/mx28evk/README
@@ -0,0 +1,46 @@
+FREESCALE MX28EVK
+==================
+
+Supported hardware: only MX28EVK rev D is supported in U-boot.
+
+Files of the MX28EVK port
+--------------------------
+
+arch/arm/cpu/arm926ejs/mxs/ - The CPU support code for the Freescale i.MX28
+arch/arm/include/asm/arch-mxs/ - Header files for the Freescale i.MX28
+board/freescale/mx28evk/ - MX28EVK board specific files
+include/configs/mx28evk.h - MX28EVK configuration file
+
+Jumper configuration
+---------------------
+
+To boot MX28EVK from an SD card, set the boot mode DIP switches as:
+
+ * Boot Mode Select: 1 0 0 1 (Boot from SD card Slot 0 - U42)
+ * JTAG PSWITCH RESET: To the right (reset disabled)
+ * Battery Source: Down
+ * Wall 5V: Up
+ * VDD 5V: To the left (off)
+ * Hold Button: Down (off)
+
+
+Environment Storage
+-------------------
+
+There are two targets for mx28evk:
+
+"make mx28evk_config" - store enviroment variables into MMC
+
+or
+
+"make mx28evk_nand_config" - store enviroment variables into NAND flash
+
+Choose the target accordingly.
+
+Note: The mx28evk board does not come with a NAND flash populated from the
+factory. It comes with an empty slot (U23), which allows the insertion of a
+48-pin TSOP flash device.
+
+Follow the instructions from doc/README.mxs to generate a bootable SD card.
+
+Insert the SD card in slot 0, power up the board and U-boot will boot.
diff --git a/board/freescale/mx6qsabresd/Makefile b/board/freescale/mx6sabresd/Makefile
index 5693772..ff3c94b 100644
--- a/board/freescale/mx6qsabresd/Makefile
+++ b/board/freescale/mx6sabresd/Makefile
@@ -23,7 +23,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).o
-COBJS := mx6qsabresd.o
+COBJS := mx6sabresd.o
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/board/freescale/mx6qsabresd/mx6qsabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 2529826..222ee98 100644
--- a/board/freescale/mx6qsabresd/mx6qsabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -17,12 +17,10 @@
* GNU General Public License for more details.
*/
-#include <common.h>
-#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>
-#include <asm/arch/mx6q_pins.h>
+#include <asm/arch/mx6-pins.h>
#include <asm/errno.h>
#include <asm/gpio.h>
#include <asm/imx-common/iomux-v3.h>
@@ -291,7 +289,6 @@ int board_late_init(void)
int checkboard(void)
{
- puts("Board: MX6Q-SabreSD\n");
-
+ puts("Board: MX6-SabreSD\n");
return 0;
}
diff --git a/board/wandboard/README b/board/wandboard/README
index ce83bbe..498db2f 100644
--- a/board/wandboard/README
+++ b/board/wandboard/README
@@ -22,6 +22,11 @@ To build U-Boot for the Wandboard Solo version:
$ make wandboard_solo_config
$ make
+To build U-Boot for the Wandboard Quad version:
+
+$ make wandboard_quad_config
+$ make
+
Flashing U-boot into the SD card
--------------------------------
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 5666cbf..43c02ac 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- gd->ram_size = CONFIG_DDR_MB * SZ_1M;
+ gd->ram_size = (phys_size_t)CONFIG_DDR_MB * 1024 * 1024;
return 0;
}