mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-05-21 06:56:18 +02:00
66a4978b43
This patch fixes following error with U-Boot 2019.01 on imx6:
In file included from tools/lib/crc16.c:1:0:
./tools/../lib/crc16.c: In function 'crc16_ccitt':
./tools/../lib/crc16.c:70:2: error: 'for' loop initial declarations are only allowed in C99 mode
for (int i = 0; i < len; i++)
^
./tools/../lib/crc16.c:70:2: note: use option -std=c99 or -std=gnu99 to compile your code
Code was introduced in the upstream v2019.01-rc1-154-g51c2345:
commit 51c2345bd24837f9f67f16268da6dc71573f1325
Author: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Date: Sun Nov 25 19:22:19 2018 +0100
Roll CRC16-CCITT into the hash infrastructure
Upstream has added -std=gnu11 host flag in v2018.07-rc2-1-gfa89399:
commit fa893990e9b53425af5f5059e04a2bffde91ccf9
Author: Tom Rini <trini@konsulko.com>
Date: Tue Jun 19 23:53:54 2018 -0400
Makefile: Ensure we build with -std=gnu11
Build tested on imx6: apalis, mx6sabresd, nitrogen6dl, nitrogen6dl2g,
nitrogen6q, nitrogen6q2g, nitrogen6s, nitrogen6s1g,
wandboard
Run tested: apalis (pending PR #1595)
Signed-off-by: Petr Štetiar <ynezz@true.cz>
105 lines
2.6 KiB
Makefile
105 lines
2.6 KiB
Makefile
PKG_NAME ?= u-boot
|
|
|
|
ifndef PKG_SOURCE_PROTO
|
|
PKG_SOURCE = $(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
|
PKG_SOURCE_URL = \
|
|
http://sources.lede-project.org \
|
|
ftp://ftp.denx.de/pub/u-boot
|
|
endif
|
|
|
|
PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
|
|
|
|
PKG_TARGETS := bin
|
|
PKG_FLAGS:=nonshared
|
|
|
|
PKG_LICENSE:=GPL-2.0 GPL-2.0+
|
|
PKG_LICENSE_FILES:=Licenses/README
|
|
|
|
PKG_BUILD_PARALLEL:=1
|
|
|
|
export GCC_HONOUR_COPTS=s
|
|
|
|
define Package/u-boot/install/default
|
|
$(CP) $(patsubst %,$(PKG_BUILD_DIR)/%,$(UBOOT_IMAGE)) $(1)/
|
|
endef
|
|
|
|
Package/u-boot/install = $(Package/u-boot/install/default)
|
|
|
|
define U-Boot/Init
|
|
BUILD_TARGET:=
|
|
BUILD_SUBTARGET:=
|
|
BUILD_DEVICES:=
|
|
NAME:=
|
|
DEPENDS:=
|
|
HIDDEN:=
|
|
DEFAULT:=
|
|
VARIANT:=$(1)
|
|
UBOOT_CONFIG:=$(1)
|
|
UBOOT_IMAGE:=u-boot.bin
|
|
endef
|
|
|
|
TARGET_DEP = TARGET_$(BUILD_TARGET)$(if $(BUILD_SUBTARGET),_$(BUILD_SUBTARGET))
|
|
|
|
UBOOT_MAKE_FLAGS = \
|
|
HOSTCC="$(HOSTCC)" \
|
|
HOSTCFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -std=gnu11" \
|
|
HOSTLDFLAGS="$(HOST_LDFLAGS)"
|
|
|
|
define Build/U-Boot/Target
|
|
$(eval $(call U-Boot/Init,$(1)))
|
|
$(eval $(call U-Boot/Default,$(1)))
|
|
$(eval $(call U-Boot/$(1),$(1)))
|
|
|
|
define Package/u-boot-$(1)
|
|
SECTION:=boot
|
|
CATEGORY:=Boot Loaders
|
|
TITLE:=U-Boot for $(NAME)
|
|
VARIANT:=$(VARIANT)
|
|
DEPENDS:=@!IN_SDK $(DEPENDS)
|
|
HIDDEN:=$(HIDDEN)
|
|
ifneq ($(BUILD_TARGET),)
|
|
DEPENDS += @$(TARGET_DEP)
|
|
ifneq ($(BUILD_DEVICES),)
|
|
DEFAULT := y if ($(TARGET_DEP)_Default \
|
|
$(patsubst %,|| $(TARGET_DEP)_DEVICE_%,$(BUILD_DEVICES)) \
|
|
$(patsubst %,|| $(patsubst TARGET_%,TARGET_DEVICE_%,$(TARGET_DEP))_DEVICE_%,$(BUILD_DEVICES)))
|
|
endif
|
|
endif
|
|
$(if $(DEFAULT),DEFAULT:=$(DEFAULT))
|
|
URL:=http://www.denx.de/wiki/U-Boot
|
|
endef
|
|
|
|
define Package/u-boot-$(1)/install
|
|
$$(Package/u-boot/install)
|
|
endef
|
|
endef
|
|
|
|
define Build/Configure/U-Boot
|
|
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(UBOOT_CONFIGURE_VARS) $(UBOOT_CONFIG)_config
|
|
endef
|
|
|
|
DTC=$(wildcard $(LINUX_DIR)/scripts/dtc/dtc)
|
|
|
|
define Build/Compile/U-Boot
|
|
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
|
CROSS_COMPILE=$(TARGET_CROSS) \
|
|
$(if $(DTC),DTC="$(DTC)") \
|
|
$(UBOOT_MAKE_FLAGS)
|
|
endef
|
|
|
|
define BuildPackage/U-Boot/Defaults
|
|
Build/Configure/Default = $$$$(Build/Configure/U-Boot)
|
|
Build/Compile/Default = $$$$(Build/Compile/U-Boot)
|
|
endef
|
|
|
|
define BuildPackage/U-Boot
|
|
$(eval $(call BuildPackage/U-Boot/Defaults))
|
|
$(foreach type,$(if $(DUMP),$(UBOOT_TARGETS),$(BUILD_VARIANT)), \
|
|
$(eval $(call Build/U-Boot/Target,$(type)))
|
|
)
|
|
$(eval $(call Build/DefaultTargets))
|
|
$(foreach type,$(if $(DUMP),$(UBOOT_TARGETS),$(BUILD_VARIANT)), \
|
|
$(call BuildPackage,u-boot-$(type))
|
|
)
|
|
endef
|