diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-15 17:47:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-15 17:47:28 -0500 |
| commit | 0dc526d98eb216003ea884739abc17f6eb05c0df (patch) | |
| tree | 918155725e45773124d7b61cb61f6a78e3d8845d /board/hisilicon/poplar | |
| parent | 8fc26fce41592175ae004514e431e68a9dd60671 (diff) | |
| parent | de5bab9c59807b109f89a39855c9eacfe4d08822 (diff) | |
Merge branch '2018-12-15-master-imports'
- Introduce tools-only build for host tools
- Bugfixes to poplar, syscon and the hashtable, a tee return code
- Fix a warning on gcc-8 by reworking part of mtk_image to be not unsafe
wrt strings.
- serial_stm32 reset support
Diffstat (limited to 'board/hisilicon/poplar')
| -rw-r--r-- | board/hisilicon/poplar/MAINTAINERS | 1 | ||||
| -rw-r--r-- | board/hisilicon/poplar/poplar.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/board/hisilicon/poplar/MAINTAINERS b/board/hisilicon/poplar/MAINTAINERS index 0cc01c8321..622e5cb18e 100644 --- a/board/hisilicon/poplar/MAINTAINERS +++ b/board/hisilicon/poplar/MAINTAINERS @@ -1,5 +1,6 @@ Poplar BOARD M: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> +M: Shawn Guo <shawn.guo@linaro.org> S: Maintained F: board/hisilicon/poplar F: include/configs/poplar.h diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c index 9e8eac7838..8adc750962 100644 --- a/board/hisilicon/poplar/poplar.c +++ b/board/hisilicon/poplar/poplar.c @@ -35,6 +35,7 @@ static struct mm_region poplar_mem_map[] = { struct mm_region *mem_map = poplar_mem_map; +#if !CONFIG_IS_ENABLED(OF_CONTROL) static const struct pl01x_serial_platdata serial_platdata = { .base = REG_BASE_UART0, .type = TYPE_PL010, @@ -45,6 +46,7 @@ U_BOOT_DEVICE(poplar_serial) = { .name = "serial_pl01x", .platdata = &serial_platdata, }; +#endif int checkboard(void) { |