RISCV: Remove the codes relevant to the creating itb image

Vendor Kernel is creating the Image as itb with its file.
But it doesn't need to use the itb image for Tizen.
Just create the Image file. So rollback the mainline style.

Change-Id: Iadaab65874141d4f3983faaa241446104d741616
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
index db7c82353e3cba8821b5bb1ba1138c697a4889ed..69a82855df26a548fee47c91950555d9667687dc 100644 (file)
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@ -155,7 +155,7 @@ ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)
 KBUILD_IMAGE := $(boot)/loader.bin
 else
 ifeq ($(CONFIG_EFI_ZBOOT),)
-KBUILD_IMAGE := $(boot)/Image.gz.itb
+KBUILD_IMAGE := $(boot)/Image.gz
 else
 KBUILD_IMAGE := $(boot)/vmlinuz.efi
 endif
@@ -163,23 +163,16 @@ endif
 endif
 BOOT_TARGETS := Image Image.gz loader loader.bin xipImage vmlinuz.efi
 
-#
-# extra files
-#
-include $(srctree)/arch/riscv/generic/Platform
-bootvars-y     = ITS_INPUTS="$(its-y)"
-
-all:   $(notdir $(KBUILD_IMAGE)) Image.itb Image.gz.itb
+all:   $(notdir $(KBUILD_IMAGE))
 
 $(BOOT_TARGETS): vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
        @$(kecho) '  Kernel: $(boot)/$@ is ready'
 
-Image.%: Image Image.gz
-       $(Q)$(MAKE) $(build)=$(boot) $(bootvars-y) $(boot)/$@
+Image.%: Image
+       $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 install: KBUILD_IMAGE := $(boot)/Image
-zinstall: KBUILD_IMAGE := $(boot)/Image.gz
 install zinstall:
        $(call cmd,install)
 

diff --git a/arch/riscv/boot/Makefile b/arch/riscv/boot/Makefile
index d53f9e3b5d026ee607efeb7cf14d5a81034da9a8..8e7fc0edf21d3ecef979f217446bf815c6cd4917 100644 (file)
--- a/arch/riscv/boot/Makefile
+++ b/arch/riscv/boot/Makefile
@@ -70,56 +70,6 @@ $(obj)/Image.zst: $(obj)/Image FORCE
 $(obj)/loader.bin: $(obj)/loader FORCE
        $(call if_changed,objcopy)
 
-ifdef CONFIG_32BIT
-ADDR_BITS := 32
-ADDR_CELLS := 1
-else
-ADDR_BITS := 64
-ADDR_CELLS := 2
-endif
-
-IMAGE_LOAD_ADDRESS := $(CONFIG_IMAGE_LOAD_OFFSET)
-IMAGE_ENTRY_ADDRESS := $(CONFIG_IMAGE_LOAD_OFFSET)
-IMAGE_ALGO := crc32
-
-quiet_cmd_its_cat = CAT     $@
-      cmd_its_cat = cat $(real-prereqs) >$@
-
-$(obj)/Image.its.S: $(addprefix $(srctree)/arch/riscv/generic/,$(ITS_INPUTS)) FORCE
-       $(call if_changed,its_cat)
-
-quiet_cmd_cpp_its_S = ITS     $@
-      cmd_cpp_its_S = $(CPP) -P -C -o $@ $< \
-               -DKERNEL_NAME="\"Linux $(KERNELRELEASE)\"" \
-               -DIMAGE_COMPRESSION="\"$(2)\"" \
-               -DIMAGE_CHECK_ALGORITHM="\"$(3)\"" \
-               -DIMAGE_BINARY="\"$(4)\"" \
-               -DIMAGE_LOAD_ADDRESS=$(IMAGE_LOAD_ADDRESS) \
-               -DIMAGE_ENTRY_ADDRESS=$(IMAGE_ENTRY_ADDRESS) \
-               -DADDR_BITS=$(ADDR_BITS) \
-               -DADDR_CELLS=$(ADDR_CELLS)
-
-$(obj)/Image.its: $(obj)/Image.its.S $(obj)/Image FORCE
-       $(call if_changed,cpp_its_S,none,$(IMAGE_ALGO),Image)
-
-$(obj)/Image.gz.its: $(obj)/Image.its.S $(obj)/Image.gz FORCE
-       $(call if_changed,cpp_its_S,gzip,$(IMAGE_ALGO),Image.gz)
-
-quiet_cmd_itb-image = ITB     $@
-      cmd_itb-image = \
-               env PATH="$(objtree)/scripts/dtc:$(PATH)" \
-               $(BASH) $(MKIMAGE) \
-               -D "-I dts -O dtb -p 500 \
-                       --include $(objtree)/arch/riscv \
-                       --warning no-unit_address_vs_reg" \
-               -f $(2) $@
-
-$(obj)/Image.itb: $(obj)/Image.its $(obj)/Image FORCE
-       $(call if_changed,itb-image,$<)
-
-$(obj)/Image.%.itb: $(obj)/Image.%.its $(obj)/Image.% FORCE
-       $(call if_changed,itb-image,$<)
-
 EFI_ZBOOT_PAYLOAD      := Image
 EFI_ZBOOT_BFD_TARGET   := elf$(BITS)-littleriscv
 EFI_ZBOOT_MACH_TYPE    := RISCV$(BITS)