Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- 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@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox