aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu
diff options
context:
space:
mode:
authorZoltan HERPAI <wigyori@uid0.hu>2017-11-07 09:45:52 +0100
committerFelix Fietkau <nbd@nbd.name>2017-12-08 19:41:18 +0100
commit7b5c989ab9bcd0c1346b7b90b8433216f7b20b71 (patch)
treebbafa6432bc6385d66f880602819878b2f076c18 /target/linux/mvebu
parentbf5cef47b38c0b119dc84a78919944e21d5c4092 (diff)
downloadupstream-7b5c989ab9bcd0c1346b7b90b8433216f7b20b71.tar.gz
upstream-7b5c989ab9bcd0c1346b7b90b8433216f7b20b71.tar.bz2
upstream-7b5c989ab9bcd0c1346b7b90b8433216f7b20b71.zip
merge: targets: update image generation and targets
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'target/linux/mvebu')
-rw-r--r--target/linux/mvebu/image/cfbase-boot.script4
-rw-r--r--target/linux/mvebu/image/cfpro-boot.script4
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/mvebu/image/cfbase-boot.script b/target/linux/mvebu/image/cfbase-boot.script
index 5f9bcd70ba..89fa1dc578 100644
--- a/target/linux/mvebu/image/cfbase-boot.script
+++ b/target/linux/mvebu/image/cfbase-boot.script
@@ -9,8 +9,8 @@ setenv fdtfile armada-388-clearfog-base.dtb
# generate bootargs for rootfs on MMC
if test "${devtype}" = "mmc"; then
- setexpr lede_rootpart ${distro_bootpart} + 1
- setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${lede_rootpart} rootfstype=auto rootwait
+ setexpr openwrt_rootpart ${distro_bootpart} + 1
+ setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${openwrt_rootpart} rootfstype=auto rootwait
fi
# here one could add logic for other rootfs device types such as scsi and usb
diff --git a/target/linux/mvebu/image/cfpro-boot.script b/target/linux/mvebu/image/cfpro-boot.script
index e1523f8fb3..1588c1546e 100644
--- a/target/linux/mvebu/image/cfpro-boot.script
+++ b/target/linux/mvebu/image/cfpro-boot.script
@@ -5,8 +5,8 @@
# generate bootargs for rootfs on MMC
if test "${devtype}" = "mmc"; then
- setexpr lede_rootpart ${distro_bootpart} + 1
- setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${lede_rootpart} rootfstype=auto rootwait
+ setexpr openwrt_rootpart ${distro_bootpart} + 1
+ setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${openwrt_rootpart} rootfstype=auto rootwait
fi
# here one could add logic for other rootfs device types such as scsi and usb