diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-11 10:38:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-11 10:38:21 -0500 |
| commit | b16f6804b4378c6d2f6b05ece0d3ae1c36ac4308 (patch) | |
| tree | 741f5604aeb9edc636cdf36f62bed3d83e004f08 /board | |
| parent | f1cc97764be4383d2aeb56d5ba5415439a1d5c97 (diff) | |
| parent | 6f2797645562e85c407aab3e9a757bfd61a027fe (diff) | |
| download | u-boot-imx-b16f6804b4378c6d2f6b05ece0d3ae1c36ac4308.zip u-boot-imx-b16f6804b4378c6d2f6b05ece0d3ae1c36ac4308.tar.gz u-boot-imx-b16f6804b4378c6d2f6b05ece0d3ae1c36ac4308.tar.bz2 | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'board')
| -rw-r--r-- | board/google/veyron/MAINTAINERS | 4 | ||||
| -rw-r--r-- | board/rockchip/miniarm_rk3288/MAINTAINERS | 6 | ||||
| -rw-r--r-- | board/rockchip/tinker_rk3288/Kconfig (renamed from board/rockchip/miniarm_rk3288/Kconfig) | 6 | ||||
| -rw-r--r-- | board/rockchip/tinker_rk3288/MAINTAINERS | 6 | ||||
| -rw-r--r-- | board/rockchip/tinker_rk3288/Makefile (renamed from board/rockchip/miniarm_rk3288/Makefile) | 2 | ||||
| -rw-r--r-- | board/rockchip/tinker_rk3288/tinker-rk3288.c (renamed from board/rockchip/miniarm_rk3288/miniarm-rk3288.c) | 0 |
6 files changed, 12 insertions, 12 deletions
diff --git a/board/google/veyron/MAINTAINERS b/board/google/veyron/MAINTAINERS index d582cb0..246a3e3 100644 --- a/board/google/veyron/MAINTAINERS +++ b/board/google/veyron/MAINTAINERS @@ -12,9 +12,9 @@ F: board/google/veyron/ F: include/configs/veyron.h F: configs/chromebit_mickey_defconfig -CHROMEBIT MINNIE BOARD +CHROMEBOOK MINNIE BOARD M: Simon Glass <sjg@chromium.org> S: Maintained F: board/google/veyron/ F: include/configs/veyron.h -F: configs/chromebit_minnie_defconfig +F: configs/chromebook_minnie_defconfig diff --git a/board/rockchip/miniarm_rk3288/MAINTAINERS b/board/rockchip/miniarm_rk3288/MAINTAINERS deleted file mode 100644 index 7537b8f..0000000 --- a/board/rockchip/miniarm_rk3288/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -MINIARM-RK3288 -M: Lin Huang <hl@rock-chips.com> -S: Maintained -F: board/rockchip/miniarm_rk3288 -F: include/configs/miniarm_rk3288.h -F: configs/miniarm-rk3288_defconfig diff --git a/board/rockchip/miniarm_rk3288/Kconfig b/board/rockchip/tinker_rk3288/Kconfig index 529c09f..bca6c37 100644 --- a/board/rockchip/miniarm_rk3288/Kconfig +++ b/board/rockchip/tinker_rk3288/Kconfig @@ -1,13 +1,13 @@ -if TARGET_MINIARM_RK3288 +if TARGET_TINKER_RK3288 config SYS_BOARD - default "miniarm_rk3288" + default "tinker_rk3288" config SYS_VENDOR default "rockchip" config SYS_CONFIG_NAME - default "miniarm_rk3288" + default "tinker_rk3288" config BOARD_SPECIFIC_OPTIONS # dummy def_bool y diff --git a/board/rockchip/tinker_rk3288/MAINTAINERS b/board/rockchip/tinker_rk3288/MAINTAINERS new file mode 100644 index 0000000..cddceaf --- /dev/null +++ b/board/rockchip/tinker_rk3288/MAINTAINERS @@ -0,0 +1,6 @@ +TINKER-RK3288 +M: Lin Huang <hl@rock-chips.com> +S: Maintained +F: board/rockchip/tinker_rk3288 +F: include/configs/tinker_rk3288.h +F: configs/tinker-rk3288_defconfig diff --git a/board/rockchip/miniarm_rk3288/Makefile b/board/rockchip/tinker_rk3288/Makefile index 9419b91..432367f 100644 --- a/board/rockchip/miniarm_rk3288/Makefile +++ b/board/rockchip/tinker_rk3288/Makefile @@ -4,4 +4,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += miniarm-rk3288.o +obj-y += tinker-rk3288.o diff --git a/board/rockchip/miniarm_rk3288/miniarm-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c index 79541a3..79541a3 100644 --- a/board/rockchip/miniarm_rk3288/miniarm-rk3288.c +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c |