summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Wesp <n.wesp@phytec.de>2019-04-04 15:26:30 +0200
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2019-04-09 17:05:49 +0200
commit7726335513d3c8d10e87e167d3d5ee0b2a930bee (patch)
tree2637b467b946d03a125c7ed4419c34de2c79ef8c
parentbac5d9fea4a2a99d6f71a833439aa01e507c1546 (diff)
downloadmeta-phytec-7726335513d3c8d10e87e167d3d5ee0b2a930bee.tar.bz2
meta-phytec-7726335513d3c8d10e87e167d3d5ee0b2a930bee.zip
wic-am335x-helper, phyam335x.inc: refactor variable names
Rename _BASE_NAME to _NAME and _SYMLINK to _LINK_NAME. This is for consistency to follow upstream refactoring of variable names. This was already done for barebox with commit: 6d18d013705312d6f2b2b7af933ba194f5410bc9 Signed-off-by: Norbert Wesp <n.wesp@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--classes/wic-am335x-helper.bbclass10
-rw-r--r--conf/machine/include/phyam335x.inc4
2 files changed, 7 insertions, 7 deletions
diff --git a/classes/wic-am335x-helper.bbclass b/classes/wic-am335x-helper.bbclass
index 1fd48a1..70057b2 100644
--- a/classes/wic-am335x-helper.bbclass
+++ b/classes/wic-am335x-helper.bbclass
@@ -1,11 +1,11 @@
IMAGE_CMD_emmc_append () {
if [ -e ${EMMCIMG} ]; then
# copy the MLO to address 0x0 and keep the partition table
- dd if=${DEPLOY_DIR_IMAGE}/${BAREBOX_IPL_BIN_SYMLINK} of=${EMMCIMG} bs=446 count=1 conv=notrunc
- dd if=${DEPLOY_DIR_IMAGE}/${BAREBOX_IPL_BIN_SYMLINK} of=${EMMCIMG} skip=1 seek=1 conv=notrunc
+ dd if=${DEPLOY_DIR_IMAGE}/${BAREBOX_IPL_BIN_LINK_NAME} of=${EMMCIMG} bs=446 count=1 conv=notrunc
+ dd if=${DEPLOY_DIR_IMAGE}/${BAREBOX_IPL_BIN_LINK_NAME} of=${EMMCIMG} skip=1 seek=1 conv=notrunc
# copy the MLO to address 0x20000, 0x40000, 0x60000
- dd if=${DEPLOY_DIR_IMAGE}/${BAREBOX_IPL_BIN_SYMLINK} of=${EMMCIMG} seek=768 bs=512 conv=notrunc
- dd if=${DEPLOY_DIR_IMAGE}/${BAREBOX_IPL_BIN_SYMLINK} of=${EMMCIMG} seek=512 bs=512 conv=notrunc
- dd if=${DEPLOY_DIR_IMAGE}/${BAREBOX_IPL_BIN_SYMLINK} of=${EMMCIMG} seek=256 bs=512 conv=notrunc
+ dd if=${DEPLOY_DIR_IMAGE}/${BAREBOX_IPL_BIN_LINK_NAME} of=${EMMCIMG} seek=768 bs=512 conv=notrunc
+ dd if=${DEPLOY_DIR_IMAGE}/${BAREBOX_IPL_BIN_LINK_NAME} of=${EMMCIMG} seek=512 bs=512 conv=notrunc
+ dd if=${DEPLOY_DIR_IMAGE}/${BAREBOX_IPL_BIN_LINK_NAME} of=${EMMCIMG} seek=256 bs=512 conv=notrunc
fi
}
diff --git a/conf/machine/include/phyam335x.inc b/conf/machine/include/phyam335x.inc
index 458d2ea..32f0996 100644
--- a/conf/machine/include/phyam335x.inc
+++ b/conf/machine/include/phyam335x.inc
@@ -13,8 +13,8 @@ PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
# Bootloader
PREFERRED_PROVIDER_virtual/bootloader ?= "barebox"
PREFERRED_PROVIDER_virtual/prebootloader ?= "barebox-ipl"
-BAREBOX_IPL_IMAGE_BASE_NAME = "MLO-${MACHINE}-${PKGV}-${PKGR}${IMAGE_VERSION_SUFFIX}"
-BAREBOX_IPL_BIN_SYMLINK = "MLO"
+BAREBOX_IPL_IMAGE_NAME = "MLO-${MACHINE}-${PKGV}-${PKGR}${IMAGE_VERSION_SUFFIX}"
+BAREBOX_IPL_BIN_LINK_NAME = "MLO"
# Kernel
PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"