From 25cee7ec176693c40d80c1614e1244624e803a85 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 23 Jan 2014 13:58:49 +0100 Subject: environment: Use accessor functions for default environment path default_environment_path only exists when CONFIG_ENV_HANDLING is enabled. Boards would have to #ifdef this if they wanted to use default_environment_path. Use accessor functions instead which can be ifdeffed on a single place. Signed-off-by: Sascha Hauer --- arch/arm/boards/gk802/board.c | 4 ++-- arch/arm/boards/raspberry-pi/rpi.c | 2 +- arch/arm/boards/tqma6x/board.c | 2 +- arch/arm/mach-omap/omap_generic.c | 2 +- arch/arm/mach-socfpga/generic.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'arch') diff --git a/arch/arm/boards/gk802/board.c b/arch/arm/boards/gk802/board.c index a4be03f149..facb92384f 100644 --- a/arch/arm/boards/gk802/board.c +++ b/arch/arm/boards/gk802/board.c @@ -53,13 +53,13 @@ static int gk802_env_init(void) bootsource_name = "mmc2"; barebox_name = "mmc2.barebox"; default_environment_name = "mmc2.bareboxenv"; - default_environment_path = "/dev/mmc2.bareboxenv"; + default_environment_path_set("/dev/mmc2.bareboxenv"); break; case 3: bootsource_name = "mmc3"; barebox_name = "mmc3.barebox"; default_environment_name = "mmc3.bareboxenv"; - default_environment_path = "/dev/mmc3.bareboxenv"; + default_environment_path_set("/dev/mmc3.bareboxenv"); break; default: return 0; diff --git a/arch/arm/boards/raspberry-pi/rpi.c b/arch/arm/boards/raspberry-pi/rpi.c index d2f27a844a..0997124c01 100644 --- a/arch/arm/boards/raspberry-pi/rpi.c +++ b/arch/arm/boards/raspberry-pi/rpi.c @@ -132,7 +132,7 @@ static int rpi_env_init(void) return 0; } - default_environment_path = "/boot/barebox.env"; + default_environment_path_set("/boot/barebox.env"); return 0; } diff --git a/arch/arm/boards/tqma6x/board.c b/arch/arm/boards/tqma6x/board.c index a870bf290f..30ebf34bd2 100644 --- a/arch/arm/boards/tqma6x/board.c +++ b/arch/arm/boards/tqma6x/board.c @@ -129,7 +129,7 @@ static int tqma6x_env_init(void) device_detect_by_name("mmc2"); - default_environment_path = "/dev/mmc2.boot1"; + default_environment_path_set("/dev/mmc2.boot1"); return 0; } diff --git a/arch/arm/mach-omap/omap_generic.c b/arch/arm/mach-omap/omap_generic.c index 3d302f3efa..bedb4d8d26 100644 --- a/arch/arm/mach-omap/omap_generic.c +++ b/arch/arm/mach-omap/omap_generic.c @@ -142,7 +142,7 @@ static int omap_env_init(void) return 0; } - default_environment_path = "/boot/barebox.env"; + default_environment_path_set("/boot/barebox.env"); return 0; } diff --git a/arch/arm/mach-socfpga/generic.c b/arch/arm/mach-socfpga/generic.c index c166369022..0d958d23af 100644 --- a/arch/arm/mach-socfpga/generic.c +++ b/arch/arm/mach-socfpga/generic.c @@ -103,7 +103,7 @@ static int socfpga_env_init(void) goto out_free; } - default_environment_path = "/boot/barebox.env"; + default_environment_path_set("/boot/barebox.env"); out_free: free(partname); -- cgit v1.2.3