[U-Boot] [PATCH v2 2/2] sunxi: Use proper naming convention for Bananapi boards

Jagan Teki jagan at openedev.com
Mon May 29 19:36:55 UTC 2017 

From: Jagan Teki <jagan at amarulasolutions.com>

Since Bananapi brand is owned by BIPAI KEJI(BPI)
- Drop vendor prefix 'Sinovoip' for defconfig names
- Drop Board name 'SINOVOIP' in MAINTAINERS file
- Use small letters for defconfig files, since
  newly supported and/or longer stable defconfigs
  follow lower-case letters.

Cc: Icenowy Zheng <icenowy at aosc.io>
Cc: Chen-Yu Tsai <wens at csie.org>
Cc: VishnuPatekar <vishnupatekar0510 at gmail.com>
Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>
---
Changes for v2:
- Drop Sinovoip and SINOVOIP vendor prefix since bananapi
  brand no longer used.

 board/sunxi/MAINTAINERS                | 14 +++++++-------
 configs/Bananapi_M1_defconfig          | 23 -----------------------
 configs/Bananapi_M2_Ultra_defconfig    | 18 ------------------
 configs/Sinovoip_BPI_M2_Plus_defconfig | 20 --------------------
 configs/Sinovoip_BPI_M2_defconfig      | 22 ----------------------
 configs/Sinovoip_BPI_M3_defconfig      | 29 -----------------------------
 configs/bananapi_m1_defconfig          | 23 +++++++++++++++++++++++
 configs/bananapi_m2_defconfig          | 22 ++++++++++++++++++++++
 configs/bananapi_m2_plus_defconfig     | 20 ++++++++++++++++++++
 configs/bananapi_m2_ultra_defconfig    | 18 ++++++++++++++++++
 configs/bananapi_m3_defconfig          | 29 +++++++++++++++++++++++++++++
 11 files changed, 119 insertions(+), 119 deletions(-)
 delete mode 100644 configs/Bananapi_M1_defconfig
 delete mode 100644 configs/Bananapi_M2_Ultra_defconfig
 delete mode 100644 configs/Sinovoip_BPI_M2_Plus_defconfig
 delete mode 100644 configs/Sinovoip_BPI_M2_defconfig
 delete mode 100644 configs/Sinovoip_BPI_M3_defconfig
 create mode 100644 configs/bananapi_m1_defconfig
 create mode 100644 configs/bananapi_m2_defconfig
 create mode 100644 configs/bananapi_m2_plus_defconfig
 create mode 100644 configs/bananapi_m2_ultra_defconfig
 create mode 100644 configs/bananapi_m3_defconfig

diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index c2f0227..5f60a4d 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -41,10 +41,10 @@ F:	configs/CSQ_CS908_defconfig
 F:	configs/inet_q972_defconfig
 F:	configs/Mele_A1000G_quad_defconfig
 F:	configs/Mele_M9_defconfig
-F:	configs/Sinovoip_BPI_M2_defconfig
+F:	configs/bananapi_m2_defconfig
 F:	include/configs/sun7i.h
 F:	configs/A20-OLinuXino_MICRO_defconfig
-F:	configs/Bananapi_M1_defconfig
+F:	configs/bananapi_m1_defconfig
 F:	configs/Bananapro_defconfig
 F:	configs/i12-tvbox_defconfig
 F:	configs/Linksprite_pcDuino3_defconfig
@@ -111,7 +111,7 @@ F:	configs/Ampe_A76_defconfig
 BANANAPI M2 ULTRA BOARD
 M:	Chen-Yu Tsai <wens at csie.org>
 S:	Maintained
-F:	configs/Bananapi_M2_Ultra_defconfig
+F:	configs/bananapi_m2_ultra_defconfig
 F:	arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
 
 COLOMBUS BOARD
@@ -284,15 +284,15 @@ S:	Maintained
 F:	configs/Sinlinx_SinA33_defconfig
 W:	http://linux-sunxi.org/Sinlinx_SinA33
 
-SINOVOIP BPI M2 PLUS H3 BOARD
+BPI M2 PLUS H3 BOARD
 M:	Icenowy Zheng <icenowy at aosc.io>
 S:	Maintained
-F:	configs/Sinovoip_BPI_M2_Plus_defconfig
+F:	configs/bananapi_m2_plus_defconfig
 
-SINOVOIP BPI M3 A83T BOARD
+BPI M3 A83T BOARD
 M:	VishnuPatekar <vishnupatekar0510 at gmail.com>
 S:	Maintained
-F:	configs/Sinovoip_BPI_M3_defconfig
+F:	configs/bananapi_m3_defconfig
 
 SUNCHIP CX-A99 BOARD
 M:	Rask Ingemann Lambertsen <rask at formelder.dk>
diff --git a/configs/Bananapi_M1_defconfig b/configs/Bananapi_M1_defconfig
deleted file mode 100644
index 1f8e37b..0000000
--- a/configs/Bananapi_M1_defconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_MACH_SUN7I=y
-CONFIG_DRAM_CLK=432
-CONFIG_MACPWR="PH23"
-CONFIG_VIDEO_COMPOSITE=y
-CONFIG_GMAC_TX_DELAY=3
-CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi-m1"
-CONFIG_AHCI=y
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL=y
-CONFIG_SPL_I2C_SUPPORT=y
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_FPGA is not set
-# CONFIG_SPL_DOS_PARTITION is not set
-# CONFIG_SPL_ISO_PARTITION is not set
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_NETCONSOLE=y
-CONFIG_ETH_DESIGNWARE=y
-CONFIG_RGMII=y
-CONFIG_SUN7I_GMAC=y
-CONFIG_USB_EHCI_HCD=y
diff --git a/configs/Bananapi_M2_Ultra_defconfig b/configs/Bananapi_M2_Ultra_defconfig
deleted file mode 100644
index 4332eca..0000000
--- a/configs/Bananapi_M2_Ultra_defconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_MACH_SUN8I_R40=y
-CONFIG_DRAM_CLK=576
-CONFIG_DRAM_ZQ=3881979
-CONFIG_DRAM_ODT_EN=y
-CONFIG_MMC0_CD_PIN="PH13"
-CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-CONFIG_DEFAULT_DEVICE_TREE="sun8i-r40-bananapi-m2-ultra"
-CONFIG_AHCI=y
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL=y
-CONFIG_SPL_I2C_SUPPORT=y
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_FPGA is not set
-CONFIG_AXP_DLDO4_VOLT=2500
-CONFIG_AXP_ELDO3_VOLT=1200
diff --git a/configs/Sinovoip_BPI_M2_Plus_defconfig b/configs/Sinovoip_BPI_M2_Plus_defconfig
deleted file mode 100644
index e8cd4fb..0000000
--- a/configs/Sinovoip_BPI_M2_Plus_defconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_MACH_SUN8I_H3=y
-CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881979
-CONFIG_DRAM_ODT_EN=y
-CONFIG_MACPWR="PD6"
-CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-bananapi-m2-plus"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_CONSOLE_MUX=y
-CONFIG_SPL=y
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_FPGA is not set
-# CONFIG_SPL_DOS_PARTITION is not set
-# CONFIG_SPL_ISO_PARTITION is not set
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_SUN8I_EMAC=y
-CONFIG_USB_EHCI_HCD=y
diff --git a/configs/Sinovoip_BPI_M2_defconfig b/configs/Sinovoip_BPI_M2_defconfig
deleted file mode 100644
index a2cadbc..0000000
--- a/configs/Sinovoip_BPI_M2_defconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_MACH_SUN6I=y
-CONFIG_DRAM_CLK=432
-CONFIG_USB1_VBUS_PIN=""
-CONFIG_USB2_VBUS_PIN=""
-CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-sinovoip-bpi-m2"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL=y
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_FPGA is not set
-# CONFIG_SPL_DOS_PARTITION is not set
-# CONFIG_SPL_ISO_PARTITION is not set
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_ETH_DESIGNWARE=y
-CONFIG_RGMII=y
-CONFIG_SUN7I_GMAC=y
-CONFIG_AXP_ALDO1_VOLT=3300
-CONFIG_AXP_ALDO2_VOLT=1800
-CONFIG_AXP_DLDO1_VOLT=3000
-CONFIG_USB_EHCI_HCD=y
diff --git a/configs/Sinovoip_BPI_M3_defconfig b/configs/Sinovoip_BPI_M3_defconfig
deleted file mode 100644
index 45eadcb..0000000
--- a/configs/Sinovoip_BPI_M3_defconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_MACH_SUN8I_A83T=y
-CONFIG_DRAM_TYPE=7
-CONFIG_DRAM_CLK=480
-CONFIG_DRAM_ZQ=15355
-CONFIG_DRAM_ODT_EN=y
-CONFIG_INITIAL_USB_SCAN_DELAY=500
-CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE"
-CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
-CONFIG_USB0_ID_DET="PH11"
-CONFIG_USB1_VBUS_PIN="PD24"
-CONFIG_AXP_GPIO=y
-CONFIG_SATAPWR="PD25"
-CONFIG_DEFAULT_DEVICE_TREE="sun8i-a83t-sinovoip-bpi-m3"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_CONSOLE_MUX=y
-CONFIG_SPL=y
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_FPGA is not set
-# CONFIG_SPL_DOS_PARTITION is not set
-# CONFIG_SPL_ISO_PARTITION is not set
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_AXP_DCDC5_VOLT=1200
-CONFIG_AXP_DLDO3_VOLT=2500
-CONFIG_AXP_SW_ON=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_MUSB_HOST=y
diff --git a/configs/bananapi_m1_defconfig b/configs/bananapi_m1_defconfig
new file mode 100644
index 0000000..1f8e37b
--- /dev/null
+++ b/configs/bananapi_m1_defconfig
@@ -0,0 +1,23 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN7I=y
+CONFIG_DRAM_CLK=432
+CONFIG_MACPWR="PH23"
+CONFIG_VIDEO_COMPOSITE=y
+CONFIG_GMAC_TX_DELAY=3
+CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi-m1"
+CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL=y
+CONFIG_SPL_I2C_SUPPORT=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_ISO_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_NETCONSOLE=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_RGMII=y
+CONFIG_SUN7I_GMAC=y
+CONFIG_USB_EHCI_HCD=y
diff --git a/configs/bananapi_m2_defconfig b/configs/bananapi_m2_defconfig
new file mode 100644
index 0000000..a2cadbc
--- /dev/null
+++ b/configs/bananapi_m2_defconfig
@@ -0,0 +1,22 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN6I=y
+CONFIG_DRAM_CLK=432
+CONFIG_USB1_VBUS_PIN=""
+CONFIG_USB2_VBUS_PIN=""
+CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-sinovoip-bpi-m2"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_ISO_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_RGMII=y
+CONFIG_SUN7I_GMAC=y
+CONFIG_AXP_ALDO1_VOLT=3300
+CONFIG_AXP_ALDO2_VOLT=1800
+CONFIG_AXP_DLDO1_VOLT=3000
+CONFIG_USB_EHCI_HCD=y
diff --git a/configs/bananapi_m2_plus_defconfig b/configs/bananapi_m2_plus_defconfig
new file mode 100644
index 0000000..e8cd4fb
--- /dev/null
+++ b/configs/bananapi_m2_plus_defconfig
@@ -0,0 +1,20 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN8I_H3=y
+CONFIG_DRAM_CLK=672
+CONFIG_DRAM_ZQ=3881979
+CONFIG_DRAM_ODT_EN=y
+CONFIG_MACPWR="PD6"
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-bananapi-m2-plus"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
+CONFIG_SPL=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_ISO_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SUN8I_EMAC=y
+CONFIG_USB_EHCI_HCD=y
diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig
new file mode 100644
index 0000000..4332eca
--- /dev/null
+++ b/configs/bananapi_m2_ultra_defconfig
@@ -0,0 +1,18 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN8I_R40=y
+CONFIG_DRAM_CLK=576
+CONFIG_DRAM_ZQ=3881979
+CONFIG_DRAM_ODT_EN=y
+CONFIG_MMC0_CD_PIN="PH13"
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-r40-bananapi-m2-ultra"
+CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL=y
+CONFIG_SPL_I2C_SUPPORT=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_AXP_DLDO4_VOLT=2500
+CONFIG_AXP_ELDO3_VOLT=1200
diff --git a/configs/bananapi_m3_defconfig b/configs/bananapi_m3_defconfig
new file mode 100644
index 0000000..45eadcb
--- /dev/null
+++ b/configs/bananapi_m3_defconfig
@@ -0,0 +1,29 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN8I_A83T=y
+CONFIG_DRAM_TYPE=7
+CONFIG_DRAM_CLK=480
+CONFIG_DRAM_ZQ=15355
+CONFIG_DRAM_ODT_EN=y
+CONFIG_INITIAL_USB_SCAN_DELAY=500
+CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE"
+CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
+CONFIG_USB0_ID_DET="PH11"
+CONFIG_USB1_VBUS_PIN="PD24"
+CONFIG_AXP_GPIO=y
+CONFIG_SATAPWR="PD25"
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-a83t-sinovoip-bpi-m3"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
+CONFIG_SPL=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_ISO_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_AXP_DCDC5_VOLT=1200
+CONFIG_AXP_DLDO3_VOLT=2500
+CONFIG_AXP_SW_ON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_MUSB_HOST=y
-- 
1.9.1

More information about the U-Boot mailing list