Changeset 8653


Ignore:
Timestamp:
2007-09-06T18:27:37+02:00 (10 years ago)
Author:
nbd
Message:

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.

Location:
trunk
Files:
29 edited
142 copied
21 moved

Legend:

Unmodified
Added
Removed
  • trunk/include/kernel-build.mk

    r8494 r8653  
    111111  ifeq ($(DUMP),1) 
    112112    dumpinfo: 
    113                 @echo 'Target: $(BOARD)-$(KERNEL)' 
     113                @echo 'Target: $(BOARD)' 
     114                @echo 'Target-Kernel: $(KERNEL)' 
    114115                @echo 'Target-Name: $(BOARDNAME) [$(KERNEL)]' 
    115116                @echo 'Target-Path: $(subst $(TOPDIR)/,,$(PWD))' 
  • trunk/include/kernel.mk

    r8591 r8653  
    3131  endif 
    3232 
    33   PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) 
     33  PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD) 
    3434  PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) 
    35   KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(KERNEL)-$(BOARD)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) 
     35  KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) 
    3636  LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) 
    3737 
  • trunk/include/toplevel.mk

    r8362 r8653  
    123123 
    124124ifeq ($(findstring v,$(DEBUG)),) 
    125   .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 
     125  .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 
    126126endif 
    127127.PHONY: help FORCE 
  • trunk/package/acx/Makefile

    r8587 r8653  
    2727define KernelPackage/acx 
    2828  TITLE:=Driver for TI ACX1xx chipset 
    29   DEPENDS:=@LINUX_2_6&&!LINUX_2_6_AVR32 +wireless-tools 
     29  DEPENDS:=@LINUX_2_6 @!TARGET_AVR32 +wireless-tools 
    3030  DESCRIPTION:=\ 
    3131        This package contains a driver for TI ACX1xx 802.11a/b/g chipsets. 
  • trunk/package/admswconfig/Makefile

    r7402 r8653  
    2525  CATEGORY:=Utilities 
    2626  TITLE:=ADM5120 Switch configuration tool 
    27   DEPENDS:=@LINUX_2_6_ADM5120||@LINUX_2_6_ADM5120EB 
     27  DEPENDS:=@TARGET_ADM5120||TARGET_ADM5120EB 
    2828  DESCRIPTION:=\ 
    2929        A program to configure the internal ethernet switch of an ADM5120 processor. \\\ 
  • trunk/package/ar7-atm/Makefile

    r8575 r8653  
    2222define KernelPackage/sangam-atm-annex-a 
    2323  SUBMENU:=Network Devices 
    24   DEPENDS:=@LINUX_2_6_AR7 +kmod-atm  
     24  DEPENDS:=@TARGET_AR7 +kmod-atm  
    2525  TITLE:=AR7 ADSL driver (Annex A, ADSL over POTS) 
    2626  DESCRIPTION:=The AR7 ADSL driver for Annex A (ADSL over POTS) 
  • trunk/package/base-files/Makefile

    r8587 r8653  
    7070  $(call Package/gcc/Default) 
    7171  TITLE:=GCC support library 
    72   DEPENDS:=@!LINUX_2_6_AVR32||@!NATIVE_TOOLCHAIN 
     72  DEPENDS:=@!TARGET_AVR32 @!NATIVE_TOOLCHAIN 
    7373endef 
    7474 
  • trunk/package/bcm43xx-mac80211/Makefile

    r8587 r8653  
    2222  TITLE:=Broadcom 43xx wireless support 
    2323  DESCRIPTION:=Kernel module for Broadcom 43xx wireless support (mac80211) 
    24   DEPENDS:=@LINUX_2_6_BRCM47XX +kmod-mac80211 
     24  DEPENDS:=@TARGET_BRCM47XX +kmod-mac80211 
    2525  KCONFIG:=CONFIG_MAC80211 
    2626  FILES:=$(PKG_BUILD_DIR)/bcm43xx-mac80211.$(LINUX_KMOD_SUFFIX) 
  • trunk/package/broadcom-diag/Makefile

    r8587 r8653  
    1717define KernelPackage/diag 
    1818  SUBMENU:=Other modules 
    19   DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_6_BRCM||LINUX_2_6_BRCM47XX 
     19  DEPENDS:=@TARGET_BRCM_2_4||TARGET_BRCM47XX 
    2020  TITLE:=Driver for router LEDs and Buttons 
    2121  FILES:=$(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX) 
  • trunk/package/broadcom-mmc/Makefile

    r8587 r8653  
    2424define KernelPackage/broadcom-mmc 
    2525  SUBMENU:=Other modules 
    26   DEPENDS:=@LINUX_2_4_BRCM 
     26  DEPENDS:=@TARGET_BRCM_2_4 
    2727  TITLE:=Kernel driver for the Linksys WRT54G MM/SD-Card Mod 
    2828  DESCRIPTION:=\ 
  • trunk/package/broadcom-wl/Makefile

    r8575 r8653  
    2626  DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo 
    2727  SUBMENU:=Proprietary BCM43xx WiFi driver 
    28   SUBMENUDEP:=@LINUX_2_4_BRCM 
     28  SUBMENUDEP:=@TARGET_BRCM_2_4 
    2929endef 
    3030 
     
    3232  $(call Package/broadcom-wl/Default) 
    3333  SECTION:=kernel 
    34   DEPENDS:=@LINUX_2_4_BRCM 
     34  DEPENDS:=@TARGET_BRCM_2_4 
    3535  TITLE:=Kernel driver for BCM43xx chipsets 
    3636  DESCRIPTION:=\ 
  • trunk/package/fonera-mp3-drv/Makefile

    r8575 r8653  
    1919define KernelPackage/fonera-mp3-driver 
    2020  SUBMENU:=Other modules 
    21   DEPENDS:=@LINUX_2_6_ATHEROS 
     21  DEPENDS:=@TARGET_ATHEROS 
    2222  TITLE:=Fonera-MP3 driver (VS1011X) 
    2323  DESCRIPTION:=driver for a vs1011X attached to a fonera 
  • trunk/package/fonera-mp3/Makefile

    r8593 r8653  
    2020  SECTION:=utils 
    2121  CATEGORY:=Utilities 
    22   DEPENDS:=@LINUX_2_6_ATHEROS 
     22  DEPENDS:=@TARGET_ATHEROS 
    2323  TITLE:=Daemon for fonera-mp3 
    2424  DESCRIPTION:=Daemon to drive a vs1011X mp3 decoder attached to the \ 
  • trunk/package/foxboard-utils/Makefile

    r7469 r8653  
    2828        This package contains a collection of tools for configuring the foxboard gpio pins/leds  
    2929  URL:=http://www.acmesystems.it 
    30   DEPENDS:=@LINUX_2_6_ETRAX 
     30  DEPENDS:=@TARGET_ETRAX 
    3131endef 
    3232 
  • trunk/package/hostapd/Makefile

    r8368 r8653  
    3737define Package/hostapd 
    3838  $(call Package/hostapd/Default) 
    39   DEPENDS:=+libopenssl @!LINUX_2_6_AVR32 @!LINUX_2_6_ETRAX 
     39  DEPENDS:=+libopenssl @!TARGET_AVR32 @!TARGET_ETRAX 
    4040  TITLE+= (full) 
    4141  DESCRIPTION:=\ 
     
    5050define Package/hostapd-mini 
    5151  $(call Package/hostapd/Default) 
    52   DEPENDS:=@!LINUX_2_6_AVR32 @!LINUX_2_6_ETRAX 
     52  DEPENDS:=@!TARGET_AVR32 @!TARGET_ETRAX 
    5353  TITLE+= (WPA-PSK only) 
    5454  DESCRIPTION:=\ 
  • trunk/package/ipset/Makefile

    r8216 r8653  
    2222  SECTION:=net 
    2323  CATEGORY:=Network 
    24   DEPENDS:=@!LINUX_2_6_ETRAX 
     24  DEPENDS:=@!TARGET_ETRAX 
    2525  TITLE:=Netfilter ip sets administration utility 
    2626  URL:=http://ipset.netfilter.org/ 
  • trunk/package/kexec-tools/Makefile

    r8359 r8653  
    2222  SECTION:=utils 
    2323  CATEGORY:=Utilities 
    24   DEPENDS:=@LINUX_2_6_X86||@LINUX_2_6_RDC +zlib 
     24  DEPENDS:=@i386 +zlib 
    2525  TITLE:=Kernel boots kernel 
    2626  DESCRIPTION:=\ 
  • trunk/package/madwifi/Makefile

    r8575 r8653  
    4444 
    4545BUS:=PCI 
    46 ifneq ($(CONFIG_LINUX_2_6_ATHEROS),) 
     46ifneq ($(CONFIG_TARGET_ATHEROS),) 
    4747  BUS:=AHB 
    4848  HAL_TARGET:=ap51 
    49 endif 
    50 ifneq ($(CONFIG_LINUX_2_6_ARUBA),) 
    51   BUS:=PCI AHB  # no suitable HAL for AHB yet. 
    5249endif 
    5350 
  • trunk/package/nvram/Makefile

    r8587 r8653  
    1717  SECTION:=utils 
    1818  CATEGORY:=Utilities 
    19   DEPENDS:=@LINUX_2_4_BRCM 
     19  DEPENDS:=@TARGET_BRCM_2_4 
    2020  TITLE:=Broadcom config utility 
    2121  DESCRIPTION:=\ 
  • trunk/package/qc-usb/Makefile

    r8587 r8653  
    3737        other webcams with similar chipsets. 
    3838  SUBMENU:=USB Support 
    39   DEPENDS:=@LINUX_2_6 @USB_SUPPORT @VIDEO_SUPPORT kmod-usb-core +kmod-videodev 
     39  DEPENDS:=@LINUX_2_6 @USB_SUPPORT kmod-usb-core +kmod-videodev 
    4040  FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX) 
    4141  AUTOLOAD:=$(call AutoLoad,90,quickcam) 
  • trunk/package/switch/Makefile

    r8587 r8653  
    1717define KernelPackage/switch 
    1818  SUBMENU:=Other modules 
    19   DEPENDS:=@LINUX_2_6_BRCM||LINUX_2_4_BRCM||LINUX_2_6_BRCM47XX 
     19  DEPENDS:=@TARGET_BRCM_2_4||TARGET_BRCM47XX 
    2020  TITLE:=Switch drivers 
    2121  DESCRIPTION:=\ 
  • trunk/package/util-linux/Makefile

    r8498 r8653  
    2222  SECTION:=utils 
    2323  CATEGORY:=Utilities 
    24   DEPENDS:=@!LINUX_2_6_ETRAX 
     24  DEPENDS:=@!TARGET_ETRAX 
    2525  URL:=http://www.kernel.org/pub/linux/utils/util-linux/ 
    2626endef 
  • trunk/package/uvcvideo/Makefile

    r8575 r8653  
    2222define KernelPackage/uvcvideo 
    2323  SUBMENU:=USB Support 
    24   DEPENDS:=@LINUX_2_6 kmod-usb-core kmod-videodev @VIDEO_SUPPORT 
     24  DEPENDS:=@LINUX_2_6 kmod-usb-core kmod-videodev 
    2525  TITLE:=Driver for Linux-UVC based USB cameras 
    2626  URL:=http://linux-uvc.berlios.de/ 
  • trunk/package/wlcompat/Makefile

    r8587 r8653  
    1717define KernelPackage/wlcompat/Default 
    1818  SUBMENU:=Proprietary BCM43xx WiFi driver 
    19   SUBMENUDEP:=@LINUX_2_4_BRCM 
    20   DEPENDS:=@LINUX_2_4_BRCM @PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +wireless-tools 
     19  SUBMENUDEP:=@TARGET_BRCM_2_4 
     20  DEPENDS:=@TARGET_BRCM_2_4 @PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +wireless-tools 
    2121  TITLE:=Broadcom wl wrapper module 
    2222  DESCRIPTION:=\ 
  • trunk/package/yamonenv/Makefile

    r6582 r8653  
    2424  SECTION:=utils 
    2525  CATEGORY:=Utilities 
    26   DEPENDS:=@LINUX_2_6_AU1000 
     26  DEPENDS:=@TARGET_AU1000 
    2727  TITLE:=YAMON configuration utility 
    2828  URL:=http://meshcube.org/nylon/stable/sources/ 
  • trunk/package/zd1211-driver/Makefile

    r8584 r8653  
    2323define KernelPackage/zd1211 
    2424  SUBMENU:=Wireless Drivers 
    25   DEPENDS:=@LINUX_2_6&&!LINUX_2_6_UML 
     25  DEPENDS:=@LINUX_2_6 @USB_SUPPORT 
    2626  TITLE:=Driver for Zydas 1211 based USB devices 
    2727  DESCRIPTION:=\ 
  • trunk/scripts/metadata.pl

    r8275 r8653  
    2323        while (<>) { 
    2424                chomp; 
    25                 /^Target:\s*((.+)-(\d+\.\d+))\s*$/ and do { 
    26                         my $conf = uc $3.'_'.$2; 
     25                /^Target:\s*(.+)\s*$/ and do { 
     26                        my $conf = uc $1; 
    2727                        $conf =~ tr/\.-/__/; 
    2828                        $target = { 
    29                                 id => $1, 
    3029                                conf => $conf, 
    31                                 board => $2, 
    32                                 kernel => $3, 
     30                                board => $1, 
    3331                                profiles => [] 
    3432                        }; 
    3533                        push @target, $target; 
    3634                }; 
     35                /^Target-Kernel:\s*(\d+\.\d+)\s*$/ and $target->{kernel} = $1; 
    3736                /^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1; 
    3837                /^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1; 
     
    204203         
    205204        @target = sort { 
    206                 $a->{id} cmp $b->{id} 
     205                $a->{board} cmp $b->{board} 
    207206        } @target; 
    208207         
    209208        foreach my $target (@target) { 
    210209                my ($profiles_def, $profiles_eval); 
    211                 my $conf = uc $target->{kernel}.'_'.$target->{board}; 
    212                 $conf =~ tr/\.-/__/; 
    213                  
     210 
    214211                foreach my $profile (@{$target->{profiles}}) { 
    215212                        $profiles_def .= " 
    216   define Profile/$conf\_$profile->{id} 
     213  define Profile/$target->{conf}\_$profile->{id} 
    217214    ID:=$profile->{id} 
    218215    NAME:=$profile->{name} 
     
    221218                        $profiles_def .= "  endef"; 
    222219                        $profiles_eval .= " 
    223 \$(eval \$(call AddProfile,$conf\_$profile->{id}))" 
     220\$(eval \$(call AddProfile,$target->{conf}\_$profile->{id}))" 
    224221                } 
    225222                print " 
    226 ifeq (\$(CONFIG_LINUX_$conf),y) 
     223ifeq (\$(CONFIG_TARGET_$target->{conf}),y) 
    227224  define Target 
    228225    KERNEL:=$target->{kernel} 
     
    269266choice 
    270267        prompt "Target System" 
    271         default LINUX_2_4_BRCM 
     268        default TARGET_BRCM_2_4 
    272269        reset if !DEVEL 
    273270         
     
    290287         
    291288                print <<EOF 
    292 config LINUX_$target->{conf} 
     289config TARGET_$target->{conf} 
    293290        bool "$target->{name}" 
    294291        select $target->{arch} 
     
    300297 
    301298        print <<EOF; 
    302 if DEVEL 
    303  
    304 config LINUX_2_6_ARM 
    305         bool "UNSUPPORTED little-endian arm platform" 
    306         depends BROKEN 
    307         select LINUX_2_6 
    308         select arm 
    309  
    310 config LINUX_2_6_CRIS 
    311         bool "UNSUPPORTED cris platform" 
    312         depends BROKEN 
    313         select LINUX_2_6 
    314         select cris 
    315  
    316 config LINUX_2_6_M68K 
    317         bool "UNSUPPORTED m68k platform" 
    318         depends BROKEN 
    319         select LINUX_2_6 
    320         select m68k 
    321  
    322 config LINUX_2_6_SH3 
    323         bool "UNSUPPORTED little-endian sh3 platform" 
    324         depends BROKEN 
    325         select LINUX_2_6 
    326         select sh3 
    327  
    328 config LINUX_2_6_SH3EB 
    329         bool "UNSUPPORTED big-endian sh3 platform" 
    330         depends BROKEN 
    331         select LINUX_2_6 
    332         select sh3eb 
    333  
    334 config LINUX_2_6_SH4 
    335         bool "UNSUPPORTED little-endian sh4 platform" 
    336         depends BROKEN 
    337         select LINUX_2_6 
    338         select sh4 
    339  
    340 config LINUX_2_6_SH4EB 
    341         bool "UNSUPPORTED big-endian sh4 platform" 
    342         depends BROKEN 
    343         select LINUX_2_6 
    344         select sh4eb 
    345  
    346 config LINUX_2_6_SPARC 
    347         bool "UNSUPPORTED sparc platform" 
    348         depends BROKEN 
    349         select LINUX_2_6 
    350         select sparc 
    351  
    352 endif 
    353  
    354299endchoice 
    355300 
     
    364309                foreach my $profile (@$profiles) { 
    365310                        print <<EOF; 
    366 config LINUX_$target->{conf}_$profile->{id} 
     311config TARGET_$target->{conf}_$profile->{id} 
    367312        bool "$profile->{name}" 
    368         depends LINUX_$target->{conf} 
     313        depends TARGET_$target->{conf} 
    369314$profile->{config} 
    370315EOF 
  • trunk/target/linux/Makefile

    r8242 r8653  
    99 
    1010prereq clean download prepare compile install menuconfig oldconfig update refresh: FORCE 
    11         $(MAKE) -C $(BOARD)-$(KERNEL) $@ 
     11        $(MAKE) -C $(BOARD) $@ 
    1212 
  • trunk/target/linux/adm5120eb/files

    r8652 r8653  
    1 link ../adm5120-2.6/files 
     1link ../adm5120/files 
  • trunk/target/linux/adm5120eb/patches-2.6.22

    r8652 r8653  
    1 link ../adm5120-2.6/patches-2.6.22 
     1link ../adm5120/patches-2.6.22 
  • trunk/target/linux/brcm-2.4/Makefile

    r6502 r8653  
    88 
    99ARCH:=mipsel 
    10 BOARD:=brcm 
     10BOARD:=brcm-2.4 
    1111BOARDNAME:=Broadcom BCM947xx/953xx 
    1212FEATURES:=squashfs 
Note: See TracChangeset for help on using the changeset viewer.