diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
| commit | 27a5414804f7b8ab41101aad219ebef02d364bde (patch) | |
| tree | c9535dfed260314855b3ba1fe2c75652fdf60a1a /linux | |
| parent | f6162290fb6800fecffb86eed42069aa0f813f87 (diff) | |
| parent | fc90fa9417d8b99b5d1c77aaa9e4c9ac4c8c7c58 (diff) | |
| download | buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.tar.gz buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.zip | |
Merge branch 'next'
Conflicts:
package/gdb/Config.in.host
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Config.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/Config.in b/linux/Config.in index 069a7d69c7..419bc8c7ff 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -184,7 +184,8 @@ config BR2_LINUX_KERNEL_BZIMAGE config BR2_LINUX_KERNEL_ZIMAGE bool "zImage" - depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_sparc || \ + depends on BR2_arm || BR2_armeb || BR2_powerpc || \ + BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || \ BR2_sh || BR2_sh64 || BR2_xtensa config BR2_LINUX_KERNEL_APPENDED_ZIMAGE |
