diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-04 08:32:52 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-04 08:32:52 +0200 |
| commit | 43c1881110b28f42c58d45465a6b8cad06540ad0 (patch) | |
| tree | 4b964b15e2ed7e6acd6e375c39e575348fd988a2 /arch/arm/boards/nhk8815/env | |
| parent | 849e910d07a2e6d9f1e8562f2d6ce1adf0034c51 (diff) | |
| parent | 81d2b141e709505fcdf9a6c4df160894ddf28667 (diff) | |
| download | barebox-43c1881110b28f42c58d45465a6b8cad06540ad0.tar.gz barebox-43c1881110b28f42c58d45465a6b8cad06540ad0.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/boards/nhk8815/env')
| -rw-r--r-- | arch/arm/boards/nhk8815/env/config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/nhk8815/env/config b/arch/arm/boards/nhk8815/env/config index 2b50b25ec5..7e7fc456c3 100644 --- a/arch/arm/boards/nhk8815/env/config +++ b/arch/arm/boards/nhk8815/env/config @@ -20,7 +20,7 @@ ip=dhcp # JFFS2 Root filesystem 22MB 0x00580000 # JFFS2 User Data 100MB 0x01b80000 -nand_parts="256k(xloader)ro,256k(meminit),2M(uboot),3M(kernel),22M(rootfs),100M(userfs),384k(free),128k(ubootenv)" +nand_parts="256k(xloader)ro,256k(meminit),2M(barebox),3M(kernel),22M(rootfs),100M(userfs),384k(free),128k(bareboxenv)" uimage=uImage-nhk15 |