2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2012-12-12 17:37:35 +01:00
|
|
|
#
|
|
|
|
|
# uboot-tools
|
|
|
|
|
#
|
2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2013-06-06 01:53:25 +02:00
|
|
|
|
2015-04-18 08:46:43 +02:00
|
|
|
UBOOT_TOOLS_VERSION = 2015.04
|
.mk files: bulk aligment and whitespace cleanup of assignments
The Buildroot coding style defines one space around make assignments and
does not align the assignment symbols.
This patch does a bulk fix of offending packages. The package
infrastructures (or more in general assignments to calculated variable
names, like $(2)_FOO) are not touched.
Alignment of line continuation characters (\) is kept as-is.
The sed command used to do this replacement is:
find * -name "*.mk" | xargs sed -i \
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#'
Brief explanation of this command:
^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line
\([?:+]\?=\) any assignment character =, :=, ?=, +=
\([^\\]\+\) any string not containing a line continuation
\([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a
line continuation character
\(\s*\\\) optional whitespace, followed by a line
continuation character
Hence, the first subexpression handles empty assignments, the second
handles regular assignments, the third handles regular assignments with
line continuation, and the fourth empty assignments with line
continuation.
This expression was tested on following test text: (initial tab not
included)
FOO = spaces before
FOO = spaces before and after
FOO = tab before
FOO = tab and spaces before
FOO = tab after
FOO = tab and spaces after
FOO = spaces and tab after
FOO = \
FOO = bar \
FOO = bar space \
FOO = \
GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
FOO += spaces before
FOO ?= spaces before and after
FOO :=
FOO =
FOO =
FOO =
FOO =
$(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C
AT91BOOTSTRAP3_DEFCONFIG = \
AXEL_DISABLE_I18N=--i18n=0
After this bulk change, following manual fixups were done:
- fix line continuation alignment in cegui06 and spice (the sed
expression leaves the number of whitespace between the value and line
continuation character intact, but the whitespace before that could have
changed, causing misalignment.
- qt5base was reverted, as this package uses extensive alignment which
actually makes the code more readable.
Finally, the end result was manually reviewed.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Cc: Yann E. Morin <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
|
|
|
UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
|
|
|
|
|
UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
|
2012-12-12 17:37:35 +01:00
|
|
|
UBOOT_TOOLS_LICENSE = GPLv2+
|
2013-10-22 18:46:40 +02:00
|
|
|
UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt
|
2011-07-18 15:22:13 +02:00
|
|
|
|
2015-04-18 08:46:43 +02:00
|
|
|
define UBOOT_TOOLS_CONFIGURE_CMDS
|
|
|
|
|
mkdir -p $(@D)/include/config
|
|
|
|
|
touch $(@D)/include/config/auto.conf
|
|
|
|
|
endef
|
|
|
|
|
|
2011-07-18 15:22:13 +02:00
|
|
|
define UBOOT_TOOLS_BUILD_CMDS
|
|
|
|
|
$(MAKE) -C $(@D) \
|
2014-04-30 08:54:51 +02:00
|
|
|
CROSS_COMPILE="$(TARGET_CROSS)" \
|
|
|
|
|
CFLAGS="$(TARGET_CFLAGS)" \
|
|
|
|
|
LDFLAGS="$(TARGET_LDFLAGS)" \
|
|
|
|
|
CROSS_BUILD_TOOLS=y \
|
2015-04-18 08:46:43 +02:00
|
|
|
CONFIG_FIT_SIGNATURE=$(BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE_FIT_SIGNATURE_SUPPORT) \
|
2014-04-30 08:54:51 +02:00
|
|
|
tools-only
|
|
|
|
|
$(MAKE) -C $(@D) \
|
|
|
|
|
CROSS_COMPILE="$(TARGET_CROSS)" \
|
|
|
|
|
CFLAGS="$(TARGET_CFLAGS)" \
|
|
|
|
|
LDFLAGS="$(TARGET_LDFLAGS)" \
|
|
|
|
|
env no-dot-config-targets=env
|
2011-07-18 15:22:13 +02:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE),y)
|
|
|
|
|
define UBOOT_TOOLS_INSTALL_MKIMAGE
|
2011-12-16 21:08:59 +01:00
|
|
|
$(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(TARGET_DIR)/usr/bin/mkimage
|
2011-07-18 15:22:13 +02:00
|
|
|
endef
|
2015-04-18 08:46:43 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE_FIT_SIGNATURE_SUPPORT),y)
|
|
|
|
|
UBOOT_TOOLS_DEPENDENCIES += openssl
|
|
|
|
|
endif # BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE_FIT_SIGNATURE_SUPPORT
|
|
|
|
|
endif # BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE
|
2011-07-18 15:22:13 +02:00
|
|
|
|
2012-12-20 03:47:17 +01:00
|
|
|
ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE),y)
|
|
|
|
|
define UBOOT_TOOLS_INSTALL_MKENVIMAGE
|
|
|
|
|
$(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(TARGET_DIR)/usr/bin/mkenvimage
|
|
|
|
|
endef
|
|
|
|
|
endif
|
|
|
|
|
|
2011-07-18 15:22:13 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV),y)
|
|
|
|
|
define UBOOT_TOOLS_INSTALL_FWPRINTENV
|
2011-12-16 21:08:59 +01:00
|
|
|
$(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(TARGET_DIR)/usr/sbin/fw_printenv
|
2011-07-18 15:22:13 +02:00
|
|
|
ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
|
|
|
|
|
endef
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
define UBOOT_TOOLS_INSTALL_TARGET_CMDS
|
|
|
|
|
$(UBOOT_TOOLS_INSTALL_MKIMAGE)
|
2012-12-20 03:47:17 +01:00
|
|
|
$(UBOOT_TOOLS_INSTALL_MKENVIMAGE)
|
2011-07-18 15:22:13 +02:00
|
|
|
$(UBOOT_TOOLS_INSTALL_FWPRINTENV)
|
|
|
|
|
endef
|
|
|
|
|
|
2015-04-18 08:46:43 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),y)
|
|
|
|
|
HOST_UBOOT_TOOLS_DEPENDENCIES += host-openssl
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
define HOST_UBOOT_TOOLS_CONFIGURE_CMDS
|
|
|
|
|
mkdir -p $(@D)/include/config
|
|
|
|
|
touch $(@D)/include/config/auto.conf
|
|
|
|
|
endef
|
|
|
|
|
|
2011-07-18 15:22:13 +02:00
|
|
|
define HOST_UBOOT_TOOLS_BUILD_CMDS
|
|
|
|
|
$(MAKE1) -C $(@D) \
|
2015-04-18 08:46:43 +02:00
|
|
|
CONFIG_FIT_SIGNATURE=$(BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE_FIT_SIGNATURE_SUPPORT) \
|
2011-07-18 15:22:13 +02:00
|
|
|
HOSTCC="$(HOSTCC)" \
|
|
|
|
|
HOSTCFLAGS="$(HOST_CFLAGS)" \
|
|
|
|
|
HOSTLDFLAGS="$(HOST_LDFLAGS)" \
|
2014-04-30 08:54:51 +02:00
|
|
|
tools-only
|
2011-07-18 15:22:13 +02:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
define HOST_UBOOT_TOOLS_INSTALL_CMDS
|
2011-12-16 21:08:59 +01:00
|
|
|
$(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin/mkimage
|
2012-12-20 03:47:17 +01:00
|
|
|
$(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/usr/bin/mkenvimage
|
2011-07-18 15:22:13 +02:00
|
|
|
endef
|
|
|
|
|
|
2012-07-03 00:07:32 +02:00
|
|
|
$(eval $(generic-package))
|
2012-07-03 00:06:54 +02:00
|
|
|
$(eval $(host-generic-package))
|
2013-11-07 00:12:35 +01:00
|
|
|
|
|
|
|
|
# Convenience variables for other mk files that make use of mkimage
|
|
|
|
|
|
|
|
|
|
MKIMAGE = $(HOST_DIR)/usr/bin/mkimage
|
|
|
|
|
|
2015-02-14 10:23:06 +01:00
|
|
|
# mkimage supports arm blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86
|
|
|
|
|
# KERNEL_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa
|
2013-11-07 00:12:35 +01:00
|
|
|
# For arm64, arc, xtensa we'll just keep KERNEL_ARCH
|
|
|
|
|
# For mips64, we'll just keep mips
|
|
|
|
|
# For i386 and x86_64, we need to convert
|
|
|
|
|
ifeq ($(KERNEL_ARCH),x86_64)
|
|
|
|
|
MKIMAGE_ARCH = x86
|
|
|
|
|
else ifeq ($(KERNEL_ARCH),i386)
|
|
|
|
|
MKIMAGE_ARCH = x86
|
|
|
|
|
else
|
|
|
|
|
MKIMAGE_ARCH = $(KERNEL_ARCH)
|
|
|
|
|
endif
|
