From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ziyuan Xu Date: Fri, 08 Jul 2016 11:53:25 +0800 Subject: [U-Boot] [PATCH] board: move all the rockchip board in one folder In-Reply-To: <1467948658-18267-1-git-send-email-kever.yang@rock-chips.com> References: <1467948658-18267-1-git-send-email-kever.yang@rock-chips.com> Message-ID: <577F23B5.10401@rock-chips.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 2016?07?08? 11:30, Kever Yang wrote: > The 'evb_rk3036' and 'kylin' is not a vendor name, let's replace them > to 'rockchip' which is a real _vendor_ name, and meet the architecure > 'board///'. > > More boards from rockchip like evb_rk3288, evb_rk3399 will comes later. > > Signed-off-by: Kever Yang > --- > arch/arm/mach-rockchip/rk3036/Kconfig | 4 +- > board/evb_rk3036/evb_rk3036/Kconfig | 15 ------ > board/evb_rk3036/evb_rk3036/MAINTAINERS | 0 > board/evb_rk3036/evb_rk3036/Makefile | 7 --- > board/evb_rk3036/evb_rk3036/evb_rk3036.c | 49 ------------------ > board/kylin/kylin_rk3036/Kconfig | 15 ------ > board/kylin/kylin_rk3036/MAINTAINERS | 0 > board/kylin/kylin_rk3036/Makefile | 7 --- > board/kylin/kylin_rk3036/kylin_rk3036.c | 81 ------------------------------ > board/rockchip/evb_rk3036/Kconfig | 15 ++++++ > board/rockchip/evb_rk3036/MAINTAINERS | 0 > board/rockchip/evb_rk3036/Makefile | 7 +++ > board/rockchip/evb_rk3036/evb_rk3036.c | 49 ++++++++++++++++++ > board/rockchip/kylin_rk3036/Kconfig | 15 ++++++ > board/rockchip/kylin_rk3036/MAINTAINERS | 0 > board/rockchip/kylin_rk3036/Makefile | 7 +++ > board/rockchip/kylin_rk3036/kylin_rk3036.c | 81 ++++++++++++++++++++++++++++++ > 17 files changed, 176 insertions(+), 176 deletions(-) > delete mode 100644 board/evb_rk3036/evb_rk3036/Kconfig > delete mode 100644 board/evb_rk3036/evb_rk3036/MAINTAINERS > delete mode 100644 board/evb_rk3036/evb_rk3036/Makefile > delete mode 100644 board/evb_rk3036/evb_rk3036/evb_rk3036.c > delete mode 100644 board/kylin/kylin_rk3036/Kconfig > delete mode 100644 board/kylin/kylin_rk3036/MAINTAINERS > delete mode 100644 board/kylin/kylin_rk3036/Makefile > delete mode 100644 board/kylin/kylin_rk3036/kylin_rk3036.c > create mode 100644 board/rockchip/evb_rk3036/Kconfig > create mode 100644 board/rockchip/evb_rk3036/MAINTAINERS > create mode 100644 board/rockchip/evb_rk3036/Makefile > create mode 100644 board/rockchip/evb_rk3036/evb_rk3036.c > create mode 100644 board/rockchip/kylin_rk3036/Kconfig > create mode 100644 board/rockchip/kylin_rk3036/MAINTAINERS > create mode 100644 board/rockchip/kylin_rk3036/Makefile > create mode 100644 board/rockchip/kylin_rk3036/kylin_rk3036.c > > diff --git a/arch/arm/mach-rockchip/rk3036/Kconfig b/arch/arm/mach-rockchip/rk3036/Kconfig > index cc03808..f7562bd 100644 > --- a/arch/arm/mach-rockchip/rk3036/Kconfig > +++ b/arch/arm/mach-rockchip/rk3036/Kconfig > @@ -15,7 +15,7 @@ config SYS_MALLOC_F_LEN > config ROCKCHIP_COMMON > bool "Support rk common fuction" > > -source "board/evb_rk3036/evb_rk3036/Kconfig" > -source "board/kylin/kylin_rk3036/Kconfig" > +source "board/rockchip/evb_rk3036/Kconfig" > +source "board/rockchip/kylin_rk3036/Kconfig" > > endif > diff --git a/board/evb_rk3036/evb_rk3036/Kconfig b/board/evb_rk3036/evb_rk3036/Kconfig > deleted file mode 100644 > index ae2a9eb..0000000 > --- a/board/evb_rk3036/evb_rk3036/Kconfig > +++ /dev/null > @@ -1,15 +0,0 @@ > -if TARGET_EVB_RK3036 > - > -config SYS_BOARD > - default "evb_rk3036" > - > -config SYS_VENDOR > - default "evb_rk3036" > - > -config SYS_CONFIG_NAME > - default "evb_rk3036" > - > -config BOARD_SPECIFIC_OPTIONS # dummy > - def_bool y > - > -endif > diff --git a/board/evb_rk3036/evb_rk3036/MAINTAINERS b/board/evb_rk3036/evb_rk3036/MAINTAINERS > deleted file mode 100644 > index e69de29..0000000 > diff --git a/board/evb_rk3036/evb_rk3036/Makefile b/board/evb_rk3036/evb_rk3036/Makefile > deleted file mode 100644 > index 0403836..0000000 > --- a/board/evb_rk3036/evb_rk3036/Makefile > +++ /dev/null > @@ -1,7 +0,0 @@ > -# > -# (C) Copyright 2015 Google, Inc > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -obj-y += evb_rk3036.o > diff --git a/board/evb_rk3036/evb_rk3036/evb_rk3036.c b/board/evb_rk3036/evb_rk3036/evb_rk3036.c > deleted file mode 100644 > index f5758b1..0000000 > --- a/board/evb_rk3036/evb_rk3036/evb_rk3036.c > +++ /dev/null > @@ -1,49 +0,0 @@ > -/* > - * (C) Copyright 2015 Rockchip Electronics Co., Ltd > - * > - * SPDX-License-Identifier: GPL-2.0+ > - */ > - > -#include > -#include > -#include > -#include > -#include > - > -DECLARE_GLOBAL_DATA_PTR; > - > -void get_ddr_config(struct rk3036_ddr_config *config) > -{ > - /* K4B4G1646Q config */ > - config->ddr_type = 3; > - config->rank = 2; > - config->cs0_row = 15; > - config->cs1_row = 15; > - > - /* 8bank */ > - config->bank = 3; > - config->col = 10; > - > - /* 16bit bw */ > - config->bw = 1; > -} > - > -int board_init(void) > -{ > - return 0; > -} > - > -int dram_init(void) > -{ > - gd->ram_size = sdram_size(); > - > - return 0; > -} > - > -#ifndef CONFIG_SYS_DCACHE_OFF > -void enable_caches(void) > -{ > - /* Enable D-cache. I-cache is already enabled in start.S */ > - dcache_enable(); > -} > -#endif > diff --git a/board/kylin/kylin_rk3036/Kconfig b/board/kylin/kylin_rk3036/Kconfig > deleted file mode 100644 > index 5d75c1f..0000000 > --- a/board/kylin/kylin_rk3036/Kconfig > +++ /dev/null > @@ -1,15 +0,0 @@ > -if TARGET_KYLIN_RK3036 > - > -config SYS_BOARD > - default "kylin_rk3036" > - > -config SYS_VENDOR > - default "kylin" > - > -config SYS_CONFIG_NAME > - default "kylin_rk3036" > - > -config BOARD_SPECIFIC_OPTIONS # dummy > - def_bool y > - > -endif > diff --git a/board/kylin/kylin_rk3036/MAINTAINERS b/board/kylin/kylin_rk3036/MAINTAINERS > deleted file mode 100644 > index e69de29..0000000 > diff --git a/board/kylin/kylin_rk3036/Makefile b/board/kylin/kylin_rk3036/Makefile > deleted file mode 100644 > index 0663270..0000000 > --- a/board/kylin/kylin_rk3036/Makefile > +++ /dev/null > @@ -1,7 +0,0 @@ > -# > -# (C) Copyright 2015 Google, Inc > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -obj-y += kylin_rk3036.o > diff --git a/board/kylin/kylin_rk3036/kylin_rk3036.c b/board/kylin/kylin_rk3036/kylin_rk3036.c > deleted file mode 100644 > index 2a25871..0000000 > --- a/board/kylin/kylin_rk3036/kylin_rk3036.c > +++ /dev/null > @@ -1,81 +0,0 @@ > -/* > - * (C) Copyright 2015 Rockchip Electronics Co., Ltd > - * > - * SPDX-License-Identifier: GPL-2.0+ > - */ > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -DECLARE_GLOBAL_DATA_PTR; > - > -#define GRF_BASE 0x20008000 > - > -void get_ddr_config(struct rk3036_ddr_config *config) > -{ > - /* K4B4G1646Q config */ > - config->ddr_type = 3; > - config->rank = 1; > - config->cs0_row = 15; > - config->cs1_row = 15; > - > - /* 8bank */ > - config->bank = 3; > - config->col = 10; > - > - /* 16bit bw */ > - config->bw = 1; > -} > - > -#define FASTBOOT_KEY_GPIO 93 > - > -int fastboot_key_pressed(void) > -{ > - gpio_request(FASTBOOT_KEY_GPIO, "fastboot_key"); > - gpio_direction_input(FASTBOOT_KEY_GPIO); > - return !gpio_get_value(FASTBOOT_KEY_GPIO); > -} > - > -#define ROCKCHIP_BOOT_MODE_FASTBOOT 0x5242C309 > - > -int board_late_init(void) > -{ > - struct rk3036_grf * const grf = (void *)GRF_BASE; > - int boot_mode = readl(&grf->os_reg[4]); > - > - /* Clear boot mode */ > - writel(0, &grf->os_reg[4]); > - > - if (boot_mode == ROCKCHIP_BOOT_MODE_FASTBOOT || > - fastboot_key_pressed()) { > - printf("enter fastboot!\n"); > - setenv("preboot", "setenv preboot; fastboot usb0"); > - } > - > - return 0; > -} > - > -int board_init(void) > -{ > - return 0; > -} > - > -int dram_init(void) > -{ > - gd->ram_size = sdram_size(); > - > - return 0; > -} > - > -#ifndef CONFIG_SYS_DCACHE_OFF > -void enable_caches(void) > -{ > - /* Enable D-cache. I-cache is already enabled in start.S */ > - dcache_enable(); > -} > -#endif > diff --git a/board/rockchip/evb_rk3036/Kconfig b/board/rockchip/evb_rk3036/Kconfig > new file mode 100644 > index 0000000..ef45f62 > --- /dev/null > +++ b/board/rockchip/evb_rk3036/Kconfig > @@ -0,0 +1,15 @@ > +if TARGET_EVB_RK3036 > + > +config SYS_BOARD > + default "evb_rk3036" > + > +config SYS_VENDOR > + default "rockchip" > + > +config SYS_CONFIG_NAME > + default "evb_rk3036" > + > +config BOARD_SPECIFIC_OPTIONS # dummy > + def_bool y > + > +endif > diff --git a/board/rockchip/evb_rk3036/MAINTAINERS b/board/rockchip/evb_rk3036/MAINTAINERS > new file mode 100644 Also merge Simon's commit https://patchwork.ozlabs.org/patch/634321/ ? > index 0000000..e69de29 > diff --git a/board/rockchip/evb_rk3036/Makefile b/board/rockchip/evb_rk3036/Makefile > new file mode 100644 > index 0000000..0403836 > --- /dev/null > +++ b/board/rockchip/evb_rk3036/Makefile > @@ -0,0 +1,7 @@ > +# > +# (C) Copyright 2015 Google, Inc > +# > +# SPDX-License-Identifier: GPL-2.0+ > +# > + > +obj-y += evb_rk3036.o > diff --git a/board/rockchip/evb_rk3036/evb_rk3036.c b/board/rockchip/evb_rk3036/evb_rk3036.c > new file mode 100644 > index 0000000..f5758b1 > --- /dev/null > +++ b/board/rockchip/evb_rk3036/evb_rk3036.c > @@ -0,0 +1,49 @@ > +/* > + * (C) Copyright 2015 Rockchip Electronics Co., Ltd > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +#include > +#include > +#include > +#include > +#include > + > +DECLARE_GLOBAL_DATA_PTR; > + > +void get_ddr_config(struct rk3036_ddr_config *config) > +{ > + /* K4B4G1646Q config */ > + config->ddr_type = 3; > + config->rank = 2; > + config->cs0_row = 15; > + config->cs1_row = 15; > + > + /* 8bank */ > + config->bank = 3; > + config->col = 10; > + > + /* 16bit bw */ > + config->bw = 1; > +} > + > +int board_init(void) > +{ > + return 0; > +} > + > +int dram_init(void) > +{ > + gd->ram_size = sdram_size(); > + > + return 0; > +} > + > +#ifndef CONFIG_SYS_DCACHE_OFF > +void enable_caches(void) > +{ > + /* Enable D-cache. I-cache is already enabled in start.S */ > + dcache_enable(); > +} > +#endif > diff --git a/board/rockchip/kylin_rk3036/Kconfig b/board/rockchip/kylin_rk3036/Kconfig > new file mode 100644 > index 0000000..8d35b4e > --- /dev/null > +++ b/board/rockchip/kylin_rk3036/Kconfig > @@ -0,0 +1,15 @@ > +if TARGET_KYLIN_RK3036 > + > +config SYS_BOARD > + default "kylin_rk3036" > + > +config SYS_VENDOR > + default "rockchip" > + > +config SYS_CONFIG_NAME > + default "kylin_rk3036" > + > +config BOARD_SPECIFIC_OPTIONS # dummy > + def_bool y > + > +endif > diff --git a/board/rockchip/kylin_rk3036/MAINTAINERS b/board/rockchip/kylin_rk3036/MAINTAINERS > new file mode 100644 > index 0000000..e69de29 > diff --git a/board/rockchip/kylin_rk3036/Makefile b/board/rockchip/kylin_rk3036/Makefile > new file mode 100644 > index 0000000..0663270 > --- /dev/null > +++ b/board/rockchip/kylin_rk3036/Makefile > @@ -0,0 +1,7 @@ > +# > +# (C) Copyright 2015 Google, Inc > +# > +# SPDX-License-Identifier: GPL-2.0+ > +# > + > +obj-y += kylin_rk3036.o > diff --git a/board/rockchip/kylin_rk3036/kylin_rk3036.c b/board/rockchip/kylin_rk3036/kylin_rk3036.c > new file mode 100644 > index 0000000..2a25871 > --- /dev/null > +++ b/board/rockchip/kylin_rk3036/kylin_rk3036.c > @@ -0,0 +1,81 @@ > +/* > + * (C) Copyright 2015 Rockchip Electronics Co., Ltd > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +DECLARE_GLOBAL_DATA_PTR; > + > +#define GRF_BASE 0x20008000 > + > +void get_ddr_config(struct rk3036_ddr_config *config) > +{ > + /* K4B4G1646Q config */ > + config->ddr_type = 3; > + config->rank = 1; > + config->cs0_row = 15; > + config->cs1_row = 15; > + > + /* 8bank */ > + config->bank = 3; > + config->col = 10; > + > + /* 16bit bw */ > + config->bw = 1; > +} > + > +#define FASTBOOT_KEY_GPIO 93 > + > +int fastboot_key_pressed(void) > +{ > + gpio_request(FASTBOOT_KEY_GPIO, "fastboot_key"); > + gpio_direction_input(FASTBOOT_KEY_GPIO); > + return !gpio_get_value(FASTBOOT_KEY_GPIO); > +} > + > +#define ROCKCHIP_BOOT_MODE_FASTBOOT 0x5242C309 > + > +int board_late_init(void) > +{ > + struct rk3036_grf * const grf = (void *)GRF_BASE; > + int boot_mode = readl(&grf->os_reg[4]); > + > + /* Clear boot mode */ > + writel(0, &grf->os_reg[4]); > + > + if (boot_mode == ROCKCHIP_BOOT_MODE_FASTBOOT || > + fastboot_key_pressed()) { > + printf("enter fastboot!\n"); > + setenv("preboot", "setenv preboot; fastboot usb0"); > + } > + > + return 0; > +} > + > +int board_init(void) > +{ > + return 0; > +} > + > +int dram_init(void) > +{ > + gd->ram_size = sdram_size(); > + > + return 0; > +} > + > +#ifndef CONFIG_SYS_DCACHE_OFF > +void enable_caches(void) > +{ > + /* Enable D-cache. I-cache is already enabled in start.S */ > + dcache_enable(); > +} > +#endif