summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/Config.in45
-rw-r--r--target/linux/Makefile3
-rw-r--r--target/linux/image/Makefile5
-rw-r--r--target/linux/image/jffs2.mk4
-rw-r--r--target/linux/image/squashfs.mk3
-rw-r--r--target/linux/linux-2.4/Makefile9
-rw-r--r--target/linux/linux-2.6/Makefile13
-rw-r--r--target/linux/linux-2.6/broadcom.mk3
-rw-r--r--target/linux/package/Makefile4
9 files changed, 35 insertions, 54 deletions
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 69f96c48d..4c1b5ee1b 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -1,13 +1,10 @@
-
-config BR2_LINUX_2_4
- bool "Linux 2.4 (choose only one target board)"
- default y
-
+choice
+ prompt "Target system"
+
config BR2_LINUX_2_4_BRCM
- bool "Support for Broadcom based routers"
+ bool "Support for Broadcom based routers [2.4]"
default y
depends BR2_mipsel
- depends BR2_LINUX_2_4
help
Build firmware images for Broadcom based routers
(e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)
@@ -17,48 +14,30 @@ config BR2_LINUX_2_4_BRCM
with TFTP client too.
config BR2_LINUX_2_4_AR7
- bool "Support for TI AR7 based devices"
+ bool "Support for TI AR7 based devices [2.4]"
default n
depends BR2_mipsel
- depends BR2_LINUX_2_4
help
Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
config BR2_LINUX_2_4_SOEKRIS
- bool "Support for Soekris boards"
+ bool "Support for Soekris boards [2.4]"
default n
depends BR2_i386
- depends BR2_LINUX_2_4
help
Build firmware images for Soekris based boards
(e.g. net4521, net4801)
-
- config BR2_TARGET_NET4521
- default y
- depends BR2_LINUX_2_4_SOEKRIS
- bool "Soekris net4521"
-
- config BR2_TARGET_NET4801
- default y
- depends BR2_LINUX_2_4_SOEKRIS
- bool "Soekris net4801"
-
-config BR2_LINUX_2_6
- bool "Linux 2.6"
- default n
-
+
config BR2_LINUX_2_6_BRCM
- bool "Support for Broadcom based routers"
+ bool "Support for Broadcom based routers [2.6]"
default n
depends BR2_mipsel
- depends BR2_LINUX_2_6
- select BR2_PACKAGE_KMOD_B44
- select BR2_PACKAGE_KMOD_MADWIFI
- select BR2_PACKAGE_ROBOCFG
help
Build firmware images for Broadcom based routers
(e.g. Netgear WGT634u)
-
+
+endchoice
+
comment "Kernel Modules"
config BR2_PACKAGE_KMOD_SANGAM_ATM_A
@@ -103,6 +82,7 @@ config BR2_PACKAGE_KMOD_BRCM_ET
config BR2_PACKAGE_KMOD_B44
tristate "Broadcom 44XX, 47XX ethernet driver"
default m
+ default y if BR2_LINUX_2_6_BRCM
help
Free driver for Broadcom Ethernet chipsets (without switch support)
@@ -347,7 +327,6 @@ config BR2_PACKAGE_KMOD_PPPOATM
config BR2_PACKAGE_KMOD_ATM
tristate "ATM support"
- default m
default y if BR2_LINUX_2_4_AR7
help
ATM support
diff --git a/target/linux/Makefile b/target/linux/Makefile
index 6fec977d6..2362ad6dd 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -58,6 +58,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
cp $(TOPDIR)/rules.mk $(IB_DIR)
cp -fpR ./image $(IB_DIR)/
cp $(TOPDIR)/.config $(IB_DIR)/
+ find $(IB_DIR) -name .svn | xargs rm -rf
find $(IB_DIR) -name CVS | xargs rm -rf
(cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2)
@@ -66,8 +67,10 @@ install: $(BIN_DIR)/$(IB_NAME).tar.bz2
endif
prepare:
+ @$(TRACE) target/linux/image/prepare
$(MAKE) -C image prepare
compile:
+ @$(TRACE) target/linux/image/compile
$(MAKE) -C image compile
install:
rebuild:
diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile
index 1e3e22f15..1dd48c752 100644
--- a/target/linux/image/Makefile
+++ b/target/linux/image/Makefile
@@ -17,10 +17,15 @@ endif
prepare:
compile:
install:
+
+$(BOARD)-compile:
+ @$(TRACE) target/linux/image/$(BOARD)/prepare
$(MAKE) -C $(BOARD) prepare
+ @$(TRACE) target/linux/image/$(BOARD)/compile
$(MAKE) -C $(BOARD) compile
install-ib:
+ @$(TRACE) target/linux/image/$(BOARD)/install-ib
-$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib
mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/
diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk
index 2a169ab32..ab8cfbef3 100644
--- a/target/linux/image/jffs2.mk
+++ b/target/linux/image/jffs2.mk
@@ -19,8 +19,10 @@ $(KDIR)/root.jffs2-8MB: install-prepare
@rm -rf $(KDIR)/root/jffs
$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root
-jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB
+jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB $(BOARD)-compile
+ $(TRACE) target/linux/image/$(BOARD)/install
$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB"
+ $(TRACE) target/linux/image/$(BOARD)/install
$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB"
jffs2-install-ib:
diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk
index 3811567a0..00411c05e 100644
--- a/target/linux/image/squashfs.mk
+++ b/target/linux/image/squashfs.mk
@@ -12,7 +12,8 @@ $(KDIR)/root.squashfs: install-prepare
@mkdir -p $(KDIR)/root/jffs
$(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -le
-squashfs-install: $(KDIR)/root.squashfs
+squashfs-install: $(KDIR)/root.squashfs $(BOARD)-compile
+ $(TRACE) target/linux/image/$(BOARD)/install
$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs"
squashfs-install-ib:
diff --git a/target/linux/linux-2.4/Makefile b/target/linux/linux-2.4/Makefile
index ede1e7a98..2754c4230 100644
--- a/target/linux/linux-2.4/Makefile
+++ b/target/linux/linux-2.4/Makefile
@@ -16,7 +16,7 @@ LINUX_BINARY_DRIVER_SITE := http://openwrt.org/downloads/sources/
LINUX_SOURCE := linux-$(LINUX_VERSION).tar.bz2
LINUX_SOURCE_DIR := $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)
MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
-TARGET_MODULES_DIR := $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)
+TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/lib/modules/$(LINUX_VERSION)
IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CONF_DIR=$(LINUX_BUILD_DIR) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
@@ -250,6 +250,7 @@ $(STAMP_DIR)/.linux-compile: $(LINUX_DIR)/.modules_done
@mkdir -p $(STAMP_DIR)
@$(MAKE) $(TARGETS)
ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR)
+ @$(TRACE) target/linux/package
$(MAKE) -C $(TOPDIR)/target/linux/package \
$(KPKG_MAKEOPTS) \
compile
@@ -274,12 +275,8 @@ compile: $(STAMP_DIR)/.linux-compile
install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG)
rm -rf $(LINUX_BUILD_DIR)/root*
+ cp -fpR $(BUILD_DIR)/root $(LINUX_BUILD_DIR)/
echo -e 'dest root /\noption offline_root $(LINUX_BUILD_DIR)/root' > $(LINUX_BUILD_DIR)/ipkg.conf
- $(MAKE) -C $(TOPDIR)/package \
- TARGET_DIR="$(LINUX_TARGET_DIR)" \
- IPKG_CONF="$(LINUX_BUILD_DIR)" \
- BOARD="$(BOARD)" \
- install
$(MAKE) -C $(TOPDIR)/target/linux/package \
$(KPKG_MAKEOPTS) \
install
diff --git a/target/linux/linux-2.6/Makefile b/target/linux/linux-2.6/Makefile
index 544b5c5c7..b61adf625 100644
--- a/target/linux/linux-2.6/Makefile
+++ b/target/linux/linux-2.6/Makefile
@@ -25,7 +25,7 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
LINUX_SOURCE := linux-$(LINUX_VERSION).tar.bz2
LINUX_SOURCE_DIR := $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)
MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
-TARGET_MODULES_DIR := $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)
+TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/lib/modules/$(LINUX_VERSION)
IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CONF_DIR=$(LINUX_BUILD_DIR) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
@@ -47,10 +47,6 @@ include $(LINUX_KCONFIG)
INSTALL_TARGETS := $(KERNEL_IPKG)
TARGETS :=
-ifeq ($(BOARD),brcm)
-include ./broadcom.mk
-endif
-
$(eval $(call KMOD_template,ATM,atm,\
$(MODULES_DIR)/kernel/net/atm/atm.ko \
$(MODULES_DIR)/kernel/net/atm/br2684.ko \
@@ -238,18 +234,15 @@ source: $(DL_DIR)/$(LINUX_SOURCE)
prepare: $(LINUX_DIR)/.configured
compile: $(LINUX_DIR)/.modules_done $(TARGETS)
ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR)
+ @$(TRACE) target/linux/package
$(MAKE) -C $(TOPDIR)/target/linux/package \
$(KPKG_MAKEOPTS) \
compile
install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG)
rm -rf $(LINUX_BUILD_DIR)/root*
+ cp -fpR $(BUILD_DIR)/root $(LINUX_BUILD_DIR)/
echo -e 'dest root /\noption offline_root $(LINUX_BUILD_DIR)/root' > $(LINUX_BUILD_DIR)/ipkg.conf
- $(MAKE) -C $(TOPDIR)/package \
- TARGET_DIR="$(LINUX_TARGET_DIR)" \
- IPKG_CONF="$(LINUX_BUILD_DIR)" \
- BOARD="$(BOARD)" \
- install
$(MAKE) -C $(TOPDIR)/target/linux/package \
$(KPKG_MAKEOPTS) \
install
diff --git a/target/linux/linux-2.6/broadcom.mk b/target/linux/linux-2.6/broadcom.mk
deleted file mode 100644
index f34fe6ac6..000000000
--- a/target/linux/linux-2.6/broadcom.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-# broadcom specific kmod packages
diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index 7e8588d99..6b7a85816 100644
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -34,20 +34,24 @@ MAKEOPTS:= BOARD="$(BOARD)" \
%-prepare:
+ @$(TRACE) target/linux/package/$(patsubst %-prepare,%,$@)-prepare
$(MAKE) -C $(patsubst %-prepare,%,$@) \
$(MAKEOPTS) \
prepare
%-compile: %-prepare
+ @$(TRACE) target/linux/package/$(patsubst %-compile,%,$@)-compile
$(MAKE) -C $(patsubst %-compile,%,$@) \
$(MAKEOPTS) \
compile
%-install: %-compile
+ @$(TRACE) target/linux/package/$(patsubst %-install,%,$@)-install
$(MAKE) -C $(patsubst %-install,%,$@) \
$(MAKEOPTS) \
install
%-clean:
+ @$(TRACE) target/linux/package/$(patsubst %-clean,%,$@)-clean
@$(MAKE) -C $(patsubst %-clean,%,$@) clean
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:15:33 +0000