diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-11-08 07:31:25 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-11-08 07:31:25 +0000 |
| commit | 3ca8fd679870d4e519be5361528484bf405ac793 (patch) | |
| tree | 04e3f1bf2d058c9d9cd9e08f33f325e0b3e8b9b4 | |
| parent | f802d1905de74153739f36dcbda42767bb0a800b (diff) | |
[buildroot] make targets provide their KERNELNAME
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23919 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/kernel-defaults.mk | 9 | ||||
| -rw-r--r-- | target/linux/avr32/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/rdc/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/x86/Makefile | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 5312ad498..312664ab7 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -6,15 +6,6 @@ # KERNELNAME= -ifneq (,$(findstring x86,$(BOARD))) - KERNELNAME="bzImage" -endif -ifneq (,$(findstring rdc,$(BOARD))) - KERNELNAME="bzImage" -endif -ifneq (,$(findstring avr32,$(BOARD))) - KERNELNAME="uImage" -endif KERNEL_MAKEOPTS := -C $(LINUX_DIR) \ CROSS_COMPILE="$(KERNEL_CROSS)" \ diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 62d249610..8c85be2fd 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -20,4 +20,6 @@ define Target/Description Build firmware images for ATNGW100 board endef +KERNELNAME:=uImage + $(eval $(call BuildTarget)) diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile index be5936cfc..9099e783e 100644 --- a/target/linux/rdc/Makefile +++ b/target/linux/rdc/Makefile @@ -16,6 +16,8 @@ LINUX_VERSION:=2.6.32.25 include $(INCLUDE_DIR)/target.mk +KERNELNAME:=bzImage + DEFAULT_PACKAGES += wpad-mini kmod-libphy kmod-r6040 kmod-input-core \ kmod-input-polldev kmod-input-gpio-buttons kmod-button-hotplug \ kmod-rdc321x-wdt diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 3cbed9542..fb365dd8e 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -16,6 +16,8 @@ LINUX_VERSION:=2.6.32.25 include $(INCLUDE_DIR)/target.mk +KERNELNAME:=bzImage + $(eval $(call BuildTarget)) $(eval $(call $(if $(CONFIG_TARGET_ROOTFS_ISO),RequireCommand,Ignore),mkisofs, \ |