diff options
-rw-r--r-- | arch/arm/boot/dts/exynos4412-midas.dtsi | 5 | ||||
-rw-r--r-- | arch/arm/configs/replicant_defconfig | 3 | ||||
-rwxr-xr-x | build.sh | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi index 8164d8281556..28510234bf92 100644 --- a/arch/arm/boot/dts/exynos4412-midas.dtsi +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi @@ -32,6 +32,11 @@ stdout-path = &serial_2; }; + firmware@204f000 { + compatible = "samsung,secure-firmware"; + reg = <0x0204F000 0x1000>; + }; + fixed-rate-clocks { xxti { diff --git a/arch/arm/configs/replicant_defconfig b/arch/arm/configs/replicant_defconfig index faaf3c4055b2..898dbced427d 100644 --- a/arch/arm/configs/replicant_defconfig +++ b/arch/arm/configs/replicant_defconfig @@ -40,9 +40,12 @@ CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_MCPM=y CONFIG_NR_CPUS=8 CONFIG_HIGHMEM=y +# CONFIG_STACKPROTECTOR_PER_TASK is not set CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y +CONFIG_CMDLINE="root=/dev/mmcblk2p16 rw buildvariant=eng device=n710x rootwait loglevel=8 no_console_suspend console=ttySAC2,115200" +CONFIG_CMDLINE_EXTEND=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -265,7 +265,7 @@ if [ "${os}" = "Android" ] ; then elif [ "${os}" = "GNU/Linux" ] ; then unset_kconfig CONFIG_USB_FUNCTIONFS # Boot by default on the microSD - cmdline_append "root=/dev/mmcblk2p13 rw" + cmdline_append "root=/dev/mmcblk2p16 rw" fi cmdline_append "buildvariant=eng device=${device} rootwait loglevel=8" |