diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 69fec1b178797a..9c8aa6fa7b5767 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -696,7 +696,7 @@ void exynos5_restart(char mode, const char *cmd) if (cmd) { #if defined(CONFIG_MACH_ODROIDXU3) - if (!strcmp((char *)cmd, "fastboot")) + if (!strcmp((char *)cmd, "fastboot") || !strcmp((char *)cmd, "bootloader")) restart_inform = REBOOT_FASTBOOT; if (!strcmp((char *)cmd, "update")) restart_inform = REBOOT_UPDATE; diff --git a/drivers/gud/gud-exynos5422/Makefile b/drivers/gud/gud-exynos5422/Makefile index 2045a37e585aaa..8d65ca38140260 100644 --- a/drivers/gud/gud-exynos5422/Makefile +++ b/drivers/gud/gud-exynos5422/Makefile @@ -1,7 +1,7 @@ # # Makefile for the kernel mobicore drivers # -GUD_ROOT_FOLDER := drivers/gud/gud-exynos5422/ +GUD_ROOT_FOLDER := $(srctree)/drivers/gud/gud-exynos5422/ # add our modules to kernel. obj-$(CONFIG_MOBICORE_API) += mcKernelApi.o obj-$(CONFIG_MOBICORE_DRIVER) += mcDrvModule.o diff --git a/firmware/Makefile b/firmware/Makefile index 90686722111149..b3ecec96ba1772 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -136,7 +136,7 @@ fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin -TSPFIRMWARE_DIRECTORY = firmware/tsp_synaptics +TSPFIRMWARE_DIRECTORY = $(srctree)/firmware/tsp_synaptics ifeq ($(shell test -d $(TSPFIRMWARE_DIRECTORY) && echo yes),yes) fw-shipped-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI) += tsp_synaptics/synaptics_b0_h.fw \ tsp_synaptics/synaptics_b0_fac.fw