[PATCH 1/4] at91bootstrap: update to v3.10.4, v4.0.1

[Petr Štetiar]

Hi, resend patch 3 didn't made it to patchwork https://patchwork.ozlabs.org/project/openwrt/list/?series=284474

Claudiu Beznea <claudiu.beznea at microchip.com> [2022-02-04 16:47:43]:

> The sender domain has a DMARC Reject/Quarantine policy which disallows
> sending mailing list messages using the original "From" header.
> 
> To mitigate this problem, the original message has been wrapped
> automatically by the mailing list software.
> AT91Bootstrap version 4 is available only for SAM9X60, SAMA5D2, SAMA5D3,
> SAMA5D4, SAMA7G5. Thus use v4.0.1 for the above targets and v3.10.4 for
> the rest of them. With the switch to v4 AT91Bootstrap binaries are now
> on build/binaries. Take also this into account. Also, patches directory
> is not needed anymore with the version update.
> 
> Signed-off-by: Claudiu Beznea <claudiu.beznea at microchip.com>
> ---
>  package/boot/at91bootstrap/Makefile           | 17 +++++++--
>  package/boot/at91bootstrap/at91bootstrap.mk   |  2 +-
>  ...ile-Remove-nostartfiles-from-LDFLAGS.patch | 38 -------------------
>  3 files changed, 15 insertions(+), 42 deletions(-)
>  delete mode 040000 package/boot/at91bootstrap/patches
>  delete mode 100644 package/boot/at91bootstrap/patches/001-Makefile-Remove-nostartfiles-from-LDFLAGS.patch
> 
> diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile
> index 2d77f7099721..a06eea90a416 100644
> --- a/package/boot/at91bootstrap/Makefile
> +++ b/package/boot/at91bootstrap/Makefile
> @@ -9,13 +9,24 @@
>  include $(TOPDIR)/rules.mk
>  
>  PKG_NAME:=at91bootstrap
> -PKG_VERSION:=v3.9.3
> +PKG_VERSION:=v4.0.1
> +PKG_MIRROR_HASH:=3d45a4bcb52162097d4cdf042b8fe1ccf53e88b512e7541f42a23f2a73692a69
> +PKG_SOURCE_VERSION:=4d41296e9ae12379555fb46a941897e7264600a2
> +BINARIES_DIR:=build/binaries
> +
> +ifdef CONFIG_TARGET_at91_sam9x
> +  ifndef CONFIG_TARGET_at91_sam9x_DEVICE_microchip_sam9x60ek
> +    PKG_VERSION=v3.10.4
> +    PKG_MIRROR_HASH=6fe61fe90838e785917383bb9e887fa05e1bd061a6725954242f504e38b5c426
> +    PKG_SOURCE_VERSION=404846dd283894367a015ca59189bcf927d92e11
> +    BINARIES_DIR=binaries
> +  endif
> +endif
> +
>  PKG_RELEASE:=2
>  
>  PKG_SOURCE_PROTO:=git
>  PKG_SOURCE_URL:=https://github.com/linux4sam/at91bootstrap.git
> -PKG_MIRROR_HASH:=06753d673756edc9753932db00f4e5b8c1f9fa7708337c4d6ce280573efb86b4
> -PKG_SOURCE_VERSION:=d96833a4b6680b237708eb4dc9f10708b9e709d8
>  PKG_BUILD_DIR = \
>  	$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
>  
> diff --git a/package/boot/at91bootstrap/at91bootstrap.mk b/package/boot/at91bootstrap/at91bootstrap.mk
> index fe6577f58927..d4e807d9a219 100644
> --- a/package/boot/at91bootstrap/at91bootstrap.mk
> +++ b/package/boot/at91bootstrap/at91bootstrap.mk
> @@ -5,7 +5,7 @@ PKG_FLAGS:=nonshared
>  export GCC_HONOUR_COPTS=s
>  
>  define Package/at91bootstrap/install/default
> -	$(CP) -avL $(PKG_BUILD_DIR)/binaries/at91bootstrap.bin $(1)/
> +	$(CP) -avL $(PKG_BUILD_DIR)/$(BINARIES_DIR)/at91bootstrap.bin $(1)/
>  endef
>  
>  Package/at91bootstrap/install = $(Package/at91bootstrap/install/default)
> diff --git a/package/boot/at91bootstrap/patches/001-Makefile-Remove-nostartfiles-from-LDFLAGS.patch b/package/boot/at91bootstrap/patches/001-Makefile-Remove-nostartfiles-from-LDFLAGS.patch
> deleted file mode 100644
> index 9d48758bdad2..000000000000
> --- a/package/boot/at91bootstrap/patches/001-Makefile-Remove-nostartfiles-from-LDFLAGS.patch
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -From 59c8963d8e6a08222616d1b384e1009ba05e6b82 Mon Sep 17 00:00:00 2001
> -From: Chris Elledge <celledge at digitallumensinc.com>
> -Date: Tue, 8 Jun 2021 14:01:14 -0400
> -Subject: Makefile: Remove -nostartfiles from LDFLAGS
> -
> -Binutils linker ld does not support the flag -nostartfiles.
> -This is interpreted as "-n -o startfiles" which fortunately has no impact
> -on the build process. Removing -nostartfiles has no impact on the build.
> -
> -Binutils 2.36 and later ld has improved flag parsing and throws an error if
> --nostartfiles is passed as an argument. Removing the flag fixes the problem.
> -
> -Details on the Binutils ML:
> -https://sourceware.org/pipermail/binutils/2021-June/116826.html
> -
> -In our ld command line there are explicit
> --n -o $(BINDIR)/$(BOOT_NAME).elf options,
> -hence removing -nostartfiles will not alter the build.
> -
> -Signed-off-by: Chris Elledge <celledge at digitallumensinc.com>
> -Reviewed-by: Aubin Constans <aubin.constans at microchip.com>
> -[eugen.hristev at microchip.com: ported to at91bootstrap4]
> -Signed-off-by: Eugen Hristev <eugen.hristev at microchip.com>
> ----
> - Makefile | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -275,7 +275,7 @@ endif
> - #    --cref:    add cross reference to map file
> - #  -lc 	   : 	tells the linker to tie in newlib
> - #  -lgcc   : 	tells the linker to tie in newlib
> --LDFLAGS=-nostartfiles -Map=$(BINDIR)/$(BOOT_NAME).map --cref -static
> -+LDFLAGS=-Map=$(BINDIR)/$(BOOT_NAME).map --cref -static
> - LDFLAGS+=-T $(link_script) $(GC_SECTIONS) -Ttext $(LINK_ADDR)
> - 
> - ifneq ($(DATA_SECTION_ADDR),)

-- 
ynezz