Merge branch 'master' into desktop

This commit is contained in:
Igor Pecovnik 2020-12-10 21:51:47 +01:00
commit 73cb74c10f
3 changed files with 16 additions and 2 deletions

View file

@ -392,7 +392,7 @@ prepare_partitions()
# mountopts[nfs] is empty
# default BOOTSIZE to use if not specified
DEFAULT_BOOTSIZE=96 # MiB
DEFAULT_BOOTSIZE=256 # MiB
# stage: determine partition configuration
if [[ -n $BOOTFS_TYPE ]]; then

View file

@ -462,7 +462,7 @@ format_emmc()
fi
# default boot partition size, in MiB
DEFAULT_BOOTSIZE=200
DEFAULT_BOOTSIZE=256
# (convert to sectors for partitioning)
DEFAULT_BOOTSIZE_SECTORS=$(((${DEFAULT_BOOTSIZE} * 1024 * 1024) / 512))

View file

@ -0,0 +1,14 @@
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 8a5591398..0094dbdda 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -51,7 +51,8 @@
gpiomem {
compatible = "samsung,exynos-gpiomem";
reg = <0x13400000 0x1000>,
- <0x14010000 0x1000>;
+ <0x14010000 0x1000>,
+ <0x03860000 0x1000>;
status = "okay";
};