From 878fbd5fbf9683be2bb021e857ce119f78e80f94 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 7 Aug 2021 18:22:02 +0200 Subject: [PATCH] Partial revert "configs/olimex_a20_olinuxino: switch to extlinux.conf" Old scripts are still used by a10_olinuxino & a20_olinuxino_micro Fixes olimex_a20_olinuxino_micro see https://gitlab.com/buildroot.org/buildroot/-/jobs/1478738568 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- board/olimex/a10_olinuxino/boot.cmd | 6 +----- board/olimex/a10_olinuxino/post-build.sh | 4 +--- board/olimex/a20_olinuxino/boot.cmd | 5 +++++ board/olimex/a20_olinuxino/post-build.sh | 3 +++ 4 files changed, 10 insertions(+), 8 deletions(-) mode change 100644 => 120000 board/olimex/a10_olinuxino/boot.cmd mode change 100755 => 120000 board/olimex/a10_olinuxino/post-build.sh create mode 100644 board/olimex/a20_olinuxino/boot.cmd create mode 100755 board/olimex/a20_olinuxino/post-build.sh diff --git a/board/olimex/a10_olinuxino/boot.cmd b/board/olimex/a10_olinuxino/boot.cmd deleted file mode 100644 index 44d9239a94..0000000000 --- a/board/olimex/a10_olinuxino/boot.cmd +++ /dev/null @@ -1,5 +0,0 @@ -setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} -ext4load mmc 0 0x49000000 /boot/${fdtfile} -ext4load mmc 0 0x46000000 /boot/zImage -env set fdt_high ffffffff -bootz 0x46000000 - 0x49000000 diff --git a/board/olimex/a10_olinuxino/boot.cmd b/board/olimex/a10_olinuxino/boot.cmd new file mode 120000 index 0000000000..612c745500 --- /dev/null +++ b/board/olimex/a10_olinuxino/boot.cmd @@ -0,0 +1 @@ +../a20_olinuxino/boot.cmd \ No newline at end of file diff --git a/board/olimex/a10_olinuxino/post-build.sh b/board/olimex/a10_olinuxino/post-build.sh deleted file mode 100755 index d3f612f811..0000000000 --- a/board/olimex/a10_olinuxino/post-build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/board/olimex/a10_olinuxino/post-build.sh b/board/olimex/a10_olinuxino/post-build.sh new file mode 120000 index 0000000000..b346896024 --- /dev/null +++ b/board/olimex/a10_olinuxino/post-build.sh @@ -0,0 +1 @@ +../a20_olinuxino/post-build.sh \ No newline at end of file diff --git a/board/olimex/a20_olinuxino/boot.cmd b/board/olimex/a20_olinuxino/boot.cmd new file mode 100644 index 0000000000..44d9239a94 --- /dev/null +++ b/board/olimex/a20_olinuxino/boot.cmd @@ -0,0 +1,5 @@ +setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} +ext4load mmc 0 0x49000000 /boot/${fdtfile} +ext4load mmc 0 0x46000000 /boot/zImage +env set fdt_high ffffffff +bootz 0x46000000 - 0x49000000 diff --git a/board/olimex/a20_olinuxino/post-build.sh b/board/olimex/a20_olinuxino/post-build.sh new file mode 100755 index 0000000000..d3f612f811 --- /dev/null +++ b/board/olimex/a20_olinuxino/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr -- 2.30.2