summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-04-18 14:30:04 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-18 15:36:10 +0200
commit8cde76869abc66b57bc42f086ade89598dfb0271 (patch)
tree5c5b48cf60ed7820639b10eafa2c4ddf8b7c4060 /arch
parent0613fca0b3c86bf8b7bdd6ef8e184f638d6123b5 (diff)
downloadbarebox-8cde76869abc66b57bc42f086ade89598dfb0271.tar.gz
barebox-8cde76869abc66b57bc42f086ade89598dfb0271.tar.xz
config: fix missing switch machine to hostname during merge
So we can use it for dhcp request too. 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/eukrea_cpuimx35/env/config14
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 8f64ba05ca..1b19bd232e 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)