Add BananaPro support and rename Bananapi to BananaPi.

Signed-off-by: Tony Zhang <hitxfd.tony@gmail.com>
LeMaker · Oct 14, 2014 · bb5691c · bb5691c
1 parent 40090ef
commit bb5691c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_MARSBOARD_A20)	+= dram_sun4i_360_1024_iow16.o
 obj-$(CONFIG_CUBIEBOARD)	+= dram_cubieboard.o
 obj-$(CONFIG_CUBIEBOARD2)	+= dram_sun7i_480_1024_iow16.o
 obj-$(CONFIG_BANANAPI)		+= dram_sun7i_432_1024_iow16.o
+obj-$(CONFIG_BANANAPRO)         += dram_sun7i_432_1024_iow16.o
 obj-$(CONFIG_CUBIETRUCK)	+= dram_cubietruck.o
 obj-$(CONFIG_DNS_M82)		+= dram_sun4i_360_1024_iow16.o
 obj-$(CONFIG_EOMA68_A10)	+= dram_sun4i_360_1024_iow8.o

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
@@ -233,7 +233,7 @@ int misc_init_r(void)
 			eth_setenv_enetaddr("ethaddr", mac_addr);
 		}
 	}
-#ifdef CONFIG_BANANAPI
+#if defined(CONFIG_BANANAPI) || defined(CONFIG_BANANAPRO)
 	else {
 		unsigned char *p;
 		p = getenv("ethaddr");

diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
@@ -29,7 +29,7 @@ int sunxi_gmac_initialize(bd_t *bis)
 	 * Bananapi. We don't know what these undocumented bits do, so this
 	 * is a Bananapi specific hack for now.
 	 */
-#ifdef CONFIG_BANANAPI
+#if defined(CONFIG_BANANAPI) || defined(CONFIG_BANANAPRO)
 	setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10);
 #endif
 

diff --git a/boards.cfg b/boards.cfg
@@ -388,8 +388,10 @@ Active  arm         armv7          sunxi       -               sunxi
 Active  arm         armv7          sunxi       -               sunxi               Auxtek-T003                          sun5i:AUXTEK_T003,SPL,AXP152_POWER,STATUSLED=34                                                                                   -
 Active  arm         armv7          sunxi       -               sunxi               Auxtek-T004                          sun5i:AUXTEK_T004,SPL,AXP152_POWER,STATUSLED=34                                                                                   -
 Active  arm         armv7          sunxi       -               sunxi               ba10_tv_box                          sun4i:BA10_TV_BOX,SPL,SUNXI_EMAC                                                                                                  -
-Active  arm         armv7          sunxi       -               sunxi               Bananapi                             sun7i:BANANAPI,SPL,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),STATUSLED=248,FAST_MBUS                                   -
-Active  arm         armv7          sunxi       -               sunxi               Bananapi_FEL                         sun7i:BANANAPI,SPL_FEL,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),STATUSLED=248,FAST_MBUS                               -
+Active  arm         armv7          sunxi       -               sunxi               BananaPi                             sun7i:BANANAPI,SPL,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),STATUSLED=248,FAST_MBUS                                   -
+Active  arm         armv7          sunxi       -               sunxi               BananaPi_FEL                         sun7i:BANANAPI,SPL_FEL,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),STATUSLED=248,FAST_MBUS                               -
+Active  arm         armv7          sunxi       -               sunxi               BananaPro                            sun7i:BANANAPRO,SPL,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),STATUSLED=248,FAST_MBUS                                        -
+Active  arm         armv7          sunxi       -               sunxi               BananaPro_FEL                        sun7i:BANANAPRO,SPL_FEL,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),STATUSLED=248,FAST_MBUS                                    -
 Active  arm         armv7          sunxi       -               sunxi               Coby_MID7042                         sun4i:COBY_MID7042,SPL                                                                                                            -
 Active  arm         armv7          sunxi       -               sunxi               Coby_MID8042                         sun4i:COBY_MID8042,SPL                                                                                                            -
 Active  arm         armv7          sunxi       -               sunxi               Coby_MID9742                         sun4i:COBY_MID9742,SPL                                                                                                            -