Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b335e91bd1e92c685c4133671119fa37c4ab43cb

Authored by Baruch Siach
Committed by Stefan Roese
1 parent 6d4d9bea35
Exists in smarc_8mq_lf_v2020.04 and in 11 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

linux/sizes.h: sync from kernel 

The kernel added SZ_4G macro in commit f2b9ba871b (arm64/kernel: kaslr:
reduce module randomization range to 4 GB).

Include linux/const.h for the _AC macro.

Drop a local SZ_4G definition in tegra code.

Cc: Tom Warren <twarren@nvidia.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>

Showing 2 changed files with 5 additions and 2 deletions Side-by-side Diff

arch/arm/mach-tegra/tegra186/nvtboot_mem.c
Diff comments   View file @ b335e91
... ... @@ -6,10 +6,9 @@
6 6 #include <common.h>
7 7 #include <fdt_support.h>
8 8 #include <fdtdec.h>
  9 +#include <linux/sizes.h>
9 10 #include <asm/arch/tegra.h>
10 11 #include <asm/armv8/mmu.h>
11   -
12   -#define SZ_4G 0x100000000ULL
13 12  
14 13 /*
15 14 * Size of a region that's large enough to hold the relocated U-Boot and all
include/linux/sizes.h
Diff comments   View file @ b335e91
... ... @@ -8,6 +8,8 @@
8 8 #ifndef __LINUX_SIZES_H__
9 9 #define __LINUX_SIZES_H__
10 10  
  11 +#include <linux/const.h>
  12 +
11 13 #define SZ_1 0x00000001
12 14 #define SZ_2 0x00000002
13 15 #define SZ_4 0x00000004
... ... @@ -43,6 +45,8 @@
43 45  
44 46 #define SZ_1G 0x40000000
45 47 #define SZ_2G 0x80000000
  48 +
  49 +#define SZ_4G _AC(0x100000000, ULL)
46 50  
47 51 #endif /* __LINUX_SIZES_H__ */