Commit 0635280cedb266e21c125afa2843dd0a0eb8ba96

Authored by Eric Lee
1 parent 5f565d12d2

Add 0001-am335x-Add-crypto-driver-settings-to-defconfig.patch that wasn't part o…

…f the official PSP 04.06.00.11 release

Showing 1 changed file with 28 additions and 12 deletions Side-by-side Diff

arch/arm/configs/am335x_evm_defconfig
... ... @@ -1278,7 +1278,9 @@
1278 1278 # CONFIG_SERIAL_XILINX_PS_UART is not set
1279 1279 # CONFIG_HVC_DCC is not set
1280 1280 # CONFIG_IPMI_HANDLER is not set
1281   -# CONFIG_HW_RANDOM is not set
  1281 +CONFIG_HW_RANDOM=y
  1282 +# CONFIG_HW_RANDOM_TIMERIOMEM is not set
  1283 +CONFIG_HW_RANDOM_OMAP4=y
1282 1284 # CONFIG_R3964 is not set
1283 1285 # CONFIG_RAW_DRIVER is not set
1284 1286 # CONFIG_TCG_TPM is not set
1285 1287  
1286 1288  
1287 1289  
1288 1290  
1289 1291  
... ... @@ -2480,36 +2482,38 @@
2480 2482 #
2481 2483 CONFIG_CRYPTO_ALGAPI=y
2482 2484 CONFIG_CRYPTO_ALGAPI2=y
  2485 +CONFIG_CRYPTO_AEAD=y
2483 2486 CONFIG_CRYPTO_AEAD2=y
2484 2487 CONFIG_CRYPTO_BLKCIPHER=y
2485 2488 CONFIG_CRYPTO_BLKCIPHER2=y
2486 2489 CONFIG_CRYPTO_HASH=y
2487 2490 CONFIG_CRYPTO_HASH2=y
  2491 +CONFIG_CRYPTO_RNG=y
2488 2492 CONFIG_CRYPTO_RNG2=y
2489 2493 CONFIG_CRYPTO_PCOMP2=y
2490 2494 CONFIG_CRYPTO_MANAGER=y
2491 2495 CONFIG_CRYPTO_MANAGER2=y
2492 2496 # CONFIG_CRYPTO_USER is not set
2493   -CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
  2497 +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
2494 2498 # CONFIG_CRYPTO_GF128MUL is not set
2495 2499 # CONFIG_CRYPTO_NULL is not set
2496 2500 CONFIG_CRYPTO_WORKQUEUE=y
2497 2501 # CONFIG_CRYPTO_CRYPTD is not set
2498 2502 # CONFIG_CRYPTO_AUTHENC is not set
2499   -# CONFIG_CRYPTO_TEST is not set
  2503 +CONFIG_CRYPTO_TEST=m
2500 2504  
2501 2505 #
2502 2506 # Authenticated Encryption with Associated Data
2503 2507 #
2504 2508 # CONFIG_CRYPTO_CCM is not set
2505 2509 # CONFIG_CRYPTO_GCM is not set
2506   -# CONFIG_CRYPTO_SEQIV is not set
  2510 +CONFIG_CRYPTO_SEQIV=y
2507 2511  
2508 2512 #
2509 2513 # Block modes
2510 2514 #
2511   -# CONFIG_CRYPTO_CBC is not set
2512   -# CONFIG_CRYPTO_CTR is not set
  2515 +CONFIG_CRYPTO_CBC=y
  2516 +CONFIG_CRYPTO_CTR=y
2513 2517 # CONFIG_CRYPTO_CTS is not set
2514 2518 CONFIG_CRYPTO_ECB=y
2515 2519 # CONFIG_CRYPTO_LRW is not set
... ... @@ -2519,7 +2523,7 @@
2519 2523 #
2520 2524 # Hash modes
2521 2525 #
2522   -# CONFIG_CRYPTO_HMAC is not set
  2526 +CONFIG_CRYPTO_HMAC=y
2523 2527 # CONFIG_CRYPTO_XCBC is not set
2524 2528 # CONFIG_CRYPTO_VMAC is not set
2525 2529  
2526 2530  
... ... @@ -2529,14 +2533,14 @@
2529 2533 CONFIG_CRYPTO_CRC32C=y
2530 2534 # CONFIG_CRYPTO_GHASH is not set
2531 2535 # CONFIG_CRYPTO_MD4 is not set
2532   -# CONFIG_CRYPTO_MD5 is not set
  2536 +CONFIG_CRYPTO_MD5=y
2533 2537 CONFIG_CRYPTO_MICHAEL_MIC=y
2534 2538 # CONFIG_CRYPTO_RMD128 is not set
2535 2539 # CONFIG_CRYPTO_RMD160 is not set
2536 2540 # CONFIG_CRYPTO_RMD256 is not set
2537 2541 # CONFIG_CRYPTO_RMD320 is not set
2538   -# CONFIG_CRYPTO_SHA1 is not set
2539   -# CONFIG_CRYPTO_SHA256 is not set
  2542 +CONFIG_CRYPTO_SHA1=y
  2543 +CONFIG_CRYPTO_SHA256=y
2540 2544 # CONFIG_CRYPTO_SHA512 is not set
2541 2545 # CONFIG_CRYPTO_TGR192 is not set
2542 2546 # CONFIG_CRYPTO_WP512 is not set
... ... @@ -2551,7 +2555,7 @@
2551 2555 # CONFIG_CRYPTO_CAMELLIA is not set
2552 2556 # CONFIG_CRYPTO_CAST5 is not set
2553 2557 # CONFIG_CRYPTO_CAST6 is not set
2554   -# CONFIG_CRYPTO_DES is not set
  2558 +CONFIG_CRYPTO_DES=y
2555 2559 # CONFIG_CRYPTO_FCRYPT is not set
2556 2560 # CONFIG_CRYPTO_KHAZAD is not set
2557 2561 # CONFIG_CRYPTO_SALSA20 is not set
... ... @@ -2573,7 +2577,19 @@
2573 2577 # CONFIG_CRYPTO_ANSI_CPRNG is not set
2574 2578 # CONFIG_CRYPTO_USER_API_HASH is not set
2575 2579 # CONFIG_CRYPTO_USER_API_SKCIPHER is not set
2576   -# CONFIG_CRYPTO_HW is not set
  2580 +CONFIG_CRYPTO_HW=y
  2581 +CONFIG_CRYPTO_DEV_OMAP4_AES=y
  2582 +CONFIG_CRYPTO_DEV_OMAP4_SHAM=y
  2583 +
  2584 +#
  2585 +# OCF Configuration
  2586 +#
  2587 +CONFIG_OCF_OCF=y
  2588 +# CONFIG_OCF_RANDOMHARVEST is not set
  2589 +CONFIG_OCF_CRYPTODEV=y
  2590 +CONFIG_OCF_CRYPTOSOFT=y
  2591 +# CONFIG_OCF_OCFNULL is not set
  2592 +# CONFIG_OCF_BENCH is not set
2577 2593 # CONFIG_BINARY_PRINTF is not set
2578 2594  
2579 2595 #