diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2008-07-09 11:41:52 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2008-07-09 11:41:52 -0400 |
commit | c356aa456e8677682aa3cdb4b81d08e814b1a379 (patch) | |
tree | 1c7d7b2bebb66bd631a16b2cfacfab66b3c6cbfd | |
parent | 1d46e379aae7349069f459618f53fd5193c2fd29 (diff) |
powerpc/bootwrapper: Allow user to specify additional default targets
It is inconvenient to add additional default targets to the bootwrapper
Makefile for each new board supported which just needs a different dts
file. This change allows the defconfig to specify additional build
targets.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
-rw-r--r-- | arch/powerpc/Kconfig | 13 | ||||
-rw-r--r-- | arch/powerpc/boot/Makefile | 3 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index f2a0f50146e1..3216a3a98396 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -458,6 +458,19 @@ config CMDLINE | |||
458 | some command-line options at build time by entering them here. In | 458 | some command-line options at build time by entering them here. In |
459 | most cases you will need to specify the root device here. | 459 | most cases you will need to specify the root device here. |
460 | 460 | ||
461 | config EXTRA_TARGETS | ||
462 | string "Additional default image types" | ||
463 | help | ||
464 | List additional targets to be built by the bootwrapper here (separated | ||
465 | by spaces). This is useful for targets that depend of device tree | ||
466 | files in the .dts directory. | ||
467 | |||
468 | Targets in this list will be build as part of the default build | ||
469 | target, or when the user does a 'make zImage' or a | ||
470 | 'make zImage.initrd'. | ||
471 | |||
472 | If unsure, leave blank | ||
473 | |||
461 | if !44x || BROKEN | 474 | if !44x || BROKEN |
462 | config ARCH_WANTS_FREEZER_CONTROL | 475 | config ARCH_WANTS_FREEZER_CONTROL |
463 | def_bool y | 476 | def_bool y |
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index df6e62116e37..88d30dbed7b7 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -276,6 +276,9 @@ ifeq ($(CONFIG_PPC32),y) | |||
276 | image-$(CONFIG_PPC_PMAC) += zImage.coff zImage.miboot | 276 | image-$(CONFIG_PPC_PMAC) += zImage.coff zImage.miboot |
277 | endif | 277 | endif |
278 | 278 | ||
279 | # Allow extra targets to be added to the defconfig | ||
280 | image-y += $(subst ",,$(CONFIG_EXTRA_TARGETS)) | ||
281 | |||
279 | initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-)) | 282 | initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-)) |
280 | initrd-y := $(patsubst zImage%, zImage.initrd%, \ | 283 | initrd-y := $(patsubst zImage%, zImage.initrd%, \ |
281 | $(patsubst dtbImage%, dtbImage.initrd%, \ | 284 | $(patsubst dtbImage%, dtbImage.initrd%, \ |