Skip to content

GitLab

B
build-system
Commit a856391c authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

We should not pass ENV_DEVICE if we do not intend to modify u-boot's environment location

parent 4b876fd7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
common.xml
View file @ a856391c
......@@ -586,12 +586,11 @@ BOARD="${BOARD}"
GCC_CONFIG="${GCC_CONFIG}"
CONSOLE="${CONSOLE}"
ROOT_DEVICE="${ROOT_DEVICE}"
ENV_DEVICE=${ROOT_DEVICE}
DISK="${DISK}"
SECONDARY="${SECONDARY}"
SHUTDOWN_WATCHDOG="${SHUTDOWN_WATCHDOG}"
RUNTIME_WATCHDOG="${RUNTIME_WATCHDOG}"
export LC_ALL PATH PROJECT_NAME ID PRETTY_NAME HOSTNAME VERSION BUILD_ID ARTIFACT_NAME DEVICE_TYPE BOARD GCC_CONFIG CONSOLE ROOT_DEVICE ENV_DEVICE DISK SECONDARY SHUTDOWN_WATCHDOG RUNTIME_WATCHDOG HOSTTYPE
export LC_ALL PATH PROJECT_NAME ID PRETTY_NAME HOSTNAME VERSION BUILD_ID ARTIFACT_NAME DEVICE_TYPE BOARD GCC_CONFIG CONSOLE ROOT_DEVICE DISK SECONDARY SHUTDOWN_WATCHDOG RUNTIME_WATCHDOG HOSTTYPE
mount -o remount,rw /
......@@ -687,12 +686,11 @@ BOARD="${BOARD}"
GCC_CONFIG="${GCC_CONFIG}"
CONSOLE="${CONSOLE}"
ROOT_DEVICE="${ROOT_DEVICE}"
ENV_DEVICE=${ROOT_DEVICE}
DISK="${DISK}"
SECONDARY="${SECONDARY}"
SHUTDOWN_WATCHDOG="${SHUTDOWN_WATCHDOG}"
RUNTIME_WATCHDOG="${RUNTIME_WATCHDOG}"
export LC_ALL PATH PROJECT_NAME ID PRETTY_NAME HOSTNAME COPYRIGHT LICENSE TRANSLATOR VERSION BUILD_ID ARTIFACT_NAME DEVICE_TYPE BOARD GCC_CONFIG CONSOLE ROOT_DEVICE ENV_DEVICE DISK SECONDARY SHUTDOWN_WATCHDOG RUNTIME_WATCHDOG HOSTTYPE
export LC_ALL PATH PROJECT_NAME ID PRETTY_NAME HOSTNAME COPYRIGHT LICENSE TRANSLATOR VERSION BUILD_ID ARTIFACT_NAME DEVICE_TYPE BOARD GCC_CONFIG CONSOLE ROOT_DEVICE DISK SECONDARY SHUTDOWN_WATCHDOG RUNTIME_WATCHDOG HOSTTYPE
mount -o remount,rw /
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment