diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
| commit | 8c746628fe6ab2cba89ef440b2895cbf3d67846b (patch) | |
| tree | e1aaf4c57155003560f6dfed9a15dc08259acfcb /arch/arm/configs | |
| parent | 08d86870b2346290e94ea1d604437a1b441850e5 (diff) | |
| parent | 25bffd8a9a1c15a2676b3b128af05c8c66981a5a (diff) | |
| download | barebox-8c746628fe6ab2cba89ef440b2895cbf3d67846b.tar.gz barebox-8c746628fe6ab2cba89ef440b2895cbf3d67846b.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/tqma53_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/tx53stk5_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/tqma53_defconfig b/arch/arm/configs/tqma53_defconfig index f163b7c701..144abbf5fb 100644 --- a/arch/arm/configs/tqma53_defconfig +++ b/arch/arm/configs/tqma53_defconfig @@ -19,7 +19,6 @@ CONFIG_AUTO_COMPLETE=y CONFIG_BLSPEC=y CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/tqma53/env/" CONFIG_DEBUG_INFO=y CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y diff --git a/arch/arm/configs/tx53stk5_defconfig b/arch/arm/configs/tx53stk5_defconfig index fc6a9a69ff..5751623295 100644 --- a/arch/arm/configs/tx53stk5_defconfig +++ b/arch/arm/configs/tx53stk5_defconfig @@ -20,7 +20,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/karo-tx53/env" CONFIG_RESET_SOURCE=y CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y |