Re: [U-Boot] [PATCH] board: move all the rockchip board in one folder
Hi Kever, On 10 July 2016 at 21:14, Kever Yangwrote: > Hi Simon, > > > On 07/09/2016 10:38 PM, Simon Glass wrote: > > Hi Kevin, > > On 7 July 2016 at 21:49, Eddie Cai wrote: > > 2016-07-08 11:30 GMT+08:00 Kever Yang : > > 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 > > Reviewed-by: Eddie Cai > > --- > 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 > > Did you use patman for these? I think it should show these as renames > rather than delete/add deltas. > > Sorry, I didn't use the patman, I use git format-patch and get send-email > instead, > I will re-send this patch again with patman. > > BTW, I get below error when I use patman, I have no idea about where I need > to define the 'board' node. > > Cleaned 1 patches > Traceback (most recent call last): > File "./tools/patman/patman", line 159, in > options.add_maintainers) > File "u-boot/tools/patman/series.py", line 225, in MakeCcFile > raise_on_error=raise_on_error) > File "u-boot/tools/patman/gitutil.py", line 326, in BuildEmailList > raw += LookupEmail(item, alias, raise_on_error=raise_on_error) > File "u-boot/tools/patman/gitutil.py", line 500, in LookupEmail > raise ValueError, msg > ValueError: Alias 'board' not found Please see 'Where Patches Are Sent' are sent in the README which talks about tags. If you want to skip this error, please add the -t flag. You are providing a 'board:' tag and there is no such alias. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] board: move all the rockchip board in one folder
Hi Simon, On 07/09/2016 10:38 PM, Simon Glass wrote: Hi Kevin, On 7 July 2016 at 21:49, Eddie Caiwrote: 2016-07-08 11:30 GMT+08:00 Kever Yang : 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 Reviewed-by: Eddie Cai --- 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 Did you use patman for these? I think it should show these as renames rather than delete/add deltas. Sorry, I didn't use the patman, I use git format-patch and get send-email instead, I will re-send this patch again with patman. BTW, I get below error when I use patman, I have no idea about where I need to define the 'board' node. Cleaned 1 patches Traceback (most recent call last): File "./tools/patman/patman", line 159, in options.add_maintainers) File "u-boot/tools/patman/series.py", line 225, in MakeCcFile raise_on_error=raise_on_error) File "u-boot/tools/patman/gitutil.py", line 326, in BuildEmailList raw += LookupEmail(item, alias, raise_on_error=raise_on_error) File "u-boot/tools/patman/gitutil.py", line 500, in LookupEmail raise ValueError, msg ValueError: Alias 'board' not found Thanks, - Kever Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] board: move all the rockchip board in one folder
On 7 July 2016 at 21:53, Ziyuan Xuwrote: > > > 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 >> [snip] >> 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/ ? > Better as a separate patch I think. I can apply them in the right order / fix things up. [snip] ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] board: move all the rockchip board in one folder
Hi Kevin, On 7 July 2016 at 21:49, Eddie Caiwrote: > 2016-07-08 11:30 GMT+08:00 Kever Yang : >> 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 > Reviewed-by: Eddie Cai >> --- >> 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 Did you use patman for these? I think it should show these as renames rather than delete/add deltas. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] board: move all the rockchip board in one folder
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..000 --- 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..000 diff --git a/board/evb_rk3036/evb_rk3036/Makefile b/board/evb_rk3036/evb_rk3036/Makefile deleted file mode 100644 index 0403836..000 --- 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..000 --- 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..000 --- a/board/kylin/kylin_rk3036/Kconfig +++ /dev/null @@ -1,15 +0,0
Re: [U-Boot] [PATCH] board: move all the rockchip board in one folder
2016-07-08 11:30 GMT+08:00 Kever Yang: > 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 Reviewed-by: Eddie Cai > --- > 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..000 > --- 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..000 > diff --git a/board/evb_rk3036/evb_rk3036/Makefile > b/board/evb_rk3036/evb_rk3036/Makefile > deleted file mode 100644 > index 0403836..000 > --- 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..000 > --- 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
[U-Boot] [PATCH] board: move all the rockchip board in one folder
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..000 --- 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..000 diff --git a/board/evb_rk3036/evb_rk3036/Makefile b/board/evb_rk3036/evb_rk3036/Makefile deleted file mode 100644 index 0403836..000 --- 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..000 --- 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..000 --- a/board/kylin/kylin_rk3036/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_KYLIN_RK3036 - -config SYS_BOARD - default "kylin_rk3036" -