Merge "add PN54x chip selection" am: 8c3bbf44cb
am: f644e0182e

* commit 'f644e0182e68dd9488594e729408a71dad330f72':
  add PN54x chip selection