| Message ID | 1468372480-6453-2-git-send-email-haokexin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, 2016-13-07 at 01:14:38 UTC, Kevin Hao wrote: > In the current code, the RELOCATABLE will be forcedly enabled when > enabling CRASH_DUMP. But for ppc32, the RELOCABLE also depend on > ADVANCED_OPTIONS and select NONSTATIC_KERNEL. This will cause the > following build error when CRASH_DUMP=y && ADVANCED_OPTIONS=n > because the select of NONSTATIC_KERNEL doesn't take effect. > arch/powerpc/include/asm/io.h: In function 'virt_to_phys': > arch/powerpc/include/asm/page.h:113:26: error: 'virt_phys_offset' undeclared (first use in this function) > #define VIRT_PHYS_OFFSET virt_phys_offset > ^ > It doesn't have any strong reasons to make the RELOCATABLE depend on > ADVANCED_OPTIONS. So remove this dependency to fix this issue. > > Signed-off-by: Kevin Hao <haokexin@gmail.com> Series applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/da4230714662278781d007fb2b cheers
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 0a4cea451cf2..cb7910b9f10f 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -952,7 +952,7 @@ config DYNAMIC_MEMSTART config RELOCATABLE bool "Build a relocatable kernel" - depends on ADVANCED_OPTIONS && FLATMEM && (44x || FSL_BOOKE) + depends on FLATMEM && (44x || FSL_BOOKE) select NONSTATIC_KERNEL help This builds a kernel image that is capable of running at the
In the current code, the RELOCATABLE will be forcedly enabled when enabling CRASH_DUMP. But for ppc32, the RELOCABLE also depend on ADVANCED_OPTIONS and select NONSTATIC_KERNEL. This will cause the following build error when CRASH_DUMP=y && ADVANCED_OPTIONS=n because the select of NONSTATIC_KERNEL doesn't take effect. arch/powerpc/include/asm/io.h: In function 'virt_to_phys': arch/powerpc/include/asm/page.h:113:26: error: 'virt_phys_offset' undeclared (first use in this function) #define VIRT_PHYS_OFFSET virt_phys_offset ^ It doesn't have any strong reasons to make the RELOCATABLE depend on ADVANCED_OPTIONS. So remove this dependency to fix this issue. Signed-off-by: Kevin Hao <haokexin@gmail.com> --- arch/powerpc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)