diff --git a/board/netcube/kumquat/linux-dts/sun8i-v3s-netcube-kumquat.dts b/board/netcube/kumquat/linux-dts/sun8i-v3s-netcube-kumquat.dts
index 3ea88a5adf..542902ce5d 100644
--- a/board/netcube/kumquat/linux-dts/sun8i-v3s-netcube-kumquat.dts
+++ b/board/netcube/kumquat/linux-dts/sun8i-v3s-netcube-kumquat.dts
@@ -212,8 +212,9 @@
 	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "jedec,spi-nor";
 		reg = <0>;
+		compatible = "jedec,spi-nor";
+		label = "firmware";
 		spi-max-frequency = <40000000>;
 	};
 
diff --git a/board/netcube/kumquat/rootfs/boot/extlinux/extlinux.conf b/board/netcube/kumquat/rootfs/boot/extlinux/extlinux.conf
index c69277dcd5..e0094b9f5d 100644
--- a/board/netcube/kumquat/rootfs/boot/extlinux/extlinux.conf
+++ b/board/netcube/kumquat/rootfs/boot/extlinux/extlinux.conf
@@ -1,4 +1,4 @@
 LABEL default
   kernel /boot/zImage
   fdt /boot/sun8i-v3s-netcube-kumquat.dtb
-  append root=/dev/mmcblk0p1 rootwait console=${console} rootfstype=ext4 panic=3
+  append root=/dev/mmcblk0p1 rootwait console=${console} rootfstype=ext4 panic=3 ${mtdparts}
diff --git a/board/netcube/kumquat/rootfs/etc/fw_env.config b/board/netcube/kumquat/rootfs/etc/fw_env.config
new file mode 100644
index 0000000000..2437dc0442
--- /dev/null
+++ b/board/netcube/kumquat/rootfs/etc/fw_env.config
@@ -0,0 +1,12 @@
+# Configuration file for fw_(printenv/setenv) utility.
+# Up to two entries are valid, in this case the redundant
+# environment sector is assumed present.
+# Notice, that the "Number of sectors" is not required on NOR and SPI-dataflash.
+# Futhermore, if the Flash sector size is omitted, this value is assumed to
+# be the same as the Environment size, which is valid for NOR and SPI-dataflash
+# Device offset must be prefixed with 0x to be parsed as a hexadecimal value.
+
+# MTD device name       Device offset   Env. size       Flash sector size       Number of sectors
+/dev/mtd1		0x0000		0x40000
+/dev/mtd2		0x0000		0x40000
+
diff --git a/board/netcube/kumquat/uboot-dts/sun8i-v3s-netcube-kumquat.dts b/board/netcube/kumquat/uboot-dts/sun8i-v3s-netcube-kumquat.dts
index 7c2be111e5..4356d17add 100644
--- a/board/netcube/kumquat/uboot-dts/sun8i-v3s-netcube-kumquat.dts
+++ b/board/netcube/kumquat/uboot-dts/sun8i-v3s-netcube-kumquat.dts
@@ -212,8 +212,9 @@
 	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "jedec,spi-nor";
 		reg = <0>;
+		compatible = "jedec,spi-nor";
+		label = "firmware";
 		spi-max-frequency = <40000000>;
 	};
 
diff --git a/board/netcube/kumquat/uboot_defconfig b/board/netcube/kumquat/uboot_defconfig
index 4b41ac74d1..f9a72a785a 100644
--- a/board/netcube/kumquat/uboot_defconfig
+++ b/board/netcube/kumquat/uboot_defconfig
@@ -19,8 +19,8 @@ CONFIG_CMD_EEPROM=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MTD=y
 CONFIG_CMD_RTC=y
-CONFIG_MTDIDS_DEFAULT="nor0=flash"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=flash:512k(u-boot)ro,256k(u-boot-env1),256k(u-boot-env2),-(user)"
+CONFIG_MTDIDS_DEFAULT="nor0=firmware"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=firmware:512k(u-boot)ro,256k(u-boot-env1),256k(u-boot-env2),-(user)"
 CONFIG_CMD_DIAG=y
 # CONFIG_ENV_IS_IN_FAT is not set
 CONFIG_ENV_IS_IN_MMC=y