wonderful-mobile/exynos-linux-stable
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

init: uh: cope with uh.elf.h existing in $(srctree) not $(objtree)

Browse source 
Change-Id: I53da7bbc25d6fec830a5a7191bfe54b725949506
Signed-off-by: FAROVITUS <farovitus@gmail.com>

 Conflicts:
	init/Makefile
	init/_uh.S
This commit is contained in:
Jesse Chan 2018-03-21 17:25:10 -07:00 • committed by FAROVITUS
parent 102879e9c1
commit d833b05398
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
init/Makefile
View file

@ -11,7 +11,7 @@ obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o
obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o
obj-$(CONFIG_UH) += _uh.o uh.o ld.o uh_fault_handler.o obj-$(CONFIG_UH) += _uh.o uh.o ld.o uh_fault_handler.o
AFLAGS__uh.o := -I$(srctree)
obj-$(CONFIG_RKP_CFP_JOPP) += rkp_cfp.o obj-$(CONFIG_RKP_CFP_JOPP) += rkp_cfp.o
ifneq ($(CONFIG_ARCH_INIT_TASK),y) ifneq ($(CONFIG_ARCH_INIT_TASK),y)

4
init/_uh.S
View file

@ -16,9 +16,9 @@
#include <linux/uh.h> #include <linux/uh.h>
#ifdef CONFIG_UH_RKP_8G #ifdef CONFIG_UH_RKP_8G
#define uh_ELF_PATH "init/uh.8g.elf" #define uh_ELF_PATH "init/uh.8g.elf.h"
#else #else
#define uh_ELF_PATH "init/uh.elf" #define uh_ELF_PATH "init/uh.elf.h"
#endif #endif
#define SMC_64BIT_RET_MAGIC 0xC2000401 #define SMC_64BIT_RET_MAGIC 0xC2000401