diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:11:48 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:11:48 +0200 |
| commit | bee8dddbfcb07de469105a660e426fa132f96b6a (patch) | |
| tree | 11568bb2d8fa6cbbdc1b468093b5202eb5bcddeb /arch/arm/boards/phycard-a-l1/env/config | |
| parent | d8b30e6c3823bfe50c3e060aab39b0fab2de933f (diff) | |
| parent | 93ca711e64d7a4d79aee15b4ce415688f5415fda (diff) | |
| download | barebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.gz barebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.xz | |
Merge branch 'for-next/omap'
Conflicts:
Makefile
Diffstat (limited to 'arch/arm/boards/phycard-a-l1/env/config')
| -rw-r--r-- | arch/arm/boards/phycard-a-l1/env/config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/phycard-a-l1/env/config b/arch/arm/boards/phycard-a-l1/env/config index 90b2c24781..6de97ed5d5 100644 --- a/arch/arm/boards/phycard-a-l1/env/config +++ b/arch/arm/boards/phycard-a-l1/env/config @@ -70,7 +70,7 @@ bootargs="$bootargs omapdss.def_disp=pd050vl1" #bootargs="$bootargs omapdss.def_disp=pd104slf" #bootargs="$bootargs omapdss.def_disp=pm070wl4" -nand_parts="512k(x-loader)ro,1920k(barebox),128k(bareboxenv),4M(kernel),-(root)" +nand_parts="128k(x-loader)ro,512k(barebox),128k(bareboxenv),4M(kernel),-(root)" nand_device=omap2-nand.0 rootfs_mtdblock_nand=4 |