diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-04-04 14:53:08 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-04-04 14:53:08 +0200 |
| commit | 691dd27f7a9256c6da86bc94cc6eaba840ba9575 (patch) | |
| tree | c786102100c5d332e630f83c5e4d7119548cd6c5 /arch/arm/boards/pm9g45 | |
| parent | 6603a7defe3648ac06c034914245043f2714467a (diff) | |
| parent | 6402171c907cb376d73c17a9f783b435b7626eb7 (diff) | |
| download | barebox-691dd27f7a9256c6da86bc94cc6eaba840ba9575.tar.gz barebox-691dd27f7a9256c6da86bc94cc6eaba840ba9575.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/boards/pm9g45')
| -rw-r--r-- | arch/arm/boards/pm9g45/env/config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boards/pm9g45/env/config b/arch/arm/boards/pm9g45/env/config index 9fcf4653fa..b8ca18dce7 100644 --- a/arch/arm/boards/pm9g45/env/config +++ b/arch/arm/boards/pm9g45/env/config @@ -10,8 +10,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp' or 'nand' +kernel_loc=tftp # can be either 'net', 'nand' or 'initrd' rootfs_loc=net |