From a934246178d7c686bf28c3dbed57b06120cb48d0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 19 Nov 2009 09:53:00 +0100 Subject: rename DEVICE to ADK_TARGET - the name is better, because qemu f.e. is no hardware device - use make TARGET=alix1c to start with a configuration for this target - use make TARGET=alix1c allmodconfig to generate a mostly complete config to build all available packages for this platform as a package The all.config and .defconfig files needed to get this working are dynamically generated. --- Makefile | 25 +++++++---- TODO | 11 +---- mk/build.mk | 79 ++++++++++++++++++++++++--------- mk/cpu.mk | 2 +- mk/image.mk | 12 ++--- mk/kernel-build.mk | 20 ++++----- mk/kernel.mk | 10 ++--- mk/vars.mk | 4 +- package/base-files/Makefile | 8 ++-- package/em28xx/Makefile | 5 +-- package/exmap/Makefile | 2 +- package/heimdal/Config.in | 1 + package/heimdal/Makefile | 7 +-- package/ipset/Makefile | 2 +- package/krb5/Config.in | 1 + package/mac80211/Makefile | 6 +-- rules.mk | 12 ++--- target/Config.in | 99 +++++++++++++++++++++--------------------- target/Makefile | 14 +++--- target/alix1c/Makefile | 1 - target/alix1c/device.mk | 7 --- target/alix1c/target.mk | 7 +++ target/foxboard/device.mk | 7 --- target/foxboard/target.mk | 7 +++ target/g1/device.mk | 7 --- target/g1/target.mk | 7 +++ target/lemote/device.mk | 7 --- target/lemote/target.mk | 7 +++ target/native/device.mk | 6 --- target/native/target.mk | 6 +++ target/qemu-arm/device.mk | 7 --- target/qemu-arm/target.mk | 7 +++ target/qemu-cris/device.mk | 7 --- target/qemu-cris/target.mk | 7 +++ target/qemu-mips/device.mk | 7 --- target/qemu-mips/target.mk | 7 +++ target/qemu-mips64/device.mk | 7 --- target/qemu-mips64/target.mk | 7 +++ target/qemu-mips64el/device.mk | 7 --- target/qemu-mips64el/target.mk | 7 +++ target/qemu-mipsel/device.mk | 7 --- target/qemu-mipsel/target.mk | 7 +++ target/qemu-x86/device.mk | 7 --- target/qemu-x86/target.mk | 7 +++ target/qemu-x86_64/device.mk | 7 --- target/qemu-x86_64/target.mk | 7 +++ target/rb411/device.mk | 7 --- target/rb411/target.mk | 7 +++ target/rb433/device.mk | 7 --- target/rb433/target.mk | 7 +++ target/rb532/device.mk | 7 --- target/rb532/target.mk | 7 +++ target/rescue-x86/device.mk | 7 --- target/rescue-x86/target.mk | 7 +++ target/rescue-x86_64/device.mk | 7 --- target/rescue-x86_64/target.mk | 7 +++ target/shuttle/device.mk | 7 --- target/shuttle/target.mk | 7 +++ target/tomtom/device.mk | 7 --- target/tomtom/target.mk | 7 +++ target/wag54g/device.mk | 7 --- target/wag54g/target.mk | 7 +++ target/zaurus/device.mk | 7 --- target/zaurus/target.mk | 7 +++ toolchain/eglibc/Makefile | 2 +- toolchain/gcc/Makefile | 8 +--- toolchain/glibc/Makefile | 2 +- toolchain/uClibc/Makefile | 2 +- 68 files changed, 335 insertions(+), 306 deletions(-) delete mode 100644 target/alix1c/device.mk create mode 100644 target/alix1c/target.mk delete mode 100644 target/foxboard/device.mk create mode 100644 target/foxboard/target.mk delete mode 100644 target/g1/device.mk create mode 100644 target/g1/target.mk delete mode 100644 target/lemote/device.mk create mode 100644 target/lemote/target.mk delete mode 100644 target/native/device.mk create mode 100644 target/native/target.mk delete mode 100644 target/qemu-arm/device.mk create mode 100644 target/qemu-arm/target.mk delete mode 100644 target/qemu-cris/device.mk create mode 100644 target/qemu-cris/target.mk delete mode 100644 target/qemu-mips/device.mk create mode 100644 target/qemu-mips/target.mk delete mode 100644 target/qemu-mips64/device.mk create mode 100644 target/qemu-mips64/target.mk delete mode 100644 target/qemu-mips64el/device.mk create mode 100644 target/qemu-mips64el/target.mk delete mode 100644 target/qemu-mipsel/device.mk create mode 100644 target/qemu-mipsel/target.mk delete mode 100644 target/qemu-x86/device.mk create mode 100644 target/qemu-x86/target.mk delete mode 100644 target/qemu-x86_64/device.mk create mode 100644 target/qemu-x86_64/target.mk delete mode 100644 target/rb411/device.mk create mode 100644 target/rb411/target.mk delete mode 100644 target/rb433/device.mk create mode 100644 target/rb433/target.mk delete mode 100644 target/rb532/device.mk create mode 100644 target/rb532/target.mk delete mode 100644 target/rescue-x86/device.mk create mode 100644 target/rescue-x86/target.mk delete mode 100644 target/rescue-x86_64/device.mk create mode 100644 target/rescue-x86_64/target.mk delete mode 100644 target/shuttle/device.mk create mode 100644 target/shuttle/target.mk delete mode 100644 target/tomtom/device.mk create mode 100644 target/tomtom/target.mk delete mode 100644 target/wag54g/device.mk create mode 100644 target/wag54g/target.mk delete mode 100644 target/zaurus/device.mk create mode 100644 target/zaurus/target.mk diff --git a/Makefile b/Makefile index 7f001e131..9c2ef0777 100644 --- a/Makefile +++ b/Makefile @@ -17,12 +17,14 @@ v: .prereq_done set -x; ${GMAKE_FMK} VERBOSE=1 all) 2>&1 | tee -a make.log help: - @echo ' switch DEV=device - Backup current config and copy old saved device config' + @echo 'Common targets:' + @echo ' switch TARGET=targetname - Backup current config and copy old saved target config' + @echo ' download - fetches all needed distfiles' @echo 'Cleaning targets:' @echo ' clean - Remove bin and build_dir directories' - @echo ' cleandevice - Same as "clean", but also remove toolchain for device' + @echo ' cleantarget - Same as "clean", but also remove toolchain for target' @echo ' cleandir - Same as "clean", but also remove all built toolchains' - @echo ' cleankernel - Remove kernel dir' + @echo ' cleankernel - Remove kernel dir, useful if you changed any kernel patches' @echo ' distclean - Same as "cleandir", but also remove downloaded' @echo ' distfiles and .config' @echo '' @@ -53,13 +55,13 @@ pkg-help: @echo ' patch - Same as "extract", but also patch the source' @echo ' build - Same as "patch", but also build the binaries' @echo ' fake - Same as "build", but also install the binaries' - @echo ' package - Same as "fake", but also create the ipkg package' + @echo ' package - Same as "fake", but also create the package' @echo ' clean - Deinstall and remove the build area' @echo ' distclean - Same as "clean", but also remove the distfiles' @echo '' @echo 'Short package rebuilding guide:' @echo ' run "make package= clean" to remove all generated binaries' - @echo ' run "make package= package" to build everything and create the ipkg' + @echo ' run "make package= package" to build everything and create the package(s)' @echo '' @echo 'This does not automatically resolve package dependencies!' @@ -97,12 +99,12 @@ cleandir dirclean: .prereq_done -@${GMAKE_INV} clean cleandir @-rm -f make.log .prereq_done -cleandevice deviceclean: .prereq_done - -@${GMAKE_INV} clean cleandevice +cleantarget targetclean: .prereq_done + -@${GMAKE_INV} clean cleantarget @-rm -f make.log -distclean cleandist: .prereq_done - -@${GMAKE_INV} clean cleandir distclean +distclean cleandist: + @-${GMAKE_INV} distclean @-rm -f make.log .prereq_done image: .prereq_done @@ -126,6 +128,11 @@ allconfig: .prereq_done allmodconfig: .prereq_done @${GMAKE_INV} _mconfig W=-o RCONFIG=Config.in +allmoddefconfig: .prereq_done + @if [ -z "$(TARGET)" ];then echo "You need to specify a target"; exit 1;fi + cp $(TOPDIR)/target/$(TARGET)/default.config $(TOPDIR)/.defconfig + @${GMAKE_INV} _mconfig W="-m -o -D .defconfig" RCONFIG=Config.in + package_index: .prereq_done @${GMAKE_INV} package_index diff --git a/TODO b/TODO index 787b8ef6d..85f34c9ea 100644 --- a/TODO +++ b/TODO @@ -2,24 +2,15 @@ - more qemu-targets (ppc/sparc) - rpm package backend - port htop software -- stripping of kernel is not working for all targets -- implement a non-interactive allmodconfig for different targets - (make TARGET=foo defconfig allmodconfig) - needed for ADK buildserver - rescue initramfs image (more archs, generic kernel config ) - usb boot via stick - fix init scripts pidof? vs. killall -- rpath libtool problem fix -- bind isc 9.6.1 -- check ac_cv_func_setpgrp_void=no - freebsd build - win cygwin build - netbsd build - macos x build - openbsd build -- optimize iptables package (libdirs depending on choosen kernel features) -- checksum for toolchain packages - network scripts for wireless client / ap - network scripts for pppoe - customise mconf help texts to better fit for OpenADK -- publish via trac+git +- publish via trac diff --git a/mk/build.mk b/mk/build.mk index c3795b404..3bfd3bce9 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -10,6 +10,10 @@ endif CONFIG_CONFIG_IN = Config.in CONFIG = config +DEFCONFIG= ADK_DEVELSYSTEM=n \ + ADK_DEBUG=n \ + ADK_STATIC=n \ + ADK_FORCE_PARALLEL=n noconfig_targets:= menuconfig \ _config \ @@ -20,10 +24,11 @@ MAKECLEAN_SYMBOLS= ADK_TARGET_LIB_UCLIBC \ ADK_TARGET_LIB_GLIBC \ ADK_TARGET_LIB_ECLIBC \ ADK_IPV6 ADK_CXX ADK_DEBUG + POSTCONFIG= -@\ if [ -f .config.old ];then \ if [ -d .cfg ];then \ - what=cleandevice; \ + what=cleantarget; \ for symbol in ${MAKECLEAN_SYMBOLS}; do \ newval=$$(grep -e "^$$symbol=" -e "^\# $$symbol " .config); \ oldval=$$(cat .cfg/"$$symbol" 2>&-); \ @@ -53,7 +58,7 @@ include ${TOPDIR}/mk/split-cfg.mk all: world .NOTPARALLEL: -.PHONY: all world clean cleandevice cleandir distclean image_clean +.PHONY: all world clean cleantarget cleandir distclean image_clean world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh @@ -107,14 +112,15 @@ image: $(MAKE) -C target image switch: - echo "Saving configuration for device: ${DEVICE}" - cp .config .config.${DEVICE} - mv .cfg .cfg.${DEVICE} - if [ -f .config.${DEV} ];then cp .config.${DEV} .config; \ - cp .config.${DEV} .config.old; \ - mv .cfg.${DEV} .cfg; \ - echo "Setting configuration to device: ${DEV}"; \ - else echo "No old device config found";mv .config .config.bak;fi + echo "Saving configuration for target: ${ADK_TARGET}" + cp -p .config .config.${ADK_TARGET} + if [ -f .config.old ];then cp -p .config.old .config.old.${ADK_TARGET};fi + mv .cfg .cfg.${ADK_TARGET} + if [ -f .config.${TARGET} ];then cp -p .config.${TARGET} .config; \ + cp -p .config.old.${TARGET} .config.old; \ + mv .cfg.${TARGET} .cfg; \ + echo "Setting configuration to target: ${TARGET}"; \ + else echo "No old target config found";mv .config .config.bak;fi ############################################################# # @@ -135,9 +141,9 @@ clean: @$(TRACE) clean $(MAKE) -C $(CONFIG) clean for d in ${STAGING_PARENT_PFX}; do \ - #echo "clean: entering $$d" ; \ + echo "clean: entering $$d" ; \ for f in $$(ls $$d/pkg/[a-z]* 2>/dev/null); do \ - #echo "clean: cleaning for $$f" ; \ + echo "clean: cleaning for $$f" ; \ while read file ; do \ rm $$d/target/$$file 2>/dev/null; \ done < $$f ; \ @@ -158,8 +164,8 @@ cleandir: rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk -cleandevice: - @$(TRACE) cleandevice +cleantarget: + @$(TRACE) cleantarget $(MAKE) -C $(CONFIG) clean rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) @@ -167,8 +173,8 @@ cleandevice: distclean: @$(TRACE) distclean - $(MAKE) -C $(CONFIG) clean - rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) ${TOPDIR}/.cfg + @$(MAKE) -C $(CONFIG) clean + rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) ${TOPDIR}/.cfg* rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) rm -f .config* .tmpconfig.h ${TOPDIR}/package/*/info.mk @@ -191,7 +197,38 @@ $(CONFIG)/conf: $(CONFIG)/mconf: @$(MAKE) -C $(CONFIG) -menuconfig: $(CONFIG)/mconf +defconfig: + @if [ ! -z "$(TARGET)" ];then \ + grep "^config" target/Config.in |grep -i "$(TARGET)"|sed -e "s#^config \(.*\)#\1=y#" > $(TOPDIR)/.defconfig; \ + for symbol in ${DEFCONFIG}; do \ + echo $$symbol >> $(TOPDIR)/.defconfig; \ + done; \ + fi +ifneq (,$(filter %_qemu,${TARGET})) + @echo ADK_LINUX_QEMU=y >> $(TOPDIR)/.defconfig +endif +ifneq (,$(filter %_rescue,${TARGET})) + @echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/.defconfig +endif + @if [ ! -z "$(TARGET)" ];then \ + $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ + fi + +modconfig: + @if [ ! -z "$(TARGET)" ];then \ + grep "^config" target/Config.in |grep -i "$(TARGET)"|sed -e "s#^config \(.*\)#\1=y#" > $(TOPDIR)/all.config; \ + for symbol in ${DEFCONFIG}; do \ + echo $$symbol >> $(TOPDIR)/all.config; \ + done; \ + fi +ifneq (,$(filter %_qemu,${TARGET})) + @echo ADK_LINUX_QEMU=y >> $(TOPDIR)/all.config +endif +ifneq (,$(filter %_rescue,${TARGET})) + @echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/all.config +endif + +menuconfig: $(CONFIG)/mconf defconfig @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) ${POSTCONFIG} @@ -202,13 +239,13 @@ _config: $(CONFIG)/conf .NOTPARALLEL: _mconfig _mconfig: ${CONFIG}/conf _mconfig2 _config -_mconfig2: ${CONFIG}/conf +_mconfig2: ${CONFIG}/conf modconfig @${CONFIG}/conf -m ${RCONFIG} >/dev/null distclean: @$(MAKE) -C $(CONFIG) clean - rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) ${TOPDIR}/.cfg - rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) $(TARGET_DIR) - rm -f .config* .tmpconfig.h ${TOPDIR}/package/*/info.mk + @rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) ${TOPDIR}/.cfg* + @rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) $(TARGET_DIR) + @rm -f .config* .tmpconfig.h ${TOPDIR}/package/*/info.mk endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) diff --git a/mk/cpu.mk b/mk/cpu.mk index 1043ee36c..1678e9311 100644 --- a/mk/cpu.mk +++ b/mk/cpu.mk @@ -3,7 +3,7 @@ # # optimization configure options for CPU features -ifeq ($(DEVICE),alix1c) +ifeq ($(ADK_TARGET),alix1c) CONFIGURE_CPU_OPTS:= --disable-ssse3 \ --disable-sse \ --enable-amd3dnow \ diff --git a/mk/image.mk b/mk/image.mk index 7c61a137d..50c5d8b95 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -48,10 +48,10 @@ image-prepare-post: chmod 4511 ${TARGET_DIR}/bin/busybox chmod 1777 ${TARGET_DIR}/tmp -INITRAMFS= ${DEVICE}-${ARCH}-${FS} -ROOTFSSQUASHFS= ${DEVICE}-${ARCH}-${FS}.img -ROOTFSTARBALL= ${DEVICE}-${ARCH}-${FS}.tar.gz -INITRAMFS_PIGGYBACK= ${DEVICE}-${ARCH}-${FS}.cpio +INITRAMFS= ${ADK_TARGET}-${ARCH}-${FS} +ROOTFSSQUASHFS= ${ADK_TARGET}-${ARCH}-${FS}.img +ROOTFSTARBALL= ${ADK_TARGET}-${ARCH}-${FS}.tar.gz +INITRAMFS_PIGGYBACK= ${ADK_TARGET}-${ARCH}-${FS}.cpio ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} cd ${TARGET_DIR}; tar -cf - --owner=0 --group=0 . | gzip -n9 >$@ @@ -68,11 +68,11 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} PATH='${TARGET_PATH}' \ mksquashfs ${TARGET_DIR} ${BUILD_DIR}/root.squashfs \ -nopad -noappend -root-owned $(MAKE_TRACE) - cat ${BIN_DIR}/${DEVICE}-${ARCH}-kernel ${BUILD_DIR}/root.squashfs > \ + cat ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} # padding of images is required dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ bs=4063232 conv=sync $(MAKE_TRACE) imageclean: - rm -f $(BIN_DIR)/$(DEVICE)-* ${BUILD_DIR}/$(DEVICE)-* + rm -f $(BIN_DIR)/$(ADK_TARGET)-* ${BUILD_DIR}/$(ADK_TARGET)-* diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index b8dccfe84..c32964c10 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -13,19 +13,19 @@ KERNEL_MAKE_OPTS+= CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) CC="$(TARGET_CC) endif $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION)/.patched: - $(TRACE) target/$(DEVICE)-kernel-patch + $(TRACE) target/$(ADK_TARGET)-kernel-patch $(PATCH) $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) - $(PATCH) $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ../$(DEVICE)/patches *.patch $(MAKE_TRACE) + $(PATCH) $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ../$(ADK_TARGET)/patches *.patch $(MAKE_TRACE) touch $@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION)/.patched - $(TRACE) target/$(DEVICE)-kernel-prepare + $(TRACE) target/$(ADK_TARGET)-kernel-prepare ln -sf $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) $(LINUX_DIR) mkdir -p $(LINUX_BUILD_DIR)/kmod-control touch $@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig - $(TRACE) target/$(DEVICE)-kernel-configure + $(TRACE) target/$(ADK_TARGET)-kernel-configure for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done $(MAKE_TRACE) $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config echo N | $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE) @@ -33,30 +33,30 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig touch -c $(LINUX_DIR)/.config $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config - $(TRACE) target/$(DEVICE)-kernel-compile + $(TRACE) target/$(ADK_TARGET)-kernel-compile $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} $(MAKE_TRACE) - $(TRACE) target/$(DEVICE)-kernel-modules-install + $(TRACE) target/$(ADK_TARGET)-kernel-modules-install rm -rf $(LINUX_BUILD_DIR)/modules $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \ INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \ modules_install $(MAKE_TRACE) - $(TRACE) target/$(DEVICE)-create-packages + $(TRACE) target/$(ADK_TARGET)-create-packages $(MAKE) $(KERNEL_PKG) $(TARGETS) touch -c $(LINUX_DIR)/vmlinux $(KERNEL_PKG): - $(TRACE) target/$(DEVICE)-create-kernel-package + $(TRACE) target/$(ADK_TARGET)-create-kernel-package rm -rf $(KERNEL_PKGDIR) @mkdir -p $(KERNEL_PKGDIR)/etc ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \ - ../linux/kernel.control ${DEVICE}-${KERNEL_VERSION} ${CPU_ARCH} + ../linux/kernel.control ${ADK_TARGET}-${KERNEL_VERSION} ${CPU_ARCH} $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE) prepare: compile: $(LINUX_DIR)/vmlinux install: compile ifneq ($(strip $(INSTALL_TARGETS)),) - $(TRACE) target/${DEVICE}-modules-install + $(TRACE) target/${ADK_TARGET}-modules-install $(PKG_INSTALL) $(INSTALL_TARGETS) $(MAKE_TRACE) endif diff --git a/mk/kernel.mk b/mk/kernel.mk index 365cc12e6..33fbf5c2a 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -4,12 +4,12 @@ LINUX_KMOD_SUFFIX=ko MODULES_SUBDIR := lib/modules/$(KERNEL_VERSION) -LINUX_BUILD_DIR := $(BUILD_DIR)/linux-$(ARCH)-$(DEVICE) +LINUX_BUILD_DIR := $(BUILD_DIR)/linux-$(ARCH)-$(ADK_TARGET) KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR) TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) -KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(DEVICE)-$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX) +KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(ADK_TARGET)-$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX) INSTALL_TARGETS:= $(KERNEL_PKG) NOINSTALL_TARGETS:= TARGETS:= @@ -30,9 +30,9 @@ TARGETS:= # define KMOD_template -IDEPENDK_$(1):=kernel ($(DEVICE)-$(KERNEL_VERSION)) $(foreach pkg,$(5),", $(pkg)") +IDEPENDK_$(1):=kernel ($(ADK_TARGET)-$(KERNEL_VERSION)) $(foreach pkg,$(5),", $(pkg)") -PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(DEVICE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(CPU_ARCH).$(PKG_SUFFIX) +PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(ADK_TARGET)-$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(CPU_ARCH).$(PKG_SUFFIX) I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) ifeq ($$(ADK_KPACKAGE_KMOD_$(1)),m) @@ -52,7 +52,7 @@ $$(PKG_$(1)): echo "Description: kernel module $(2)" >> $(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $$(I_$(1)) \ $(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control \ - $(DEVICE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE) $(CPU_ARCH) + $(ADK_TARGET)-$(KERNEL_VERSION)-$(KERNEL_RELEASE) $(CPU_ARCH) echo "Depends: $$(IDEPENDK_$(1))" >> $$(I_$(1))/CONTROL/control ifneq ($(strip $(3)),) mkdir -p $$(I_$(1))/lib/modules/$(KERNEL_VERSION) diff --git a/mk/vars.mk b/mk/vars.mk index 45975779f..b68cd6297 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -31,10 +31,10 @@ TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH} TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_* TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build SCRIPT_DIR:= $(BASE_DIR)/scripts -BIN_DIR:= $(BASE_DIR)/bin_${DEVICE} +BIN_DIR:= $(BASE_DIR)/bin_${ADK_TARGET} BIN_DIR_PFX:= $(BASE_DIR)/bin_* PACKAGE_DIR:= $(BIN_DIR)/packages -TARGET_DIR:= $(BASE_DIR)/root_${DEVICE} +TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET} TARGET_DIR_PFX:= $(BASE_DIR)/root_* TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH} REAL_GNU_TARGET_NAME= $(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 52130bf10..f785e303e 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 6 +PKG_RELEASE:= 7 PKG_DESCR:= basic filesystem structure and scripts PKG_SECTION:= base @@ -15,7 +15,7 @@ NO_DISTFILES:= 1 ifeq ($(CPU_ARCH),x86_64) PKG_ID= x86-64-${FS} else -PKG_ID= ${DEVICE}-${FS} +PKG_ID= ${ADK_TARGET}-${FS} endif WRKDIR= ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-${PKG_ID} @@ -25,8 +25,8 @@ $(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_ do-install: $(CP) ./extra/* $(IDIR_BASE_FILES) - $(CP) $(TOPDIR)/target/$(DEVICE)/files/* $(IDIR_BASE_FILES) - $(SED) 's,@TARGET@,$(DEVICE),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES) + $(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf echo /bin/sh >${IDIR_BASE_FILES}/etc/shells echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells diff --git a/package/em28xx/Makefile b/package/em28xx/Makefile index 2a405660e..bd2ba0315 100644 --- a/package/em28xx/Makefile +++ b/package/em28xx/Makefile @@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KMOD_EM28XX,kmod-em28xx,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) +$(eval $(call PKG_template,KMOD_EM28XX,kmod-em28xx,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${TARGET}-${KERNEL_RELEASE}))) CONFIGURE_STYLE:= manual BUILD_STYLE:= manual @@ -22,7 +22,6 @@ BUILD_STYLE:= manual EM28XX_MAKEOPTS= -C ${WRKBUILD} \ ARCH="${ARCH}" \ CROSS_COMPILE="${TARGET_CROSS}" \ - TARGET="${HAL_TARGET}" \ TOOLPREFIX="${TARGET_CROSS}" \ TOOLPATH="${TARGET_CROSS}" \ KERNELPATH="${LINUX_DIR}" \ @@ -35,7 +34,7 @@ do-build: post-install: ${INSTALL_DIR} ${IDIR_KMOD_EM28XX}/etc/modules.d/ ${INSTALL_DIR} ${IDIR_KMOD_EM28XX}/lib/modules/${KERNEL_VERSION}/ - ${CP} ${WRKBUILD}/*.ko \ + ${CP} ${WRKBUILD}/*.ko \ ${IDIR_KMOD_EM28XX}/lib/modules/${KERNEL_VERSION}/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/exmap/Makefile b/package/exmap/Makefile index be7953f5b..092ba4a34 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-doc diff --git a/package/heimdal/Config.in b/package/heimdal/Config.in index 449d4c5f3..de86f9d27 100644 --- a/package/heimdal/Config.in +++ b/package/heimdal/Config.in @@ -1,6 +1,7 @@ config ADK_COMPILE_HEIMDAL prompt "heimdal........................... Heimdal kerberos software" bool + depends on !ADK_COMPILE_KRB5 default n config ADK_COMPILE_HEIMDAL_WITH_PKINIT diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 3ae793bc0..d7926542b 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -66,11 +66,11 @@ CONFIGURE_OPTS+= --disable-pk-init endif TCFLAGS+= -pthread -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= ${CONFIGURE_OPTS} CONFIGURE_ENV+= ac_cv_func_getaddrinfo_numserv=yes -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +BUILD_STYLE:= auto +INSTALL_STYLE:= auto pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ @@ -93,6 +93,7 @@ pre-configure: ${MAKE} -C ${WRKBUILD} clean post-install: + -rm $(STAGING_DIR)/usr/lib/libcom_err* ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y) ${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/openldap/schema ${INSTALL_DATA} ${WRKBUILD}/lib/hdb/hdb.schema \ diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 4f5350201..6db433527 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -17,7 +17,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${TARGET}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS+= PREFIX=/usr BUILD_STYLE:= auto diff --git a/package/krb5/Config.in b/package/krb5/Config.in index 5fa68aa6f..d4f8b6436 100644 --- a/package/krb5/Config.in +++ b/package/krb5/Config.in @@ -8,6 +8,7 @@ config ADK_PACKAGE_KRB5_SERVER prompt "krb5-server....................... MIT kerberos server" tristate depends on ADK_COMPILE_KRB5 + depends on !ADK_COMPILE_HEIMDAL select ADK_PACKAGE_LIBPTHREAD select ADK_PACKAGE_KRB5_LIBS default n diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index d03f59486..919b7f120 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -21,9 +21,9 @@ WRKDIST= ${WRKDIR}/compat-wireless-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) -$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) -$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) +$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) +$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) +$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) BUILD_STYLE:= auto INSTALL_STYLE:= manual diff --git a/rules.mk b/rules.mk index 16f35b923..8d1d5e914 100644 --- a/rules.mk +++ b/rules.mk @@ -25,12 +25,12 @@ SET_DASHX:= : endif # Strip off the annoying quoting -DEVICE:= $(strip $(subst ",, $(ADK_DEVICE))) +ADK_TARGET:= $(strip $(subst ",, $(ADK_TARGET))) ADK_TARGET_SUFFIX:= $(strip $(subst ",, $(ADK_TARGET_SUFFIX))) ADK_COMPRESSION_TOOL:= $(strip $(subst ",, $(ADK_COMPRESSION_TOOL))) ifeq ($(strip ${ADK_HAVE_DOT_CONFIG}),y) -include $(TOPDIR)/target/$(DEVICE)/device.mk +include $(TOPDIR)/target/$(ADK_TARGET)/target.mk endif include $(TOPDIR)/mk/vars.mk @@ -43,7 +43,7 @@ TARGET_CFLAGS:= $(strip -fwrapv -fno-ident ${TARGET_CFLAGS}) TARGET_CC:= $(strip ${TARGET_CC}) TARGET_CXX:= $(strip ${TARGET_CXX}) -ifneq (${show},) -_show: - @echo '$($(show))' -endif +#ifneq (${show},) +#_show: +# @echo '$($(show))' +#endif diff --git a/target/Config.in b/target/Config.in index d3b443145..18c57c7b6 100644 --- a/target/Config.in +++ b/target/Config.in @@ -8,7 +8,7 @@ config ADK_BROKEN config ADK_TOOLCHAIN_ONLY bool -config ADK_DEVICE_NO_FPU +config ADK_TARGET_NO_FPU bool config ADK_EABI @@ -23,28 +23,28 @@ config ADK_NATIVE config ADK_alix1c tristate -config ADK_qemu_arm +config ADK_arm_qemu tristate -config ADK_qemu_mips +config ADK_mips_qemu tristate -config ADK_qemu_mipsel +config ADK_mipsel_qemu tristate -config ADK_qemu_mips64 +config ADK_mips64_qemu tristate -config ADK_qemu_mips64el +config ADK_mips64el_qemu tristate -config ADK_qemu_cris +config ADK_cris_qemu tristate -config ADK_qemu_x86 +config ADK_x86_qemu tristate -config ADK_qemu_x86_64 +config ADK_x86_64_qemu tristate config ADK_rb532 @@ -68,16 +68,16 @@ config ADK_foxboard config ADK_lemote tristate -config ADK_rescue_x86 +config ADK_x86_rescue tristate -config ADK_rescue_x86_64 +config ADK_x86_64_rescue tristate -config ADK_rescue_mips +config ADK_mips_rescue tristate -config ADK_rescue_mipsel +config ADK_mipsel_rescue tristate config ADK_wag54g @@ -89,17 +89,17 @@ config ADK_shuttle config ADK_g1 tristate -config ADK_DEVICE +config ADK_TARGET string default "alix1c" if ADK_alix1c - default "qemu-arm" if ADK_qemu_arm - default "qemu-cris" if ADK_qemu_cris - default "qemu-mips" if ADK_qemu_mips - default "qemu-mipsel" if ADK_qemu_mipsel - default "qemu-mips64" if ADK_qemu_mips64 - default "qemu-mips64el" if ADK_qemu_mips64el - default "qemu-x86" if ADK_qemu_x86 - default "qemu-x86_64" if ADK_qemu_x86_64 + default "qemu-arm" if ADK_arm_qemu + default "qemu-cris" if ADK_cris_qemu + default "qemu-mips" if ADK_mips_qemu + default "qemu-mipsel" if ADK_mipsel_qemu + default "qemu-mips64" if ADK_mips64_qemu + default "qemu-mips64el" if ADK_mips64el_qemu + default "qemu-x86" if ADK_x86_qemu + default "qemu-x86_64" if ADK_x86_64_qemu default "foxboard" if ADK_foxboard default "native" if ADK_NATIVE default "rb532" if ADK_rb532 @@ -108,10 +108,10 @@ config ADK_DEVICE default "zaurus" if ADK_arm default "lemote" if ADK_lemote default "wag54g" if ADK_wag54g - default "rescue-x86" if ADK_rescue_x86 - default "rescue-x86_64" if ADK_rescue_x86_64 - default "rescue-mips" if ADK_rescue_mips - default "rescue-mipsel" if ADK_rescue_mipsel + default "rescue-x86" if ADK_x86_rescue + default "rescue-x86_64" if ADK_x86_64_rescue + default "rescue-mips" if ADK_mips_rescue + default "rescue-mipsel" if ADK_mipsel_rescue default "shuttle" if ADK_shuttle default "tomtom" if ADK_tomtom default "g1" if ADK_g1 @@ -119,7 +119,7 @@ config ADK_DEVICE menu "Target system" choice -prompt "Embedded Device" +prompt "Embedded Device or Emulator" default ADK_LINUX_NATIVE config ADK_LINUX_NATIVE @@ -184,7 +184,7 @@ config ADK_LINUX_MIPS_WAG54G config ADK_LINUX_ARM_TOMTOM bool "TomTom Applications" select ADK_tomtom - select ADK_DEVICE_NO_FPU + select ADK_TARGET_NO_FPU select ADK_EABI select ADK_TOOLCHAIN_ONLY help @@ -195,7 +195,7 @@ config ADK_LINUX_ARM_TOMTOM config ADK_LINUX_ARM_G1 bool "Google G1 Applications" select ADK_g1 - select ADK_DEVICE_NO_FPU + select ADK_TARGET_NO_FPU select ADK_EABI select ADK_TOOLCHAIN_ONLY help @@ -205,9 +205,8 @@ config ADK_LINUX_ARM_G1 #config ADK_LINUX_XSCALE_ZAURUS # bool "Zaurus SL-C3200" -# depends on ADK_BROKEN # select ADK_zaurus -# select ADK_DEVICE_NO_FPU +# select ADK_TARGET_NO_FPU # help # Support for Sharp Zaurus SL-C3200 (aka Terrier) @@ -242,7 +241,6 @@ config ADK_LINUX_X86_64_SHUTTLE select ADK_KPACKAGE_KMOD_MD_RAID1 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK help Support for a nice and fast shuttle xpc with AMD quad-core CPU. - Known as OpenADK multi operating system buildserver. endchoice @@ -252,25 +250,25 @@ depends on ADK_LINUX_RESCUE config ADK_LINUX_X86_64_RESCUE bool "x86_64" - select ADK_rescue_x86_64 + select ADK_x86_64_rescue help X86 architecture. config ADK_LINUX_X86_RESCUE bool "x86" - select ADK_rescue_x86 + select ADK_x86_rescue help X86 architecture. config ADK_LINUX_MIPSEL_RESCUE bool "mips (little endian)" - select ADK_rescue_mipsel + select ADK_mipsel_rescue help MIPS LE architecture. config ADK_LINUX_MIPS_RESCUE bool "mips (big endian)" - select ADK_rescue_mips + select ADK_mips_rescue help MIPS BE architecture. @@ -282,7 +280,7 @@ depends on ADK_LINUX_QEMU config ADK_LINUX_ARM_QEMU bool "arm" - select ADK_qemu_arm + select ADK_arm_qemu select ADK_EABI help Qemu support for ARM architecture. @@ -290,40 +288,40 @@ config ADK_LINUX_ARM_QEMU config ADK_LINUX_MIPS_QEMU bool "mips (big endian)" - select ADK_qemu_mips + select ADK_mips_qemu help Qemu support for MIPS BE architecture. config ADK_LINUX_MIPSEL_QEMU bool "mipsel (little endian)" - select ADK_qemu_mipsel + select ADK_mipsel_qemu help Qemu support for MIPS LE architecture. config ADK_LINUX_MIPS64_QEMU bool "mips64 (big endian)" - select ADK_qemu_mips64 + select ADK_mips64_qemu select ADK_LINUX_64 help Qemu support for MIPS64 BE architecture. config ADK_LINUX_MIPS64EL_QEMU bool "mips64 (little endian)" - select ADK_qemu_mips64el + select ADK_mips64el_qemu select ADK_LINUX_64 help Qemu support for MIPS64 LE architecture. config ADK_LINUX_CRIS_QEMU bool "cris" - select ADK_qemu_cris + select ADK_cris_qemu # select ADK_BROKEN help Qemu support for CRISv32 architecture. config ADK_LINUX_X86_QEMU bool "x86" - select ADK_qemu_x86 + select ADK_x86_qemu select ADK_KPACKAGE_KMOD_NE2K_PCI select ADK_KERNEL_INPUT_KEYBOARD help @@ -331,7 +329,7 @@ config ADK_LINUX_X86_QEMU config ADK_LINUX_X86_64_QEMU bool "x86_64" - select ADK_qemu_x86_64 + select ADK_x86_64_qemu select ADK_KPACKAGE_KMOD_NE2K_PCI select ADK_KERNEL_INPUT_KEYBOARD help @@ -416,6 +414,7 @@ config ADK_TARGET_LIB_EGLIBC ADK_LINUX_MIPS64EL_QEMU || \ ADK_LINUX_X86_ALIX1C || \ ADK_LINUX_MIPS_RB411 || \ + ADK_LINUX_MIPS_RB433 || \ ADK_LINUX_MIPS_RB532 || \ ADK_LINUX_RESCUE || \ ADK_LINUX_X86_64_SHUTTLE || \ @@ -435,6 +434,7 @@ config ADK_TARGET_LIB_GLIBC ADK_LINUX_MIPS64EL_QEMU || \ ADK_LINUX_X86_ALIX1C || \ ADK_LINUX_MIPS_RB411 || \ + ADK_LINUX_MIPS_RB433 || \ ADK_LINUX_RESCUE || \ ADK_LINUX_X86_64_SHUTTLE || \ ADK_LINUX_ARM_TOMTOM || \ @@ -456,7 +456,7 @@ config ADK_TARGET_SUFFIX choice prompt "Target Firmware type" depends on !ADK_TOOLCHAIN_ONLY - default ADK_TARGET_ROOTFS_EXT2_CF + default ADK_TARGET_ROOTFS_ARCHIVE config ADK_TARGET_ROOTFS_INITRAMFS bool "initramfs filesystem" @@ -699,13 +699,13 @@ config ADK_TARGET_PACKAGE_TGZ boolean prompt "gzip compressed tar archive" help - Create simple compressed tar archives. + Create compressed tar archives. config ADK_TARGET_PACKAGE_RPM boolean prompt "rpm package format" help - Create rpm binary packages. + Create rpm packages. endchoice @@ -721,7 +721,7 @@ config ADK_CXX bool "Enable C++ support" default n help - Enable C++ Compiler and Libraries + Enable C++ compiler and libraries. config ADK_IPV6 bool "Enable IPv6 support" @@ -731,7 +731,7 @@ config ADK_IPV6 select BUSYBOX_FEATURE_IFUPDOWN_IPV6 select BUSYBOX_PING6 help - Enable basic IPv6 support (kmod-ipv6) and + Enable basic IPv6 support and make the IPv6 support options in packages visible. config ADK_X11 @@ -742,5 +742,4 @@ config ADK_X11 Try to compile other packages with X11 support. (f.e. mplayer) - endmenu diff --git a/target/Makefile b/target/Makefile index 63c3e58cc..b3f266ee0 100644 --- a/target/Makefile +++ b/target/Makefile @@ -41,9 +41,9 @@ config-prepare: $(TOPDIR)/.config >${BUILD_DIR}/.kernelconfig.nokernel # if native build, first try /proc/config.gz ifeq ($(ADK_NATIVE),y) - @if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${DEVICE}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi + @if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${ADK_TARGET}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi else - @cp ${DEVICE}/kernel.config ${BUILD_DIR}/.kernelconfig.board + @cp ${ADK_TARGET}/kernel.config ${BUILD_DIR}/.kernelconfig.board endif @(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \ while IFS='=' read symbol value; do \ @@ -62,11 +62,11 @@ endif cp .kernelconfig.tmp .kernelconfig @-rm -f ${BUILD_DIR}/.kernelconfig.tmp -prepare: $(DEVICE)-prepare -compile: $(DEVICE)-compile -image: $(DEVICE)-imageclean $(DEVICE)-imageinstall -install: $(DEVICE)-imageclean $(DEVICE)-install $(DEVICE)-imageinstall -clean: $(DEVICE)-clean $(DEVICE)-imageclean +prepare: $(ADK_TARGET)-prepare +compile: $(ADK_TARGET)-compile +image: $(ADK_TARGET)-imageclean $(ADK_TARGET)-imageinstall +install: $(ADK_TARGET)-imageclean $(ADK_TARGET)-install $(ADK_TARGET)-imageinstall +clean: $(ADK_TARGET)-clean $(ADK_TARGET)-imageclean %-clean: $(TRACE) target/$(patsubst %-clean,%,$@)-clean diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile index 539a1fdba..64f442027 100644 --- a/target/alix1c/Makefile +++ b/target/alix1c/Makefile @@ -20,7 +20,6 @@ endif ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/alix1c/device.mk b/target/alix1c/device.mk deleted file mode 100644 index 18f3c923e..000000000 --- a/target/alix1c/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= x86 -CPU_ARCH:= i586 -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=geode diff --git a/target/alix1c/target.mk b/target/alix1c/target.mk new file mode 100644 index 000000000..18f3c923e --- /dev/null +++ b/target/alix1c/target.mk @@ -0,0 +1,7 @@ +ARCH:= x86 +CPU_ARCH:= i586 +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=geode diff --git a/target/foxboard/device.mk b/target/foxboard/device.mk deleted file mode 100644 index 0dabf25ab..000000000 --- a/target/foxboard/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= cris -CPU_ARCH:= cris -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -fno-peephole2 -TARGET_CFLAGS_ARCH:= -march=v10 diff --git a/target/foxboard/target.mk b/target/foxboard/target.mk new file mode 100644 index 000000000..0dabf25ab --- /dev/null +++ b/target/foxboard/target.mk @@ -0,0 +1,7 @@ +ARCH:= cris +CPU_ARCH:= cris +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe -fno-peephole2 +TARGET_CFLAGS_ARCH:= -march=v10 diff --git a/target/g1/device.mk b/target/g1/device.mk deleted file mode 100644 index a19b67034..000000000 --- a/target/g1/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= arm -CPU_ARCH:= armel -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=armv5te -msoft-float diff --git a/target/g1/target.mk b/target/g1/target.mk new file mode 100644 index 000000000..a19b67034 --- /dev/null +++ b/target/g1/target.mk @@ -0,0 +1,7 @@ +ARCH:= arm +CPU_ARCH:= armel +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=armv5te -msoft-float diff --git a/target/lemote/device.mk b/target/lemote/device.mk deleted file mode 100644 index 2702be95b..000000000 --- a/target/lemote/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= mips -CPU_ARCH:= mips64el -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=loongson2f -mabi=64 diff --git a/target/lemote/target.mk b/target/lemote/target.mk new file mode 100644 index 000000000..2702be95b --- /dev/null +++ b/target/lemote/target.mk @@ -0,0 +1,7 @@ +ARCH:= mips +CPU_ARCH:= mips64el +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=loongson2f -mabi=64 diff --git a/target/native/device.mk b/target/native/device.mk deleted file mode 100644 index 8b38a16b2..000000000 --- a/target/native/device.mk +++ /dev/null @@ -1,6 +0,0 @@ -ARCH:= $(shell uname -m|sed -e "s/i.*86/x86/" -e "s/_64//") -CPU_ARCH:= $(shell uname -m) -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe diff --git a/target/native/target.mk b/target/native/target.mk new file mode 100644 index 000000000..8b38a16b2 --- /dev/null +++ b/target/native/target.mk @@ -0,0 +1,6 @@ +ARCH:= $(shell uname -m|sed -e "s/i.*86/x86/" -e "s/_64//") +CPU_ARCH:= $(shell uname -m) +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe diff --git a/target/qemu-arm/device.mk b/target/qemu-arm/device.mk deleted file mode 100644 index f6e2c2e25..000000000 --- a/target/qemu-arm/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= arm -CPU_ARCH:= arm -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=armv5te -msoft-float diff --git a/target/qemu-arm/target.mk b/target/qemu-arm/target.mk new file mode 100644 index 000000000..f6e2c2e25 --- /dev/null +++ b/target/qemu-arm/target.mk @@ -0,0 +1,7 @@ +ARCH:= arm +CPU_ARCH:= arm +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=armv5te -msoft-float diff --git a/target/qemu-cris/device.mk b/target/qemu-cris/device.mk deleted file mode 100644 index 3c8d8c4f9..000000000 --- a/target/qemu-cris/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= cris -CPU_ARCH:= crisv32 -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=v32 diff --git a/target/qemu-cris/target.mk b/target/qemu-cris/target.mk new file mode 100644 index 000000000..3c8d8c4f9 --- /dev/null +++ b/target/qemu-cris/target.mk @@ -0,0 +1,7 @@ +ARCH:= cris +CPU_ARCH:= crisv32 +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=v32 diff --git a/target/qemu-mips/device.mk b/target/qemu-mips/device.mk deleted file mode 100644 index 8a5abd384..000000000 --- a/target/qemu-mips/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= mips -CPU_ARCH:= mips -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=mips32 -mabi=32 diff --git a/target/qemu-mips/target.mk b/target/qemu-mips/target.mk new file mode 100644 index 000000000..8a5abd384 --- /dev/null +++ b/target/qemu-mips/target.mk @@ -0,0 +1,7 @@ +ARCH:= mips +CPU_ARCH:= mips +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=mips32 -mabi=32 diff --git a/target/qemu-mips64/device.mk b/target/qemu-mips64/device.mk deleted file mode 100644 index 19b0fba32..000000000 --- a/target/qemu-mips64/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= mips -CPU_ARCH:= mips64 -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=mips64 -mabi=64 diff --git a/target/qemu-mips64/target.mk b/target/qemu-mips64/target.mk new file mode 100644 index 000000000..19b0fba32 --- /dev/null +++ b/target/qemu-mips64/target.mk @@ -0,0 +1,7 @@ +ARCH:= mips +CPU_ARCH:= mips64 +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=mips64 -mabi=64 diff --git a/target/qemu-mips64el/device.mk b/target/qemu-mips64el/device.mk deleted file mode 100644 index 1222cdee6..000000000 --- a/target/qemu-mips64el/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= mips -CPU_ARCH:= mips64el -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=mips64 -mabi=64 diff --git a/target/qemu-mips64el/target.mk b/target/qemu-mips64el/target.mk new file mode 100644 index 000000000..1222cdee6 --- /dev/null +++ b/target/qemu-mips64el/target.mk @@ -0,0 +1,7 @@ +ARCH:= mips +CPU_ARCH:= mips64el +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=mips64 -mabi=64 diff --git a/target/qemu-mipsel/device.mk b/target/qemu-mipsel/device.mk deleted file mode 100644 index bd8f7ca79..000000000 --- a/target/qemu-mipsel/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= mips -CPU_ARCH:= mipsel -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=mips32 -mabi=32 diff --git a/target/qemu-mipsel/target.mk b/target/qemu-mipsel/target.mk new file mode 100644 index 000000000..bd8f7ca79 --- /dev/null +++ b/target/qemu-mipsel/target.mk @@ -0,0 +1,7 @@ +ARCH:= mips +CPU_ARCH:= mipsel +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=mips32 -mabi=32 diff --git a/target/qemu-x86/device.mk b/target/qemu-x86/device.mk deleted file mode 100644 index f825d0259..000000000 --- a/target/qemu-x86/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= x86 -CPU_ARCH:= i586 -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=i586 diff --git a/target/qemu-x86/target.mk b/target/qemu-x86/target.mk new file mode 100644 index 000000000..f825d0259 --- /dev/null +++ b/target/qemu-x86/target.mk @@ -0,0 +1,7 @@ +ARCH:= x86 +CPU_ARCH:= i586 +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=i586 diff --git a/target/qemu-x86_64/device.mk b/target/qemu-x86_64/device.mk deleted file mode 100644 index 7652dbff4..000000000 --- a/target/qemu-x86_64/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= x86 -CPU_ARCH:= x86_64 -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= diff --git a/target/qemu-x86_64/target.mk b/target/qemu-x86_64/target.mk new file mode 100644 index 000000000..7652dbff4 --- /dev/null +++ b/target/qemu-x86_64/target.mk @@ -0,0 +1,7 @@ +ARCH:= x86 +CPU_ARCH:= x86_64 +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= diff --git a/target/rb411/device.mk b/target/rb411/device.mk deleted file mode 100644 index 2ab6faed7..000000000 --- a/target/rb411/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= mips -CPU_ARCH:= mips -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=mips32 diff --git a/target/rb411/target.mk b/target/rb411/target.mk new file mode 100644 index 000000000..2ab6faed7 --- /dev/null +++ b/target/rb411/target.mk @@ -0,0 +1,7 @@ +ARCH:= mips +CPU_ARCH:= mips +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=mips32 diff --git a/target/rb433/device.mk b/target/rb433/device.mk deleted file mode 100644 index 2ab6faed7..000000000 --- a/target/rb433/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= mips -CPU_ARCH:= mips -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=mips32 diff --git a/target/rb433/target.mk b/target/rb433/target.mk new file mode 100644 index 000000000..2ab6faed7 --- /dev/null +++ b/target/rb433/target.mk @@ -0,0 +1,7 @@ +ARCH:= mips +CPU_ARCH:= mips +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=mips32 diff --git a/target/rb532/device.mk b/target/rb532/device.mk deleted file mode 100644 index c0924be1f..000000000 --- a/target/rb532/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= mips -CPU_ARCH:= mipsel -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=mips32 diff --git a/target/rb532/target.mk b/target/rb532/target.mk new file mode 100644 index 000000000..c0924be1f --- /dev/null +++ b/target/rb532/target.mk @@ -0,0 +1,7 @@ +ARCH:= mips +CPU_ARCH:= mipsel +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=mips32 diff --git a/target/rescue-x86/device.mk b/target/rescue-x86/device.mk deleted file mode 100644 index 7021d0bb9..000000000 --- a/target/rescue-x86/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= x86 -CPU_ARCH:= i686 -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -O2 -pipe -TARGET_CFLAGS_ARCH:= -march=i686 diff --git a/target/rescue-x86/target.mk b/target/rescue-x86/target.mk new file mode 100644 index 000000000..7021d0bb9 --- /dev/null +++ b/target/rescue-x86/target.mk @@ -0,0 +1,7 @@ +ARCH:= x86 +CPU_ARCH:= i686 +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -O2 -pipe +TARGET_CFLAGS_ARCH:= -march=i686 diff --git a/target/rescue-x86_64/device.mk b/target/rescue-x86_64/device.mk deleted file mode 100644 index 7ff8b016e..000000000 --- a/target/rescue-x86_64/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= x86 -CPU_ARCH:= x86_64 -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -O2 -pipe -TARGET_CFLAGS_ARCH:= diff --git a/target/rescue-x86_64/target.mk b/target/rescue-x86_64/target.mk new file mode 100644 index 000000000..7ff8b016e --- /dev/null +++ b/target/rescue-x86_64/target.mk @@ -0,0 +1,7 @@ +ARCH:= x86 +CPU_ARCH:= x86_64 +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -O2 -pipe +TARGET_CFLAGS_ARCH:= diff --git a/target/shuttle/device.mk b/target/shuttle/device.mk deleted file mode 100644 index caf9be90a..000000000 --- a/target/shuttle/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= x86 -CPU_ARCH:= x86_64 -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -O2 -pipe -TARGET_CFLAGS_ARCH:= -march=amdfam10 diff --git a/target/shuttle/target.mk b/target/shuttle/target.mk new file mode 100644 index 000000000..caf9be90a --- /dev/null +++ b/target/shuttle/target.mk @@ -0,0 +1,7 @@ +ARCH:= x86 +CPU_ARCH:= x86_64 +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -O2 -pipe +TARGET_CFLAGS_ARCH:= -march=amdfam10 diff --git a/target/tomtom/device.mk b/target/tomtom/device.mk deleted file mode 100644 index a35a5b7ba..000000000 --- a/target/tomtom/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= arm -CPU_ARCH:= armel -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=armv4t -msoft-float diff --git a/target/tomtom/target.mk b/target/tomtom/target.mk new file mode 100644 index 000000000..a35a5b7ba --- /dev/null +++ b/target/tomtom/target.mk @@ -0,0 +1,7 @@ +ARCH:= arm +CPU_ARCH:= armel +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=armv4t -msoft-float diff --git a/target/wag54g/device.mk b/target/wag54g/device.mk deleted file mode 100644 index c0924be1f..000000000 --- a/target/wag54g/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= mips -CPU_ARCH:= mipsel -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=mips32 diff --git a/target/wag54g/target.mk b/target/wag54g/target.mk new file mode 100644 index 000000000..c0924be1f --- /dev/null +++ b/target/wag54g/target.mk @@ -0,0 +1,7 @@ +ARCH:= mips +CPU_ARCH:= mipsel +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=mips32 diff --git a/target/zaurus/device.mk b/target/zaurus/device.mk deleted file mode 100644 index f6e2c2e25..000000000 --- a/target/zaurus/device.mk +++ /dev/null @@ -1,7 +0,0 @@ -ARCH:= arm -CPU_ARCH:= arm -KERNEL_VERSION:= 2.6.31.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 -TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= -march=armv5te -msoft-float diff --git a/target/zaurus/target.mk b/target/zaurus/target.mk new file mode 100644 index 000000000..f6e2c2e25 --- /dev/null +++ b/target/zaurus/target.mk @@ -0,0 +1,7 @@ +ARCH:= arm +CPU_ARCH:= arm +KERNEL_VERSION:= 2.6.31.5 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=armv5te -msoft-float diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index 7b04ffa23..ec0f4f639 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -33,7 +33,7 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_gnu99_inline=yes \ libc_cv_slibdir="/lib" -ifeq ($(ADK_DEVICE_NO_FPU),y) +ifeq ($(ADK_TARGET_NO_FPU),y) EGLIBC_CONFOPTS+= --without-fp endif diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 210c0f68a..f93691cab 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -28,19 +28,13 @@ GCC_CONFOPTS= --prefix=$(STAGING_TOOLS) \ --disable-sjlj-exceptions \ --disable-nls -#ifeq ($(ADK_LINUX_ARM_TOMTOM),y) -#GCC_CONFOPTS+= --enable-sjlj-exceptions -#else -#GCC_CONFOPTS+= --disable-sjlj-exceptions -#endif - ifeq ($(ADK_SSP),y) GCC_CONFOPTS+= --enable-libssp else GCC_CONFOPTS+= --disable-libssp endif -ifeq ($(ADK_DEVICE_NO_FPU),y) +ifeq ($(ADK_TARGET_NO_FPU),y) GCC_CONFOPTS+= --with-float=soft endif diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 36d6f1214..448d41606 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -39,7 +39,7 @@ GLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_gnu99_inline=yes \ libc_cv_slibdir="/lib" -ifeq ($(ADK_DEVICE_NO_FPU),y) +ifeq ($(ADK_TARGET_NO_FPU),y) GLIBC_CONFOPTS+= --without-fp endif diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 3a9310ad1..d3e2c7e70 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -20,7 +20,7 @@ endif $(WRKBUILD)/.headers: $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${TOOLCHAIN_SYSROOT}/usr/include\"' \ - $(TOPDIR)/target/$(DEVICE)/uclibc.config >${WRKBUILD}/.config + $(TOPDIR)/target/$(ADK_TARGET)/uclibc.config >${WRKBUILD}/.config ifeq ($(ADK_IPV6),y) $(SED) 's,# UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=y,' \ ${WRKBUILD}/.config -- cgit v1.2.3