On Wed, 29 May 2019 at 15:06, Leif Lindholm <leif.lindh...@linaro.org> wrote: > > On Wed, May 29, 2019 at 02:50:19PM +0200, Ard Biesheuvel wrote: > > As opposed to the Secure96's I2C peripherals, whose bus addresses are > > properties of the peripherals themselves, the SPI CS address of the > > TPM is a property of the platform that incorporates the LS connector. > > > > So tweak the macros that emit the CS values and related properties > > to put it under the control of the platform that incorporates the > > driver. > > > > Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> > > --- > > Platform/96Boards/Secure96Dxe/Secure96.dts | 2 +- > > Platform/96Boards/Secure96Dxe/Secure96.h | 11 ++++++++--- > > 2 files changed, 9 insertions(+), 4 deletions(-) > > > > diff --git a/Platform/96Boards/Secure96Dxe/Secure96.dts > > b/Platform/96Boards/Secure96Dxe/Secure96.dts > > index d066fcb1933c..0d7d9b3900a4 100644 > > --- a/Platform/96Boards/Secure96Dxe/Secure96.dts > > +++ b/Platform/96Boards/Secure96Dxe/Secure96.dts > > @@ -39,7 +39,7 @@ > > __overlay__ { > > INFINEON_SLB9670_DT_NODENAME { > > compatible = "infineon,slb9670"; > > - reg = <INFINEON_SLB9670_SPI_CS>; > > + reg = <SECURE96_SPI0_CS>; > > spi-max-frequency = <22500000>; > > }; > > }; > > diff --git a/Platform/96Boards/Secure96Dxe/Secure96.h > > b/Platform/96Boards/Secure96Dxe/Secure96.h > > index c34fc5eea046..1d8bf4159209 100644 > > --- a/Platform/96Boards/Secure96Dxe/Secure96.h > > +++ b/Platform/96Boards/Secure96Dxe/Secure96.h > > @@ -1,6 +1,6 @@ > > /** @file > > > > - Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR> > > + Copyright (c) 2018-2019, Linaro, Ltd. All rights reserved.<BR> > > > > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > > @@ -8,14 +8,19 @@ > > #ifndef _SECURE96_H_ > > #define _SECURE96_H_ > > > > +#define __CONCAT(a,b) a ## b > > + > > Urgh. We badly need to properly add some official macros for this. > You could possibly use __CONCATENATE from Base.h. >
OK, I'll use that instead. > For new macros, we really should avoid leading _. > True. -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#41614): https://edk2.groups.io/g/devel/message/41614 Mute This Topic: https://groups.io/mt/31833223/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-