From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 3/3] ARM: rockchip: radxa-rock: build defaultenv
Date: Tue, 18 May 2021 13:44:04 +0200 [thread overview]
Message-ID: <20210518114404.5553-4-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20210518114404.5553-1-s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/radxa-rock/Makefile | 1 +
arch/arm/boards/radxa-rock/board.c | 3 +++
.../radxa-rock/{env => defaultenv-radxa-rock}/boot/mshc1 | 0
.../radxa-rock/{env => defaultenv-radxa-rock}/boot/mshc1-old | 0
.../radxa-rock/{env => defaultenv-radxa-rock}/init/bootsource | 0
.../radxa-rock/{env => defaultenv-radxa-rock}/nv/hostname | 0
.../{env => defaultenv-radxa-rock}/nv/linux.bootargs.console | 0
7 files changed, 4 insertions(+)
rename arch/arm/boards/radxa-rock/{env => defaultenv-radxa-rock}/boot/mshc1 (100%)
rename arch/arm/boards/radxa-rock/{env => defaultenv-radxa-rock}/boot/mshc1-old (100%)
rename arch/arm/boards/radxa-rock/{env => defaultenv-radxa-rock}/init/bootsource (100%)
rename arch/arm/boards/radxa-rock/{env => defaultenv-radxa-rock}/nv/hostname (100%)
rename arch/arm/boards/radxa-rock/{env => defaultenv-radxa-rock}/nv/linux.bootargs.console (100%)
diff --git a/arch/arm/boards/radxa-rock/Makefile b/arch/arm/boards/radxa-rock/Makefile
index 79c8aec199..ec930bc264 100644
--- a/arch/arm/boards/radxa-rock/Makefile
+++ b/arch/arm/boards/radxa-rock/Makefile
@@ -1,2 +1,3 @@
obj-$(CONFIG_MACH_RADXA_ROCK) += board.o
lwl-y += lowlevel.o
+bbenv-y += defaultenv-radxa-rock
diff --git a/arch/arm/boards/radxa-rock/board.c b/arch/arm/boards/radxa-rock/board.c
index 5c87f64897..0ada54a849 100644
--- a/arch/arm/boards/radxa-rock/board.c
+++ b/arch/arm/boards/radxa-rock/board.c
@@ -4,6 +4,7 @@
#include <common.h>
#include <init.h>
#include <io.h>
+#include <envfs.h>
#include <i2c/i2c.h>
#include <i2c/i2c-gpio.h>
#include <mach/rk3188-regs.h>
@@ -51,6 +52,8 @@ static int devices_init(void)
writel((RK_SOC_CON0_REMAP << 16) | RK_SOC_CON0_REMAP,
RK_GRF_BASE + RK_GRF_SOC_CON0);
+ defaultenv_append_directory(defaultenv_radxa_rock);
+
return 0;
}
device_initcall(devices_init);
diff --git a/arch/arm/boards/radxa-rock/env/boot/mshc1 b/arch/arm/boards/radxa-rock/defaultenv-radxa-rock/boot/mshc1
similarity index 100%
rename from arch/arm/boards/radxa-rock/env/boot/mshc1
rename to arch/arm/boards/radxa-rock/defaultenv-radxa-rock/boot/mshc1
diff --git a/arch/arm/boards/radxa-rock/env/boot/mshc1-old b/arch/arm/boards/radxa-rock/defaultenv-radxa-rock/boot/mshc1-old
similarity index 100%
rename from arch/arm/boards/radxa-rock/env/boot/mshc1-old
rename to arch/arm/boards/radxa-rock/defaultenv-radxa-rock/boot/mshc1-old
diff --git a/arch/arm/boards/radxa-rock/env/init/bootsource b/arch/arm/boards/radxa-rock/defaultenv-radxa-rock/init/bootsource
similarity index 100%
rename from arch/arm/boards/radxa-rock/env/init/bootsource
rename to arch/arm/boards/radxa-rock/defaultenv-radxa-rock/init/bootsource
diff --git a/arch/arm/boards/radxa-rock/env/nv/hostname b/arch/arm/boards/radxa-rock/defaultenv-radxa-rock/nv/hostname
similarity index 100%
rename from arch/arm/boards/radxa-rock/env/nv/hostname
rename to arch/arm/boards/radxa-rock/defaultenv-radxa-rock/nv/hostname
diff --git a/arch/arm/boards/radxa-rock/env/nv/linux.bootargs.console b/arch/arm/boards/radxa-rock/defaultenv-radxa-rock/nv/linux.bootargs.console
similarity index 100%
rename from arch/arm/boards/radxa-rock/env/nv/linux.bootargs.console
rename to arch/arm/boards/radxa-rock/defaultenv-radxa-rock/nv/linux.bootargs.console
--
2.29.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2021-05-18 11:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 11:44 [PATCH 0/3] rockchip: Build for multiple SoCs Sascha Hauer
2021-05-18 11:44 ` [PATCH 1/3] ARM: rockchip: Allow to build " Sascha Hauer
2021-05-18 11:44 ` [PATCH 2/3] ARM: Rockchip: Merge defconfig files Sascha Hauer
2021-05-18 11:48 ` Ahmad Fatoum
2021-06-02 6:54 ` Sascha Hauer
2021-05-18 11:44 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210518114404.5553-4-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox