[PATCH 0/6] some fixes

[PATCH 0/6] some fixes

[Jean-Christophe PLAGNIOL-VILLARD]

HI,

	the following patch serie are some random fixes

The following changes since commit c406f591292ccc2af583445c0a8b5f9ade0310e2:

  at91sam9260ek/9g20ek: udpate defconfig (2012-04-13 15:55:28 +0200)

are available in the git repository at:

  git://git.jcrosoft.org/barebox.git fixes

for you to fetch changes up to 19a8c7cb6accacdc15c4fe2689e530cdf238e7da:

  arm: bootm: zImage: add error message when can not request the memory (2012-04-15 00:11:00 +0800)

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (6):
      menu: enable the fancy color support only if HUSH is enabled
      at91sam9263ek: update defconfig
      defaultenv/update: add oftree support
      net: use net_alloc_packet to allocate packet
      mx53/loco: udpate defconfig with USB host
      arm: bootm: zImage: add error message when can not request the memory

 arch/arm/configs/at91sam9263ek_defconfig       |    3 +++
 arch/arm/configs/freescale_mx53_loco_defconfig |    3 +++
 arch/arm/lib/bootm.c                           |    2 ++
 common/menu.c                                  |   21 +++++++++++++++------
 defaultenv/bin/_update_help                    |    3 ++-
 defaultenv/bin/update                          |    5 +++++
 net/net.c                                      |    4 ++--
 7 files changed, 32 insertions(+), 9 deletions(-)

Best Regards,
J.

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

[PATCH 1/6] menu: enable the fancy color support only if HUSH is enabled

[Jean-Christophe PLAGNIOL-VILLARD]

So we can use the menu for the xloader too.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 common/menu.c |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/common/menu.c b/common/menu.c
index 50af36e..83821ec 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -174,12 +174,17 @@ static void print_menu_entry(struct menu *m, struct menu_entry *me,
 		puts("   ");
 	}
 
-	process_escape_sequence(me->display, m->display_buffer,
-				m->display_buffer_size);
+	if (IS_ENABLED(CONFIG_SHELL_HUSH))
+		process_escape_sequence(me->display, m->display_buffer,
+					m->display_buffer_size);
+
 	printf(" %d: ", me->num);
 	if (selected)
 		puts("\e[7m");
-	puts(m->display_buffer);
+	if (IS_ENABLED(CONFIG_SHELL_HUSH))
+		puts(m->display_buffer);
+	else
+		puts(me->display);
 
 	if (selected)
 		puts("\e[m");
@@ -236,9 +241,13 @@ static void print_menu(struct menu *m)
 	clear();
 	gotoXY(1, 2);
 	if(m->display) {
-		process_escape_sequence(m->display, m->display_buffer,
-					m->display_buffer_size);
-		puts(m->display_buffer);
+		if (IS_ENABLED(CONFIG_SHELL_HUSH)) {
+			process_escape_sequence(m->display, m->display_buffer,
+						m->display_buffer_size);
+			puts(m->display_buffer);
+		} else {
+			puts(m->display);
+		}
 	} else {
 		puts("Menu : ");
 		puts(m->name);
-- 
1.7.9.1


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

[PATCH 2/6] at91sam9263ek: update defconfig

[Jean-Christophe PLAGNIOL-VILLARD]

drop:
 - bootz
 - cfi 32 width
 - cpuinfo command support

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/arm/configs/at91sam9263ek_defconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig
index f59eab9..ec9c1b6 100644
--- a/arch/arm/configs/at91sam9263ek_defconfig
+++ b/arch/arm/configs/at91sam9263ek_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARCH_AT91SAM9263=y
+# CONFIG_CMD_ARM_CPUINFO is not set
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_MMU=y
 CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000
@@ -29,6 +30,7 @@ CONFIG_CMD_BOOTM_INITRD=y
 CONFIG_CMD_BOOTM_OFTREE=y
 CONFIG_CMD_BOOTM_OFTREE_UIMAGE=y
 CONFIG_CMD_UIMAGE=y
+# CONFIG_CMD_BOOTZ is not set
 # CONFIG_CMD_BOOTU is not set
 CONFIG_CMD_RESET=y
 CONFIG_CMD_GO=y
@@ -47,6 +49,7 @@ CONFIG_DRIVER_NET_MACB=y
 # CONFIG_SPI is not set
 CONFIG_DRIVER_CFI=y
 # CONFIG_DRIVER_CFI_INTEL is not set
+# CONFIG_DRIVER_CFI_BANK_WIDTH_4 is not set
 CONFIG_MTD=y
 # CONFIG_MTD_OOB_DEVICE is not set
 CONFIG_NAND=y
-- 
1.7.9.1


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

[PATCH 3/6] defaultenv/update: add oftree support

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 defaultenv/bin/_update_help |    3 ++-
 defaultenv/bin/update       |    5 +++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/defaultenv/bin/_update_help b/defaultenv/bin/_update_help
index 3b7ad23..b41e288 100644
--- a/defaultenv/bin/_update_help
+++ b/defaultenv/bin/_update_help
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo "usage: update -t <kernel|rootfs|barebox|bareboxenv|xload> -d <nor|nand> [-m tftp|xmodem] [-f imagename] -c"
+echo "usage: update -t <kernel|rootfs|barebox|bareboxenv|xload|oftree> -d <nor|nand> [-m tftp|xmodem] [-f imagename] -c"
 echo "update tools."
 echo ""
 echo "options"
@@ -12,3 +12,4 @@ echo "type update -t rootfs -d <nor|nand> [-m tftp|xmodem|nfs] [-f imagename] to
 echo "type update -t barebox -d <nor|nand> [-m tftp|xmodem|nfs] [-f imagename] to update barebox into flash"
 echo "type update -t bareboxenv -d <nor|nand> [-m tftp|xmodem|nfs] [-f imagename] to update bareboxenv into flash"
 echo "type update -t xload -d <nor|nand> [-m tftp|xmodem|nfs] [-f imagename] to update xload into flash"
+echo "type update -t oftree -d <nor|nand> [-m tftp|xmodem|nfs] [-f imagename] to update oftree into flash"
diff --git a/defaultenv/bin/update b/defaultenv/bin/update
index 96442b1..1578789 100644
--- a/defaultenv/bin/update
+++ b/defaultenv/bin/update
@@ -36,6 +36,11 @@ elif [ x${type} = xbarebox ]; then
 	if [ -z ${image} ]; then
 		image=barebox.bin
 	fi
+elif [ x${type} = xoftree ]; then
+	image=$oftreeimage
+	if [ -z ${image} ]; then
+		image=oftree.bin
+	fi
 elif [ x${type} = xbareboxenv ]; then
 	image=$bareboxenvimage
 	if [ -z ${image} ]; then
-- 
1.7.9.1


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

[PATCH 4/6] net: use net_alloc_packet to allocate packet

[Jean-Christophe PLAGNIOL-VILLARD]

Was missing in net_init and net_new.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 net/net.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/net.c b/net/net.c
index 046ddd4..c6bc8a1 100644
--- a/net/net.c
+++ b/net/net.c
@@ -378,7 +378,7 @@ static struct net_connection *net_new(IPaddr_t dest, rx_handler_f *handler,
 		return ERR_PTR(-ENETDOWN);
 
 	con = xzalloc(sizeof(*con));
-	con->packet = xmemalign(32, PKTSIZE);
+	con->packet = net_alloc_packet();
 	con->priv = ctx;
 	memset(con->packet, 0, PKTSIZE);
 
@@ -673,7 +673,7 @@ static int net_init(void)
 	int i;
 
 	for (i = 0; i < PKTBUFSRX; i++)
-		NetRxPackets[i] =  xmemalign(32, PKTSIZE);
+		NetRxPackets[i] = net_alloc_packet();
 
 	return 0;
 }
-- 
1.7.9.1


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

[PATCH 5/6] mx53/loco: udpate defconfig with USB host

[Jean-Christophe PLAGNIOL-VILLARD]

enable USB storage.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/arm/configs/freescale_mx53_loco_defconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/configs/freescale_mx53_loco_defconfig b/arch/arm/configs/freescale_mx53_loco_defconfig
index f31d5bf..6cb4c17 100644
--- a/arch/arm/configs/freescale_mx53_loco_defconfig
+++ b/arch/arm/configs/freescale_mx53_loco_defconfig
@@ -57,6 +57,9 @@ CONFIG_DRIVER_NET_FEC_IMX=y
 # CONFIG_SPI is not set
 CONFIG_I2C=y
 CONFIG_I2C_IMX=y
+CONFIG_USB=y
+CONFIG_USB_EHCI=y
+CONFIG_USB_STORAGE=y
 CONFIG_MCI=y
 CONFIG_MCI_STARTUP=y
 CONFIG_MCI_IMX_ESDHC=y
-- 
1.7.9.1


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

[PATCH 6/6] arm: bootm: zImage: add error message when can not request the memory

[Jean-Christophe PLAGNIOL-VILLARD]

This will allow to understand what happened.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/arm/lib/bootm.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 26053dc..1e29afd 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -239,6 +239,8 @@ static int do_bootz_linux(struct image_data *data)
 
 	data->os_res = request_sdram_region("zimage", load_address, end);
 	if (!data->os_res) {
+		pr_err("bootm/zImage: failled to request memory at 0x%lx to 0x%lx (%d).\n",
+		       load_address, load_address + end, end);
 		ret = -ENOMEM;
 		goto err_out;
 	}
-- 
1.7.9.1


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

Re: [PATCH 6/6] arm: bootm: zImage: add error message when can not request the memory

[Sascha Hauer]

On Sat, Apr 14, 2012 at 06:02:23PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> This will allow to understand what happened.
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  arch/arm/lib/bootm.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
> index 26053dc..1e29afd 100644
> --- a/arch/arm/lib/bootm.c
> +++ b/arch/arm/lib/bootm.c
> @@ -239,6 +239,8 @@ static int do_bootz_linux(struct image_data *data)
>  
>  	data->os_res = request_sdram_region("zimage", load_address, end);
>  	if (!data->os_res) {
> +		pr_err("bootm/zImage: failled to request memory at 0x%lx to 0x%lx (%d).\n",
> +		       load_address, load_address + end, end);

s/failled/failed/

I applied the remaining patches from this series.

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