* [Buildroot] [PATCH] board/olimex/a20_olinuxino: switch to extlinux.conf
@ 2021-07-20 4:36 Francois Perrad
2021-07-20 19:24 ` Thomas Petazzoni
2021-08-07 10:40 ` Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Francois Perrad @ 2021-07-20 4:36 UTC (permalink / raw)
To: buildroot
a10_olinuxino is not switched, so broken links are replaced by the previous content
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
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 ---
.../rootfs_overlay/boot/extlinux/extlinux.conf | 4 ++++
configs/olimex_a20_olinuxino_lime2_defconfig | 4 +---
configs/olimex_a20_olinuxino_lime_defconfig | 4 +---
7 files changed, 14 insertions(+), 16 deletions(-)
mode change 120000 => 100644 board/olimex/a10_olinuxino/boot.cmd
mode change 120000 => 100755 board/olimex/a10_olinuxino/post-build.sh
delete mode 100644 board/olimex/a20_olinuxino/boot.cmd
delete mode 100755 board/olimex/a20_olinuxino/post-build.sh
create mode 100644 board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf
diff --git a/board/olimex/a10_olinuxino/boot.cmd b/board/olimex/a10_olinuxino/boot.cmd
deleted file mode 120000
index 612c74550..000000000
--- a/board/olimex/a10_olinuxino/boot.cmd
+++ /dev/null
@@ -1 +0,0 @@
-../a20_olinuxino/boot.cmd
\ No newline at end of file
diff --git a/board/olimex/a10_olinuxino/boot.cmd b/board/olimex/a10_olinuxino/boot.cmd
new file mode 100644
index 000000000..44d9239a9
--- /dev/null
+++ b/board/olimex/a10_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/a10_olinuxino/post-build.sh b/board/olimex/a10_olinuxino/post-build.sh
deleted file mode 120000
index b34689602..000000000
--- a/board/olimex/a10_olinuxino/post-build.sh
+++ /dev/null
@@ -1 +0,0 @@
-../a20_olinuxino/post-build.sh
\ No newline at end of file
diff --git a/board/olimex/a10_olinuxino/post-build.sh b/board/olimex/a10_olinuxino/post-build.sh
new file mode 100755
index 000000000..d3f612f81
--- /dev/null
+++ b/board/olimex/a10_olinuxino/post-build.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr
diff --git a/board/olimex/a20_olinuxino/boot.cmd b/board/olimex/a20_olinuxino/boot.cmd
deleted file mode 100644
index 44d9239a9..000000000
--- a/board/olimex/a20_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/a20_olinuxino/post-build.sh b/board/olimex/a20_olinuxino/post-build.sh
deleted file mode 100755
index d3f612f81..000000000
--- a/board/olimex/a20_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/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf b/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf
new file mode 100644
index 000000000..f754da362
--- /dev/null
+++ b/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf
@@ -0,0 +1,4 @@
+label Olinuxino
+ kernel /boot/zImage
+ fdtdir /boot
+ append console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra}
diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig
index 84582dc25..213e38cc9 100644
--- a/configs/olimex_a20_olinuxino_lime2_defconfig
+++ b/configs/olimex_a20_olinuxino_lime2_defconfig
@@ -17,7 +17,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!"
BR2_TARGET_GENERIC_GETTY=y
BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh"
+BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg"
@@ -54,8 +54,6 @@ BR2_TARGET_UBOOT_FORMAT_BIN=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd"
# Additional tools
BR2_PACKAGE_HOST_GENIMAGE=y
diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig
index df07e5f4b..6d383f286 100644
--- a/configs/olimex_a20_olinuxino_lime_defconfig
+++ b/configs/olimex_a20_olinuxino_lime_defconfig
@@ -17,7 +17,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!"
BR2_TARGET_GENERIC_GETTY=y
BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh"
+BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg"
@@ -54,8 +54,6 @@ BR2_TARGET_UBOOT_FORMAT_BIN=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd"
# Additional tools
BR2_PACKAGE_HOST_GENIMAGE=y
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] board/olimex/a20_olinuxino: switch to extlinux.conf
2021-07-20 4:36 [Buildroot] [PATCH] board/olimex/a20_olinuxino: switch to extlinux.conf Francois Perrad
@ 2021-07-20 19:24 ` Thomas Petazzoni
2021-08-07 10:40 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2021-07-20 19:24 UTC (permalink / raw)
To: buildroot
On Tue, 20 Jul 2021 06:36:07 +0200
Francois Perrad <fperrad@gmail.com> wrote:
> a10_olinuxino is not switched, so broken links are replaced by the previous content
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> 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 ---
> .../rootfs_overlay/boot/extlinux/extlinux.conf | 4 ++++
> configs/olimex_a20_olinuxino_lime2_defconfig | 4 +---
> configs/olimex_a20_olinuxino_lime_defconfig | 4 +---
> 7 files changed, 14 insertions(+), 16 deletions(-)
> mode change 120000 => 100644 board/olimex/a10_olinuxino/boot.cmd
> mode change 120000 => 100755 board/olimex/a10_olinuxino/post-build.sh
> delete mode 100644 board/olimex/a20_olinuxino/boot.cmd
> delete mode 100755 board/olimex/a20_olinuxino/post-build.sh
> create mode 100644 board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] board/olimex/a20_olinuxino: switch to extlinux.conf
2021-07-20 4:36 [Buildroot] [PATCH] board/olimex/a20_olinuxino: switch to extlinux.conf Francois Perrad
2021-07-20 19:24 ` Thomas Petazzoni
@ 2021-08-07 10:40 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2021-08-07 10:40 UTC (permalink / raw)
To: Francois Perrad; +Cc: buildroot, Leon Anavi
Hello,
On Tue, 20 Jul 2021 06:36:07 +0200
Francois Perrad <fperrad@gmail.com> wrote:
> a10_olinuxino is not switched, so broken links are replaced by the previous content
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> board/olimex/a10_olinuxino/boot.cmd | 6 +++++-
> board/olimex/a10_olinuxino/post-build.sh | 4 +++-
> board/olimex/a20_olinuxino/boot.cmd | 5 -----
The removal of this file has broken
configs/olimex_a20_olinuxino_micro_defconfig which still references it,
causing a build failure:
https://gitlab.com/buildroot.org/buildroot/-/jobs/1478738568
Could you provide a fix for this ? (Probably restore the file ?)
Thanks,
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-07 10:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-20 4:36 [Buildroot] [PATCH] board/olimex/a20_olinuxino: switch to extlinux.conf Francois Perrad
2021-07-20 19:24 ` Thomas Petazzoni
2021-08-07 10:40 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox