From: jk.kernel@gmail.com Date: Tue, 26 Jul 2016 10:28:27 +0000 (+0800) Subject: rockchip: rk3288: move evb board to rockchip folder X-Git-Tag: v2016.09-rc2~154^2~2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cba6bb1b74133060207192fba55e650d5744ed39;p=oweals%2Fu-boot.git rockchip: rk3288: move evb board to rockchip folder The 'evb-rk3288' is not a vendor name, change it to 'rockchip' which is the real vendor name. Signed-off-by: Ziyuan Xu Acked-by: Simon Glass --- diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index 031dbfc061..67f29d2835 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -53,6 +53,6 @@ source "board/firefly/firefly-rk3288/Kconfig" source "board/radxa/rock2/Kconfig" -source "board/evb-rk3288/evb-rk3288/Kconfig" +source "board/rockchip/evb_rk3288/Kconfig" endif diff --git a/board/evb-rk3288/evb-rk3288/Kconfig b/board/evb-rk3288/evb-rk3288/Kconfig deleted file mode 100644 index b201acb983..0000000000 --- a/board/evb-rk3288/evb-rk3288/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_EVB_RK3288 - -config SYS_BOARD - default "evb-rk3288" - -config SYS_VENDOR - default "evb-rk3288" - -config SYS_CONFIG_NAME - default "evb-rk3288" - -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - -endif diff --git a/board/evb-rk3288/evb-rk3288/MAINTAINERS b/board/evb-rk3288/evb-rk3288/MAINTAINERS deleted file mode 100644 index 222c254c61..0000000000 --- a/board/evb-rk3288/evb-rk3288/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -EVB-RK3288 -M: Lin Huang -S: Maintained -F: board/evb-rk3288/evb-rk3288 -F: include/configs/evb-rk3288.h -F: configs/evb-rk3288_defconfig diff --git a/board/evb-rk3288/evb-rk3288/Makefile b/board/evb-rk3288/evb-rk3288/Makefile deleted file mode 100644 index c11b657601..0000000000 --- a/board/evb-rk3288/evb-rk3288/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2016 Rockchip Electronics Co., Ltd -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += evb-rk3288.o diff --git a/board/evb-rk3288/evb-rk3288/evb-rk3288.c b/board/evb-rk3288/evb-rk3288/evb-rk3288.c deleted file mode 100644 index a82f0ae283..0000000000 --- a/board/evb-rk3288/evb-rk3288/evb-rk3288.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include - -void board_boot_order(u32 *spl_boot_list) -{ - /* eMMC prior to sdcard. */ - spl_boot_list[0] = BOOT_DEVICE_MMC2; - spl_boot_list[1] = BOOT_DEVICE_MMC1; -} diff --git a/board/rockchip/evb_rk3288/Kconfig b/board/rockchip/evb_rk3288/Kconfig new file mode 100644 index 0000000000..8ab07f41fa --- /dev/null +++ b/board/rockchip/evb_rk3288/Kconfig @@ -0,0 +1,15 @@ +if TARGET_EVB_RK3288 + +config SYS_BOARD + default "evb_rk3288" + +config SYS_VENDOR + default "rockchip" + +config SYS_CONFIG_NAME + default "evb_rk3288" + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + +endif diff --git a/board/rockchip/evb_rk3288/MAINTAINERS b/board/rockchip/evb_rk3288/MAINTAINERS new file mode 100644 index 0000000000..8a4f127f88 --- /dev/null +++ b/board/rockchip/evb_rk3288/MAINTAINERS @@ -0,0 +1,6 @@ +EVB-RK3288 +M: Lin Huang +S: Maintained +F: board/rockchip/evb_rk3288 +F: include/configs/evb_rk3288.h +F: configs/evb-rk3288_defconfig diff --git a/board/rockchip/evb_rk3288/Makefile b/board/rockchip/evb_rk3288/Makefile new file mode 100644 index 0000000000..c11b657601 --- /dev/null +++ b/board/rockchip/evb_rk3288/Makefile @@ -0,0 +1,7 @@ +# +# (C) Copyright 2016 Rockchip Electronics Co., Ltd +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += evb-rk3288.o diff --git a/board/rockchip/evb_rk3288/evb-rk3288.c b/board/rockchip/evb_rk3288/evb-rk3288.c new file mode 100644 index 0000000000..a82f0ae283 --- /dev/null +++ b/board/rockchip/evb_rk3288/evb-rk3288.c @@ -0,0 +1,15 @@ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include + +void board_boot_order(u32 *spl_boot_list) +{ + /* eMMC prior to sdcard. */ + spl_boot_list[0] = BOOT_DEVICE_MMC2; + spl_boot_list[1] = BOOT_DEVICE_MMC1; +} diff --git a/include/configs/evb-rk3288.h b/include/configs/evb-rk3288.h deleted file mode 100644 index 342557fff3..0000000000 --- a/include/configs/evb-rk3288.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#define ROCKCHIP_DEVICE_SETTINGS -#include - -#define CONFIG_SPL_MMC_SUPPORT - -#define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 1 -/* SPL @ 32k for ~36k - * ENV @ 96k - * u-boot @ 128K - */ -#define CONFIG_ENV_OFFSET (96 * 1024) - -#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10 - -#endif diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h new file mode 100644 index 0000000000..342557fff3 --- /dev/null +++ b/include/configs/evb_rk3288.h @@ -0,0 +1,26 @@ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#define ROCKCHIP_DEVICE_SETTINGS +#include + +#define CONFIG_SPL_MMC_SUPPORT + +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_MMC_ENV_DEV 1 +/* SPL @ 32k for ~36k + * ENV @ 96k + * u-boot @ 128K + */ +#define CONFIG_ENV_OFFSET (96 * 1024) + +#define CONFIG_SYS_WHITE_ON_BLACK +#define CONFIG_CONSOLE_SCROLL_LINES 10 + +#endif