summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hemp <c.hemp@phytec.de>2013-07-26 14:43:04 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-03-26 21:07:53 +0100
commite237fb57df918121030d407812b8e0dc0cff44f2 (patch)
tree8930c28634c32fb51882aa85c290da224f3f486c
parentd36eae3c0f21acaf0127987be4fb3475a0e88032 (diff)
downloadbarebox-e237fb57df918121030d407812b8e0dc0cff44f2.tar.gz
barebox-e237fb57df918121030d407812b8e0dc0cff44f2.tar.xz
ARM: pfla02: add 4GB version
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
-rw-r--r--arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg2
-rw-r--r--arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg2
-rw-r--r--arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-4gib.imxcfg6
-rw-r--r--arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h2
-rw-r--r--arch/arm/boards/phytec-phyflex-imx6/lowlevel.c15
-rw-r--r--images/Makefile.imx6
6 files changed, 30 insertions, 3 deletions
diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg
index 524ebca580..d73207c364 100644
--- a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg
+++ b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg
@@ -1,5 +1,5 @@
-#define SETUP_1GIB_2GIB \
+#define SETUP_1GIB_2GIB_4GIB \
wm 32 0x021b0040 0x00000017; \
wm 32 0x021b0000 0xc21a0000
diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg
index bf6e0ab26b..2291b71e8c 100644
--- a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg
+++ b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg
@@ -1,5 +1,5 @@
-#define SETUP_1GIB_2GIB \
+#define SETUP_1GIB_2GIB_4GIB \
wm 32 0x021b0040 0x00000027; \
wm 32 0x021b0000 0xC31A0000
diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-4gib.imxcfg b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-4gib.imxcfg
new file mode 100644
index 0000000000..c6dc775d8f
--- /dev/null
+++ b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-4gib.imxcfg
@@ -0,0 +1,6 @@
+
+#define SETUP_1GIB_2GIB_4GIB \
+ wm 32 0x021b0040 0x00000047; \
+ wm 32 0x021b0000 0xC41A0000
+
+#include "flash-header-phytec-pfla02.h"
diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h
index b90f7cb3cf..138ae36ee3 100644
--- a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h
+++ b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h
@@ -60,7 +60,7 @@ wm 32 0x021b0030 0x005b0e21
wm 32 0x021b0008 0x09444040
wm 32 0x021b0004 0x00025576
-SETUP_1GIB_2GIB
+SETUP_1GIB_2GIB_4GIB
wm 32 0x021b001c 0x04088032
wm 32 0x021b001c 0x0408803a
diff --git a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
index 6422bc4dcb..c0b0c875b7 100644
--- a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
@@ -86,3 +86,18 @@ ENTRY_FUNCTION(start_phytec_pbab01_2gib, r0, r1, r2)
barebox_arm_entry(0x10000000, SZ_2G, fdt);
}
+
+ENTRY_FUNCTION(start_phytec_pbab01_4gib, r0, r1, r2)
+{
+ uint32_t fdt;
+
+ __barebox_arm_head();
+
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(0x00920000 - 8);
+
+ fdt = (uint32_t)__dtb_imx6q_phytec_pbab01_start - get_runtime_offset();
+
+ barebox_arm_entry(0x10000000, 0xEFFFFFF8, fdt);
+}
diff --git a/images/Makefile.imx b/images/Makefile.imx
index 5b650de69b..29cec4345e 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -82,6 +82,12 @@ CFG_start_imx6q_mba6x.pblx.imximg = $(board)/tqma6x/flash-header-tqma6q.imxcfg
FILE_barebox-tq-tqma6q-mba6x.img = start_imx6q_mba6x.pblx.imximg
image-$(CONFIG_MACH_TQMA6X) += barebox-tq-tqma6q-mba6x.img
+pblx-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_pbab01_4gib
+CFG_start_phytec_pbab01_4gib.pblx.imximg = $(board)/phytec-phyflex-imx6/flash-header-phytec-pfla02-4gib.imxcfg
+imximage-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_pbab01_4gib.pblx.imximg
+FILE_barebox-phytec-pbab01-4gib.img = start_phytec_pbab01_4gib.pblx.imximg
+image-$(CONFIG_MACH_PHYTEC_PFLA02) += barebox-phytec-pbab01-4gib.img
+
pblx-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_pbab01_2gib
CFG_start_phytec_pbab01_2gib.pblx.imximg = $(board)/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg
FILE_barebox-phytec-pbab01-2gib.img = start_phytec_pbab01_2gib.pblx.imximg