Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

uboot-sunxi: Banana Pi M2 Ultra switch to mainline defconfig #2849

Closed
wants to merge 1 commit into from

Conversation

abajk
Copy link
Contributor

@abajk abajk commented Mar 22, 2020

U-boot also have defconfig for this board. In 2019.01 branch they are identical.

Fixes: 26898a8

Signed-off-by: Aleksander Jan Bajkowski A.Bajkowski@stud.elka.pw.edu.pl

@ynezz ynezz added target/sunxi pull request/issue for sunxi target core packages pull request/issue for core (in-tree) packages labels Mar 23, 2020
@@ -294,7 +295,6 @@ UBOOT_TARGETS := \
pangolin \
pine64_plus \
Sinovoip_BPI_M2_Plus \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CHKDSK88 BTW what about Sinovoip_BPI_M2_Plus ? Seems like it wont work these days.

ynezz@ntbk:/opt/devel/u-boot$ make Sinovoip_BPI_M2_Plus_config
***
*** Can't find default configuration "arch/../configs/Sinovoip_BPI_M2_Plus_defconfig"!
***

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ynezz

This is a reason: u-boot/u-boot@268ae65

It should be changed if we bump uboot-sunxi to >=2019.04.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CHKDSK88 Thanks, should be fixed via ynezz@fefa6f5 as I plan to bump U-Boot to 2020.01 soon via ynezz@5cb06c0

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ynezz
Thanks for info. LGTM.
At this moment, I can't run test it because my banana was burned.

@ynezz
Copy link
Member

ynezz commented Mar 23, 2020

Fixes: 26898a8

I would remove this, that commit was probably fine as it just included that config in separate patch.

@ynezz ynezz self-assigned this Mar 23, 2020
U-boot also have defconfig for this board. In 2019.01 branch they are identical.

Signed-off-by: Aleksander Jan Bajkowski <A.Bajkowski@stud.elka.pw.edu.pl>
@ynezz
Copy link
Member

ynezz commented Mar 25, 2020

Thanks! Pulled into my staging tree at https://git.openwrt.org/openwrt/staging/ynezz.git

@ynezz ynezz closed this Mar 25, 2020
jow- pushed a commit that referenced this pull request Mar 28, 2020
Rename the board as done in upstream commit 268ae6548779 ("sunxi: Rename
Sinovoip BPI M2 Plus to Bananapi M2 Plus H3") which backs the rename
with the following reasoning:

 The brand Sinovoip is used for Sinovoip's original VOIP products, while
 the Bananapi brand is for the single board computers they produce.  This
 has been verified by Bananapi. Rename the board from "Sinovoip BPI M2
 Plus" to "Bananapi M2 Plus". For the defconfig file, all lowercase is
 used.

 To support the H5 variant of this board, the "H3" suffix is added to
 the defconfig name.

This has to be done in order to allow building U-Boot past v2019.04
release where this change was introduced.

Ref: #2849 (comment)
Suggested-by: Pawel Dembicki <paweldembicki@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
@abajk abajk deleted the bpi_m2_ultra_defc branch March 28, 2020 21:28
pull bot pushed a commit to zxlhhyccc/openwrt-sfe that referenced this pull request Jul 10, 2020
Rename the board as done in upstream commit 268ae6548779 ("sunxi: Rename
Sinovoip BPI M2 Plus to Bananapi M2 Plus H3") which backs the rename
with the following reasoning:

 The brand Sinovoip is used for Sinovoip's original VOIP products, while
 the Bananapi brand is for the single board computers they produce.  This
 has been verified by Bananapi. Rename the board from "Sinovoip BPI M2
 Plus" to "Bananapi M2 Plus". For the defconfig file, all lowercase is
 used.

 To support the H5 variant of this board, the "H3" suffix is added to
 the defconfig name.

This has to be done in order to allow building U-Boot past v2019.04
release where this change was introduced.

Ref: openwrt/openwrt#2849 (comment)
Suggested-by: Pawel Dembicki <paweldembicki@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core packages pull request/issue for core (in-tree) packages target/sunxi pull request/issue for sunxi target
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants