Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
samsung open source update v2
  • Loading branch information
codeworkx committed Oct 9, 2011
1 parent 1e46077 commit 0ba0c66
Show file tree
Hide file tree
Showing 397 changed files with 64,859 additions and 3,954 deletions.
Empty file modified Documentation/arm/Samsung/clksrc-change-registers.awk 100755 → 100644
Empty file.
6 changes: 6 additions & 0 deletions Makefile
Expand Up @@ -353,6 +353,12 @@ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-Werror-implicit-function-declaration \
-Wno-format-security \
-fno-delete-null-pointer-checks
#change@wtl.kSingh - enabling FIPS mode - starts
ifeq ($(USE_SEC_FIPS_MODE),true)
KBUILD_CFLAGS += -DSEC_FIPS_ENABLED
endif
#change@wtl.kSingh - enabling FIPS mode - ends

KBUILD_AFLAGS := -D__ASSEMBLY__

# Read KERNELRELEASE from include/config/kernel.release (if it exists)
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/Kconfig
Expand Up @@ -1207,6 +1207,13 @@ source "drivers/pcmcia/Kconfig"

endmenu

menu "Samsung Kernel Debug Features"

config KERNEL_DEBUG_SEC
bool "KERNEL_DEBUG_SEC"

endmenu

menu "Kernel Features"

source "kernel/time/Kconfig"
Expand Down
33 changes: 33 additions & 0 deletions arch/arm/boot/compressed/head.S
Expand Up @@ -175,9 +175,13 @@ not_angel:
THUMB( ldr sp, [r0, #32] )
subs r0, r0, r1 @ calculate the delta offset

#ifndef CONFIG_CRYPTO_FIPS
@ if delta is zero, we are
beq not_relocated @ running at the address we
@ were linked at.
#else
beq not_relocated_copy
#endif

/*
* We're running at a different address. We need to fix
Expand All @@ -201,6 +205,9 @@ not_angel:
*/
add r2, r2, r0
add r3, r3, r0
#ifdef CONFIG_CRYPTO_FIPS
bl copy_compressed
#endif
add sp, sp, r0

/*
Expand Down Expand Up @@ -327,6 +334,32 @@ params: ldr r0, =params_phys
.align
#endif

#ifdef CONFIG_CRYPTO_FIPS
/* change@wtl.whenze FIPS integrity check
Do copy for non-relocated image. (Is this needed, image always relocated?) */
not_relocated_copy:
bl copy_compressed
b not_relocated

/* change@wtl.whenze FIPs integrity check
copy compressed image + 32 bytes) to 0x60000000 */
copy_compressed:
mov r1, r5
mov r9, #0x60000000

1:
ldmia r1!, {r10}
stmia r9!, {r10}
cmp r1, r3
blo 1b

.rept 8
ldmia r1!, {r10}
stmia r9!, {r10}
.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.
Expand Down

0 comments on commit 0ba0c66

Please sign in to comment.