diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-06-15 12:08:11 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-06-15 12:08:11 +0200 |
| commit | 212b66016120fa4cd3b8f7edbe4c9f106032884e (patch) | |
| tree | f956cd9195952c7890493897a9c2108a8ee852d7 /lib | |
| parent | b31fb4b97b4d9c9fcf5a50c39d5d2c277f7008c9 (diff) | |
| parent | 64d16706a052553c85d2f8f4c741879a4e3e6116 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig | 4 | ||||
| -rw-r--r-- | lib/fdtdec.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 3c8de869b1..7ec8c98da2 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -45,7 +45,9 @@ config REGEX "setexpr". config LIB_RAND - bool + bool "Pseudo-random library support " + help + This library provides pseudo-random number generator functions. source lib/rsa/Kconfig diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 46dfcb675c..9877849f99 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -22,9 +22,6 @@ DECLARE_GLOBAL_DATA_PTR; #define COMPAT(id, name) name static const char * const compat_names[COMPAT_COUNT] = { COMPAT(UNKNOWN, "<none>"), - COMPAT(NVIDIA_TEGRA20_USB, "nvidia,tegra20-ehci"), - COMPAT(NVIDIA_TEGRA30_USB, "nvidia,tegra30-ehci"), - COMPAT(NVIDIA_TEGRA114_USB, "nvidia,tegra114-ehci"), COMPAT(NVIDIA_TEGRA20_EMC, "nvidia,tegra20-emc"), COMPAT(NVIDIA_TEGRA20_EMC_TABLE, "nvidia,tegra20-emc-table"), COMPAT(NVIDIA_TEGRA20_KBC, "nvidia,tegra20-kbc"), |