diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 13:13:45 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 13:13:45 +0200 |
| commit | 9cce00617bf67a462eabd8c473c423f78414a8e8 (patch) | |
| tree | 950cab0665633f390ad04b9b2b5147f10a4be896 /arch/mips/configs | |
| parent | ba465b6c4dc4b0729e98f1581a13ad7e01032461 (diff) | |
| parent | 642f8fbed8b4c55d56a0934b803146009539905e (diff) | |
| download | barebox-9cce00617bf67a462eabd8c473c423f78414a8e8.tar.gz barebox-9cce00617bf67a462eabd8c473c423f78414a8e8.tar.xz | |
Merge branch 'for-next/rtc'
Conflicts:
arch/mips/dts/jz4755.dtsi
commands/Makefile
Diffstat (limited to 'arch/mips/configs')
| -rw-r--r-- | arch/mips/configs/ritmix-rzx50_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/configs/ritmix-rzx50_defconfig b/arch/mips/configs/ritmix-rzx50_defconfig index 232faa2659..fb67014532 100644 --- a/arch/mips/configs/ritmix-rzx50_defconfig +++ b/arch/mips/configs/ritmix-rzx50_defconfig @@ -10,6 +10,7 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y # CONFIG_DEFAULT_ENVIRONMENT is not set CONFIG_DEBUG_LL=y +CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_BOOTM_SHOW_TYPE=y @@ -42,6 +43,8 @@ CONFIG_LED_GPIO=y CONFIG_LED_GPIO_OF=y CONFIG_LED_TRIGGERS=y CONFIG_GPIO_JZ4740=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_JZ4740=y CONFIG_SHA1=y CONFIG_SHA224=y CONFIG_SHA256=y |