diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-05-14 07:10:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-05-14 07:10:55 +0200 |
| commit | cc31adf78d10eb1a5880ef51e240ab4273315e4b (patch) | |
| tree | 4a33bb60a4e230634e60dfe7503e60c2536ecdcd /common | |
| parent | e4ea8e8bfa7a37fea2d97c3d268206417e196bdf (diff) | |
| parent | 992116ba3aeda6635c103ea2d04682bdd081fb4b (diff) | |
| download | barebox-cc31adf78d10eb1a5880ef51e240ab4273315e4b.tar.gz barebox-cc31adf78d10eb1a5880ef51e240ab4273315e4b.tar.xz | |
Merge branch 'for-next/kbuild'
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 3 | ||||
| -rw-r--r-- | common/Makefile | 4 | ||||
| -rw-r--r-- | common/image.c | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/common/Kconfig b/common/Kconfig index 44a955c5ff..f514e3b4a2 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1,8 +1,7 @@ config DEFCONFIG_LIST string option defconfig_list - default ARCH_DEFCONFIG - default "arch/$(ARCH)/defconfig" + default "arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)" config GREGORIAN_CALENDER bool diff --git a/common/Makefile b/common/Makefile index 84463b4d48..c14af692f9 100644 --- a/common/Makefile +++ b/common/Makefile @@ -86,11 +86,9 @@ echo "\";" \ endef endif -include/generated/passwd.h: $(srctree)/$(src)/Makefile FORCE +include/generated/passwd.h: FORCE $(call filechk,passwd) -targets += include/generated/passwd.h - $(obj)/password.o: include/generated/passwd.h endif # CONFIG_PASSWORD diff --git a/common/image.c b/common/image.c index 04cd86bf9a..fc10ce5fd9 100644 --- a/common/image.c +++ b/common/image.c @@ -50,6 +50,7 @@ static table_entry_t arch_name[] = { { IH_ARCH_MIPS64, "mips64", "MIPS 64 Bit", }, { IH_ARCH_NIOS, "nios", "NIOS", }, { IH_ARCH_NIOS2, "nios2", "NIOS II", }, + { IH_ARCH_PPC, "powerpc", "PowerPC", }, { IH_ARCH_PPC, "ppc", "PowerPC", }, { IH_ARCH_S390, "s390", "IBM S390", }, { IH_ARCH_SH, "sh", "SuperH", }, |