[v5,0/3] WaRP7 unify secure and non-secure defconfigs

Message ID 20180424174432.11757-1-bryan.odonoghue@linaro.org
Headers show
Series
  • WaRP7 unify secure and non-secure defconfigs
Related show

Message

Bryan O'Donoghue April 24, 2018, 5:44 p.m.
This tree here is pullable

http://git.linaro.org/landing-teams/working/mbl/u-boot.git/log/?h=linaro-mbl%2bbod-nouart

v5:
- Fixes broken merge conflict missed in last patch resend

V4:
- Adds Tested-by/Reviewed-by from Beno and Fabio as indicated
  for my patches

- Resends Pierre-Jean's patch
  Since my parallel patchset relies on this patch I'm sending it again with
  my own series to make sure it doesn't get lost.
  To Pierre-Jean's patch I've added
  - Reviewed-by as Fabio indicated
  - Signed-off-by from me too

V3:
- Remove warp7_secure_defconfig from board/warp7/MAINTAINERS
- Add RB-tag from Fabio as indicated

V2:
Maintaining a secure and non-secure defconfig is a PITA. Having discussed
an observed bug with the non-secure boot-path with Fabio and undertaken to
ensure both upstream and NXP BSP kernels would work - this patchset does
two things.

1. Switches on CONFIG_ARMV7_BOOT_SEC_DEFAULT for warp7_defconfig
2. Removes warp7_secure_defconfig in its entirety

I have an upcoming set of patches that uses the secure defconfig which I've
already verified can simply be merged into mainline WaRP7 as-is so, in this
context there appears to be no justification for keeping separate
configuration files.

Fix the bug and zap the fat !

Bryan O'Donoghue (2):
  warp7: defconfig: Fix CAAM on boot with tip-of-tree
  warp7: secure_defconfig: Remove secure_defconfig

Pierre-Jean TEXIER (1):
  warp7: configs: enable CONFIG_CMD_FS_GENERIC

 board/warp7/MAINTAINERS        |  1 -
 configs/warp7_defconfig        |  2 ++
 configs/warp7_secure_defconfig | 43 ----------------------------------
 3 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 configs/warp7_secure_defconfig