diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-08-03 09:31:38 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-08-03 09:31:38 +0200 |
commit | 139ec08127825f2fdc4d0386d26f1fad9f745c2c (patch) | |
tree | 65e0aa4d72f548dd1e8771fc80e918dcbc5365ec /arch/arm/configs/pcm037_defconfig | |
parent | 68d0d31d41d9034a6246991ee1d486dc805ff479 (diff) | |
parent | 6f354bc067482fbe78e9148c3a1501188b18f22d (diff) | |
download | barebox-139ec08127825f2fdc4d0386d26f1fad9f745c2c.tar.gz barebox-139ec08127825f2fdc4d0386d26f1fad9f745c2c.tar.xz |
Merge branch 'next'
Diffstat (limited to 'arch/arm/configs/pcm037_defconfig')
-rw-r--r-- | arch/arm/configs/pcm037_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/pcm037_defconfig b/arch/arm/configs/pcm037_defconfig index 5a4ac70751..bb67995f03 100644 --- a/arch/arm/configs/pcm037_defconfig +++ b/arch/arm/configs/pcm037_defconfig @@ -111,7 +111,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y # CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y CONFIG_DEFAULT_ENVIRONMENT=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv board/pcm037/env" +CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv arch/arm/boards/pcm037/env" # # Debugging |