* [Buildroot] [PATCH 01/12] linux: rename LINUX26 to LINUX
2011-07-11 13:53 [Buildroot] [pull request v4] Pull request for branch for-2011.08/bootloaders Thomas Petazzoni
@ 2011-07-11 13:53 ` Thomas Petazzoni
2011-07-11 13:53 ` [Buildroot] [PATCH 02/12] linux: indent and align some definitions Thomas Petazzoni
` (10 subsequent siblings)
11 siblings, 0 replies; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 13:53 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
linux/linux.mk | 110 ++++++++++++++++++++++++++++----------------------------
1 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index f9fe454..6dfd558 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -1,24 +1,24 @@
###############################################################################
#
-# Linux kernel 2.6 target
+# Linux kernel target
#
###############################################################################
-LINUX26_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
+LINUX_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
-# Compute LINUX26_SOURCE and LINUX26_SITE from the configuration
-ifeq ($(LINUX26_VERSION),custom)
-LINUX26_TARBALL:=$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
-LINUX26_SITE:=$(dir $(LINUX26_TARBALL))
-LINUX26_SOURCE:=$(notdir $(LINUX26_TARBALL))
+# Compute LINUX_SOURCE and LINUX_SITE from the configuration
+ifeq ($(LINUX_VERSION),custom)
+LINUX_TARBALL:=$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
+LINUX_SITE:=$(dir $(LINUX_TARBALL))
+LINUX_SOURCE:=$(notdir $(LINUX_TARBALL))
else
-LINUX26_SOURCE:=linux-$(LINUX26_VERSION).tar.bz2
-LINUX26_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
+LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
+LINUX_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
endif
-LINUX26_DIR:=$(BUILD_DIR)/linux-$(LINUX26_VERSION)
-LINUX26_PATCH=$(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
+LINUX_DIR:=$(BUILD_DIR)/linux-$(LINUX_VERSION)
+LINUX_PATCH=$(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
-LINUX26_MAKE_FLAGS = \
+LINUX_MAKE_FLAGS = \
HOSTCC="$(HOSTCC)" \
HOSTCFLAGS="$(HOSTCFLAGS)" \
ARCH=$(KERNEL_ARCH) \
@@ -28,27 +28,27 @@ LINUX26_MAKE_FLAGS = \
# Get the real Linux version, which tells us where kernel modules are
# going to be installed in the target filesystem.
-LINUX26_VERSION_PROBED = $(shell $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) --no-print-directory -s kernelrelease)
+LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
-LINUX26_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
+LINUX_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
else
ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y)
ifeq ($(KERNEL_ARCH),blackfin)
# a uImage, but with a different file name
-LINUX26_IMAGE_NAME=vmImage
+LINUX_IMAGE_NAME=vmImage
else
-LINUX26_IMAGE_NAME=uImage
+LINUX_IMAGE_NAME=uImage
endif
-LINUX26_DEPENDENCIES+=$(MKIMAGE)
+LINUX_DEPENDENCIES+=host-uboot-mkimage
else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y)
-LINUX26_IMAGE_NAME=bzImage
+LINUX_IMAGE_NAME=bzImage
else ifeq ($(BR2_LINUX_KERNEL_ZIMAGE),y)
-LINUX26_IMAGE_NAME=zImage
+LINUX_IMAGE_NAME=zImage
else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y)
-LINUX26_IMAGE_NAME=vmlinux.bin
+LINUX_IMAGE_NAME=vmlinux.bin
else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
-LINUX26_IMAGE_NAME=vmlinux
+LINUX_IMAGE_NAME=vmlinux
endif
endif
@@ -57,44 +57,44 @@ endif
# for bzImage, arch/i386 and arch/x86_64 do not exist when copying the
# defconfig file.
ifeq ($(KERNEL_ARCH),i386)
-KERNEL_ARCH_PATH=$(LINUX26_DIR)/arch/x86
+KERNEL_ARCH_PATH=$(LINUX_DIR)/arch/x86
else ifeq ($(KERNEL_ARCH),x86_64)
-KERNEL_ARCH_PATH=$(LINUX26_DIR)/arch/x86
+KERNEL_ARCH_PATH=$(LINUX_DIR)/arch/x86
else
-KERNEL_ARCH_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)
+KERNEL_ARCH_PATH=$(LINUX_DIR)/arch/$(KERNEL_ARCH)
endif
ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
-LINUX26_IMAGE_PATH=$(LINUX26_DIR)/$(LINUX26_IMAGE_NAME)
+LINUX_IMAGE_PATH=$(LINUX_DIR)/$(LINUX_IMAGE_NAME)
else
ifeq ($(KERNEL_ARCH),avr32)
-LINUX26_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/images/$(LINUX26_IMAGE_NAME)
+LINUX_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/images/$(LINUX_IMAGE_NAME)
else
-LINUX26_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/$(LINUX26_IMAGE_NAME)
+LINUX_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME)
endif
endif # BR2_LINUX_KERNEL_VMLINUX
# Download
-$(LINUX26_DIR)/.stamp_downloaded:
+$(LINUX_DIR)/.stamp_downloaded:
@$(call MESSAGE,"Downloading kernel")
- $(call DOWNLOAD,$(LINUX26_SITE),$(LINUX26_SOURCE))
- $(foreach patch,$(filter ftp://% http://%,$(LINUX26_PATCH)),\
+ $(call DOWNLOAD,$(LINUX_SITE),$(LINUX_SOURCE))
+ $(foreach patch,$(filter ftp://% http://%,$(LINUX_PATCH)),\
$(call DOWNLOAD,$(dir $(patch)),$(notdir $(patch)))$(sep))
mkdir -p $(@D)
touch $@
# Extraction
-$(LINUX26_DIR)/.stamp_extracted: $(LINUX26_DIR)/.stamp_downloaded
+$(LINUX_DIR)/.stamp_extracted: $(LINUX_DIR)/.stamp_downloaded
@$(call MESSAGE,"Extracting kernel")
mkdir -p $(@D)
- $(Q)$(INFLATE$(suffix $(LINUX26_SOURCE))) $(DL_DIR)/$(LINUX26_SOURCE) | \
+ $(Q)$(INFLATE$(suffix $(LINUX_SOURCE))) $(DL_DIR)/$(LINUX_SOURCE) | \
tar -C $(@D) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) -
$(Q)touch $@
# Patch
-$(LINUX26_DIR)/.stamp_patched: $(LINUX26_DIR)/.stamp_extracted
+$(LINUX_DIR)/.stamp_patched: $(LINUX_DIR)/.stamp_extracted
@$(call MESSAGE,"Patching kernel")
- for p in $(LINUX26_PATCH) ; do \
+ for p in $(LINUX_PATCH) ; do \
if echo $$p | grep -q -E "^ftp://|^http://" ; then \
toolchain/patch-kernel.sh $(@D) $(DL_DIR) `basename $$p` ; \
elif test -d $$p ; then \
@@ -107,13 +107,13 @@ $(LINUX26_DIR)/.stamp_patched: $(LINUX26_DIR)/.stamp_extracted
# Configuration
-$(LINUX26_DIR)/.stamp_configured: $(LINUX26_DIR)/.stamp_patched
+$(LINUX_DIR)/.stamp_configured: $(LINUX_DIR)/.stamp_patched
@$(call MESSAGE,"Configuring kernel")
ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
- $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX26_MAKE_FLAGS) -C $(@D) $(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
+ $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) $(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
cp $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
- $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX26_MAKE_FLAGS) -C $(@D) buildroot_defconfig
+ $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
endif
ifeq ($(BR2_ARM_EABI),y)
@@ -141,61 +141,61 @@ endif
ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
$(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config)
endif
- $(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig
+ $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) oldconfig
$(Q)touch $@
# Compilation. We make sure the kernel gets rebuilt when the
# configuration has changed.
-$(LINUX26_DIR)/.stamp_compiled: $(LINUX26_DIR)/.stamp_configured $(LINUX26_DIR)/.config
+$(LINUX_DIR)/.stamp_compiled: $(LINUX_DIR)/.stamp_configured $(LINUX_DIR)/.config
@$(call MESSAGE,"Compiling kernel")
- $(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) $(LINUX26_IMAGE_NAME)
+ $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
- $(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) modules ; \
+ $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
fi
$(Q)touch $@
# Installation
-$(LINUX26_DIR)/.stamp_installed: $(LINUX26_DIR)/.stamp_compiled
+$(LINUX_DIR)/.stamp_installed: $(LINUX_DIR)/.stamp_compiled
@$(call MESSAGE,"Installing kernel")
ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),y)
- install -m 0644 -D $(LINUX26_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX26_IMAGE_NAME)
+ install -m 0644 -D $(LINUX_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
endif
- cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR)
+ cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
# Install modules and remove symbolic links pointing to build
# directories, not relevant on the target
@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
- $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX26_MAKE_FLAGS) -C $(@D) \
+ $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) \
DEPMOD="$(HOST_DIR)/usr/sbin/depmod" modules_install ; \
- rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION_PROBED)/build ; \
- rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION_PROBED)/source ; \
+ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \
+ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \
fi
$(Q)touch $@
-linux linux26: host-module-init-tools $(LINUX26_DEPENDENCIES) $(LINUX26_DIR)/.stamp_installed
+linux linux26: host-module-init-tools $(LINUX_DEPENDENCIES) $(LINUX_DIR)/.stamp_installed
-linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs $(LINUX26_DIR)/.stamp_configured
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) \
+linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs $(LINUX_DIR)/.stamp_configured
+ $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \
$(subst linux-,,$(subst linux26-,,$@))
# Support for rebuilding the kernel after the initramfs file list has
# been generated in $(BINARIES_DIR)/rootfs.initramfs.
-$(LINUX26_DIR)/.stamp_initramfs_rebuilt: $(LINUX26_DIR)/.stamp_installed $(BINARIES_DIR)/rootfs.initramfs
+$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_installed $(BINARIES_DIR)/rootfs.initramfs
@$(call MESSAGE,"Rebuilding kernel with initramfs")
# Remove the previously generated initramfs which was empty,
# to make sure the kernel will actually regenerate it.
$(RM) -f $(@D)/usr/initramfs_data.cpio*
# Build the kernel.
- $(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) $(LINUX26_IMAGE_NAME)
+ $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
# Copy the kernel image to its final destination
- cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR)
+ cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
$(Q)touch $@
# The initramfs building code must make sure this target gets called
# after it generated the initramfs list of files.
-linux-rebuild-with-initramfs linux26-rebuild-with-initramfs: $(LINUX26_DIR)/.stamp_initramfs_rebuilt
+linux-rebuild-with-initramfs linux26-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_initramfs_rebuilt
ifeq ($(BR2_LINUX_KERNEL),y)
-TARGETS+=linux26
+TARGETS+=linux
endif
# Checks to give errors that the user can understand
--
1.7.4.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 02/12] linux: indent and align some definitions
2011-07-11 13:53 [Buildroot] [pull request v4] Pull request for branch for-2011.08/bootloaders Thomas Petazzoni
2011-07-11 13:53 ` [Buildroot] [PATCH 01/12] linux: rename LINUX26 to LINUX Thomas Petazzoni
@ 2011-07-11 13:53 ` Thomas Petazzoni
2011-07-11 19:30 ` Peter Korsgaard
2011-07-11 13:53 ` [Buildroot] [PATCH 03/12] linux: convert to the GENTARGETS infrastructure Thomas Petazzoni
` (9 subsequent siblings)
11 siblings, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 13:53 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
linux/linux.mk | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index 6dfd558..9a63382 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -3,20 +3,20 @@
# Linux kernel target
#
###############################################################################
-LINUX_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
+LINUX_VERSION := $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
# Compute LINUX_SOURCE and LINUX_SITE from the configuration
ifeq ($(LINUX_VERSION),custom)
-LINUX_TARBALL:=$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
-LINUX_SITE:=$(dir $(LINUX_TARBALL))
-LINUX_SOURCE:=$(notdir $(LINUX_TARBALL))
+LINUX_TARBALL := $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
+LINUX_SITE := $(dir $(LINUX_TARBALL))
+LINUX_SOURCE := $(notdir $(LINUX_TARBALL))
else
-LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
-LINUX_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
+LINUX_SOURCE := linux-$(LINUX_VERSION).tar.bz2
+LINUX_SITE := $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
endif
-LINUX_DIR:=$(BUILD_DIR)/linux-$(LINUX_VERSION)
-LINUX_PATCH=$(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
+LINUX_DIR := $(BUILD_DIR)/linux-$(LINUX_VERSION)
+LINUX_PATCH := $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
LINUX_MAKE_FLAGS = \
HOSTCC="$(HOSTCC)" \
--
1.7.4.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 02/12] linux: indent and align some definitions
2011-07-11 13:53 ` [Buildroot] [PATCH 02/12] linux: indent and align some definitions Thomas Petazzoni
@ 2011-07-11 19:30 ` Peter Korsgaard
2011-07-11 20:42 ` Thomas Petazzoni
0 siblings, 1 reply; 30+ messages in thread
From: Peter Korsgaard @ 2011-07-11 19:30 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> linux/linux.mk | 16 ++++++++--------
Thomas> 1 files changed, 8 insertions(+), 8 deletions(-)
Please use the
BLAH = foo
Style instead, for the reasons outlined in my mails yesterday.
Thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 02/12] linux: indent and align some definitions
2011-07-11 19:30 ` Peter Korsgaard
@ 2011-07-11 20:42 ` Thomas Petazzoni
0 siblings, 0 replies; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 20:42 UTC (permalink / raw)
To: buildroot
Le Mon, 11 Jul 2011 21:30:20 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :
> >>>>> "Thomas" == Thomas Petazzoni
> >>>>> <thomas.petazzoni@free-electrons.com> writes:
>
> Thomas> Signed-off-by: Thomas Petazzoni
> Thomas> <thomas.petazzoni@free-electrons.com> ---
> Thomas> linux/linux.mk | 16 ++++++++--------
> Thomas> 1 files changed, 8 insertions(+), 8 deletions(-)
>
> Please use the
>
> BLAH = foo
>
> Style instead, for the reasons outlined in my mails yesterday.
I have dropped this patch, and used the
BLAH = foo
syntax elsewhere.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 03/12] linux: convert to the GENTARGETS infrastructure
2011-07-11 13:53 [Buildroot] [pull request v4] Pull request for branch for-2011.08/bootloaders Thomas Petazzoni
2011-07-11 13:53 ` [Buildroot] [PATCH 01/12] linux: rename LINUX26 to LINUX Thomas Petazzoni
2011-07-11 13:53 ` [Buildroot] [PATCH 02/12] linux: indent and align some definitions Thomas Petazzoni
@ 2011-07-11 13:53 ` Thomas Petazzoni
2011-07-11 19:31 ` Peter Korsgaard
2011-07-11 13:53 ` [Buildroot] [PATCH 04/12] u-boot: rename to uboot Thomas Petazzoni
` (8 subsequent siblings)
11 siblings, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 13:53 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
linux/linux.mk | 116 +++++++++++++++++++++++++++-----------------------------
1 files changed, 56 insertions(+), 60 deletions(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index 9a63382..2c7ce89 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -15,8 +15,10 @@ LINUX_SOURCE := linux-$(LINUX_VERSION).tar.bz2
LINUX_SITE := $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
endif
-LINUX_DIR := $(BUILD_DIR)/linux-$(LINUX_VERSION)
-LINUX_PATCH := $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
+LINUX_PATCHES := $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
+
+LINUX_INSTALL_IMAGES = YES
+LINUX_DEPENDENCIES += host-module-init-tools
LINUX_MAKE_FLAGS = \
HOSTCC="$(HOSTCC)" \
@@ -74,27 +76,17 @@ LINUX_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME)
endif
endif # BR2_LINUX_KERNEL_VMLINUX
-# Download
-$(LINUX_DIR)/.stamp_downloaded:
- @$(call MESSAGE,"Downloading kernel")
- $(call DOWNLOAD,$(LINUX_SITE),$(LINUX_SOURCE))
- $(foreach patch,$(filter ftp://% http://%,$(LINUX_PATCH)),\
+define LINUX_DOWNLOAD_PATCHES
+ $(if $(LINUX_PATCHES),
+ @$(call MESSAGE,"Download additional patches"))
+ $(foreach patch,$(filter ftp://% http://%,$(LINUX_PATCHES)),\
$(call DOWNLOAD,$(dir $(patch)),$(notdir $(patch)))$(sep))
- mkdir -p $(@D)
- touch $@
-
-# Extraction
-$(LINUX_DIR)/.stamp_extracted: $(LINUX_DIR)/.stamp_downloaded
- @$(call MESSAGE,"Extracting kernel")
- mkdir -p $(@D)
- $(Q)$(INFLATE$(suffix $(LINUX_SOURCE))) $(DL_DIR)/$(LINUX_SOURCE) | \
- tar -C $(@D) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) -
- $(Q)touch $@
+endef
+
+LINUX_POST_DOWNLOAD_HOOKS += LINUX_DOWNLOAD_PATCHES
-# Patch
-$(LINUX_DIR)/.stamp_patched: $(LINUX_DIR)/.stamp_extracted
- @$(call MESSAGE,"Patching kernel")
- for p in $(LINUX_PATCH) ; do \
+define LINUX_APPLY_PATCHES
+ for p in $(LINUX_PATCHES) ; do \
if echo $$p | grep -q -E "^ftp://|^http://" ; then \
toolchain/patch-kernel.sh $(@D) $(DL_DIR) `basename $$p` ; \
elif test -d $$p ; then \
@@ -103,64 +95,66 @@ $(LINUX_DIR)/.stamp_patched: $(LINUX_DIR)/.stamp_extracted
toolchain/patch-kernel.sh $(@D) `dirname $$p` `basename $$p` ; \
fi \
done
- $(Q)touch $@
+endef
+
+LINUX_POST_PATCH_HOOKS += LINUX_APPLY_PATCHES
-# Configuration
-$(LINUX_DIR)/.stamp_configured: $(LINUX_DIR)/.stamp_patched
- @$(call MESSAGE,"Configuring kernel")
ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
- $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) $(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
+KERNEL_SOURCE_CONFIG = $(KERNEL_ARCH_PATH)/configs/$(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
- cp $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
+KERNEL_SOURCE_CONFIG = $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
+endif
+
+define LINUX_CONFIGURE_CMDS
+ cp $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
-endif
-ifeq ($(BR2_ARM_EABI),y)
- $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config)
-else
- $(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config)
-endif
-ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+ $(if $(BR2_ARM_EABI),
+ $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config),
+ $(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config))
# As the kernel gets compiled before root filesystems are
# built, we create a fake initramfs file list. It'll be
# replaced later by the real list, and the kernel will be
# rebuilt using the linux26-rebuild-with-initramfs target.
- touch $(BINARIES_DIR)/rootfs.initramfs
- $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.initramfs\",$(@D)/.config)
- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)
- $(call KCONFIG_DISABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_NONE,$(@D)/.config)
- $(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config)
-endif
-ifneq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
- $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
- $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config)
-endif
-ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
- $(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config)
-endif
- $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) oldconfig
- $(Q)touch $@
+ $(if $(BR2_TARGET_ROOTFS_INITRAMFS),
+ touch $(BINARIES_DIR)/rootfs.initramfs
+ $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
+ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.initramfs\",$(@D)/.config)
+ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
+ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)
+ $(call KCONFIG_DISABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_NONE,$(@D)/.config)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config))
+ $(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),,
+ $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
+ $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),
+ $(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config))
+ yes '' | $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) oldconfig
+endef
# Compilation. We make sure the kernel gets rebuilt when the
# configuration has changed.
-$(LINUX_DIR)/.stamp_compiled: $(LINUX_DIR)/.stamp_configured $(LINUX_DIR)/.config
- @$(call MESSAGE,"Compiling kernel")
+define LINUX_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
fi
- $(Q)touch $@
+endef
+
-# Installation
-$(LINUX_DIR)/.stamp_installed: $(LINUX_DIR)/.stamp_compiled
- @$(call MESSAGE,"Installing kernel")
ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),y)
+define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET
install -m 0644 -D $(LINUX_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
+endef
endif
+
+define LINUX_INSTALL_IMAGES_CMDS
cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
+endef
+
+define LINUX_INSTALL_TARGET_CMDS
+ $(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET)
# Install modules and remove symbolic links pointing to build
# directories, not relevant on the target
@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
@@ -169,17 +163,18 @@ endif
rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \
rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \
fi
- $(Q)touch $@
+endef
-linux linux26: host-module-init-tools $(LINUX_DEPENDENCIES) $(LINUX_DIR)/.stamp_installed
+$(eval $(call GENTARGETS,,linux))
linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs $(LINUX_DIR)/.stamp_configured
$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \
$(subst linux-,,$(subst linux26-,,$@))
+ rm -f $(LINUX_DIR)/.stamp_{built,target_installed,images_installed}
# Support for rebuilding the kernel after the initramfs file list has
# been generated in $(BINARIES_DIR)/rootfs.initramfs.
-$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_installed $(BINARIES_DIR)/rootfs.initramfs
+$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/rootfs.initramfs
@$(call MESSAGE,"Rebuilding kernel with initramfs")
# Remove the previously generated initramfs which was empty,
# to make sure the kernel will actually regenerate it.
@@ -194,6 +189,7 @@ $(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_installed $(BINARIES_
# after it generated the initramfs list of files.
linux-rebuild-with-initramfs linux26-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_initramfs_rebuilt
+
ifeq ($(BR2_LINUX_KERNEL),y)
TARGETS+=linux
endif
--
1.7.4.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 03/12] linux: convert to the GENTARGETS infrastructure
2011-07-11 13:53 ` [Buildroot] [PATCH 03/12] linux: convert to the GENTARGETS infrastructure Thomas Petazzoni
@ 2011-07-11 19:31 ` Peter Korsgaard
2011-07-11 20:42 ` Thomas Petazzoni
0 siblings, 1 reply; 30+ messages in thread
From: Peter Korsgaard @ 2011-07-11 19:31 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> linux/linux.mk | 116 +++++++++++++++++++++++++++-----------------------------
Thomas> 1 files changed, 56 insertions(+), 60 deletions(-)
Thomas> diff --git a/linux/linux.mk b/linux/linux.mk
Thomas> index 9a63382..2c7ce89 100644
Thomas> --- a/linux/linux.mk
Thomas> +++ b/linux/linux.mk
Thomas> @@ -15,8 +15,10 @@ LINUX_SOURCE := linux-$(LINUX_VERSION).tar.bz2
Thomas> LINUX_SITE := $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
Thomas> endif
Thomas> -LINUX_DIR := $(BUILD_DIR)/linux-$(LINUX_VERSION)
Thomas> -LINUX_PATCH := $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
Thomas> +LINUX_PATCHES := $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
Please use '=' for consistency. Otherwise looks good.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 04/12] u-boot: rename to uboot
2011-07-11 13:53 [Buildroot] [pull request v4] Pull request for branch for-2011.08/bootloaders Thomas Petazzoni
` (2 preceding siblings ...)
2011-07-11 13:53 ` [Buildroot] [PATCH 03/12] linux: convert to the GENTARGETS infrastructure Thomas Petazzoni
@ 2011-07-11 13:53 ` Thomas Petazzoni
2011-07-11 13:53 ` [Buildroot] [PATCH 05/12] Improve TARGETS handling for bootloaders and kernel Thomas Petazzoni
` (7 subsequent siblings)
11 siblings, 0 replies; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 13:53 UTC (permalink / raw)
To: buildroot
This will allow to match the currently Config.in option
BR2_TARGET_UBOOT, in order to make it easy to integrate U-Boot into
the package infrastructure.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
boot/Config.in | 2 +-
boot/{u-boot => uboot}/Config.in | 0
.../uboot-2010.03-fix-avr32.patch} | 0
boot/{u-boot/u-boot.mk => uboot/uboot.mk} | 78 ++++++++++----------
4 files changed, 40 insertions(+), 40 deletions(-)
rename boot/{u-boot => uboot}/Config.in (100%)
rename boot/{u-boot/u-boot-2010.03-fix-avr32.patch => uboot/uboot-2010.03-fix-avr32.patch} (100%)
rename boot/{u-boot/u-boot.mk => uboot/uboot.mk} (62%)
diff --git a/boot/Config.in b/boot/Config.in
index 67ab8ac..67adae8 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -3,7 +3,7 @@ menu "Bootloaders"
source "boot/barebox/Config.in"
source "boot/grub/Config.in"
source "boot/syslinux/Config.in"
-source "boot/u-boot/Config.in"
+source "boot/uboot/Config.in"
source "boot/at91bootstrap/Config.in"
source "boot/at91dataflashboot/Config.in"
diff --git a/boot/u-boot/Config.in b/boot/uboot/Config.in
similarity index 100%
rename from boot/u-boot/Config.in
rename to boot/uboot/Config.in
diff --git a/boot/u-boot/u-boot-2010.03-fix-avr32.patch b/boot/uboot/uboot-2010.03-fix-avr32.patch
similarity index 100%
rename from boot/u-boot/u-boot-2010.03-fix-avr32.patch
rename to boot/uboot/uboot-2010.03-fix-avr32.patch
diff --git a/boot/u-boot/u-boot.mk b/boot/uboot/uboot.mk
similarity index 62%
rename from boot/u-boot/u-boot.mk
rename to boot/uboot/uboot.mk
index 215b1c7..3e945c7 100644
--- a/boot/u-boot/u-boot.mk
+++ b/boot/uboot/uboot.mk
@@ -3,42 +3,42 @@
# U-Boot
#
#############################################################
-U_BOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
-U_BOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
+UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
+UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
-U_BOOT_INSTALL_IMAGES = YES
+UBOOT_INSTALL_IMAGES = YES
-ifeq ($(U_BOOT_VERSION),custom)
+ifeq ($(UBOOT_VERSION),custom)
# Handle custom U-Boot tarballs as specified by the configuration
-U_BOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
-U_BOOT_SITE = $(dir $(U_BOOT_TARBALL))
-U_BOOT_SOURCE = $(notdir $(U_BOOT_TARBALL))
+UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
+UBOOT_SITE = $(dir $(UBOOT_TARBALL))
+UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL))
else
# Handle stable official U-Boot versions
-U_BOOT_SITE = ftp://ftp.denx.de/pub/u-boot
-U_BOOT_SOURCE = u-boot-$(U_BOOT_VERSION).tar.bz2
+UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot
+UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2
endif
ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
-U_BOOT_BIN = u-boot.kwb
-U_BOOT_MAKE_TARGET = $(U_BOOT_BIN)
+UBOOT_BIN = u-boot.kwb
+UBOOT_MAKE_TARGET = $(U_BOOT_BIN)
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
-U_BOOT_BIN = u-boot.ldr
+UBOOT_BIN = u-boot.ldr
else
-U_BOOT_BIN = u-boot.bin
+UBOOT_BIN = u-boot.bin
endif
-U_BOOT_ARCH=$(KERNEL_ARCH)
+UBOOT_ARCH=$(KERNEL_ARCH)
# u-boot in the past used arch=ppc for powerpc
-ifneq ($(findstring x2010.03,x$(U_BOOT_VERSION)),)
-U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
+ifneq ($(findstring x2010.03,x$(UBOOT_VERSION)),)
+UBOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
endif
-U_BOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1
-U_BOOT_MAKE_OPTS += \
+UBOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1
+UBOOT_MAKE_OPTS += \
CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
- ARCH=$(U_BOOT_ARCH)
+ ARCH=$(UBOOT_ARCH)
# Helper function to fill the U-Boot config.h file.
# Argument 1: option name
@@ -53,18 +53,18 @@ $(if $(call qstrip,$(2)),
endef
ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
-define U_BOOT_APPLY_CUSTOM_PATCHES
+define UBOOT_APPLY_CUSTOM_PATCHES
toolchain/patch-kernel.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
- u-boot-$(U_BOOT_VERSION)-\*.patch
+ uboot-$(UBOOT_VERSION)-\*.patch
endef
-U_BOOT_POST_PATCH_HOOKS += U_BOOT_APPLY_CUSTOM_PATCHES
+UBOOT_POST_PATCH_HOOKS += U_BOOT_APPLY_CUSTOM_PATCHES
endif
-define U_BOOT_CONFIGURE_CMDS
- $(TARGET_CONFIGURE_OPTS) $(U_BOOT_CONFIGURE_OPTS) \
- $(MAKE) -C $(@D) $(U_BOOT_MAKE_OPTS) \
- $(U_BOOT_BOARD_NAME)_config
+define UBOOT_CONFIGURE_CMDS
+ $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
+ $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
+ $(UBOOT_BOARD_NAME)_config
@echo >> $(@D)/include/config.h
@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(@D)/include/config.h
@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(@D)/include/config.h
@@ -81,35 +81,35 @@ define U_BOOT_CONFIGURE_CMDS
endef
ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
-define U_BOOT_BUILD_TARGET_ENV_UTILS
+define UBOOT_BUILD_TARGET_ENV_UTILS
$(TARGET_CONFIGURE_OPTS) $(MAKE) HOSTCC="$(TARGET_CC)" -C $(@D) env
endef
endif
-define U_BOOT_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(U_BOOT_CONFIGURE_OPTS) \
- $(MAKE) -C $(@D) $(U_BOOT_MAKE_OPTS) \
- $(U_BOOT_MAKE_TARGET)
- $(U_BOOT_BUILD_TARGET_ENV_UTILS)
+define UBOOT_BUILD_CMDS
+ $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
+ $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
+ $(UBOOT_MAKE_TARGET)
+ $(UBOOT_BUILD_TARGET_ENV_UTILS)
endef
-define U_BOOT_INSTALL_IMAGES_CMDS
- cp -dpf $(@D)/$(U_BOOT_BIN) $(BINARIES_DIR)/
+define UBOOT_INSTALL_IMAGES_CMDS
+ cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
endef
ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
-define U_BOOT_INSTALL_TARGET_ENV_UTILS
+define UBOOT_INSTALL_TARGET_ENV_UTILS
$(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv \
$(TARGET_DIR)/usr/sbin/fw_printenv
ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
endef
endif
-define U_BOOT_INSTALL_TARGET_CMDS
- $(U_BOOT_INSTALL_TARGET_ENV_UTILS)
+define UBOOT_INSTALL_TARGET_CMDS
+ $(UBOOT_INSTALL_TARGET_ENV_UTILS)
endef
-$(eval $(call GENTARGETS,boot,u-boot))
+$(eval $(call GENTARGETS,boot,uboot))
#############################################################
#
@@ -121,7 +121,7 @@ TARGETS+=u-boot
# we NEED a board name unless we're at make source
ifeq ($(filter source,$(MAKECMDGOALS)),)
-ifeq ($(U_BOOT_BOARD_NAME),)
+ifeq ($(UBOOT_BOARD_NAME),)
$(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)
endif
endif
--
1.7.4.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 05/12] Improve TARGETS handling for bootloaders and kernel
2011-07-11 13:53 [Buildroot] [pull request v4] Pull request for branch for-2011.08/bootloaders Thomas Petazzoni
` (3 preceding siblings ...)
2011-07-11 13:53 ` [Buildroot] [PATCH 04/12] u-boot: rename to uboot Thomas Petazzoni
@ 2011-07-11 13:53 ` Thomas Petazzoni
2011-07-11 19:34 ` Peter Korsgaard
2011-07-11 13:53 ` [Buildroot] [PATCH 06/12] linux: allow specification of a custom Git repository as a source Thomas Petazzoni
` (6 subsequent siblings)
11 siblings, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 13:53 UTC (permalink / raw)
To: buildroot
As the kernel and bootloaders do not use the normal BR2_PACKAGE_*
Kconfig options, their target name was not automatically added to the
global TARGETS variable. Each bootloader .mk and the linux.mk had to
add their own target manually to TARGETS, and the package
infrastructure was making tests on non-existing Kconfig variables.
This commit improves the package infrastructure so that it looks at
BR2_PACKAGE_<pkg> for packages, BR2_BOOT_<pkg> for bootloaders and at
the special BR2_LINUX_KERNEL for the linux package.
This allows to simplify a little bit the bootloaders and linux .mk
files.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
boot/at91bootstrap/at91bootstrap.mk | 8 --------
boot/at91dataflashboot/at91dataflashboot.mk | 9 ---------
boot/barebox/barebox.mk | 3 ---
boot/grub/grub.mk | 9 ---------
boot/syslinux/syslinux.mk | 9 ---------
boot/uboot/uboot.mk | 8 --------
linux/linux.mk | 5 -----
package/Makefile.package.in | 16 +++++++++++++---
8 files changed, 13 insertions(+), 54 deletions(-)
diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index 37f8ac7..871b0ff 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -31,19 +31,11 @@ endef
$(eval $(call GENTARGETS,boot,at91bootstrap))
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
-TARGETS+=at91bootstrap
-
# we NEED a board name unless we're at make source
ifeq ($(filter source,$(MAKECMDGOALS)),)
ifeq ($(AT91BOOTSTRAP_BOARD),)
$(error No AT91Bootstrap board name set. Check your BR2_TARGET_AT91BOOTSTRAP_BOARD setting)
endif
endif
-
endif
diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk
index 9b6cf21..14fb8c5 100644
--- a/boot/at91dataflashboot/at91dataflashboot.mk
+++ b/boot/at91dataflashboot/at91dataflashboot.mk
@@ -20,12 +20,3 @@ define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS
endef
$(eval $(call GENTARGETS,boot,at91dataflashboot))
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_AT91DATAFLASHBOOT),y)
-TARGETS+=at91dataflashboot
-endif
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 34ec5da..1952c98 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -54,13 +54,10 @@ endif
$(eval $(call GENTARGETS,boot,barebox))
ifeq ($(BR2_TARGET_BAREBOX),y)
-TARGETS+=barebox
-
# we NEED a board defconfig file unless we're at make source
ifeq ($(filter source,$(MAKECMDGOALS)),)
ifeq ($(BAREBOX_BOARD_DEFCONFIG),)
$(error No Barebox defconfig file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG setting)
endif
endif
-
endif
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 4938416..2ce8eab 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -83,12 +83,3 @@ define GRUB_UNINSTALL_TARGET_CMDS
endef
$(eval $(call AUTOTARGETS,boot,grub))
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_GRUB),y)
-TARGETS+=grub
-endif
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index e9c32b6..686124f 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -27,12 +27,3 @@ define SYSLINUX_INSTALL_IMAGES_CMDS
endef
$(eval $(call GENTARGETS,boot,syslinux))
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_SYSLINUX),y)
-TARGETS+=syslinux
-endif
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 3e945c7..dfa012a 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -111,19 +111,11 @@ endef
$(eval $(call GENTARGETS,boot,uboot))
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
ifeq ($(BR2_TARGET_UBOOT),y)
-TARGETS+=u-boot
-
# we NEED a board name unless we're at make source
ifeq ($(filter source,$(MAKECMDGOALS)),)
ifeq ($(UBOOT_BOARD_NAME),)
$(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)
endif
endif
-
endif
diff --git a/linux/linux.mk b/linux/linux.mk
index 2c7ce89..0e1466f 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -189,11 +189,6 @@ $(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LI
# after it generated the initramfs list of files.
linux-rebuild-with-initramfs linux26-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_initramfs_rebuilt
-
-ifeq ($(BR2_LINUX_KERNEL),y)
-TARGETS+=linux
-endif
-
# Checks to give errors that the user can understand
ifeq ($(filter source,$(MAKECMDGOALS)),)
ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index aa5c0d7..faa7ff1 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -522,10 +522,20 @@ $$($(2)_TARGET_UNINSTALL): PKG=$(2)
$$($(2)_TARGET_CLEAN): PKG=$(2)
$$($(2)_TARGET_DIRCLEAN): PKG=$(2)
+# Compute the name of the Kconfig option that correspond to the
+# package being enabled. We handle three cases: the special Linux
+# kernel case, the bootloaders case, and the normal packages case.
+ifeq ($(1),linux)
+$(2)_KCONFIG_VAR = BR2_LINUX_KERNEL
+else ifeq ($(4),boot)
+$(2)_KCONFIG_VAR = BR2_TARGET_$(2)
+else
+$(2)_KCONFIG_VAR = BR2_PACKAGE_$(2)
+endif
+
# add package to the general list of targets if requested by the buildroot
# configuration
-
-ifeq ($$(BR2_PACKAGE_$(2)),y)
+ifeq ($$($$($(2)_KCONFIG_VAR)),y)
TARGETS += $(1)
@@ -537,7 +547,7 @@ else ifeq ($$($(2)_SITE_METHOD),bzr)
DL_TOOLS_DEPENDENCIES += bzr
endif # SITE_METHOD
-endif # BR2_PACKAGE_$(2)
+endif # $(2)_KCONFIG_VAR
endef # GENTARGETS_INNER
################################################################################
--
1.7.4.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 05/12] Improve TARGETS handling for bootloaders and kernel
2011-07-11 13:53 ` [Buildroot] [PATCH 05/12] Improve TARGETS handling for bootloaders and kernel Thomas Petazzoni
@ 2011-07-11 19:34 ` Peter Korsgaard
2011-07-11 20:42 ` Thomas Petazzoni
0 siblings, 1 reply; 30+ messages in thread
From: Peter Korsgaard @ 2011-07-11 19:34 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> As the kernel and bootloaders do not use the normal BR2_PACKAGE_*
Thomas> Kconfig options, their target name was not automatically added to the
Thomas> global TARGETS variable. Each bootloader .mk and the linux.mk had to
Thomas> add their own target manually to TARGETS, and the package
Thomas> infrastructure was making tests on non-existing Kconfig variables.
Thomas> This commit improves the package infrastructure so that it looks at
Thomas> BR2_PACKAGE_<pkg> for packages, BR2_BOOT_<pkg> for bootloaders and at
Thomas> the special BR2_LINUX_KERNEL for the linux package.
You forgot to adjust the commit message now that you kept bootloaders as
BR2_TARGET_<pkg>.
Otherwise it looks good.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 06/12] linux: allow specification of a custom Git repository as a source
2011-07-11 13:53 [Buildroot] [pull request v4] Pull request for branch for-2011.08/bootloaders Thomas Petazzoni
` (4 preceding siblings ...)
2011-07-11 13:53 ` [Buildroot] [PATCH 05/12] Improve TARGETS handling for bootloaders and kernel Thomas Petazzoni
@ 2011-07-11 13:53 ` Thomas Petazzoni
2011-07-11 19:35 ` Peter Korsgaard
2011-07-11 13:53 ` [Buildroot] [PATCH 07/12] u-boot: allow specification of custom Git repo as source Thomas Petazzoni
` (5 subsequent siblings)
11 siblings, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 13:53 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
linux/Config.in | 15 +++++++++++++++
linux/linux.mk | 3 +++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index bf16ddf..4a17cba 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -47,6 +47,12 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL
This option allows to specify the http or ftp location of a
specific kernel source tarball
+config BR2_LINUX_KERNEL_CUSTOM_GIT
+ bool "Custom Git tree"
+ help
+ This option allows Buildroot to get the Linux kernel source
+ code from a Git repository.
+
endchoice
config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
@@ -58,12 +64,21 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
string "URL of custom kernel tarball"
depends on BR2_LINUX_KERNEL_CUSTOM_TARBALL
+config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL
+ string "URL of custom Git repository"
+ depends on BR2_LINUX_KERNEL_CUSTOM_GIT
+
+config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
+ string "Custom Git version"
+ depends on BR2_LINUX_KERNEL_CUSTOM_GIT
+
config BR2_LINUX_KERNEL_VERSION
string
default "2.6.39.3" if BR2_LINUX_KERNEL_2_6_39
default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
+ default $BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION if BR2_LINUX_KERNEL_CUSTOM_GIT
#
# Patch selection
diff --git a/linux/linux.mk b/linux/linux.mk
index 0e1466f..9ead859 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -10,6 +10,9 @@ ifeq ($(LINUX_VERSION),custom)
LINUX_TARBALL := $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
LINUX_SITE := $(dir $(LINUX_TARBALL))
LINUX_SOURCE := $(notdir $(LINUX_TARBALL))
+else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y)
+LINUX_SITE := $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL))
+LINUX_SITE_METHOD := git
else
LINUX_SOURCE := linux-$(LINUX_VERSION).tar.bz2
LINUX_SITE := $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
--
1.7.4.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 06/12] linux: allow specification of a custom Git repository as a source
2011-07-11 13:53 ` [Buildroot] [PATCH 06/12] linux: allow specification of a custom Git repository as a source Thomas Petazzoni
@ 2011-07-11 19:35 ` Peter Korsgaard
0 siblings, 0 replies; 30+ messages in thread
From: Peter Korsgaard @ 2011-07-11 19:35 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> linux/Config.in | 15 +++++++++++++++
Thomas> linux/linux.mk | 3 +++
Thomas> 2 files changed, 18 insertions(+), 0 deletions(-)
Thomas> diff --git a/linux/Config.in b/linux/Config.in
Thomas> index bf16ddf..4a17cba 100644
Thomas> --- a/linux/Config.in
Thomas> +++ b/linux/Config.in
Thomas> @@ -47,6 +47,12 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL
Thomas> This option allows to specify the http or ftp location of a
Thomas> specific kernel source tarball
Thomas> +config BR2_LINUX_KERNEL_CUSTOM_GIT
Thomas> + bool "Custom Git tree"
Wrong indentation.
Thomas> +config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL
Thomas> + string "URL of custom Git repository"
Here as well.
Thomas> +config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
Thomas> + string "Custom Git version"
And here.
Otherwise it looks good.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 07/12] u-boot: allow specification of custom Git repo as source
2011-07-11 13:53 [Buildroot] [pull request v4] Pull request for branch for-2011.08/bootloaders Thomas Petazzoni
` (5 preceding siblings ...)
2011-07-11 13:53 ` [Buildroot] [PATCH 06/12] linux: allow specification of a custom Git repository as a source Thomas Petazzoni
@ 2011-07-11 13:53 ` Thomas Petazzoni
2011-07-11 19:38 ` Peter Korsgaard
2011-07-11 13:53 ` [Buildroot] [PATCH 08/12] Add x-loader bootloader Thomas Petazzoni
` (4 subsequent siblings)
11 siblings, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 13:53 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
boot/uboot/Config.in | 14 ++++++++++++++
boot/uboot/uboot.mk | 3 +++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index aada346..b8eb42d 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -34,6 +34,9 @@ config BR2_TARGET_UBOOT_2010_03
config BR2_TARGET_UBOOT_CUSTOM_TARBALL
bool "Custom tarball"
+config BR2_TARGET_UBOOT_CUSTOM_GIT
+ bool "Custom Git repository"
+
endchoice
if BR2_TARGET_UBOOT_CUSTOM_TARBALL
@@ -51,6 +54,7 @@ config BR2_TARGET_UBOOT_VERSION
default "2010.06" if BR2_TARGET_UBOOT_2010_06
default "2010.03" if BR2_TARGET_UBOOT_2010_03
default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
+ default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
string "custom patch dir"
@@ -61,6 +65,16 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
Most users may leave this empty
+if BR2_TARGET_UBOOT_CUSTOM_GIT
+
+config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL
+ string "URL of custom Git repository"
+
+config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION
+ string "Custom Git version"
+
+endif
+
choice
prompt "U-Boot binary format"
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index dfa012a..e87727b 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -13,6 +13,9 @@ ifeq ($(UBOOT_VERSION),custom)
UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
UBOOT_SITE = $(dir $(UBOOT_TARBALL))
UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL))
+else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
+UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL))
+UBOOT_SITE_METHOD = git
else
# Handle stable official U-Boot versions
UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot
--
1.7.4.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 07/12] u-boot: allow specification of custom Git repo as source
2011-07-11 13:53 ` [Buildroot] [PATCH 07/12] u-boot: allow specification of custom Git repo as source Thomas Petazzoni
@ 2011-07-11 19:38 ` Peter Korsgaard
2011-07-11 19:44 ` Thomas Petazzoni
0 siblings, 1 reply; 30+ messages in thread
From: Peter Korsgaard @ 2011-07-11 19:38 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> boot/uboot/Config.in | 14 ++++++++++++++
Thomas> boot/uboot/uboot.mk | 3 +++
Thomas> 2 files changed, 17 insertions(+), 0 deletions(-)
Thomas> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
Thomas> index aada346..b8eb42d 100644
Thomas> --- a/boot/uboot/Config.in
Thomas> +++ b/boot/uboot/Config.in
Thomas> @@ -34,6 +34,9 @@ config BR2_TARGET_UBOOT_2010_03
Thomas> config BR2_TARGET_UBOOT_CUSTOM_TARBALL
Thomas> bool "Custom tarball"
Thomas> +config BR2_TARGET_UBOOT_CUSTOM_GIT
Thomas> + bool "Custom Git repository"
Should be <tab> rather than spaces.
Thomas> +if BR2_TARGET_UBOOT_CUSTOM_GIT
Thomas> +
Thomas> +config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL
Thomas> + string "URL of custom Git repository"
Here as well.
Thomas> +
Thomas> +config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION
Thomas> + string "Custom Git version"
And here.
Otherwise it looks good. The only possible improvement would be to make
it simply a custum URL, and let the Makefile.package.in support sort out
if it's a tarball, a svn repo or git or whatever.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 07/12] u-boot: allow specification of custom Git repo as source
2011-07-11 19:38 ` Peter Korsgaard
@ 2011-07-11 19:44 ` Thomas Petazzoni
2011-07-11 20:06 ` Peter Korsgaard
0 siblings, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 19:44 UTC (permalink / raw)
To: buildroot
Le Mon, 11 Jul 2011 21:38:05 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :
> Otherwise it looks good. The only possible improvement would be to
> make it simply a custum URL, and let the Makefile.package.in support
> sort out if it's a tarball, a svn repo or git or whatever.
This would rule out support for SVN over HTTP and Git over HTTP.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 07/12] u-boot: allow specification of custom Git repo as source
2011-07-11 19:44 ` Thomas Petazzoni
@ 2011-07-11 20:06 ` Peter Korsgaard
0 siblings, 0 replies; 30+ messages in thread
From: Peter Korsgaard @ 2011-07-11 20:06 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Le Mon, 11 Jul 2011 21:38:05 +0200,
Thomas> Peter Korsgaard <jacmet@uclibc.org> a ?crit :
>> Otherwise it looks good. The only possible improvement would be to
>> make it simply a custum URL, and let the Makefile.package.in support
>> sort out if it's a tarball, a svn repo or git or whatever.
Thomas> This would rule out support for SVN over HTTP and Git over HTTP.
Yes, unless we extend the logic in Makefile.package.in to support
pseudo URLs like OE, something like <url>;method=<method> or
<method>;<url>.
But ok, we can do that later.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 08/12] Add x-loader bootloader
2011-07-11 13:53 [Buildroot] [pull request v4] Pull request for branch for-2011.08/bootloaders Thomas Petazzoni
` (6 preceding siblings ...)
2011-07-11 13:53 ` [Buildroot] [PATCH 07/12] u-boot: allow specification of custom Git repo as source Thomas Petazzoni
@ 2011-07-11 13:53 ` Thomas Petazzoni
2011-07-11 19:43 ` Peter Korsgaard
2011-07-11 13:53 ` [Buildroot] [PATCH 09/12] barebox: bump version Thomas Petazzoni
` (3 subsequent siblings)
11 siblings, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 13:53 UTC (permalink / raw)
To: buildroot
From: Philippe Reynes <tremyfr@yahoo.fr>
Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
merge xloader
---
boot/Config.in | 1 +
boot/xloader/Config.in | 15 +++++++++++++++
boot/xloader/xloader.mk | 37 +++++++++++++++++++++++++++++++++++++
3 files changed, 53 insertions(+), 0 deletions(-)
create mode 100644 boot/xloader/Config.in
create mode 100644 boot/xloader/xloader.mk
diff --git a/boot/Config.in b/boot/Config.in
index 67adae8..2a97695 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -6,6 +6,7 @@ source "boot/syslinux/Config.in"
source "boot/uboot/Config.in"
source "boot/at91bootstrap/Config.in"
source "boot/at91dataflashboot/Config.in"
+source "boot/xloader/Config.in"
endmenu
diff --git a/boot/xloader/Config.in b/boot/xloader/Config.in
new file mode 100644
index 0000000..fe9a20c
--- /dev/null
+++ b/boot/xloader/Config.in
@@ -0,0 +1,15 @@
+menuconfig BR2_TARGET_XLOADER
+ bool "X-loader"
+ depends on BR2_arm
+ help
+ The x-loader bootloader. It is mainly used on OMAP-based
+ platforms.
+
+if BR2_TARGET_XLOADER
+config BR2_TARGET_XLOADER_BOARDNAME
+ string "x-loader board name"
+ help
+ One of x-loader supported boards to be built.
+ This will be suffixed with _config to meet x-loader
+ standard naming.
+endif
diff --git a/boot/xloader/xloader.mk b/boot/xloader/xloader.mk
new file mode 100644
index 0000000..8d8cce3
--- /dev/null
+++ b/boot/xloader/xloader.mk
@@ -0,0 +1,37 @@
+#############################################################
+#
+# x-loader
+#
+#############################################################
+XLOADER_VERSION = 6f3a26101303051e0f91b6213735b68ce804e94e
+XLOADER_SITE = git://gitorious.org/x-loader/x-loader.git
+XLOADER_BOARD_NAME = $(call qstrip,$(BR2_TARGET_XLOADER_BOARDNAME))
+
+XLOADER_INSTALL_IMAGES = YES
+
+define XLOADER_BUILD_CMDS
+ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) $(XLOADER_BOARD_NAME)_config
+ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) all
+ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) ift
+endef
+
+define XLOADER_INSTALL_IMAGES_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/MLO $(BINARIES_DIR)/
+endef
+
+$(eval $(call GENTARGETS,boot,xloader))
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_TARGET_XLOADER),y)
+# we NEED a board name unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
+ifeq ($(XLOADER_BOARD_NAME),)
+$(error NO x-loader board name set. Check your BR2_BOOT_XLOADER_BOARDNAME setting)
+endif
+endif
+
+endif
--
1.7.4.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 08/12] Add x-loader bootloader
2011-07-11 13:53 ` [Buildroot] [PATCH 08/12] Add x-loader bootloader Thomas Petazzoni
@ 2011-07-11 19:43 ` Peter Korsgaard
2011-07-11 20:45 ` Thomas Petazzoni
0 siblings, 1 reply; 30+ messages in thread
From: Peter Korsgaard @ 2011-07-11 19:43 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> From: Philippe Reynes <tremyfr@yahoo.fr>
Thomas> Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr>
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> merge xloader
A bit more info would be good. There seem to be quite a few xloader
trees around. Is this the best choice for omap3, omap4, .. ?
Thomas> ---
Thomas> boot/Config.in | 1 +
Thomas> boot/xloader/Config.in | 15 +++++++++++++++
Thomas> boot/xloader/xloader.mk | 37 +++++++++++++++++++++++++++++++++++++
Thomas> 3 files changed, 53 insertions(+), 0 deletions(-)
Thomas> create mode 100644 boot/xloader/Config.in
Thomas> create mode 100644 boot/xloader/xloader.mk
Thomas> diff --git a/boot/Config.in b/boot/Config.in
Thomas> index 67adae8..2a97695 100644
Thomas> --- a/boot/Config.in
Thomas> +++ b/boot/Config.in
Thomas> @@ -6,6 +6,7 @@ source "boot/syslinux/Config.in"
Thomas> source "boot/uboot/Config.in"
Thomas> source "boot/at91bootstrap/Config.in"
Thomas> source "boot/at91dataflashboot/Config.in"
Thomas> +source "boot/xloader/Config.in"
Thomas> endmenu
Thomas> diff --git a/boot/xloader/Config.in b/boot/xloader/Config.in
Thomas> new file mode 100644
Thomas> index 0000000..fe9a20c
Thomas> --- /dev/null
Thomas> +++ b/boot/xloader/Config.in
Thomas> @@ -0,0 +1,15 @@
Thomas> +menuconfig BR2_TARGET_XLOADER
Thomas> + bool "X-loader"
Thomas> + depends on BR2_arm
This could be more explicit like BR2_cortex_a8 || BR2_cortex_a9 I
believe.
Thomas> + help
Thomas> + The x-loader bootloader. It is mainly used on OMAP-based
Thomas> + platforms.
Thomas> +
Thomas> +if BR2_TARGET_XLOADER
Thomas> +config BR2_TARGET_XLOADER_BOARDNAME
Thomas> + string "x-loader board name"
Thomas> + help
Thomas> + One of x-loader supported boards to be built.
Thomas> + This will be suffixed with _config to meet x-loader
Thomas> + standard naming.
Thomas> +endif
Perhaps we should add a custom git location option like for u-boot /
linux.
Otherwise it looks good.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 08/12] Add x-loader bootloader
2011-07-11 19:43 ` Peter Korsgaard
@ 2011-07-11 20:45 ` Thomas Petazzoni
0 siblings, 0 replies; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 20:45 UTC (permalink / raw)
To: buildroot
Le Mon, 11 Jul 2011 21:43:47 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :
> A bit more info would be good. There seem to be quite a few xloader
> trees around. Is this the best choice for omap3, omap4, .. ?
I don't know. I have seen this gitorious tree recommended in multiple
places, but x-loader development is a big mess with no clear official
upstream location.
> This could be more explicit like BR2_cortex_a8 || BR2_cortex_a9 I
> believe.
Done.
> Perhaps we should add a custom git location option like for u-boot /
> linux.
Later ? :-)
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 09/12] barebox: bump version
2011-07-11 13:53 [Buildroot] [pull request v4] Pull request for branch for-2011.08/bootloaders Thomas Petazzoni
` (7 preceding siblings ...)
2011-07-11 13:53 ` [Buildroot] [PATCH 08/12] Add x-loader bootloader Thomas Petazzoni
@ 2011-07-11 13:53 ` Thomas Petazzoni
2011-07-11 13:53 ` [Buildroot] [PATCH 10/12] at91dataflashboot: use "config" instead of "menuconfig" Thomas Petazzoni
` (2 subsequent siblings)
11 siblings, 0 replies; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 13:53 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
boot/barebox/barebox.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 1952c98..7e69437 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -4,7 +4,7 @@
#
#############################################################
-BAREBOX_VERSION = 2011.05.0
+BAREBOX_VERSION = 2011.06.0
BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2
BAREBOX_SITE = http://www.barebox.org/download/
--
1.7.4.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 10/12] at91dataflashboot: use "config" instead of "menuconfig"
2011-07-11 13:53 [Buildroot] [pull request v4] Pull request for branch for-2011.08/bootloaders Thomas Petazzoni
` (8 preceding siblings ...)
2011-07-11 13:53 ` [Buildroot] [PATCH 09/12] barebox: bump version Thomas Petazzoni
@ 2011-07-11 13:53 ` Thomas Petazzoni
2011-07-11 19:45 ` Peter Korsgaard
2011-07-11 13:53 ` [Buildroot] [PATCH 11/12] linux: add support for 3.x and -rc versions Thomas Petazzoni
2011-07-11 13:53 ` [Buildroot] [PATCH 12/12] uboot: Add 2011.06 Thomas Petazzoni
11 siblings, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 13:53 UTC (permalink / raw)
To: buildroot
Since at91dataflashboot, using "menuconfig" is useless and confusing,
as it creates an empty submenu in the configuration interface.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
boot/at91dataflashboot/Config.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in
index 88cd058..a4efe11 100644
--- a/boot/at91dataflashboot/Config.in
+++ b/boot/at91dataflashboot/Config.in
@@ -1,3 +1,3 @@
-menuconfig BR2_TARGET_AT91DATAFLASHBOOT
+config BR2_TARGET_AT91DATAFLASHBOOT
depends on BR2_arm
bool "AT91 DataFlashBoot"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 11/12] linux: add support for 3.x and -rc versions
2011-07-11 13:53 [Buildroot] [pull request v4] Pull request for branch for-2011.08/bootloaders Thomas Petazzoni
` (9 preceding siblings ...)
2011-07-11 13:53 ` [Buildroot] [PATCH 10/12] at91dataflashboot: use "config" instead of "menuconfig" Thomas Petazzoni
@ 2011-07-11 13:53 ` Thomas Petazzoni
2011-07-11 19:57 ` Peter Korsgaard
2011-07-11 13:53 ` [Buildroot] [PATCH 12/12] uboot: Add 2011.06 Thomas Petazzoni
11 siblings, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 13:53 UTC (permalink / raw)
To: buildroot
The assumption that all kernels are in
http://www.kernel.org/pub/linux/kernel/v2.6/ is no longer true:
versions 3.x are in separate directories.
We know compute the directory name from the major and minor versions
of the version provided by the user. This assumes that the 3.1 version
will be in a /v3.1/ directory, which we don't know yet because the 3.1
cycle hasn't started yet.
At the same time, we add support for the official -rcX versions.
Patch tested by compiling 3.0-rc6, which Buildroot has successfully
downloaded and built.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
linux/linux.mk | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index 9ead859..db1b953 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -15,7 +15,16 @@ LINUX_SITE := $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL))
LINUX_SITE_METHOD := git
else
LINUX_SOURCE := linux-$(LINUX_VERSION).tar.bz2
-LINUX_SITE := $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
+# In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
+# to use the $(word) function. We support versions such as 3.1,
+# 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
+LINUX_VERSION_MAJOR = $(word 1,$(subst ., ,$(subst -, ,$(LINUX_VERSION))))
+LINUX_VERSION_MINOR = $(word 2,$(subst ., ,$(subst -, ,$(LINUX_VERSION))))
+ifeq ($(findstring -rc,$(LINUX_VERSION)),)
+LINUX_SITE := $(BR2_KERNEL_MIRROR)/linux/kernel/v$(LINUX_VERSION_MAJOR).$(LINUX_VERSION_MINOR)/
+else
+LINUX_SITE := $(BR2_KERNEL_MIRROR)/linux/kernel/v$(LINUX_VERSION_MAJOR).$(LINUX_VERSION_MINOR)/testing/
+endif # -rc
endif
LINUX_PATCHES := $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
--
1.7.4.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 11/12] linux: add support for 3.x and -rc versions
2011-07-11 13:53 ` [Buildroot] [PATCH 11/12] linux: add support for 3.x and -rc versions Thomas Petazzoni
@ 2011-07-11 19:57 ` Peter Korsgaard
2011-07-11 20:45 ` Thomas Petazzoni
0 siblings, 1 reply; 30+ messages in thread
From: Peter Korsgaard @ 2011-07-11 19:57 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> The assumption that all kernels are in
Thomas> http://www.kernel.org/pub/linux/kernel/v2.6/ is no longer true:
Thomas> versions 3.x are in separate directories.
Thomas> We know compute the directory name from the major and minor versions
S/know/now/
Thomas> of the version provided by the user. This assumes that the 3.1 version
Thomas> will be in a /v3.1/ directory, which we don't know yet because the 3.1
Thomas> cycle hasn't started yet.
Good question. Have you heard anything to make you think it will be so,
or are you just guessing?
Thomas> At the same time, we add support for the official -rcX versions.
Thomas> Patch tested by compiling 3.0-rc6, which Buildroot has successfully
Thomas> downloaded and built.
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> linux/linux.mk | 11 ++++++++++-
Thomas> 1 files changed, 10 insertions(+), 1 deletions(-)
Thomas> diff --git a/linux/linux.mk b/linux/linux.mk
Thomas> index 9ead859..db1b953 100644
Thomas> --- a/linux/linux.mk
Thomas> +++ b/linux/linux.mk
Thomas> @@ -15,7 +15,16 @@ LINUX_SITE := $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL))
Thomas> LINUX_SITE_METHOD := git
Thomas> else
Thomas> LINUX_SOURCE := linux-$(LINUX_VERSION).tar.bz2
Thomas> -LINUX_SITE := $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
Thomas> +# In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
Thomas> +# to use the $(word) function. We support versions such as 3.1,
Thomas> +# 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
Thomas> +LINUX_VERSION_MAJOR = $(word 1,$(subst ., ,$(subst -, ,$(LINUX_VERSION))))
Thomas> +LINUX_VERSION_MINOR = $(word 2,$(subst ., ,$(subst -, ,$(LINUX_VERSION))))
Thomas> +ifeq ($(findstring -rc,$(LINUX_VERSION)),)
Thomas> +LINUX_SITE := $(BR2_KERNEL_MIRROR)/linux/kernel/v$(LINUX_VERSION_MAJOR).$(LINUX_VERSION_MINOR)/
Thomas> +else
Thomas> +LINUX_SITE := $(BR2_KERNEL_MIRROR)/linux/kernel/v$(LINUX_VERSION_MAJOR).$(LINUX_VERSION_MINOR)/testing/
Thomas> +endif # -rc
Minor nit. I prefer positive logic, E.G.
LINUX_SITE := $(BR2_KERNEL_MIRROR)/linux/kernel/v$(LINUX_VERSION_MAJOR).$(LINUX_VERSION_MINOR)/
# release candidates are in the testing/ sub dir
ifneq ($(findstring -rc,$(LINUX_VERSION)),)
LINUX_SITE := $(LINUX_SITE)testing/
endif
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 11/12] linux: add support for 3.x and -rc versions
2011-07-11 19:57 ` Peter Korsgaard
@ 2011-07-11 20:45 ` Thomas Petazzoni
0 siblings, 0 replies; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 20:45 UTC (permalink / raw)
To: buildroot
Le Mon, 11 Jul 2011 21:57:30 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :
> Thomas> of the version provided by the user. This assumes that the
> Thomas> 3.1 version will be in a /v3.1/ directory, which we don't
> Thomas> know yet because the 3.1 cycle hasn't started yet.
>
> Good question. Have you heard anything to make you think it will be
> so, or are you just guessing?
Just guessing.
> Minor nit. I prefer positive logic, E.G.
>
> LINUX_SITE :=
> $(BR2_KERNEL_MIRROR)/linux/kernel/v$(LINUX_VERSION_MAJOR).$(LINUX_VERSION_MINOR)/
>
> # release candidates are in the testing/ sub dir
> ifneq ($(findstring -rc,$(LINUX_VERSION)),)
> LINUX_SITE := $(LINUX_SITE)testing/
> endif
Fixed.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 12/12] uboot: Add 2011.06
2011-07-11 13:53 [Buildroot] [pull request v4] Pull request for branch for-2011.08/bootloaders Thomas Petazzoni
` (10 preceding siblings ...)
2011-07-11 13:53 ` [Buildroot] [PATCH 11/12] linux: add support for 3.x and -rc versions Thomas Petazzoni
@ 2011-07-11 13:53 ` Thomas Petazzoni
2011-07-11 19:58 ` Peter Korsgaard
11 siblings, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2011-07-11 13:53 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
boot/uboot/Config.in | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index b8eb42d..d396fb5 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -12,10 +12,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
choice
prompt "U-Boot Version"
- default BR2_TARGET_UBOOT_2011_03
+ default BR2_TARGET_UBOOT_2011_06
help
Select the specific U-Boot version you want to use
+config BR2_TARGET_UBOOT_2011_06
+ bool "2011.06"
+
config BR2_TARGET_UBOOT_2011_03
bool "2011.03"
@@ -48,6 +51,7 @@ endif
config BR2_TARGET_UBOOT_VERSION
string
+ default "2011.06" if BR2_TARGET_UBOOT_2011_06
default "2011.03" if BR2_TARGET_UBOOT_2011_03
default "2010.12" if BR2_TARGET_UBOOT_2010_12
default "2010.09" if BR2_TARGET_UBOOT_2010_09
--
1.7.4.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 12/12] uboot: Add 2011.06
2011-07-11 13:53 ` [Buildroot] [PATCH 12/12] uboot: Add 2011.06 Thomas Petazzoni
@ 2011-07-11 19:58 ` Peter Korsgaard
2011-07-11 20:45 ` Thomas Petazzoni
0 siblings, 1 reply; 30+ messages in thread
From: Peter Korsgaard @ 2011-07-11 19:58 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> boot/uboot/Config.in | 6 +++++-
Thomas> 1 files changed, 5 insertions(+), 1 deletions(-)
Thomas> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
Thomas> index b8eb42d..d396fb5 100644
Thomas> --- a/boot/uboot/Config.in
Thomas> +++ b/boot/uboot/Config.in
Thomas> @@ -12,10 +12,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
Thomas> choice
Thomas> prompt "U-Boot Version"
Thomas> - default BR2_TARGET_UBOOT_2011_03
Thomas> + default BR2_TARGET_UBOOT_2011_06
Thomas> help
Thomas> Select the specific U-Boot version you want to use
Thomas> +config BR2_TARGET_UBOOT_2011_06
Thomas> + bool "2011.06"
Thomas> +
Thomas> config BR2_TARGET_UBOOT_2011_03
Thomas> bool "2011.03"
Thomas> @@ -48,6 +51,7 @@ endif
Thomas> config BR2_TARGET_UBOOT_VERSION
Thomas> string
Thomas> + default "2011.06" if BR2_TARGET_UBOOT_2011_06
Thomas> default "2011.03" if BR2_TARGET_UBOOT_2011_03
Thomas> default "2010.12" if BR2_TARGET_UBOOT_2010_12
Thomas> default "2010.09" if BR2_TARGET_UBOOT_2010_09
So now we're up to 6 versions (+custom/git). I think we should drop
2010.03, but I can do that.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread