strip the kernel version suffix from target directories, except for brcm-2.4 (the -2.4 will be included in the board name here). CONFIG_LINUX_<ver>_<board> becomes CONFIG_TARGET_<board>, same for profiles.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8653 3c298f89-4303-0410-b956-a3cf2f4a3e73

include/kernel-build.mk

@@ -110,7 +110,8 @@ define BuildKernel
 
   ifeq ($(DUMP),1)
     dumpinfo:
-		@echo 'Target: $(BOARD)-$(KERNEL)'
+		@echo 'Target: $(BOARD)'
+		@echo 'Target-Kernel: $(KERNEL)'
 		@echo 'Target-Name: $(BOARDNAME) [$(KERNEL)]'
 		@echo 'Target-Path: $(subst $(TOPDIR)/,,$(PWD))'
 		@echo 'Target-Arch: $(ARCH)'

include/kernel.mk

@@ -30,9 +30,9 @@ else
     KERNEL_CROSS:=$(TARGET_CROSS)
   endif
 
-  PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)
+  PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)
   PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
-  KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(KERNEL)-$(BOARD)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
+  KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
   LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 
   MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)

include/toplevel.mk

@@ -122,7 +122,7 @@ distclean:
 	rm -rf tmp build_dir staging_dir dl .config*
 
 ifeq ($(findstring v,$(DEBUG)),)
-  .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target prepare-tmpinfo
+  .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package prepare-tmpinfo
 endif
 .PHONY: help FORCE
 .NOTPARALLEL:

package/acx/Makefile

@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/acx
   TITLE:=Driver for TI ACX1xx chipset
-  DEPENDS:=@LINUX_2_6&&!LINUX_2_6_AVR32 +wireless-tools
+  DEPENDS:=@LINUX_2_6 @!TARGET_AVR32 +wireless-tools
   DESCRIPTION:=\
 	This package contains a driver for TI ACX1xx 802.11a/b/g chipsets.
   URL:=http://acx100.sourceforge.net/

package/admswconfig/Makefile

@@ -24,7 +24,7 @@ define Package/admswconfig
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=ADM5120 Switch configuration tool
-  DEPENDS:=@LINUX_2_6_ADM5120||@LINUX_2_6_ADM5120EB
+  DEPENDS:=@TARGET_ADM5120||TARGET_ADM5120EB
   DESCRIPTION:=\
 	A program to configure the internal ethernet switch of an ADM5120 processor. \\\
 	You need the corresponding driver for the switch in the kernel. \\\

package/ar7-atm/Makefile

@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/sangam-atm-annex-a
   SUBMENU:=Network Devices
-  DEPENDS:=@LINUX_2_6_AR7 +kmod-atm 
+  DEPENDS:=@TARGET_AR7 +kmod-atm 
   TITLE:=AR7 ADSL driver (Annex A, ADSL over POTS)
   DESCRIPTION:=The AR7 ADSL driver for Annex A (ADSL over POTS)
   FILES:=$(PKG_BUILD_DIR)/tiatm.$(LINUX_KMOD_SUFFIX)

package/base-files/Makefile

@@ -69,7 +69,7 @@ endef
 define Package/libgcc
   $(call Package/gcc/Default)
   TITLE:=GCC support library
-  DEPENDS:=@!LINUX_2_6_AVR32||@!NATIVE_TOOLCHAIN
+  DEPENDS:=@!TARGET_AVR32 @!NATIVE_TOOLCHAIN
 endef
 
 define Package/libssp

package/bcm43xx-mac80211/Makefile

@@ -21,7 +21,7 @@ define KernelPackage/bcm43xx-mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=Broadcom 43xx wireless support
   DESCRIPTION:=Kernel module for Broadcom 43xx wireless support (mac80211)
-  DEPENDS:=@LINUX_2_6_BRCM47XX +kmod-mac80211
+  DEPENDS:=@TARGET_BRCM47XX +kmod-mac80211
   KCONFIG:=CONFIG_MAC80211
   FILES:=$(PKG_BUILD_DIR)/bcm43xx-mac80211.$(LINUX_KMOD_SUFFIX)
 #  AUTOLOAD:=$(call AutoLoad,30,bcm43xx-mac80211)

package/broadcom-diag/Makefile

@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/diag
   SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_6_BRCM||LINUX_2_6_BRCM47XX
+  DEPENDS:=@TARGET_BRCM_2_4||TARGET_BRCM47XX
   TITLE:=Driver for router LEDs and Buttons
   FILES:=$(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX)
 endef

package/broadcom-mmc/Makefile

@@ -23,7 +23,7 @@ MAKEFLAGS_KMOD:= -C "$(LINUX_DIR)" \
 
 define KernelPackage/broadcom-mmc
   SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_4_BRCM
+  DEPENDS:=@TARGET_BRCM_2_4
   TITLE:=Kernel driver for the Linksys WRT54G MM/SD-Card Mod
   DESCRIPTION:=\
 	Kernel driver for the Linksys WRT54G MM/SD-Card Mod

package/broadcom-wl/Makefile

@@ -25,13 +25,13 @@ define Package/broadcom-wl/Default
   CATEGORY:=Kernel modules
   DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo
   SUBMENU:=Proprietary BCM43xx WiFi driver
-  SUBMENUDEP:=@LINUX_2_4_BRCM
+  SUBMENUDEP:=@TARGET_BRCM_2_4
 endef
 
 define KernelPackage/brcm-wl/Default
   $(call Package/broadcom-wl/Default)
   SECTION:=kernel
-  DEPENDS:=@LINUX_2_4_BRCM
+  DEPENDS:=@TARGET_BRCM_2_4
   TITLE:=Kernel driver for BCM43xx chipsets
   DESCRIPTION:=\
 	This package contains the proprietary wireless driver for the Broadcom \\\

package/fonera-mp3-drv/Makefile

@@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/fonera-mp3-driver
   SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_6_ATHEROS
+  DEPENDS:=@TARGET_ATHEROS
   TITLE:=Fonera-MP3 driver (VS1011X)
   DESCRIPTION:=driver for a vs1011X attached to a fonera
   FILES:=$(PKG_BUILD_DIR)/mp3_drv.$(LINUX_KMOD_SUFFIX)

package/fonera-mp3/Makefile

@@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/fonera-mp3d
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@LINUX_2_6_ATHEROS
+  DEPENDS:=@TARGET_ATHEROS
   TITLE:=Daemon for fonera-mp3
   DESCRIPTION:=Daemon to drive a vs1011X mp3 decoder attached to the \
 	  fonera gpio pins

package/foxboard-utils/Makefile

@@ -27,7 +27,7 @@ define Package/foxboard-utils
   DESCRIPTION:=\
 	This package contains a collection of tools for configuring the foxboard gpio pins/leds 
   URL:=http://www.acmesystems.it
-  DEPENDS:=@LINUX_2_6_ETRAX
+  DEPENDS:=@TARGET_ETRAX
 endef
 
 define Build/Compile

package/hostapd/Makefile

@@ -36,7 +36,7 @@ endef
 
 define Package/hostapd
   $(call Package/hostapd/Default)
-  DEPENDS:=+libopenssl @!LINUX_2_6_AVR32 @!LINUX_2_6_ETRAX
+  DEPENDS:=+libopenssl @!TARGET_AVR32 @!TARGET_ETRAX
   TITLE+= (full)
   DESCRIPTION:=\
 	This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\
@@ -49,7 +49,7 @@ endef
 
 define Package/hostapd-mini
   $(call Package/hostapd/Default)
-  DEPENDS:=@!LINUX_2_6_AVR32 @!LINUX_2_6_ETRAX
+  DEPENDS:=@!TARGET_AVR32 @!TARGET_ETRAX
   TITLE+= (WPA-PSK only)
   DESCRIPTION:=\
 	This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\

package/ipset/Makefile

@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/ipset
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=@!LINUX_2_6_ETRAX
+  DEPENDS:=@!TARGET_ETRAX
   TITLE:=Netfilter ip sets administration utility
   URL:=http://ipset.netfilter.org/
 endef

package/kexec-tools/Makefile

@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/kexec-tools
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@LINUX_2_6_X86||@LINUX_2_6_RDC +zlib
+  DEPENDS:=@i386 +zlib
   TITLE:=Kernel boots kernel
   DESCRIPTION:=\
 	kexec is a set of systems call that allows you to load \\\

package/madwifi/Makefile

@@ -43,13 +43,10 @@ ifeq ($(ARCH),powerpc)
 endif
 
 BUS:=PCI
-ifneq ($(CONFIG_LINUX_2_6_ATHEROS),)
+ifneq ($(CONFIG_TARGET_ATHEROS),)
   BUS:=AHB
   HAL_TARGET:=ap51
 endif
-ifneq ($(CONFIG_LINUX_2_6_ARUBA),)
-  BUS:=PCI AHB	# no suitable HAL for AHB yet.
-endif
 
 BUS_MODULES:=
 ifeq ($(findstring AHB,$(BUS)),AHB)

package/nvram/Makefile

@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/nvram
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@LINUX_2_4_BRCM
+  DEPENDS:=@TARGET_BRCM_2_4
   TITLE:=Broadcom config utility
   DESCRIPTION:=\
 	This package contains an utility to control broadcom's 'nvram' config \\\

package/qc-usb/Makefile

@@ -36,7 +36,7 @@ define KernelPackage/usb-qc
 	Kernel support for Logitech's QuickCam Express webcam and \\\
 	other webcams with similar chipsets.
   SUBMENU:=USB Support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT @VIDEO_SUPPORT kmod-usb-core +kmod-videodev
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT kmod-usb-core +kmod-videodev
   FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,quickcam)
 endef

package/switch/Makefile

@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/switch
   SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_6_BRCM||LINUX_2_4_BRCM||LINUX_2_6_BRCM47XX
+  DEPENDS:=@TARGET_BRCM_2_4||TARGET_BRCM47XX
   TITLE:=Switch drivers
   DESCRIPTION:=\
 	This package contains switch drivers for ADM6996L and BCM53XX RoboSwitch.

package/util-linux/Makefile

@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/util-linux/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@!LINUX_2_6_ETRAX
+  DEPENDS:=@!TARGET_ETRAX
   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 

package/uvcvideo/Makefile

@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/uvcvideo
   SUBMENU:=USB Support
-  DEPENDS:=@LINUX_2_6 kmod-usb-core kmod-videodev @VIDEO_SUPPORT
+  DEPENDS:=@LINUX_2_6 kmod-usb-core kmod-videodev
   TITLE:=Driver for Linux-UVC based USB cameras
   URL:=http://linux-uvc.berlios.de/
   FILES:=$(PKG_BUILD_DIR)/uvcvideo.$(LINUX_KMOD_SUFFIX)

package/wlcompat/Makefile

@@ -16,8 +16,8 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/wlcompat/Default
   SUBMENU:=Proprietary BCM43xx WiFi driver
-  SUBMENUDEP:=@LINUX_2_4_BRCM
+  SUBMENUDEP:=@TARGET_BRCM_2_4
-  DEPENDS:=@LINUX_2_4_BRCM @PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +wireless-tools
+  DEPENDS:=@TARGET_BRCM_2_4 @PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +wireless-tools
   TITLE:=Broadcom wl wrapper module
   DESCRIPTION:=\
 	This package contains a wrapper module, that provides Wireless Extension \\\

package/yamonenv/Makefile

@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/yamonenv
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@LINUX_2_6_AU1000
+  DEPENDS:=@TARGET_AU1000
   TITLE:=YAMON configuration utility
   URL:=http://meshcube.org/nylon/stable/sources/
 endef

package/zd1211-driver/Makefile

@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 #FIXME: add proper dependency handling on kmod-usb-core packages
 define KernelPackage/zd1211
   SUBMENU:=Wireless Drivers
-  DEPENDS:=@LINUX_2_6&&!LINUX_2_6_UML
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT
   TITLE:=Driver for Zydas 1211 based USB devices
   DESCRIPTION:=\
 	This package contains a Linux driver for the ZyDAS ZD1211 802.11b/g \\\

scripts/metadata.pl

@@ -22,18 +22,17 @@ sub parse_target_metadata() {
 	my ($target, @target, $profile);	
 	while (<>) {
 		chomp;
-		/^Target:\s*((.+)-(\d+\.\d+))\s*$/ and do {
+		/^Target:\s*(.+)\s*$/ and do {
-			my $conf = uc $3.'_'.$2;
+			my $conf = uc $1;
 			$conf =~ tr/\.-/__/;
 			$target = {
-				id => $1,
 				conf => $conf,
-				board => $2,
+				board => $1,
-				kernel => $3,
 				profiles => []
 			};
 			push @target, $target;
 		};
+		/^Target-Kernel:\s*(\d+\.\d+)\s*$/ and $target->{kernel} = $1;
 		/^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1;
 		/^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1;
 		/^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1;
@@ -203,27 +202,25 @@ sub gen_target_mk() {
 	my @target = parse_target_metadata();
 	
 	@target = sort {
-		$a->{id} cmp $b->{id}
+		$a->{board} cmp $b->{board}
 	} @target;
 	
 	foreach my $target (@target) {
 		my ($profiles_def, $profiles_eval);
-		my $conf = uc $target->{kernel}.'_'.$target->{board};
-		$conf =~ tr/\.-/__/;
 
 		foreach my $profile (@{$target->{profiles}}) {
 			$profiles_def .= "
-  define Profile/$conf\_$profile->{id}
+  define Profile/$target->{conf}\_$profile->{id}
     ID:=$profile->{id}
     NAME:=$profile->{name}
     PACKAGES:=".join(" ", merge_package_lists($target->{packages}, $profile->{packages}))."\n";
 			$profile->{kconfig} and $profiles_def .= "    KCONFIG:=1\n";
 			$profiles_def .= "  endef";
 			$profiles_eval .= "
-\$(eval \$(call AddProfile,$conf\_$profile->{id}))"
+\$(eval \$(call AddProfile,$target->{conf}\_$profile->{id}))"
 		}
 		print "
-ifeq (\$(CONFIG_LINUX_$conf),y)
+ifeq (\$(CONFIG_TARGET_$target->{conf}),y)
   define Target
     KERNEL:=$target->{kernel}
     BOARD:=$target->{board}
@@ -268,7 +265,7 @@ sub gen_target_config() {
 	print <<EOF;
 choice
 	prompt "Target System"
-	default LINUX_2_4_BRCM
+	default TARGET_BRCM_2_4
 	reset if !DEVEL
 	
 EOF
@@ -289,7 +286,7 @@ EOF
 		}
 	
 		print <<EOF
-config LINUX_$target->{conf}
+config TARGET_$target->{conf}
 	bool "$target->{name}"
 	select $target->{arch}
 	select LINUX_$kernel
@@ -299,58 +296,6 @@ EOF
 	}
 
 	print <<EOF;
-if DEVEL
-
-config LINUX_2_6_ARM
-	bool "UNSUPPORTED little-endian arm platform"
-	depends BROKEN
-	select LINUX_2_6
-	select arm
-
-config LINUX_2_6_CRIS
-	bool "UNSUPPORTED cris platform"
-	depends BROKEN
-	select LINUX_2_6
-	select cris
-
-config LINUX_2_6_M68K
-	bool "UNSUPPORTED m68k platform"
-	depends BROKEN
-	select LINUX_2_6
-	select m68k
-
-config LINUX_2_6_SH3
-	bool "UNSUPPORTED little-endian sh3 platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sh3
-
-config LINUX_2_6_SH3EB
-	bool "UNSUPPORTED big-endian sh3 platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sh3eb
-
-config LINUX_2_6_SH4
-	bool "UNSUPPORTED little-endian sh4 platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sh4
-
-config LINUX_2_6_SH4EB
-	bool "UNSUPPORTED big-endian sh4 platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sh4eb
-
-config LINUX_2_6_SPARC
-	bool "UNSUPPORTED sparc platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sparc
-
-endif
-
 endchoice
 
 choice
@@ -363,9 +308,9 @@ EOF
 		
 		foreach my $profile (@$profiles) {
 			print <<EOF;
-config LINUX_$target->{conf}_$profile->{id}
+config TARGET_$target->{conf}_$profile->{id}
 	bool "$profile->{name}"
-	depends LINUX_$target->{conf}
+	depends TARGET_$target->{conf}
 $profile->{config}
 EOF
 			$profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";

target/linux/Makefile

@@ -8,5 +8,5 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
 prereq clean download prepare compile install menuconfig oldconfig update refresh: FORCE
-	$(MAKE) -C $(BOARD)-$(KERNEL) $@
+	$(MAKE) -C $(BOARD) $@