From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1738CC25B75 for ; Mon, 3 Jun 2024 11:56:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D58B8400E4; Mon, 3 Jun 2024 11:56:01 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id A9ecRueCp3Pg; Mon, 3 Jun 2024 11:56:00 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org A2E2B405CC Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id A2E2B405CC; Mon, 3 Jun 2024 11:56:00 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A41561BF383 for ; Mon, 3 Jun 2024 11:55:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8DEAB8212C for ; Mon, 3 Jun 2024 11:55:58 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id XTiRJ5F8P-dq for ; Mon, 3 Jun 2024 11:55:57 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=217.70.183.200; helo=relay7-d.mail.gandi.net; envelope-from=peko@48ers.dk; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 24F258212A DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 24F258212A Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by smtp1.osuosl.org (Postfix) with ESMTPS id 24F258212A for ; Mon, 3 Jun 2024 11:55:56 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 38DAD20005; Mon, 3 Jun 2024 11:55:54 +0000 (UTC) Received: from peko by dell.be.48ers.dk with local (Exim 4.96) (envelope-from ) id 1sE6I5-002vvu-2H; Mon, 03 Jun 2024 13:55:53 +0200 From: Peter Korsgaard To: buildroot@buildroot.org Date: Mon, 3 Jun 2024 13:55:49 +0200 Message-Id: <20240603115550.699332-2-peter@korsgaard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603115550.699332-1-peter@korsgaard.com> References: <20240603115550.699332-1-peter@korsgaard.com> MIME-Version: 1.0 X-GND-Sasl: peter@korsgaard.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Subject: [Buildroot] [PATCH 2/2] boot/at91dataflashboot: remove package X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" At91dataflashboot is an ancient (2006) fork of at91bootstrap1 specifically for the Atmel/Microchip AT45 series (dataflash) of serial flashes. The package hasn't seen any meaningful updates since, is not used by any defconfigs and at91bootstrap3 nowadays has AT45 support - So remove the package. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 +++ boot/Config.in | 1 - .../0001-do-not-install.patch | 22 ---------- boot/at91dataflashboot/0002-eabi-fixes.patch | 43 ------------------- boot/at91dataflashboot/Config.in | 3 -- boot/at91dataflashboot/at91dataflashboot.hash | 2 - boot/at91dataflashboot/at91dataflashboot.mk | 28 ------------ 7 files changed, 6 insertions(+), 99 deletions(-) delete mode 100644 boot/at91dataflashboot/0001-do-not-install.patch delete mode 100644 boot/at91dataflashboot/0002-eabi-fixes.patch delete mode 100644 boot/at91dataflashboot/Config.in delete mode 100644 boot/at91dataflashboot/at91dataflashboot.hash delete mode 100644 boot/at91dataflashboot/at91dataflashboot.mk diff --git a/Config.in.legacy b/Config.in.legacy index 7e5bc28bae..f0bff5191f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -153,6 +153,12 @@ config BR2_TARGET_AT91BOOTSTRAP Upstream for at91bootstrap 1.x is no longer available and has been replaced by at91bootstrap3. +config BR2_TARGET_AT91DATAFLASHBOOT + bool "at91dataflashboot removed" + select BR2_LEGACY + help + at91dataflashboot has been replaced by at91bootstrap3. + config BR2_PACKAGE_ON2_8170_MODULES bool "on2-8170-modules removed" select BR2_LEGACY diff --git a/boot/Config.in b/boot/Config.in index 3e00d28e56..14e0ca65fa 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -2,7 +2,6 @@ menu "Bootloaders" source "boot/afboot-stm32/Config.in" source "boot/at91bootstrap3/Config.in" -source "boot/at91dataflashboot/Config.in" source "boot/arm-trusted-firmware/Config.in" source "boot/barebox/Config.in" source "boot/beaglev-ddrinit/Config.in" diff --git a/boot/at91dataflashboot/0001-do-not-install.patch b/boot/at91dataflashboot/0001-do-not-install.patch deleted file mode 100644 index 41d97ad20e..0000000000 --- a/boot/at91dataflashboot/0001-do-not-install.patch +++ /dev/null @@ -1,22 +0,0 @@ -Disable the automatic installation of at91dataflashboot since it tries -to install things to /tftpboot, which is not possible when not -building as root. - -Signed-off-by: Thomas Petazzoni ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: at91dataflashboot-1.05/Makefile -=================================================================== ---- at91dataflashboot-1.05.orig/Makefile -+++ at91dataflashboot-1.05/Makefile -@@ -40,7 +40,7 @@ - - I=config.h com.h dataflash.h embedded_services.h main.h stdio.h include/AT91RM9200.h include/lib_AT91RM9200.h - --all: clean $(BINNAME) $(LSSNAME) install -+all: clean $(BINNAME) $(LSSNAME) - $(SIZE) $(OUTNAME) - - # C objects here diff --git a/boot/at91dataflashboot/0002-eabi-fixes.patch b/boot/at91dataflashboot/0002-eabi-fixes.patch deleted file mode 100644 index e38905f7cb..0000000000 --- a/boot/at91dataflashboot/0002-eabi-fixes.patch +++ /dev/null @@ -1,43 +0,0 @@ -Get at91dataflashboot to build with EABI toolchains, by providing the -__aeabi_uidiv and __aeabi_uidivmod symbols. The code is based on -U-Boot's code. - -Signed-off-by: Thomas Petazzoni ---- - _udivsi3.S | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -Index: DataflashBoot-1.05/_udivsi3.S -=================================================================== ---- DataflashBoot-1.05.orig/_udivsi3.S -+++ DataflashBoot-1.05/_udivsi3.S -@@ -12,8 +12,11 @@ - .text - .globl __udivsi3 - .type __udivsi3 ,function -+ .globl __aeabi_uidiv -+ .type __aeabi_uidiv ,function - .align 0 - __udivsi3 : -+ __aeabi_uidiv: - cmp divisor, #0 - beq Ldiv0 - mov curbit, #1 -@@ -68,6 +71,17 @@ - mov r0, #0 @ about as wrong as it could be - ldmia sp!, {pc} - .size __udivsi3 , . - __udivsi3 -+ -+.globl __aeabi_uidivmod -+__aeabi_uidivmod: -+ -+ stmfd sp!, {r0, r1, ip, lr} -+ bl __aeabi_uidiv -+ ldmfd sp!, {r1, r2, ip, lr} -+ mul r3, r0, r2 -+ sub r1, r1, r3 -+ mov pc, lr -+ - /* # 235 "libgcc1.S" */ - /* # 320 "libgcc1.S" */ - /* # 421 "libgcc1.S" */ diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in deleted file mode 100644 index 8b37d84409..0000000000 --- a/boot/at91dataflashboot/Config.in +++ /dev/null @@ -1,3 +0,0 @@ -config BR2_TARGET_AT91DATAFLASHBOOT - bool "AT91 DataFlashBoot" - depends on BR2_arm && BR2_arm926t diff --git a/boot/at91dataflashboot/at91dataflashboot.hash b/boot/at91dataflashboot/at91dataflashboot.hash deleted file mode 100644 index 57df4e5389..0000000000 --- a/boot/at91dataflashboot/at91dataflashboot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 2cfeb6a9236e1a743c8010f05e504dbc92169ef42d9a6cf7948954a577bfc386 DataflashBoot-1.05.tar.bz2 diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk deleted file mode 100644 index cb329a90df..0000000000 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# at91dataflashboot -# -################################################################################ - -AT91DATAFLASHBOOT_VERSION = 1.05 -AT91DATAFLASHBOOT_SOURCE = DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).tar.bz2 -AT91DATAFLASHBOOT_SITE = ftp://www.at91.com/pub/buildroot - -AT91DATAFLASHBOOT_INSTALL_TARGET = NO -AT91DATAFLASHBOOT_INSTALL_IMAGES = YES - -AT91DATAFLASHBOOT_CFLAGS = $(TARGET_CFLAGS) -fno-stack-protector -ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) -AT91DATAFLASHBOOT_CFLAGS += -marm -endif - -define AT91DATAFLASHBOOT_BUILD_CMDS - make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS="$(AT91DATAFLASHBOOT_CFLAGS)" -endef - -define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS - cp $(@D)/DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).bin $(BINARIES_DIR) -endef - -$(eval $(generic-package)) -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot