From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pg0-x234.google.com ([2607:f8b0:400e:c05::234]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJ2c2-0001TW-RW for barebox@lists.infradead.org; Wed, 16 May 2018 20:01:28 +0000 Received: by mail-pg0-x234.google.com with SMTP id c22-v6so79061pgn.11 for ; Wed, 16 May 2018 13:01:16 -0700 (PDT) From: Andrey Smirnov Date: Wed, 16 May 2018 13:00:16 -0700 Message-Id: <20180516200036.29829-9-andrew.smirnov@gmail.com> In-Reply-To: <20180516200036.29829-1-andrew.smirnov@gmail.com> References: <20180516200036.29829-1-andrew.smirnov@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH v2 08/28] sizes.h: Sync with Linux 4.16 To: barebox@lists.infradead.org Cc: Andrey Smirnov Sync with Linux 4.16 to get SZ_4G. Signed-off-by: Andrey Smirnov --- arch/arm/boards/phytec-som-imx6/lowlevel.c | 1 + include/linux/sizes.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/arch/arm/boards/phytec-som-imx6/lowlevel.c b/arch/arm/boards/phytec-som-imx6/lowlevel.c index f9d70c745..05f918f6c 100644 --- a/arch/arm/boards/phytec-som-imx6/lowlevel.c +++ b/arch/arm/boards/phytec-som-imx6/lowlevel.c @@ -38,6 +38,7 @@ static inline void setup_uart(void) putc_ll('>'); } +#undef SZ_4G #define SZ_4G 0xEFFFFFF8 BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_128M, IMD_TYPE_PARAMETER, "memsize=128", 0); diff --git a/include/linux/sizes.h b/include/linux/sizes.h index ce3e8150c..fbde0bc7e 100644 --- a/include/linux/sizes.h +++ b/include/linux/sizes.h @@ -8,6 +8,8 @@ #ifndef __LINUX_SIZES_H__ #define __LINUX_SIZES_H__ +#include + #define SZ_1 0x00000001 #define SZ_2 0x00000002 #define SZ_4 0x00000004 @@ -44,4 +46,6 @@ #define SZ_1G 0x40000000 #define SZ_2G 0x80000000 +#define SZ_4G _AC(0x100000000, ULL) + #endif /* __LINUX_SIZES_H__ */ -- 2.17.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox