Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ba7f80f authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michael Ellerman
Browse files

powerpc/boot: pass CONFIG options in a simpler and more robust way 



Commit 5e9dcb61 ("powerpc/boot: Expose Kconfig symbols to wrapper")
was wrong, but commit e41b93a6 ("powerpc/boot: Fix build failures
with -j 1") was also wrong.

The correct dependency is:

  $(obj)/serial.o: $(obj)/autoconf.h

However, I do not see the reason why we need to copy autoconf.h to
arch/power/boot/. Nor do I see consistency in the way of passing
CONFIG options.

decompress.c references CONFIG_KERNEL_GZIP and CONFIG_KERNEL_XZ, which
are passed via the command line.

serial.c includes autoconf.h to reference a couple of CONFIG options,
but this is fragile because we often forget to include "autoconf.h"
from source files.

In fact, it is already broken.

ppc_asm.h references CONFIG_PPC_8xx, but utils.S is not given any way
to access CONFIG options. So, CONFIG_PPC_8xx is never defined here.

Pass $(LINUXINCLUDE) to make sure CONFIG options are accessible from
all .c and .S files in arch/powerpc/boot/.

I also removed the -traditional flag to make include/linux/kconfig.h
work. This flag makes the preprocessor imitate the behavior of the
pre-standard C compiler, but I do not understand why it is necessary.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190705100144.28785-2-yamada.masahiro@socionext.com
parent 9e005b76

arch/powerpc/boot/.gitignore

+0 −2
Original line number Diff line number Diff line
@@ -44,5 +44,3 @@ fdt_sw.c 
fdt_wip.c

libfdt.h

libfdt_internal.h
 
autoconf.h

arch/powerpc/boot/Makefile

+3 −13
Original line number Diff line number Diff line
@@ -20,11 +20,6 @@ 


all: $(obj)/zImage



compress-$(CONFIG_KERNEL_GZIP) := CONFIG_KERNEL_GZIP

compress-$(CONFIG_KERNEL_XZ)   := CONFIG_KERNEL_XZ

compress-$(CONFIG_KERNEL_LZMA) := CONFIG_KERNEL_LZMA

compress-$(CONFIG_KERNEL_LZO)   := CONFIG_KERNEL_LZO



ifdef CROSS32_COMPILE

    BOOTCC := $(CROSS32_COMPILE)gcc

    BOOTAR := $(CROSS32_COMPILE)ar
@@ -36,7 +31,7 @@ endif 
BOOTCFLAGS    := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

		 -fno-strict-aliasing -O2 -msoft-float -mno-altivec -mno-vsx \

		 -pipe -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \

		 -D$(compress-y)

		 $(LINUXINCLUDE)



ifdef CONFIG_PPC64_BOOT_WRAPPER

BOOTCFLAGS	+= -m64
@@ -53,7 +48,7 @@ BOOTCFLAGS += -mlittle-endian 
BOOTCFLAGS	+= $(call cc-option,-mabi=elfv2)

endif



BOOTAFLAGS	:= -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc

BOOTAFLAGS	:= -D__ASSEMBLY__ $(BOOTCFLAGS) -nostdinc



BOOTARFLAGS	:= -cr$(KBUILD_ARFLAGS)
@@ -204,14 +199,9 @@ $(obj)/empty.c: 
$(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds : $(obj)/%: $(srctree)/$(src)/%.S

	$(Q)cp $< $@



$(srctree)/$(src)/serial.c: $(obj)/autoconf.h



$(obj)/autoconf.h: $(obj)/%: $(objtree)/include/generated/%

	$(Q)cp $< $@



clean-files := $(zlib-) $(zlibheader-) $(zliblinuxheader-) \

		$(zlib-decomp-) $(libfdt) $(libfdtheader) \

		autoconf.h empty.c zImage.coff.lds zImage.ps3.lds zImage.lds

		empty.c zImage.coff.lds zImage.ps3.lds zImage.lds



quiet_cmd_bootcc = BOOTCC  $@

      cmd_bootcc = $(BOOTCC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<

arch/powerpc/boot/serial.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include "stdio.h"

#include "io.h"

#include "ops.h"

#include "autoconf.h"



static int serial_open(void)

{