3 files changed, 0 insertions, 47 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index 9ec1a8d..9128fdd 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -12,7 +12,6 @@
 #
 
 MKIMAGE         := $(srctree)/scripts/mkuboot.sh
-MKFIPS          := $(srctree)/scripts/mk_fipsbinary.sh
 
 ifneq ($(MACHINE),)
 include $(srctree)/$(MACHINE)/Makefile.boot
@@ -56,9 +55,6 @@ $(obj)/compressed/vmlinux: $(obj)/Image FORCE
 
 $(obj)/zImage:	$(obj)/compressed/vmlinux FORCE
 	$(call if_changed,objcopy)
-ifeq ($(CONFIG_CRYPTO_FIPS),y)
-	$(MKFIPS) $(obj)/zImage
-endif
 	@echo '  Kernel: $@ is ready'
 
 endif
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 54c9428..23aad07 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -16,11 +16,6 @@ endif
 endif
 
 AFLAGS_head.o += -DTEXT_OFFSET=$(TEXT_OFFSET)
-# change@wtl.rsengott
-# FIPS_KERNEL_RAM_BASE is start of kernel text in RAM
-ifeq ($(CONFIG_CRYPTO_FIPS),y)
-AFLAGS_head.o += -DFIPS_KERNEL_RAM_BASE=0x40008000
-endif
 HEAD	= head.o
 OBJS	+= misc.o decompress.o
 FONTC	= $(srctree)/drivers/video/console/font_acorn_8x8.c
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index e28de2a..caddb9d 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -292,13 +292,7 @@ wont_overwrite:
  *   sp  = stack pointer
  */
 		teq	r0, #0
-#ifndef CONFIG_CRYPTO_FIPS
 		beq	not_relocated
-#else
-        movw r5, #:lower16:zimage_ram_base_addr
-        movt r5, #:upper16:zimage_ram_base_addr
-        beq not_relocated_copy
-#endif
 		add	r11, r11, r0
 		add	r12, r12, r0
 
@@ -311,11 +305,6 @@ wont_overwrite:
 		add	r2, r2, r0
 		add	r3, r3, r0
 
-#ifdef CONFIG_CRYPTO_FIPS
-        movw r5, #:lower16:zimage_ram_base_addr
-        movt r5, #:upper16:zimage_ram_base_addr
-        bl copy_compressed
-#endif
 		/*
 		 * Relocate all entries in the GOT table.
 		 */
@@ -378,10 +367,6 @@ LC0:		.word	LC0			@ r1
 		.word	.L_user_stack_end	@ sp
 		.size	LC0, . - LC0
 
-#ifdef CONFIG_CRYPTO_FIPS
-        .equ   zimage_ram_base_addr, FIPS_KERNEL_RAM_BASE
-#endif
-
 #ifdef CONFIG_ARCH_RPC
 		.globl	params
 params:		ldr	r0, =0x10000100		@ params_phys for RPC
@@ -390,29 +375,6 @@ params:		ldr	r0, =0x10000100		@ params_phys for RPC
 		.align
 #endif
 
-
-#ifdef CONFIG_CRYPTO_FIPS
-not_relocated_copy:
-		bl copy_compressed
-		b not_relocated
-
-copy_compressed:
-		mov r1, r5
-		add	r9, r4, #CONFIG_CRYPTO_FIPS_INTEG_OFFSET
-
-1:
-		ldmia	r1!, {r5}
-		stmia	r9!, {r5}
-		cmp	r1, r2
-		blo	1b
-
-		.rept 8
-		ldmia	r1!, {r5}
-		stmia	r9!, {r5}
-		.endr
-		mov	pc, lr
-#endif
-
 /*
  * Turn on the cache.  We need to setup some page tables so that we
  * can have both the I and D caches on.