[PATCH OSSTEST] Debian: Allow per-host additional u-boot script commands

[PATCH OSSTEST] Debian: Allow per-host additional u-boot script commands

[Ian Campbell]

On marilith boxes an appropriate setting is:
HostProp_marilith-n4_UBootScriptEarlyCommands= <<END
fdt set /soc/ethernet@fff50000 dma-coherent
fdt set /soc/ethernet@fff51000 dma-coherent
END
---
 Osstest/Debian.pm |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index c675e0d..e51a233 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -136,6 +136,8 @@ sub setupboot_uboot ($$$) {
 	logm("Xen options: $xenhopt");
 	logm("Linux options: $xenkopt");
 
+	my $early_commands = get_host_property($ho, 'UBootScriptEarlyCommands', '');
+
 	target_cmd_root($ho, <<END);
 if test ! -f /boot/$kern ; then
     exit 1
@@ -154,6 +156,8 @@ scsi scan
 fdt addr \\\${fdt_addr}
 fdt resize
 
+${early_commands}
+
 fdt set /chosen \\\#address-cells <1>
 fdt set /chosen \\\#size-cells <1>
 
-- 
1.7.10.4

Re: [PATCH OSSTEST] Debian: Allow per-host additional u-boot script commands

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST] Debian: Allow per-host additional u-boot script commands"):
> On marilith boxes an appropriate setting is:
> HostProp_marilith-n4_UBootScriptEarlyCommands= <<END
> fdt set /soc/ethernet@fff50000 dma-coherent
> fdt set /soc/ethernet@fff51000 dma-coherent
> END

I'm afraid this is no good because in the production database you
can't (or anyway shouldn't) set host properties to contain newlines.

Are ;s reserved or useful ?

Thanks,
Ian.

Re: [PATCH OSSTEST] Debian: Allow per-host additional u-boot script commands

[Ian Campbell]

On Mon, 2013-10-28 at 15:38 +0000, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH OSSTEST] Debian: Allow per-host additional u-boot script commands"):
> > On marilith boxes an appropriate setting is:
> > HostProp_marilith-n4_UBootScriptEarlyCommands= <<END
> > fdt set /soc/ethernet@fff50000 dma-coherent
> > fdt set /soc/ethernet@fff51000 dma-coherent
> > END
> 
> I'm afraid this is no good because in the production database you
> can't (or anyway shouldn't) set host properties to contain newlines.

I wondered about that, there are newlines in production-config but I
suppose that's not the "database" as such.

> Are ;s reserved or useful ?

I think they do what is expected, yes. I'll try it.

Ian.