diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-17 18:18:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-17 18:18:15 -0500 |
| commit | 0ebf465d343868bf1080d540ab64de39bb927a09 (patch) | |
| tree | 0d7723140a0fb6e4bd81656a89296d85e6a36d24 /include | |
| parent | b9c9ce8a4064c8d88f714604db856cf1cd2b40b5 (diff) | |
| parent | 121cfe5a84d463893bd01da16417ab138f98666a (diff) | |
Merge tag 'dm-pull-17dec21' of https://source.denx.de/u-boot/custodians/u-boot-dm into next
binman support for ATF FIP
fdtgrep fixes for empty devicetree
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/edison.h | 3 | ||||
| -rw-r--r-- | include/configs/sandbox.h | 2 | ||||
| -rw-r--r-- | include/configs/x86-common.h | 2 | ||||
| -rw-r--r-- | include/fdt_region.h | 1 |
4 files changed, 1 insertions, 7 deletions
diff --git a/include/configs/edison.h b/include/configs/edison.h index 3ec35db4bc..02f33f3c29 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -14,9 +14,6 @@ #define CONFIG_SYS_MAXARGS 128 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -/* Memory */ -#define CONFIG_PHYSMEM - #define CONFIG_SYS_STACK_SIZE (32 * 1024) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 0458c72360..cd7d99ec69 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -14,8 +14,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ -#define CONFIG_PHYSMEM - /* Size of our emulated memory */ #define SB_CONCAT(x, y) x ## y #define SB_TO_UL(s) SB_CONCAT(s, UL) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index ca90902c71..a03913d5e7 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -14,8 +14,6 @@ * High Level Configuration Options * (easy to change) */ -#define CONFIG_PHYSMEM - #define CONFIG_SYS_BOOTM_LEN (16 << 20) /* SATA AHCI storage */ diff --git a/include/fdt_region.h b/include/fdt_region.h index ff7a1ccb9a..d0c68760f7 100644 --- a/include/fdt_region.h +++ b/include/fdt_region.h @@ -77,6 +77,7 @@ struct fdt_region_state { int max_regions; /* Maximum regions to find */ int can_merge; /* 1 if we can merge with previous region */ int start; /* Start position of current region */ + bool have_node; /* True if any node is included */ struct fdt_region_ptrs ptrs; /* Pointers for what we are up to */ }; |