From eb7f6579a5b60fb5eccf55025fdf5043cf19da34 Mon Sep 17 00:00:00 2001 From: Johannes Zink Date: Mon, 5 Sep 2022 18:36:08 +0200 Subject: v8a: barebox: move default environment The imx8m default environment is generic enough for reuse on other boards. Rename the environment to common to make this more visible. Signed-off-by: Johannes Zink Signed-off-by: Michael Tretter Link: https://lore.pengutronix.de/20220905163615.2807729-14-m.tretter@pengutronix.de Signed-off-by: Robert Schwebel --- .../platform-v8a/barebox-common-defaultenv/init/bootsource | 11 +++++++++++ .../barebox-common-defaultenv/nv/linux.bootargs.loglevel | 1 + configs/platform-v8a/barebox-imx8m-defaultenv/init/bootsource | 11 ----------- .../barebox-imx8m-defaultenv/nv/linux.bootargs.loglevel | 1 - configs/platform-v8a/rules/barebox-imx8m.make | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 configs/platform-v8a/barebox-common-defaultenv/init/bootsource create mode 100644 configs/platform-v8a/barebox-common-defaultenv/nv/linux.bootargs.loglevel delete mode 100644 configs/platform-v8a/barebox-imx8m-defaultenv/init/bootsource delete mode 100644 configs/platform-v8a/barebox-imx8m-defaultenv/nv/linux.bootargs.loglevel diff --git a/configs/platform-v8a/barebox-common-defaultenv/init/bootsource b/configs/platform-v8a/barebox-common-defaultenv/init/bootsource new file mode 100644 index 0000000..0dfb309 --- /dev/null +++ b/configs/platform-v8a/barebox-common-defaultenv/init/bootsource @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ -n "${nv.boot.default}" ]; then + exit +fi + + +if [ "$bootsource" = mmc ]; then + detect mmc$bootsource_instance + global.boot.default="mmc$bootsource_instance net" +fi diff --git a/configs/platform-v8a/barebox-common-defaultenv/nv/linux.bootargs.loglevel b/configs/platform-v8a/barebox-common-defaultenv/nv/linux.bootargs.loglevel new file mode 100644 index 0000000..705752c --- /dev/null +++ b/configs/platform-v8a/barebox-common-defaultenv/nv/linux.bootargs.loglevel @@ -0,0 +1 @@ +loglevel=5 systemd.log_level=warning systemd.show_status=auto diff --git a/configs/platform-v8a/barebox-imx8m-defaultenv/init/bootsource b/configs/platform-v8a/barebox-imx8m-defaultenv/init/bootsource deleted file mode 100644 index 0dfb309..0000000 --- a/configs/platform-v8a/barebox-imx8m-defaultenv/init/bootsource +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -if [ -n "${nv.boot.default}" ]; then - exit -fi - - -if [ "$bootsource" = mmc ]; then - detect mmc$bootsource_instance - global.boot.default="mmc$bootsource_instance net" -fi diff --git a/configs/platform-v8a/barebox-imx8m-defaultenv/nv/linux.bootargs.loglevel b/configs/platform-v8a/barebox-imx8m-defaultenv/nv/linux.bootargs.loglevel deleted file mode 100644 index 705752c..0000000 --- a/configs/platform-v8a/barebox-imx8m-defaultenv/nv/linux.bootargs.loglevel +++ /dev/null @@ -1 +0,0 @@ -loglevel=5 systemd.log_level=warning systemd.show_status=auto diff --git a/configs/platform-v8a/rules/barebox-imx8m.make b/configs/platform-v8a/rules/barebox-imx8m.make index 8ea3e49..da1adfa 100644 --- a/configs/platform-v8a/rules/barebox-imx8m.make +++ b/configs/platform-v8a/rules/barebox-imx8m.make @@ -76,7 +76,7 @@ $(STATEDIR)/barebox-imx8m.prepare: $(BAREBOX_IMX8M_CONFIG) done @rm -f "$(BAREBOX_IMX8M_BUILD_DIR)/.ptxdist-defaultenv" - @ln -s "$(call ptx/in-platformconfigdir, barebox-imx8m-defaultenv)" \ + @ln -s "$(call ptx/in-platformconfigdir, barebox-common-defaultenv)" \ "$(BAREBOX_IMX8M_BUILD_DIR)/.ptxdist-defaultenv" @$(call touch) -- cgit v1.2.3