From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukasz Majewski Date: Sat, 6 Feb 2021 16:23:14 +0100 Subject: [RESEND PATCH 15/16] Nokia RX-51: Move content of rx51.h to rx51.c In-Reply-To: <20210205191212.7644-16-pali@kernel.org> References: <20210205191212.7644-1-pali@kernel.org> <20210205191212.7644-16-pali@kernel.org> Message-ID: <20210206162314.40f59089@jawa> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Fri, 5 Feb 2021 20:12:11 +0100 Pali Roh?r wrote: > After removal of MUX configuration there is no need to have extra > rx51.h. > > Signed-off-by: Pali Roh?r > --- > board/nokia/rx51/rx51.c | 17 ++++++++++++++++- > board/nokia/rx51/rx51.h | 31 ------------------------------- > 2 files changed, 16 insertions(+), 32 deletions(-) > delete mode 100644 board/nokia/rx51/rx51.h > > diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c > index cb72ffaaa9..0597a94faa 100644 > --- a/board/nokia/rx51/rx51.c > +++ b/board/nokia/rx51/rx51.c > @@ -39,9 +39,24 @@ > #include > #include > > -#include "rx51.h" > #include "tag_omap.h" > > +/* Needed for ROM SMC call */ > +struct emu_hal_params_rx51 { > + u32 num_params; > + u32 param1; > + u32 param2; > + u32 param3; > + u32 param4; > +}; > + > +#define ONENAND_GPMC_CONFIG1_RX51 0xfb001202 > +#define ONENAND_GPMC_CONFIG2_RX51 0x00111100 > +#define ONENAND_GPMC_CONFIG3_RX51 0x00020200 > +#define ONENAND_GPMC_CONFIG4_RX51 0x11001102 > +#define ONENAND_GPMC_CONFIG5_RX51 0x03101616 > +#define ONENAND_GPMC_CONFIG6_RX51 0x90060000 > + > DECLARE_GLOBAL_DATA_PTR; > > GraphicDevice gdev; > diff --git a/board/nokia/rx51/rx51.h b/board/nokia/rx51/rx51.h > deleted file mode 100644 > index 0eddb06219..0000000000 > --- a/board/nokia/rx51/rx51.h > +++ /dev/null > @@ -1,31 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * (C) Copyright 2012 > - * ?????? ???????? > - * > - * (C) Copyright 2011-2012 > - * Pali Roh?r > - * > - * (C) Copyright 2008 > - * Dirk Behme > - */ > -#ifndef _RX51_H_ > -#define _RX51_H_ > - > -/* Needed for ROM SMC call */ > -struct emu_hal_params_rx51 { > - u32 num_params; > - u32 param1; > - u32 param2; > - u32 param3; > - u32 param4; > -}; > - > -#define ONENAND_GPMC_CONFIG1_RX51 0xfb001202 > -#define ONENAND_GPMC_CONFIG2_RX51 0x00111100 > -#define ONENAND_GPMC_CONFIG3_RX51 0x00020200 > -#define ONENAND_GPMC_CONFIG4_RX51 0x11001102 > -#define ONENAND_GPMC_CONFIG5_RX51 0x03101616 > -#define ONENAND_GPMC_CONFIG6_RX51 0x90060000 > - > -#endif Reviewed-by: Lukasz Majewski Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: