rework the default x86 target

This commit is contained in:
Eric Andersen 2006-12-13 11:53:00 +00:00
parent c6201a9df3
commit d699758c45
4 changed files with 83 additions and 123 deletions

View File

@ -54,7 +54,7 @@ BR2_JLEVEL=5
# BR2_KERNEL_HEADERS_2_6_9 is not set
# BR2_KERNEL_HEADERS_2_6_11 is not set
BR2_KERNEL_HEADERS_2_6_12=y
# BR2_KERNEL_HEADERS_2_6_19 is not set
# BR2_KERNEL_HEADERS_2_6_19_1 is not set
BR2_DEFAULT_KERNEL_HEADERS="2.6.12"
#
@ -205,7 +205,7 @@ BR2_PACKAGE_DHCP_CLIENT=y
# BR2_PACKAGE_DMRAID is not set
# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
# BR2_PACKAGE_DROPBEAR_URANDOM is not set
BR2_PACKAGE_DROPBEAR_URANDOM=y
# BR2_PACKAGE_ETHTOOL is not set
# BR2_PACKAGE_EXPAT is not set
# BR2_PACKAGE_E2FSPROGS is not set
@ -242,7 +242,7 @@ BR2_PACKAGE_DROPBEAR=y
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
# BR2_PACKAGE_LSOF is not set
BR2_PACKAGE_LTP-TESTSUITE=y
# BR2_PACKAGE_LTP-TESTSUITE is not set
# BR2_PACKAGE_LTT is not set
# BR2_PACKAGE_LVM2 is not set
# BR2_PACKAGE_LZO is not set

View File

@ -1,33 +1,5 @@
X86_I386_PATH=target/device/x86/i386
BR2_PACKAGE_BUSYBOX_CONFIG=$(X86_I386_PATH)/busybox.config
UCLIBC_CONFIG_FILE=$(TOOL_BUILD_DIR)/uClibc.config.$(ARCH)
#TARGET_SKELETON=$(X86_I386_PATH)/skel.tar.gz
#TARGET_SKEL_DIR=$(X86_I386_PATH)/target_skeleton
#TARGET_DEVICE_TABLE=$(X86_I386_PATH)/device_table.txt
TARGETS+=linux
uclibc_config_file_prep::
cp toolchain/uClibc/uClibc-$(UCLIBC_VER).config $(UCLIBC_CONFIG_FILE)
/bin/echo "ARCH_LITTLE_ENDIAN=y" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# ARCH_BIG_ENDIAN is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_GENERIC_386 is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_386 is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_486 is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "CONFIG_586=y" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_586MMX is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_686 is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_PENTIUMII is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_PENTIUMIII is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_PENTIUM4 is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_K6 is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_K7 is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_ELAN is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_CRUSOE is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_WINCHIPC6 is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_WINCHIP2 is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_CYRIXIII is not set" >> $(UCLIBC_CONFIG_FILE)
/bin/echo "# CONFIG_NEHEMIAH is not set" >> $(UCLIBC_CONFIG_FILE)
TARGETS+=linux26

View File

@ -1,126 +1,114 @@
#############################################################
#
# Linux kernel targets
#
# Note: If you have any patches to apply, create the directory
# sources/kernel-patches and put your patches in there and number
# them in the order you wish to apply them... i.e.
#
# sources/kernel-patches/001-my-special-stuff.bz2
# sources/kernel-patches/003-gcc-Os.bz2
# sources/kernel-patches/004_no-warnings.bz2
# sources/kernel-patches/030-lowlatency-mini.bz2
# sources/kernel-patches/031-lowlatency-fixes-5.bz2
# sources/kernel-patches/099-shutup.bz2
# etc...
#
# these patches will all be applied by the patch-kernel.sh
# script (which will also abort the build if it finds rejects)
# -Erik
# Linux kernel 2.6 target
#
#############################################################
ifneq ($(filter $(TARGETS),linux),)
ifneq ($(filter $(TARGETS),linux26),)
LINUX_VERSION=$(LINUX_HEADERS_VERSION)
# File name for the Linux kernel binary
LINUX_KERNEL=linux-kernel-$(LINUX_VERSION)-$(KERNEL_ARCH).srec
# Version of Linux to download and then apply patches to
DOWNLOAD_LINUX26_VERSION=2.6.19.1
# Version of Linux after applying any patches
LINUX26_VERSION=2.6.19.1
LINUX26_SOURCE=linux-$(DOWNLOAD_LINUX26_VERSION).tar.bz2
LINUX26_SITE=http://ftp.kernel.org/pub/linux/kernel/v2.6
#LINUX26_FORMAT=vmlinux
#LINUX26_BINLOC=$(LINUX26_FORMAT)
LINUX26_FORMAT=bzImage
LINUX26_BINLOC=arch/i386/boot/$(LINUX26_FORMAT)
# Linux kernel configuration file
LINUX_KCONFIG=$(X86_I386_PATH)/linux.config
LINUX26_KCONFIG=$(X86_I386_PATH)/linux26.config
# File name for the Linux kernel binary
LINUX26_KERNEL=linux-kernel-$(LINUX26_VERSION)-$(KERNEL_ARCH)
# Version of Linux AFTER patches
LINUX26_DIR=$(BUILD_DIR)/linux-$(LINUX26_VERSION)
# kernel patches
LINUX_PATCH_DIR=target/device/x86/i386/kernel-patches/
LINUX26_PATCH_DIR=target/device/x86/i386/kernel-patches/
LINUX_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS) ARCH=$(KERNEL_ARCH) PATH=$(TARGET_PATH) \
INSTALL_MOD_PATH=$(TARGET_DIR) \
LINUX_FORMAT=vmlinux
LINUX_BINLOC=$(LINUX_FORMAT)
##LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION)
##LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2
##LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.6
# Used by pcmcia-cs and others
LINUX_DIR=$(LINUX_HEADERS_UNPACK_DIR)
LINUX26_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS) ARCH=$(KERNEL_ARCH) \
PATH=$(TARGET_PATH) INSTALL_MOD_PATH=$(TARGET_DIR) \
CROSS_COMPILE=$(KERNEL_CROSS)
#$(DL_DIR)/$(LINUX_SOURCE):
# -mkdir -p $(DL_DIR)
# $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE)
#$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
# -mkdir -p $(TOOL_BUILD_DIR)
# -(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX_DIR) linux)
# $(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
#ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION))
# # Rename the dir from the downloaded version to the AFTER patch version
# mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX_VERSION) $(BUILD_DIR)/linux-$(LINUX_VERSION)
#endif
# [ -d $(LINUX_PATCH_DIR) && toolchain/patch-kernel.sh $(LINUX_DIR) $(LINUX_PATCH_DIR)
# touch $(LINUX_DIR)/.unpacked
$(LINUX_KCONFIG):
@if [ ! -f "$(LINUX_KCONFIG)" ] ; then \
$(DL_DIR)/$(LINUX26_SOURCE):
$(WGET) -P $(DL_DIR) $(LINUX26_SITE)/$(LINUX26_SOURCE)
$(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE)
rm -rf $(LINUX26_DIR)
bzcat $(DL_DIR)/$(LINUX26_SOURCE) | tar -C $(BUILD_DIR) -xvf -
ifneq ($(DOWNLOAD_LINUX26_VERSION),$(LINUX26_VERSION))
# Rename the dir from the downloaded version to the AFTER patch version
mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX26_VERSION) $(BUILD_DIR)/linux-$(LINUX26_VERSION)
endif
touch $(LINUX26_DIR)/.unpacked
$(LINUX26_KCONFIG):
@if [ ! -f "$(LINUX26_KCONFIG)" ] ; then \
echo ""; \
echo "You should create a .config for your kernel"; \
echo "and install it as $(LINUX_KCONFIG)"; \
echo "and install it as $(LINUX26_KCONFIG)"; \
echo ""; \
sleep 5; \
fi;
#$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG)
$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched $(LINUX_KCONFIG)
-cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config
$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) oldconfig
touch $(LINUX_DIR)/.configured
$(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked
#toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR)
touch $(LINUX26_DIR)/.patched
linux-menuconfig: $(LINUX_DIR)/.patched
[ -f $(LINUX_DIR)/.config ] || cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config
$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) menuconfig
-[ -f $(LINUX_DIR)/.config ] && touch $(LINUX_DIR)/.configured
$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG)
-cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig
touch $(LINUX26_DIR)/.configured
$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.patched
$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) prepare
touch $(LINUX_DIR)/.depend_done
linux26-menuconfig: $(LINUX26_DIR)/.patched
[ -f $(LINUX26_DIR)/.config ] || cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig
-[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
$(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.depend_done
$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) $(LINUX_FORMAT) bzImage
$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) modules
$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare
touch $(LINUX26_DIR)/.depend_done
$(LINUX26_KERNEL): $(LINUX26_DIR)/.depend_done
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(LINUX26_FORMAT) bzImage
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) modules
cp -fa $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL)
touch -c $(LINUX26_KERNEL)
$(TARGET_DIR)/boot/$(LINUX26_BINLOC): $(LINUX26_KERNEL)
[ -d $(TARGET_DIR)/boot/ ] || mkdir $(TARGET_DIR)/boot
cp -a $(LINUX_DIR)/arch/$(KERNEL_ARCH)/boot/bzImage $(LINUX_DIR)/System.map $(TARGET_DIR)/boot/
cp -a $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_DIR)/System.map $(TARGET_DIR)/boot/
touch -c $(TARGET_DIR)/boot/$(LINUX26_BINLOC)
$(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
$(KERNEL_CROSS)objcopy -O srec $(LINUX_DIR)/$(LINUX_BINLOC) $(LINUX_KERNEL)
touch -c $(LINUX_KERNEL)
$(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep: $(LINUX_KERNEL)
rm -rf $(TARGET_DIR)/lib/modules
$(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep: $(LINUX26_KERNEL)
rm -rf $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)
rm -f $(TARGET_DIR)/sbin/cardmgr
$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) DEPMOD=`which true` \
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) \
DEPMOD=$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod \
INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
(cd $(TARGET_DIR)/lib/modules; ln -s $(LINUX_VERSION)/kernel/drivers .)
$(TARGET_DEVICE_DEPMOD) \
-b $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/ \
-k $(LINUX_DIR)/vmlinux \
-F $(LINUX_DIR)/System.map \
> $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/build
touch -c $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep
$(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
mkdir -p $(STAGING_DIR)/include
tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/
tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/
linux26: cross-depmod26 $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep
linux: $(STAGING_DIR)/include/linux/version.h $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
linux-source: $(DL_DIR)/$(LINUX_SOURCE)
linux26-source: $(DL_DIR)/$(LINUX26_SOURCE)
# This has been renamed so we do _NOT_ by default run this on 'make clean'
linuxclean:
rm -f $(LINUX_KERNEL)
-$(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) clean
linux26clean:
rm -f $(LINUX26_KERNEL)
-$(MAKE) PATH=$(TARGET_PATH) -C $(LINUX26_DIR) clean
linux-dirclean:
rm -rf $(LINUX_DIR)
linux26-dirclean:
rm -rf $(LINUX26_DIR)
endif