[PATCH 1/2] ARM: pxa: RAM and console fixes for zylonite

[PATCH 1/2] ARM: pxa: RAM and console fixes for zylonite

[Robert Jarzmik]

There is at least one zylonite variant with a PXA311 and only 64 MB of
memory, while the other variants have at least 128 MB.
As 64 MB is the smallest common denominator, tell barebox to use only
the 64 MB bytes.

At the same time, fix the kernel command line to use only these 64 MB,
and output log on the console.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 arch/arm/boards/zylonite/board.c    | 2 +-
 arch/arm/boards/zylonite/env/config | 2 +-
 arch/arm/boards/zylonite/lowlevel.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boards/zylonite/board.c b/arch/arm/boards/zylonite/board.c
index 96357a5..dabc6ff 100644
--- a/arch/arm/boards/zylonite/board.c
+++ b/arch/arm/boards/zylonite/board.c
@@ -95,7 +95,7 @@ coredevice_initcall(zylonite_coredevice_init);
 
 static int zylonite_mem_init(void)
 {
-	arm_add_mem_device("ram0", 0x80000000, 128 * 1024 * 1024);
+	arm_add_mem_device("ram0", 0x80000000, 64 * 1024 * 1024);
 	return 0;
 }
 mem_initcall(zylonite_mem_init);
diff --git a/arch/arm/boards/zylonite/env/config b/arch/arm/boards/zylonite/env/config
index 56ee90f..ee66e37 100644
--- a/arch/arm/boards/zylonite/env/config
+++ b/arch/arm/boards/zylonite/env/config
@@ -3,4 +3,4 @@
 autoboot_timeout=3
 
 mtdparts="128k@0(TIMH)ro,128k@128k(OBMI)ro,768k@256k(barebox),256k@1024k(barebox-env),12M@1280k(kernel),38016k@13568k(root)"
-bootargs="$bootargs mtdparts=pxa3xx-nand.0:$mtdparts ubi.mtd=6 rootfstype=ubifs root=ubi0:linux_root ro"
+bootargs="$bootargs mtdparts=pxa3xx_nand-0:$mtdparts ubi.mtd=5 rootfstype=ubifs root=ubi0:root ro ram=64M console=ttyS0,115200"
diff --git a/arch/arm/boards/zylonite/lowlevel.c b/arch/arm/boards/zylonite/lowlevel.c
index 5c43679..9f1aa66 100644
--- a/arch/arm/boards/zylonite/lowlevel.c
+++ b/arch/arm/boards/zylonite/lowlevel.c
@@ -6,5 +6,5 @@
 void __naked barebox_arm_reset_vector(void)
 {
 	arm_cpu_lowlevel_init();
-	barebox_arm_entry(0x80000000, SZ_128M, NULL);
+	barebox_arm_entry(0x80000000, SZ_64M, NULL);
 }
-- 
2.1.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] ARM: pxa: fix pxa310 config

[Robert Jarzmik]

This is a 2 fold small fix patch for pxa3xx architecture :
  - the ARCH_PXA310 was forgotten from the KConfig, breaking the
    zylonite 310 board.
  - the TEXT_BASE is moved to the end of memory, making room for more
    malloc space, to flash big UBI filesystem images

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 arch/arm/mach-pxa/Kconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 63f148b..b36e720 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -4,7 +4,7 @@ config ARCH_TEXT_BASE
 	hex
 	default 0xa0000000 if MACH_MIOA701
 	default 0xa3f00000 if MACH_PCM027
-	default 0x81000000 if MACH_ZYLONITE
+	default 0x83f00000 if MACH_ZYLONITE
 
 # ----------------------------------------------------------
 
@@ -16,6 +16,9 @@ config ARCH_PXA3XX
        bool
        select CPU_XSC3
 
+config ARCH_PXA310
+       bool
+
 choice
 	prompt "Intel/Marvell PXA Processor"
 
-- 
2.1.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] ARM: pxa: RAM and console fixes for zylonite

[Sascha Hauer]

On Sat, Jan 17, 2015 at 02:58:50PM +0100, Robert Jarzmik wrote:
> There is at least one zylonite variant with a PXA311 and only 64 MB of
> memory, while the other variants have at least 128 MB.
> As 64 MB is the smallest common denominator, tell barebox to use only
> the 64 MB bytes.
> 
> At the same time, fix the kernel command line to use only these 64 MB,
> and output log on the console.
> 
> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>

Squashed these into the original commits.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] ARM: pxa: RAM and console fixes for zylonite

[Robert Jarzmik]

Sascha Hauer <s.hauer@pengutronix.de> writes:

> Squashed these into the original commits.
Thanks. I will retest this week-end just to be sure on my zylonite board.

Cheers.

-- 
Robert

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] ARM: pxa: RAM and console fixes for zylonite

[Robert Jarzmik]

Robert Jarzmik <robert.jarzmik@free.fr> writes:

> Sascha Hauer <s.hauer@pengutronix.de> writes:
>
>> Squashed these into the original commits.
> Thanks. I will retest this week-end just to be sure on my zylonite board.
Retested, everything is all right, thanks.

-- 
Robert

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox