From patchwork Thu Jul 19 10:31:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 946180 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=boundarydevices.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.b="BLQ6uIcx"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41WVgG3gNkz9s21 for ; Thu, 19 Jul 2018 20:31:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 43F1089E6B; Thu, 19 Jul 2018 10:31:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XxMfT1L7nGFx; Thu, 19 Jul 2018 10:31:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 32D7289E6A; Thu, 19 Jul 2018 10:31:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 73B891CF047 for ; Thu, 19 Jul 2018 10:31:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7150430917 for ; Thu, 19 Jul 2018 10:31:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tza6OudO+LwT for ; Thu, 19 Jul 2018 10:31:26 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by silver.osuosl.org (Postfix) with ESMTPS id 52B1330916 for ; Thu, 19 Jul 2018 10:31:26 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id y22-v6so5893241wma.0 for ; Thu, 19 Jul 2018 03:31:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kiQ8a7TOfixCmcsb0kP/BobshAFk1tNosWbuZDsy9yU=; b=BLQ6uIcxQgQp++si9e9/tFlrxmd5BnotdIZ7/CjufF9Q0C2vFLqS08j1PrwjJ413ld ullYSXIY3OH77sXFWMUd1rLF7K2AMCjtlDOuKOY7W5uTF0eSxP76Vf9bErxapZ2y39ko rM3KdOTNz1LpyplX2ht5IwqDVuzVIlJa/HxY74Oxu4PhpV1bX6g9ah9kQexkDp0hfqJI lvLk8/agsUwE18oGfR4nwp4oz13wm2sOnBeeYklWamsgFEJqFhKa5MBrBmmbuj+nEFcC gQ7h3VGPT8x+0GCCMb6IbD09hpVDV2s4ouYBmQzQI0kx/nD5klqwtpqFun5oRB5gl223 Po7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kiQ8a7TOfixCmcsb0kP/BobshAFk1tNosWbuZDsy9yU=; b=rIthcl8sco8hG84o5VQZE8RgyODEgU2zDytWk3ftRnynhbIwUyFnwhj7lIC9LAx2RQ Z1kgaK023BbDucUhmfpU2qarz11tdeL47mZWoyQ2cS0PleubZlXO6/jqpyyM9PTdkmkQ wWfvXXjZvc3UViiBGKzakoh3ogR6lWSutsow2cTGgnClWghq9Gqmo0cp5xm2gs7EVIC5 nEeRK4mDQYwJppXwniL9UhjT7QI2ukKM/ZvRiKVw3gYnARJ+uAKPwPaInaa1+YK/TE9N Daw0dIviUSyrYNnr9MSG5fddp080AXHIO8UAWF39hPGN8xR8A9FQ0kSyhZOvO5jfF6hI HE5g== X-Gm-Message-State: AOUpUlHk0b2gWN4eDPItxNcvGDRDf1zVeKr73v2EdR8HCWFOtrPmaYmV +QNWfLYxDfU37C6392ZGwVW4DDRgQeM= X-Google-Smtp-Source: AAOMgpeD9O5npxLOBmoIrGx0ic1UUqE73tLqMwZUNaUWuYLgmaDcNPL3IVoJw2RWcqM1/L0JVuksdQ== X-Received: by 2002:a1c:d892:: with SMTP id p140-v6mr4162213wmg.76.1531996284582; Thu, 19 Jul 2018 03:31:24 -0700 (PDT) Received: from g751.home (2a01cb040a78e30028cbd66b90cf39f4.ipv6.abo.wanadoo.fr. [2a01:cb04:a78:e300:28cb:d66b:90cf:39f4]) by smtp.googlemail.com with ESMTPSA id u4-v6sm11003723wrt.31.2018.07.19.03.31.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jul 2018 03:31:23 -0700 (PDT) From: Gary Bisson To: buildroot@buildroot.org Date: Thu, 19 Jul 2018 12:31:06 +0200 Message-Id: <20180719103109.19887-5-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180719103109.19887-1-gary.bisson@boundarydevices.com> References: <20180719103109.19887-1-gary.bisson@boundarydevices.com> Subject: [Buildroot] [PATCH v2 4/7] board/boundarydevices: remove obsolete u-boot scripts X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@bootlin.com MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 6x_bootscript/6x_upgrade have been deprecated for more than a year. Signed-off-by: Gary Bisson --- Changes in v2: - include post-build.sh modifications in the same patch --- .../boundarydevices/common/6x_bootscript.txt | 131 ------------------ board/boundarydevices/common/6x_upgrade.txt | 69 --------- board/boundarydevices/common/post-build.sh | 6 - 3 files changed, 206 deletions(-) delete mode 100644 board/boundarydevices/common/6x_bootscript.txt delete mode 100644 board/boundarydevices/common/6x_upgrade.txt diff --git a/board/boundarydevices/common/6x_bootscript.txt b/board/boundarydevices/common/6x_bootscript.txt deleted file mode 100644 index af5822a88b..0000000000 --- a/board/boundarydevices/common/6x_bootscript.txt +++ /dev/null @@ -1,131 +0,0 @@ -setenv bootargs '' - -if itest.s x6SX == "x${cpu}" || itest.s x7D == "x${cpu}"; then - a_script=0x80800000 - a_zImage=0x80800000 - a_fdt=0x83000000 - m4='' - if itest.s "x1" == "x$m4enabled" ; then - run m4boot; - m4='-m4'; - fi -else - a_script=0x10800000 - a_zImage=0x10800000 - a_fdt=0x13000000 -fi - -setenv initrd_high 0xffffffff -if itest.s "x" == "x${dtbname}" ; then - if itest.s x6SOLO == "x${cpu}" ; then - dtbname=imx6dl-${board}.dtb; - elif itest.s x6DL == "x${cpu}" ; then - dtbname=imx6dl-${board}.dtb; - elif itest.s x6QP == "x${cpu}" ; then - dtbname=imx6qp-${board}.dtb; - elif itest.s x6SX == "x${cpu}" ; then - dtbname=imx6sx-${board}${m4}.dtb; - elif itest.s x7D == "x${cpu}" ; then - dtbname=imx7d-${board}${m4}.dtb; - else - dtbname=imx6q-${board}.dtb; - fi -fi - -if load ${dtype} ${disk}:1 ${a_script} uEnv.txt ; then - env import -t ${a_script} ${filesize} -fi - -if itest.s x == x${bootdir} ; then - bootdir=/boot/ -fi - -if itest.s x${bootpart} == x ; then - bootpart=1 -fi - -if load ${dtype} ${disk}:${bootpart} ${a_fdt} ${bootdir}${dtbname} ; then - fdt addr ${a_fdt} - setenv fdt_high 0xffffffff -else - echo "!!!! Error loading ${bootdir}${dtbname}"; - exit; -fi - -cmd_xxx_present= -fdt resize -if itest.s "x" != "x${cmd_custom}" ; then - run cmd_custom - cmd_xxx_present=1; -fi - -if itest.s "x" != "x${cmd_hdmi}" ; then - run cmd_hdmi - cmd_xxx_present=1; - if itest.s x == x${allow_noncea} ; then - setenv bootargs ${bootargs} mxc_hdmi.only_cea=1; - echo "only CEA modes allowed on HDMI port"; - else - setenv bootargs ${bootargs} mxc_hdmi.only_cea=0; - echo "non-CEA modes allowed on HDMI, audio may be affected"; - fi -fi - -if itest.s "x" != "x${cmd_lcd}" ; then - run cmd_lcd - cmd_xxx_present=1; -fi -if itest.s "x" != "x${cmd_lvds}" ; then - run cmd_lvds - cmd_xxx_present=1; -fi -if itest.s "x" != "x${cmd_lvds2}" ; then - run cmd_lvds2 - cmd_xxx_present=1; -fi - -if itest.s "x" == "x${cmd_xxx_present}" ; then - echo "!!!!!!!!!!!!!!!!" - echo "warning: your u-boot may be outdated, please upgrade" - echo "!!!!!!!!!!!!!!!!" -fi - -setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc" - -if test "sata" = "${dtype}" ; then - setenv bootargs "${bootargs} root=/dev/sda${bootpart}" ; -elif test "usb" = "${dtype}" ; then - setenv bootargs "${bootargs} root=/dev/sda${bootpart}" ; -else - setenv bootargs "${bootargs} root=/dev/mmcblk${disk}p${bootpart}" -fi - -if itest.s "x" != "x${disable_giga}" ; then - setenv bootargs ${bootargs} fec.disable_giga=1 -fi - -if itest.s "x" != "x${wlmac}" ; then - setenv bootargs ${bootargs} wlcore.mac=${wlmac} - setenv bootargs ${bootargs} wlan.mac=${wlmac} -fi - -if itest.s "x" != "x${gpumem}" ; then - setenv bootargs ${bootargs} galcore.contiguousSize=${gpumem} -fi - -if itest.s "x" != "x${cma}" ; then - setenv bootargs ${bootargs} cma=${cma} -fi - -if itest.s "x" != "x${show_fdt}" ; then - fdt print / -fi - -if itest.s "x" != "x${show_env}" ; then - printenv -fi - -if load ${dtype} ${disk}:${bootpart} ${a_zImage} ${bootdir}/zImage ; then - bootz ${a_zImage} - ${a_fdt} -fi -echo "Error loading kernel image" diff --git a/board/boundarydevices/common/6x_upgrade.txt b/board/boundarydevices/common/6x_upgrade.txt deleted file mode 100644 index e012ff97ac..0000000000 --- a/board/boundarydevices/common/6x_upgrade.txt +++ /dev/null @@ -1,69 +0,0 @@ -if itest.s a$uboot_defconfig == a; then - echo "Please set uboot_defconfig to the appropriate value" - exit -fi - -offset=0x400 -a_uImage1=0x12000000 -a_uImage2=0x12400000 - -if itest.s x6SX == "x${cpu}" || itest.s x7D == "x${cpu}"; then - a_uImage1=0x82000000 - a_uImage2=0x82400000 -fi - -setenv stdout serial,vga -echo "check U-Boot" ; - -if load ${dtype} ${disk}:1 ${a_uImage1} u-boot.$uboot_defconfig ; then -else - echo "No U-Boot image found on SD card" ; - exit -fi -echo "read $filesize bytes from SD card" ; -if sf probe || sf probe || sf probe 1 27000000 || sf probe 1 27000000 ; then - echo "probed SPI ROM" ; -else - echo "Error initializing EEPROM" ; - exit -fi ; -if sf read ${a_uImage2} $offset $filesize ; then -else - echo "Error reading boot loader from EEPROM" ; - exit -fi -if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then - echo "------- U-Boot versions match" ; - exit -fi -echo "Need U-Boot upgrade" ; -echo "Program in 5 seconds" ; -for n in 5 4 3 2 1 ; do - echo $n ; - sleep 1 ; -done -echo "erasing" ; -sf erase 0 0xC0000 ; - -# two steps to prevent bricking -echo "programming" ; -setexpr a1 ${a_uImage1} + 0x400 -setexpr o1 ${offset} + 0x400 -setexpr s1 ${filesize} - 0x400 -sf write ${a1} ${o1} ${s1} ; -sf write ${a_uImage1} $offset 0x400 ; - -echo "verifying" ; -if sf read ${a_uImage2} $offset $filesize ; then -else - echo "Error re-reading EEPROM" ; - exit -fi -if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then -else - echo "Read verification error" ; - exit -fi -while echo "---- U-Boot upgraded. reset" ; do - sleep 120 -done diff --git a/board/boundarydevices/common/post-build.sh b/board/boundarydevices/common/post-build.sh index d97c8d7b6a..e30efe8b88 100755 --- a/board/boundarydevices/common/post-build.sh +++ b/board/boundarydevices/common/post-build.sh @@ -10,9 +10,6 @@ UBOOT_DEFCONFIG="$(grep BR2_TARGET_UBOOT_BOARD_DEFCONFIG ${BR2_CONFIG} | sed 's/ # bd u-boot looks for standard bootscript install -m 0644 -D $BINARIES_DIR/boot.scr $TARGET_DIR/boot/ -# legacy 6x_bootscript script -$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ --n "boot script" -d $BOARD_DIR/6x_bootscript.txt $TARGET_DIR/6x_bootscript # u-boot / update script for bd upgradeu command if [ -e $BINARIES_DIR/u-boot.imx ]; then @@ -20,7 +17,4 @@ if [ -e $BINARIES_DIR/u-boot.imx ]; then $TARGET_DIR/u-boot.$UBOOT_DEFCONFIG $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ -n "upgrade script" -d $BOARD_DIR/upgrade.cmd $TARGET_DIR/upgrade.scr - # legacy 6x_upgrade script - $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ - -n "upgrade script" -d $BOARD_DIR/6x_upgrade.txt $TARGET_DIR/6x_upgrade fi