diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-14 09:36:10 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-14 09:36:10 +0200 |
| commit | 00928230056867bfd1914a29aed81c145fa26e37 (patch) | |
| tree | 347224f806e1e4250eb1910ea4eb7318a131729e /arch | |
| parent | 2f74da06b4b1ed4839fa0e3445bccb30ae554fd2 (diff) | |
| parent | 3e5058e31fa58608531ab5e3dd6ceff00f05b019 (diff) | |
| download | barebox-00928230056867bfd1914a29aed81c145fa26e37.tar.gz barebox-00928230056867bfd1914a29aed81c145fa26e37.tar.xz | |
Merge branch 'pu/omap'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/panda_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/panda_defconfig b/arch/arm/configs/panda_defconfig index 38cc9582ef..3ea24664d6 100644 --- a/arch/arm/configs/panda_defconfig +++ b/arch/arm/configs/panda_defconfig @@ -17,7 +17,7 @@ CONFIG_AUTO_COMPLETE=y # CONFIG_TIMESTAMP is not set CONFIG_PARTITION=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/pcm049/env" +CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/panda/env" CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y |