From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 05 Sep 2022 18:36:33 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oVF5L-007hyu-M0 for lore@lore.pengutronix.de; Mon, 05 Sep 2022 18:36:33 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oVF5K-0002Xr-4R; Mon, 05 Sep 2022 18:36:30 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oVF5A-00027b-Lr; Mon, 05 Sep 2022 18:36:20 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oVF57-00460O-RC; Mon, 05 Sep 2022 18:36:19 +0200 Received: from mtr by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oVF56-00BmRZ-Kj; Mon, 05 Sep 2022 18:36:16 +0200 From: Michael Tretter To: distrokit@pengutronix.de Date: Mon, 5 Sep 2022 18:36:13 +0200 Message-Id: <20220905163615.2807729-19-m.tretter@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220905163615.2807729-1-m.tretter@pengutronix.de> References: <20220905163615.2807729-1-m.tretter@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 18/20] v8a: rockchip: copy default barebox env X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mtr@pengutronix.de, jzi@pengutronix.de Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false From: Johannes Zink Create a custom Barebox environment for the ROCK 3A to be able to apply board specific workarounds. Signed-off-by: Johannes Zink Signed-off-by: Michael Tretter --- .../barebox-rock3a-defaultenv/init/bootsource | 13 +++++++++++++ .../nv/linux.bootargs.loglevel | 1 + configs/platform-v8a/rules/barebox-rockchip.make | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 configs/platform-v8a/barebox-rock3a-defaultenv/init/bootsource create mode 100644 configs/platform-v8a/barebox-rock3a-defaultenv/nv/linux.bootargs.loglevel diff --git a/configs/platform-v8a/barebox-rock3a-defaultenv/init/bootsource b/configs/platform-v8a/barebox-rock3a-defaultenv/init/bootsource new file mode 100644 index 000000000000..fe7991dbc13c --- /dev/null +++ b/configs/platform-v8a/barebox-rock3a-defaultenv/init/bootsource @@ -0,0 +1,13 @@ +#!/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" +elif [ "$bootsource" = "spi-nor" ]; then + usbgadget -A '/dev/mmc0(sd)' + global.autoboot=abort +fi diff --git a/configs/platform-v8a/barebox-rock3a-defaultenv/nv/linux.bootargs.loglevel b/configs/platform-v8a/barebox-rock3a-defaultenv/nv/linux.bootargs.loglevel new file mode 100644 index 000000000000..705752ca416d --- /dev/null +++ b/configs/platform-v8a/barebox-rock3a-defaultenv/nv/linux.bootargs.loglevel @@ -0,0 +1 @@ +loglevel=5 systemd.log_level=warning systemd.show_status=auto diff --git a/configs/platform-v8a/rules/barebox-rockchip.make b/configs/platform-v8a/rules/barebox-rockchip.make index cca9866b1ed7..39032e0a35ed 100644 --- a/configs/platform-v8a/rules/barebox-rockchip.make +++ b/configs/platform-v8a/rules/barebox-rockchip.make @@ -69,7 +69,7 @@ $(BAREBOX_ROCKCHIP_CONFIG): endif BAREBOX_ROCKCHIP_EXTRA_ENV_PATH := $(foreach path, \ - $(call remove_quotes,"barebox-common-defaultenv"), \ + $(call remove_quotes,"barebox-rock3a-defaultenv"), \ $(call ptx/in-platformconfigdir,$(path))) BAREBOX_ROCKCHIP_EXTRA_ENV_DEPS := \ $(BAREBOX_ROCKCHIP_EXTRA_ENV_PATH) \ -- 2.30.2