diff options
| author | Stefan Roese <sr@denx.de> | 2015-10-02 08:20:35 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-11 17:12:09 -0400 |
| commit | 04386f656bbc35abd7718a4bbbba7fcfb4f59aef (patch) | |
| tree | 7358bb617f05f24a0f2faf7198165efe1d0191c8 /arch/powerpc | |
| parent | 1254b44a9f31c78ce7325eb392eaa949a2c7fc9a (diff) | |
| download | blackbird-obmc-uboot-04386f656bbc35abd7718a4bbbba7fcfb4f59aef.tar.gz blackbird-obmc-uboot-04386f656bbc35abd7718a4bbbba7fcfb4f59aef.zip | |
Revert "powerpc: ppc4xx: remove lwmon5 support"
This reverts commit 8fe11b8901a31d11990488c82bc23612589d57be.
I'll add support to lwmon5 in the next patch and will remove
support for the broken lcd4_lwmon5 as well.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/Kconfig | 5 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/global_data.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index 23ecc895fb..8d3ba8d73f 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -8,6 +8,10 @@ choice prompt "Target select" optional +config TARGET_LWMON5 + bool "Support lwmon5" + select SUPPORT_SPL + config TARGET_T3CORP bool "Support t3corp" @@ -165,6 +169,7 @@ source "board/gdsys/405ex/Kconfig" source "board/gdsys/dlvision/Kconfig" source "board/gdsys/gdppc440etx/Kconfig" source "board/gdsys/intip/Kconfig" +source "board/lwmon5/Kconfig" source "board/mosaixtech/icon/Kconfig" source "board/mpl/mip405/Kconfig" source "board/mpl/pip405/Kconfig" diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index 2527ef88de..4090975bf5 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -106,6 +106,12 @@ struct arch_global_data { #ifdef CONFIG_SYS_FPGA_COUNT unsigned fpga_state[CONFIG_SYS_FPGA_COUNT]; #endif +#if defined(CONFIG_WD_MAX_RATE) + unsigned long long wdt_last; /* trace watch-dog triggering rate */ +#endif +#if defined(CONFIG_LWMON5) + unsigned long kbd_status; +#endif }; #include <asm-generic/global_data.h> |
