diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:46 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:46 +0100 |
| commit | 86d711f394f0449f4420819d7df000fd5f2f769b (patch) | |
| tree | a81c0473d4b230a7686eac1a8a5f668762f5108a /include | |
| parent | 28e374e062aede65b6bb6f341376f196e5ac4fc7 (diff) | |
| parent | 55246d3136115b18133e6df8e90e0c2056893888 (diff) | |
| download | barebox-86d711f394f0449f4420819d7df000fd5f2f769b.tar.gz barebox-86d711f394f0449f4420819d7df000fd5f2f769b.tar.xz | |
Merge branch 'for-next/zynq'
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/barebox.lds.h | 3 | ||||
| -rw-r--r-- | include/bootsource.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/barebox.lds.h b/include/asm-generic/barebox.lds.h index b6ca8eb2be..68b78a13a9 100644 --- a/include/asm-generic/barebox.lds.h +++ b/include/asm-generic/barebox.lds.h @@ -7,8 +7,7 @@ #define STRUCT_ALIGN() . = ALIGN(STRUCT_ALIGNMENT) #if defined CONFIG_X86 || \ - defined CONFIG_ARCH_EP93XX || \ - defined CONFIG_ARCH_ZYNQ + defined CONFIG_ARCH_EP93XX #include <mach/barebox.lds.h> #endif diff --git a/include/bootsource.h b/include/bootsource.h index 29347aaeb0..92f7f27cd4 100644 --- a/include/bootsource.h +++ b/include/bootsource.h @@ -17,6 +17,7 @@ enum bootsource { BOOTSOURCE_USB, BOOTSOURCE_NET, BOOTSOURCE_CAN, + BOOTSOURCE_JTAG, }; #define BOOTSOURCE_INSTANCE_UNKNOWN -1 |