[Buildroot] [git commit] Partial revert "configs/olimex_a20_olinuxino: switch to extlinux.conf"

Thomas Petazzoni thomas.petazzoni at bootlin.com
Sun Aug 8 21:25:54 UTC 2021


commit: https://git.buildroot.net/buildroot/commit/?id=878fbd5fbf9683be2bb021e857ce119f78e80f94
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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 <francois.perrad at gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
 board/olimex/a10_olinuxino/boot.cmd                         | 6 +-----
 board/olimex/a10_olinuxino/post-build.sh                    | 4 +---
 board/olimex/{a10_olinuxino => a20_olinuxino}/boot.cmd      | 0
 board/olimex/{a10_olinuxino => a20_olinuxino}/post-build.sh | 0
 4 files changed, 2 insertions(+), 8 deletions(-)

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/a10_olinuxino/boot.cmd b/board/olimex/a20_olinuxino/boot.cmd
similarity index 100%
copy from board/olimex/a10_olinuxino/boot.cmd
copy to board/olimex/a20_olinuxino/boot.cmd
diff --git a/board/olimex/a10_olinuxino/post-build.sh b/board/olimex/a20_olinuxino/post-build.sh
similarity index 100%
copy from board/olimex/a10_olinuxino/post-build.sh
copy to board/olimex/a20_olinuxino/post-build.sh


More information about the buildroot mailing list