[PATCH 0/3] fixes

[PATCH 0/3] fixes

[Jean-Christophe PLAGNIOL-VILLARD]

HI,

	the following patch series is ramdom fixes of the next

The following changes since commit a2d2e8868fe3c963ebac634b695ae18bb4b411ca:

  config: switch machine to hostname (2012-04-18 12:03:58 +0200)

are available in the git repository at:

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

for you to fetch changes up to 8c04018b528bb638e22b7f573617842482bbc05a:

  config: fix missing switch machine to hostname during merge (2012-04-18 19:51:05 +0800)

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (3):
      arm: bootm: zImage: add error message when can not request the memory
      dhcp: fix typo introduce during rebase of hostname patch
      config: fix missing switch machine to hostname during merge

 arch/arm/boards/eukrea_cpuimx35/env/config |   14 +++++++-------
 arch/arm/lib/bootm.c                       |    2 ++
 net/dhcp.c                                 |    2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

Best Regards,
J.

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

[PATCH 1/3] 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..36f4342 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: failed 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

[PATCH 2/3] dhcp: fix typo introduce during rebase of hostname patch

[Jean-Christophe PLAGNIOL-VILLARD]

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

diff --git a/net/dhcp.c b/net/dhcp.c
index 1d01d05..0c882fb 100644
--- a/net/dhcp.c
+++ b/net/dhcp.c
@@ -681,7 +681,7 @@ BAREBOX_CMD_HELP_START(dhcp)
 BAREBOX_CMD_HELP_USAGE("dhcp [OPTIONS]\n")
 BAREBOX_CMD_HELP_SHORT("Invoke dhcp client to obtain ip/boot params.\n")
 BAREBOX_CMD_HELP_OPT  ("-H <hostname>",
-"Hostname to send to the DHCP server\n");
+"Hostname to send to the DHCP server\n")
 BAREBOX_CMD_HELP_OPT  ("-v <vendor_id>",
 "DHCP Vendor ID (code 60) submitted in DHCP requests. It can\n"
 "be used in the DHCP server's configuration to select options\n"
-- 
1.7.9.1


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

[PATCH 3/3] config: fix missing switch machine to hostname during merge

[Jean-Christophe PLAGNIOL-VILLARD]

So we can use it for dhcp request too.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/arm/boards/eukrea_cpuimx35/env/config |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boards/eukrea_cpuimx35/env/config b/arch/arm/boards/eukrea_cpuimx35/env/config
index 8f64ba0..1b19bd2 100644
--- a/arch/arm/boards/eukrea_cpuimx35/env/config
+++ b/arch/arm/boards/eukrea_cpuimx35/env/config
@@ -3,7 +3,7 @@
 # otg port mode : can be 'host' or 'device'
 otg_mode="device"
 
-machine=eukrea-cpuimx35
+hostname=eukrea-cpuimx35
 
 # use 'dhcp' to do dhcp in barebox and in kernel
 # use 'none' if you want to skip kernel ip autoconfiguration
@@ -22,16 +22,16 @@ rootfs_loc=nand
 
 # rootfs
 rootfs_type=ubifs
-rootfsimage=$machine/rootfs.$rootfs_type
+rootfsimage=$hostname/rootfs.$rootfs_type
 
 # kernel
-kernelimage=$machine/uImage-${machine}.bin
+kernelimage=$hostname/uImage-${hostname}.bin
 
 # barebox and it's env
-bareboximage=$machine/barebox-${machine}.bin
-bareboxenvimage=$machine/bareboxenv-${machine}.bin
+bareboximage=$hostname/barebox-${hostname}.bin
+bareboxenvimage=$hostname/bareboxenv-${hostname}.bin
 
-nfsroot="$eth0.serverip:/srv/nfs/$machine"
+nfsroot="$eth0.serverip:/srv/nfs/$hostname"
 
 autoboot_timeout=1
 
@@ -40,7 +40,7 @@ bootargs="console=ttymxc0,115200 otg_mode=$otg_mode"
 nand_parts="256k(barebox)ro,128k(bareboxenv),3M(kernel),-(root)"
 rootfs_mtdblock_nand=3
 nand_device="mxc_nand"
-ubiroot="$machine-rootfs"
+ubiroot="$hostname-rootfs"
 device_type="nand"
 
 # set a fancy prompt (if support is compiled in)
-- 
1.7.9.1


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

Re: [PATCH 0/3] fixes

[Sascha Hauer]

On Wed, Apr 18, 2012 at 02:08:34PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> HI,
> 
> 	the following patch series is ramdom fixes of the next
> 
> The following changes since commit a2d2e8868fe3c963ebac634b695ae18bb4b411ca:
> 
>   config: switch machine to hostname (2012-04-18 12:03:58 +0200)
> 
> are available in the git repository at:
> 
>   git://git.jcrosoft.org/barebox.git fixes
> 
> for you to fetch changes up to 8c04018b528bb638e22b7f573617842482bbc05a:
> 
>   config: fix missing switch machine to hostname during merge (2012-04-18 19:51:05 +0800)

Applied, thanks.

Sascha

> 
> ----------------------------------------------------------------
> Jean-Christophe PLAGNIOL-VILLARD (3):
>       arm: bootm: zImage: add error message when can not request the memory
>       dhcp: fix typo introduce during rebase of hostname patch
>       config: fix missing switch machine to hostname during merge
> 
>  arch/arm/boards/eukrea_cpuimx35/env/config |   14 +++++++-------
>  arch/arm/lib/bootm.c                       |    2 ++
>  net/dhcp.c                                 |    2 +-
>  3 files changed, 10 insertions(+), 8 deletions(-)
> 
> Best Regards,
> J.
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
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