summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2014-12-23 19:21:53 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-01-05 11:37:43 +0100
commit94ed83afa45ca76914a0834cf1481ada3b4bd163 (patch)
treeb0e4d5f3747b9c09d15ec055813c52c41f58c448 /arch
parent5804e287c603d8e11c5e008e83a382b00a4d27a7 (diff)
downloadbarebox-94ed83afa45ca76914a0834cf1481ada3b4bd163.tar.gz
barebox-94ed83afa45ca76914a0834cf1481ada3b4bd163.tar.xz
versatilepb: move barebox to 32 MiB and use zImage
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boards/versatile/env/config4
-rw-r--r--arch/arm/mach-versatile/Kconfig3
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/boards/versatile/env/config b/arch/arm/boards/versatile/env/config
index 667dce3747..1bc575b77a 100644
--- a/arch/arm/boards/versatile/env/config
+++ b/arch/arm/boards/versatile/env/config
@@ -19,8 +19,8 @@ rootfs_loc=initrd
rootfs_type=ubifs
rootfsimage=root.$rootfs_type
-#kernelimage=zImage
-kernelimage=uImage
+kernelimage=zImage
+#kernelimage=uImage
#kernelimage=Image
#kernelimage=Image.lzo
diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
index 9a1bf953b0..9ad186929f 100644
--- a/arch/arm/mach-versatile/Kconfig
+++ b/arch/arm/mach-versatile/Kconfig
@@ -1,6 +1,9 @@
if ARCH_VERSATILE
+config ARCH_TEXT_BASE
+ default 0x02000000
+
choice
prompt "ARM Board type"