summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Christ <s.christ@phytec.de>2015-09-25 10:26:28 +0200
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-09-25 13:00:56 +0200
commit2ff4903c1e298549c93d9cf3c3bfb96c00e42eb3 (patch)
treeb19a38a69b23d9687ee7322ef16ed7997922a861
parentcf036c3e8f52207eb50c7400543f9e0539f36e48 (diff)
downloadmeta-phytec-2ff4903c1e298549c93d9cf3c3bfb96c00e42eb3.tar.bz2
meta-phytec-2ff4903c1e298549c93d9cf3c3bfb96c00e42eb3.zip
barebox.inc: remove BAREBOX_DEFAULT_ENV handling
The machine specific variable BAREBOX_DEFAULT_ENV contains the path to the default environment in the barebox source tree. It's only used when no other environments machineenv, boardenv and commonenv is used. It's only a fallback mechanism. In the first case, when machineenv, boardenv or commonenv is defined, the variable BAREBOX_DEFAULT_ENV is not used and no files are added to the environment from the internal barebox default environment. In the second case, when machineenv, boardenv and commonenv are not defined, the variable BAREBOX_DEFAULT_ENV _is_ used and the path to the internal barebox environment is added to the config parameter CONFIG_DEFAULT_ENVIRONMENT_PATH instead of the machineenv, boardenv or commonenv paths. But the internal barebox environment in source tree in folders arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/ and arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/ is nevertheless used, because our device init functions in board.c have the code lines like defaultenv_append_directory(defaultenv_physom_am335x); Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/machine/phyboard-alcor-imx6-1.conf1
-rw-r--r--conf/machine/phyboard-mira-imx6-3.conf1
-rw-r--r--conf/machine/phyboard-mira-imx6-4.conf1
-rw-r--r--conf/machine/phyboard-subra-imx6-1.conf1
-rw-r--r--conf/machine/phycard-imx6-1.conf1
-rw-r--r--conf/machine/phycard-imx6-2.conf1
-rw-r--r--conf/machine/phycore-am335x-1.conf1
-rw-r--r--conf/machine/phyflex-am335x-1.conf1
-rw-r--r--conf/machine/phyflex-imx6-1.conf1
-rw-r--r--conf/machine/phyflex-imx6-10.conf1
-rw-r--r--conf/machine/phyflex-imx6-2.conf1
-rw-r--r--conf/machine/phyflex-imx6-3.conf1
-rw-r--r--conf/machine/phyflex-imx6-4.conf1
-rw-r--r--conf/machine/phyflex-imx6-5.conf1
-rw-r--r--conf/machine/phyflex-imx6-6.conf1
-rw-r--r--conf/machine/phyflex-imx6-7.conf1
-rw-r--r--conf/machine/phyflex-imx6-8.conf1
-rw-r--r--conf/machine/phyflex-imx6-9.conf1
-rw-r--r--recipes-bsp/barebox/barebox.inc10
19 files changed, 1 insertions, 27 deletions
diff --git a/conf/machine/phyboard-alcor-imx6-1.conf b/conf/machine/phyboard-alcor-imx6-1.conf
index 30c5566..6e48e7a 100644
--- a/conf/machine/phyboard-alcor-imx6-1.conf
+++ b/conf/machine/phyboard-alcor-imx6-1.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-phyboard-alcor-1gib.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen can"
diff --git a/conf/machine/phyboard-mira-imx6-3.conf b/conf/machine/phyboard-mira-imx6-3.conf
index b4d6c22..2895f19 100644
--- a/conf/machine/phyboard-mira-imx6-3.conf
+++ b/conf/machine/phyboard-mira-imx6-3.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phycore-imx6/defaultenv-phycore-imx6"
MACHINE_FEATURES += "touchscreen pci can"
diff --git a/conf/machine/phyboard-mira-imx6-4.conf b/conf/machine/phyboard-mira-imx6-4.conf
index 5b6dc84..0798ec1 100644
--- a/conf/machine/phyboard-mira-imx6-4.conf
+++ b/conf/machine/phyboard-mira-imx6-4.conf
@@ -14,6 +14,5 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-nand-256mb.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phycore-imx6/defaultenv-phycore-imx6"
SERIAL_CONSOLES = "115200;ttymxc1"
diff --git a/conf/machine/phyboard-subra-imx6-1.conf b/conf/machine/phyboard-subra-imx6-1.conf
index b5f9c53..f5c49da 100644
--- a/conf/machine/phyboard-subra-imx6-1.conf
+++ b/conf/machine/phyboard-subra-imx6-1.conf
@@ -14,6 +14,5 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-phyboard-subra-512mb-1bank.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
MACHINE_FEATURES += "can"
diff --git a/conf/machine/phycard-imx6-1.conf b/conf/machine/phycard-imx6-1.conf
index 4e6036b..c7ccbed 100644
--- a/conf/machine/phycard-imx6-1.conf
+++ b/conf/machine/phycard-imx6-1.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-pbaa03-1gib.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen alsa"
diff --git a/conf/machine/phycard-imx6-2.conf b/conf/machine/phycard-imx6-2.conf
index 4102734..55bf67a 100644
--- a/conf/machine/phycard-imx6-2.conf
+++ b/conf/machine/phycard-imx6-2.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-pbaa03-1gib-1bank.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen alsa"
diff --git a/conf/machine/phycore-am335x-1.conf b/conf/machine/phycore-am335x-1.conf
index bc40a7e..ab77603 100644
--- a/conf/machine/phycore-am335x-1.conf
+++ b/conf/machine/phycore-am335x-1.conf
@@ -12,7 +12,6 @@ KERNEL_DEVICETREE = "am335x-phycore-rdk.dtb"
# Barebox
BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-512mb.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-core-am335x/defaultenv-phycore-am335x"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen"
diff --git a/conf/machine/phyflex-am335x-1.conf b/conf/machine/phyflex-am335x-1.conf
index fafa281..fb7addb 100644
--- a/conf/machine/phyflex-am335x-1.conf
+++ b/conf/machine/phyflex-am335x-1.conf
@@ -12,7 +12,6 @@ KERNEL_DEVICETREE = "am335x-phyflex-rdk.dtb"
# Barebox
BAREBOX_BIN = "images/barebox-am33xx-phytec-phyflex.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phyflex-mlo-256mb.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-am335x/defaultenv-phyflex-am335x"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen"
diff --git a/conf/machine/phyflex-imx6-1.conf b/conf/machine/phyflex-imx6-1.conf
index fff3ff3..6125151 100644
--- a/conf/machine/phyflex-imx6-1.conf
+++ b/conf/machine/phyflex-imx6-1.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-pbab01-1gib.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen pci can alsa"
diff --git a/conf/machine/phyflex-imx6-10.conf b/conf/machine/phyflex-imx6-10.conf
index 8c8a4c7..f5a61cb 100644
--- a/conf/machine/phyflex-imx6-10.conf
+++ b/conf/machine/phyflex-imx6-10.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-pbab01s-128mb-1bank.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen pci can alsa"
diff --git a/conf/machine/phyflex-imx6-2.conf b/conf/machine/phyflex-imx6-2.conf
index 21d0920..c9189c4 100644
--- a/conf/machine/phyflex-imx6-2.conf
+++ b/conf/machine/phyflex-imx6-2.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-pbab01-1gib-1bank.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen pci can alsa"
diff --git a/conf/machine/phyflex-imx6-3.conf b/conf/machine/phyflex-imx6-3.conf
index 51f3631..0fe8db9 100644
--- a/conf/machine/phyflex-imx6-3.conf
+++ b/conf/machine/phyflex-imx6-3.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-pbab01-2gib.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen pci can alsa"
diff --git a/conf/machine/phyflex-imx6-4.conf b/conf/machine/phyflex-imx6-4.conf
index e55521e..b329484 100644
--- a/conf/machine/phyflex-imx6-4.conf
+++ b/conf/machine/phyflex-imx6-4.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-pbab01-4gib.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen pci can alsa"
diff --git a/conf/machine/phyflex-imx6-5.conf b/conf/machine/phyflex-imx6-5.conf
index fa8afa4..66dc31a 100644
--- a/conf/machine/phyflex-imx6-5.conf
+++ b/conf/machine/phyflex-imx6-5.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-pbab01-512mb-1bank.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen pci can alsa"
diff --git a/conf/machine/phyflex-imx6-6.conf b/conf/machine/phyflex-imx6-6.conf
index cf07efc..227619e 100644
--- a/conf/machine/phyflex-imx6-6.conf
+++ b/conf/machine/phyflex-imx6-6.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-pbab01dl-1gib.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen pci can alsa"
diff --git a/conf/machine/phyflex-imx6-7.conf b/conf/machine/phyflex-imx6-7.conf
index 0f951d2..4d1d2fa 100644
--- a/conf/machine/phyflex-imx6-7.conf
+++ b/conf/machine/phyflex-imx6-7.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-pbab01dl-1gib-1bank.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen pci can alsa"
diff --git a/conf/machine/phyflex-imx6-8.conf b/conf/machine/phyflex-imx6-8.conf
index 8e53c51..2b103b7 100644
--- a/conf/machine/phyflex-imx6-8.conf
+++ b/conf/machine/phyflex-imx6-8.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-pbab01s-512mb-1bank.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen pci can alsa"
diff --git a/conf/machine/phyflex-imx6-9.conf b/conf/machine/phyflex-imx6-9.conf
index b3d21b9..218fd03 100644
--- a/conf/machine/phyflex-imx6-9.conf
+++ b/conf/machine/phyflex-imx6-9.conf
@@ -14,7 +14,6 @@ KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-pbab01s-256mb-1bank.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
# touchscreen, the rdk has one attached
MACHINE_FEATURES += "touchscreen pci can alsa"
diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc
index babf60d..de7cb12 100644
--- a/recipes-bsp/barebox/barebox.inc
+++ b/recipes-bsp/barebox/barebox.inc
@@ -29,7 +29,7 @@ inherit kernel-arch cml1 deploy
inherit kconfig-prepare-configure
# Increase INC_PR everytime the include file is changed.
-INC_PR = "r2"
+INC_PR = "r3"
PACKAGE_ARCH = "${MACHINE_ARCH}"
# verbose build 0/1
@@ -49,8 +49,6 @@ BAREBOX_IMAGE_BASE_NAME ?= "barebox-${MACHINE}-${PKGV}-${PKGR}-${DATETIME}"
BAREBOX_IMAGE_BASE_NAME[vardepsexclude] += "DATETIME"
BAREBOX_BIN_SYMLINK ?= "barebox.bin"
BAREBOX_DEFAULT_DEFCONFIG ?= ""
-# barebox environment
-BAREBOX_DEFAULT_ENV ?= ""
# recipe private variables
BAREBOX_COMMON_ENVDIR = "${WORKDIR}/commonenv"
@@ -86,12 +84,6 @@ python do_prepare_env() {
machine_env_dir = d.getVar('BAREBOX_MACHINE_ENVDIR', True)
board_env_dir = d.getVar('BAREBOX_BOARD_ENVDIR', True)
common_env_dir = d.getVar('BAREBOX_COMMON_ENVDIR', True)
- if not (os.path.isdir(common_env_dir) or os.path.isdir(board_env_dir) or os.path.isdir(machine_env_dir)):
- bb.note("No environment directory provided, using BAREBOX_DEFAULT_ENV")
- common_env_dir = d.getVar('BAREBOX_DEFAULT_ENV', True)
- if not common_env_dir:
- bb.note("no BAREBOX_DEFAULT_ENV provided, creating empty default")
- bb.utils.mkdirhier(os.path.join(S, '.commonenv'))
if os.path.isdir(common_env_dir):
bb.note("copying common environment to source directory")
oe.path.copytree(common_env_dir, oe.path.join(S, '.commonenv'))